diff --git a/Dockerfile b/Dockerfile index f66188d718fc9528705983d3f6bd779457d21770..e3a10ceddafac09f6595efd1bfe3324fedaca90d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.10.3-ubi8 +ARG GITLAB_VERSION=v13.11.0-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby -ARG BASE_TAG=13.10.3 +ARG BASE_TAG=13.11.0 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/build-scripts/build.sh b/build-scripts/build.sh index f478c165cd9e7ad2c558682e012cd12c53b20fbd..9991bd298f4ca585afd51763b34791cbaaa4fc42 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.10.3} +TAG=${1:-13.11.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index e98f7a97bb774b6a7edb79ce281f1bee3663a8d3..3b65ac6e9b65b999bab4725fdec62904fa66f0f4 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-shell" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: - - "13.10.3" + - "13.11.0" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-ruby" - BASE_TAG: "13.10.3" + BASE_TAG: "13.11.0" # Docker image labels labels: org.opencontainers.image.title: "Gitlab Shell" @@ -22,7 +22,7 @@ labels: org.opencontainers.image.url: "https://about.gitlab.com/" ## Name of the distributing entity, organization or individual org.opencontainers.image.vendor: "Gitlab" - org.opencontainers.image.version: "13.10.3" + org.opencontainers.image.version: "13.11.0" ## Keywords to help with search (ex. "cicd,gitops,golang") mil.dso.ironbank.image.keywords: "gitlab, git, gitops" ## This value can be "opensource" or "commercial" @@ -43,13 +43,13 @@ maintainers: username: "alfontaine" email: "alan.fontaine@centauricorp.com" resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.3-ubi8/gitlab-shell.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.11.0-ubi8/gitlab-shell.tar.gz" filename: "gitlab-shell.tar.gz" validation: type: "sha256" - value: "89d9d47445f0a2e62363e11df549802a02c0cf7d84cc559df31ad9910694c01d" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.3-ubi8/gitlab-logger.tar.gz" + value: "b2ffeb23cffef6cd01b81ce7ee077ddd47f0911ddeb6a7d9dd36eb2c15f9f52d" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.11.0-ubi8/gitlab-logger.tar.gz" filename: "gitlab-logger.tar.gz" validation: type: "sha256" - value: "c1fdd021b52c724c6c44e94e5de1266241b8f7e1cdeeb194e62547ae1b43a8d4" + value: "b48ecbb91aebda8cd5a2e5369b0c226da4b0e25510815b6abd6becd4a4a148a7" diff --git a/openshift.metadata b/openshift.metadata new file mode 100644 index 0000000000000000000000000000000000000000..d331b472401fb734b5a56e997a931d64e4c43318 --- /dev/null +++ b/openshift.metadata @@ -0,0 +1,6 @@ +io.openshift.tags=gitlab-shell +io.openshift.wants=gitlab-webservice +io.k8s.description=GitLab Shell service container. +io.openshift.non-scalable=false +io.openshift-min-memory=6Mi +io.openshift.min-cpu=0m