diff --git a/Dockerfile b/Dockerfile index 926de6b8c2696cedddc88fba76178075fbeeab19..2957a89d4846c39abe99977d9c5701b9b3be4f3d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.9.3-ubi8 +ARG GITLAB_VERSION=v13.10.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.9.3 +ARG BASE_TAG=13.10.0 ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/build-scripts/build.sh b/build-scripts/build.sh index d89354bc3af41206b1a2ca506b6b0301171b9705..bdc2efd6768af37a046bb9b0970c819a9322e112 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.9.3} +TAG=${1:-13.10.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 5c6353613c5b44b734d3e3052321e0fd8a2249c5..f6b12b2dfebc7016c1dd3dda7cd10e63e2144084 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-task-runner" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: - - "13.9.3" + - "13.10.0" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-rails" - BASE_TAG: "13.9.3" + BASE_TAG: "13.10.0" # Docker image labels labels: org.opencontainers.image.title: "Gitlab Task Runner" @@ -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.3" + org.opencontainers.image.version: "13.10.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.9.3-ubi8/gitlab-task-runner-ee.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.0-ubi8/gitlab-task-runner-ee.tar.gz" filename: "gitlab-task-runner-ee.tar.gz" validation: type: "sha256" - value: "c8195e30c78586112ad0e1b09188dff267cb226e4982912174d086a668caed24" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.9.3-ubi8/gitlab-python.tar.gz" + value: "7324b972fa0c7a47dd6647ee161ded8cb6d8d9872a84244447eb9421306a7acd" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.0-ubi8/gitlab-python.tar.gz" filename: "gitlab-python.tar.gz" validation: type: "sha256" - value: "ee5cc7f70ff32e72a7a68e7c2257f384ca5c63d47a4c611571b1101945e749da" + value: "3e24e604dc632bd8ce5af666dfb2ff0b82615cc43a213cfd70d8b47700121ff9"