diff --git a/Dockerfile b/Dockerfile index a5ee80c9a2d8b1e3fdecb1500adc7c35c96e70c4..c40ba2a6548878a0a6c255bf69e2555ffda37c6d 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-rails -ARG BASE_TAG=13.10.3 +ARG BASE_TAG=13.11.0 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 095f4935af609693892fb0d7d78817e4602a1f35..8001c4bd880499d65a43f1d07e2a66383926f4a1 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 2196524ea2436b6512b04b4494c28b1ee7227c0d..eef57ca7e82af4a713c6459d06acd17626f28142 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-sidekiq" # 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-rails" - BASE_TAG: "13.10.3" + BASE_TAG: "13.11.0" # Docker image labels labels: org.opencontainers.image.title: "Gitlab Sidekiq" @@ -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,18 +43,18 @@ maintainers: username: "alfontaine" email: "alan.fontaine@centauricorp.com" resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.3-ubi8/gitlab-sidekiq-ee.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.11.0-ubi8/gitlab-sidekiq-ee.tar.gz" filename: "gitlab-sidekiq-ee.tar.gz" validation: type: "sha256" - value: "88c85ad1922e5b7d28555c1bf5ef55faf5ef47652994398c57d9e073c4a9e843" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.3-ubi8/gitlab-python.tar.gz" + value: "b9ff670052d6b8b6249e30253530e449c8299a04668713e19a564e0093631a69" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.11.0-ubi8/gitlab-python.tar.gz" filename: "gitlab-python.tar.gz" validation: type: "sha256" - value: "cc08b0efbcd78877f7ed57607fdc46674871bdb94c3ec98329356fb5aafea5ba" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.3-ubi8/gitlab-logger.tar.gz" + value: "0ff636e520a5853c14e87e20872ea86f6714bb991730a2fec8255e2f8caa3441" + - 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..21a9a8946208c2c0550f2f73ec1e5ea53343506c --- /dev/null +++ b/openshift.metadata @@ -0,0 +1,6 @@ +io.openshift.tags=gitlab-sidekiq +io.openshift.wants=gitlab-webservice +io.k8s.description=GitLab Sidekiq service container. +io.openshift.non-scalable=false +io.openshift-min-memory=2Gi +io.openshift.min-cpu=900m