From dbf9727eb8925c1ecc352f44aaac5ea60cb4875e Mon Sep 17 00:00:00 2001 From: Steven Terhar Date: Thu, 11 Mar 2021 20:12:59 +0000 Subject: [PATCH 1/4] Update GitLab to the 13.9.3 Patch Release --- Dockerfile | 4 ++-- build-scripts/build.sh | 2 +- hardening_manifest.yaml | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 898489f..c2046a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -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} diff --git a/build-scripts/build.sh b/build-scripts/build.sh index e24f039..2c1838d 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 cae6e3b..7cc4e4c 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-rails" # 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 Rails" @@ -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,8 +43,8 @@ maintainers: username: "alfontaine" email: "alan.fontaine@centauricorp.com" resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.9.0-ubi8/gitlab-rails-ee.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.9.3-ubi8/gitlab-rails-ee.tar.gz" filename: "gitlab-rails-ee.tar.gz" validation: type: "sha256" - value: "02806fb74bd256c94c5af618c3bf743d449514bd666d7b2c15307406e7c171fa" + value: "fe33ddefbdf7b96d57f487e403925f8678235eb325edf21fa8bba4f3c7aaa3dc" -- GitLab From 21236d23d9abd21b55120a6ac7c7ec32f9d5923f Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Wed, 17 Mar 2021 18:57:12 +0000 Subject: [PATCH 2/4] Update Dockerfile --- Dockerfile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index c2046a9..6012489 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,15 +12,6 @@ ARG GITLAB_USER=git ARG GITLAB_DATA=/var/opt/gitlab ARG DNF_OPTS -LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-rails" \ - name="GitLab Rails" \ - maintainer="GitLab Distribution Team" \ - vendor="GitLab" \ - version=${GITLAB_VERSION} \ - release=${GITLAB_VERSION} \ - summary="Rails container for GitLab." \ - description="Rails container for GitLab." - RUN dnf clean all \ && rm -r /var/cache/dnf \ && dnf ${DNF_OPTS} install -by --nodocs \ -- GitLab From 28080e099ee3ad5671ea9c8f939c91c143962fe8 Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Mon, 22 Mar 2021 09:02:21 -0700 Subject: [PATCH 3/4] Update GitLab to the 13.10.0 Minor Feature Release --- Dockerfile | 13 +++++++++++-- build-scripts/build.sh | 2 +- hardening_manifest.yaml | 10 +++++----- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6012489..12f8f29 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-ruby -ARG BASE_TAG=13.9.3 +ARG BASE_TAG=13.10.0 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} @@ -12,6 +12,15 @@ ARG GITLAB_USER=git ARG GITLAB_DATA=/var/opt/gitlab ARG DNF_OPTS +LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-rails" \ + name="GitLab Rails" \ + maintainer="GitLab Distribution Team" \ + vendor="GitLab" \ + version=${GITLAB_VERSION} \ + release=${GITLAB_VERSION} \ + summary="Rails container for GitLab." \ + description="Rails container for GitLab." + RUN dnf clean all \ && rm -r /var/cache/dnf \ && dnf ${DNF_OPTS} install -by --nodocs \ diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 2c1838d..13cff25 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 7cc4e4c..8afadb8 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-rails" # 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-ruby" - BASE_TAG: "13.9.3" + BASE_TAG: "13.10.0" # Docker image labels labels: org.opencontainers.image.title: "Gitlab Rails" @@ -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,8 +43,8 @@ maintainers: username: "alfontaine" email: "alan.fontaine@centauricorp.com" resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.9.3-ubi8/gitlab-rails-ee.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.10.0-ubi8/gitlab-rails-ee.tar.gz" filename: "gitlab-rails-ee.tar.gz" validation: type: "sha256" - value: "fe33ddefbdf7b96d57f487e403925f8678235eb325edf21fa8bba4f3c7aaa3dc" + value: "1059b34ef15d8d1acf64fe97b52c5b3c286fa6b9f06beb3cb82e4d6839c16dad" -- GitLab From d29b1eb650d3d7268b5e1accb2295a47e6554458 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Mon, 29 Mar 2021 16:02:28 +0000 Subject: [PATCH 4/4] Update Dockerfile --- Dockerfile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 12f8f29..fe968f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,15 +12,6 @@ ARG GITLAB_USER=git ARG GITLAB_DATA=/var/opt/gitlab ARG DNF_OPTS -LABEL source="https://gitlab.com/gitlab-org/build/CNG/-/tree/master/gitlab-rails" \ - name="GitLab Rails" \ - maintainer="GitLab Distribution Team" \ - vendor="GitLab" \ - version=${GITLAB_VERSION} \ - release=${GITLAB_VERSION} \ - summary="Rails container for GitLab." \ - description="Rails container for GitLab." - RUN dnf clean all \ && rm -r /var/cache/dnf \ && dnf ${DNF_OPTS} install -by --nodocs \ -- GitLab