diff --git a/Dockerfile b/Dockerfile index b5e177fab3ed336fd2de18f0b38d92c343b68632..afeddd43783f9635b94869f855426a981a3ed588 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -ARG GITLAB_VERSION=v13.9.0-ubi8 +ARG GITLAB_VERSION=v13.9.3-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby -ARG BASE_TAG=13.9.0 +ARG BASE_TAG=13.9.3 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${RUBY_IMAGE} -ARG GITLAB_SHELL_VERSION=v13.16.1 +ARG GITLAB_SHELL_VERSION=v13.17.0 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/build-scripts/build.sh b/build-scripts/build.sh index dfcfcc3ebc25197651551c9bf9884a9b956f288e..793a3254f0309f8a2d83fffa48bd1f368eeec19e 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.9.0} +TAG=${1:-13.9.3} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index dc64ae0beb8c540426effcd41a1a6c9fd76d462f..dd9b68404b76d1975cddbf555bde9ae40a7666cc 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.9.0" + - "13.9.3" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-ruby" - BASE_TAG: "13.9.0" + BASE_TAG: "13.9.3" # 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.9.0" + org.opencontainers.image.version: "13.9.3" ## 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.9.0-ubi8/gitlab-shell.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.9.3-ubi8/gitlab-shell.tar.gz" filename: "gitlab-shell.tar.gz" validation: type: "sha256" - value: "97a561f55d375c1f16b545424a0672d91ddebc31c1ba8fb6696334b6965d3743" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.9.0-ubi8/gitlab-logger.tar.gz" + value: "b537ebd47ac28b9ce6f2cfaef2f4e397fd366f46944205f45973453e96f1545d" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.9.3-ubi8/gitlab-logger.tar.gz" filename: "gitlab-logger.tar.gz" validation: type: "sha256" - value: "75fafdb14ba52d988a3dc8517c6a03b7b1fe007d05400be1b88b1c706c65484d" + value: "21510dedbd7e738a76c2adf423f83fa39a2e794fd7011933295351ae8add7a13"