From 5ead30a4c6e6ea7832321bb0fdf55afc3ec18c67 Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Tue, 22 Dec 2020 07:39:26 -0800 Subject: [PATCH 1/6] Upgrade GitLab to the 13.7.0 Feature Release --- Dockerfile | 13 +++++++++++-- Jenkinsfile | 2 +- build-scripts/build.sh | 2 +- download.yaml | 4 ++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5d8751a..56ba831 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v13.6.3-ubi8 +ARG GITLAB_VERSION=v13.7.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.6.3 +ARG BASE_TAG=13.7.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/Jenkinsfile b/Jenkinsfile index d0a3425..58e7e3e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "13.6.3") +dccscrPipeline(version: "13.7.0") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 791fcf3..1d20f3f 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.6.3} +TAG=${1:-13.7.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.yaml b/download.yaml index c7449ca..bab2024 100644 --- a/download.yaml +++ b/download.yaml @@ -1,6 +1,6 @@ resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.3-ubi8/gitlab-rails-ee.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.0-ubi8/gitlab-rails-ee.tar.gz" filename: "gitlab-rails-ee.tar.gz" validation: type: "sha256" - value: "74ee61a14ae796d2882111d8ce6c9abcd60cbb40209651786a23b84881f9a0fb" + value: "91d5a68a86f2568efa5819af2435368ba955342d0c27a33699bf924ddce7eb9f" -- GitLab From b1c2ac8948a107b19057eeb6b5f8b21c717433ea Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Thu, 7 Jan 2021 15:35:00 +0000 Subject: [PATCH 2/6] Delete Jenkinsfile --- Jenkinsfile | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 58e7e3e..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,2 +0,0 @@ -@Library('DCCSCR@master') _ -dccscrPipeline(version: "13.7.0") -- GitLab From 5f896f3fadd59b4ea9b268762ea177435b73ecef Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Thu, 7 Jan 2021 15:36:56 +0000 Subject: [PATCH 3/6] Add new file --- hardening_manifest.yaml | 59 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 hardening_manifest.yaml diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml new file mode 100644 index 0000000..d93c957 --- /dev/null +++ b/hardening_manifest.yaml @@ -0,0 +1,59 @@ +--- +apiVersion: v1 + +# The repository name in registry1, excluding /ironbank/ +name: "gitlab/gitlab/gitlab-rails" + +# List of tags to push for the repository in registry1 +# The most specific version should be the first tag and will be shown +# on ironbank.dsop.io +tags: +- "13.7.0" +- "latest" + +# Build args passed to Dockerfile ARGs +args: + BASE_IMAGE: "gitlab/gitlab/gitlab-ruby" + BASE_TAG: "13.7.0" + +# Docker image labels +labels: + org.opencontainers.image.title: "Gitlab Rails" + ## Human-readable description of the software packaged in the image + org.opencontainers.image.description: "Rails container for GitLab." + ## License(s) under which contained software is distributed + org.opencontainers.image.licenses: "MIT License" + ## URL to find more information on the image + 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.6.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" + mil.dso.ironbank.image.type: "commercial" + ## Product the image belongs to for grouping multiple images + mil.dso.ironbank.product.name: "gitlab" + + +# List of resources to make available to the offline build context +resources: +- filename: gitlab-rails-ee.tar.gz + url: https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.0-ubi8/gitlab-rails-ee.tar.gz + validation: + type: sha256 + value: 91d5a68a86f2568efa5819af2435368ba955342d0c27a33699bf924ddce7eb9f + +# List of project maintainers +# FIXME: Fill in the following details for the current container owner in the whitelist +# FIXME: Include any other vendor information if applicable +maintainers: +- email: "dj@gitlab.com " +# # The name of the current container owner + name: "DJ Mountney" +# # The gitlab username of the current container owner + username: "twk3" +# cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT +- name: "Al Fontaine" + username: "alfontaine" + email: "alan.fontaine@centauricorp.com" -- GitLab From d649bb640aea1c4b71e19500aa4161c93a5ac04d Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Thu, 7 Jan 2021 15:37:05 +0000 Subject: [PATCH 4/6] Delete download.yaml --- download.yaml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 download.yaml diff --git a/download.yaml b/download.yaml deleted file mode 100644 index bab2024..0000000 --- a/download.yaml +++ /dev/null @@ -1,6 +0,0 @@ -resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.7.0-ubi8/gitlab-rails-ee.tar.gz" - filename: "gitlab-rails-ee.tar.gz" - validation: - type: "sha256" - value: "91d5a68a86f2568efa5819af2435368ba955342d0c27a33699bf924ddce7eb9f" -- GitLab From 8c50e157e5a801c33255518a8e42b0dad40e3e21 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Thu, 7 Jan 2021 15:37:55 +0000 Subject: [PATCH 5/6] Update hardening_manifest.yaml --- hardening_manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index d93c957..449a8cc 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -27,7 +27,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.6.3" + org.opencontainers.image.version: "13.7.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" -- GitLab From dc2413cd5658528d2d7c81ed8ceabd7bf751be76 Mon Sep 17 00:00:00 2001 From: Al Fontaine Date: Thu, 7 Jan 2021 15:38:47 +0000 Subject: [PATCH 6/6] Update Dockerfile --- Dockerfile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 56ba831..316aadd 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