Update GitLab to the 14.2.0 Feature Release

Dockerfile

-ARG CI_REGISTRY_IMAGE="registry.gitlab.com/gitlab-org/build/cng"
-ARG TAG="master"
-ARG FROM_IMAGE="$CI_REGISTRY_IMAGE/gitlab-rails-ee"
-ARG PYTHON_TAG=3.8.9
-ARG GITALY_IMAGE=
-
-FROM ${CI_REGISTRY_IMAGE}/gitlab-python:${PYTHON_TAG} AS python
-
-FROM ${GITALY_IMAGE} AS gitaly
-
-FROM ${FROM_IMAGE}:${TAG}
-
-ARG S3CMD_VERSION="2.1.0"
-ARG GSUTIL_VERSION="4.43"
-
-COPY --from=python /usr/local/bin /usr/local/bin/
-COPY --from=python /usr/local/lib /usr/local/lib/
-COPY --from=python /usr/local/include /usr/local/include/
-COPY --from=gitaly  /usr/local/bin/gitaly-backup /usr/local/bin/
-
-RUN apt-get update \
-	&& apt-get install -y --no-install-recommends \
-  gcc \
-  ca-certificates \
-  openssl \
-  tar \
-  && ldconfig \
-  && pip3 install --upgrade s3cmd==${S3CMD_VERSION} \
-  && pip3 install gsutil==${GSUTIL_VERSION} crcmod \
-  && apt-get purge -y --auto-remove gcc \
-  && rm -rf /var/lib/apt/lists/*
+ARG GITLAB_VERSION=v14.2.0-ubi8
 
+ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
+ARG BASE_IMAGE=gitlab/gitlab/gitlab-rails
+ARG BASE_TAG=14.2.0
+
+ARG RAILS_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
+
+FROM ${RAILS_IMAGE}
+
+ARG GITLAB_VERSION
 ARG GITLAB_USER=git
+ARG DNF_OPTS
+ENV LIBDIR ${LIBDIR:-"/usr/lib64"}
+
+ADD gitlab-toolbox-ee.tar.gz /
+ADD gitlab-python.tar.gz /
 
 COPY scripts/bin/* /usr/local/bin/
-COPY scripts/lib/* /usr/lib/ruby/vendor_ruby/
+COPY scripts/lib/* ${LIBDIR}/ruby/vendor_ruby/
+
+RUN dnf clean all \
+    && rm -r /var/cache/dnf \
+    && dnf ${DNF_OPTS} install -by --nodocs ca-certificates openssl
 
-USER $GITLAB_USER:$GITLAB_USER
+USER ${GITLAB_USER}:${GITLAB_USER}
 
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
\ No newline at end of file

Dockerfile.build.ubi8

-ARG BUILD_IMAGE=
-
-FROM ${BUILD_IMAGE}
-
-ARG S3CMD_VERSION=2.1.0
-ARG GSUTIL_VERSION=4.42
-ARG DNF_OPTS
-
-ADD gitlab-python.tar.gz /
-ADD gitaly.tar.gz /tmp/gitaly
-
-RUN dnf ${DNF_OPTS} install -by --nodocs gcc \
-    && mkdir /assets \
-    && pip3 install s3cmd==${S3CMD_VERSION} gsutil==${GSUTIL_VERSION} crcmod \
-    && mv /tmp/gitaly/usr/local/bin/gitaly-backup /usr/local/bin \
-    && cp -R --parents \
-        /usr/local/lib/python3.8/site-packages \
-        /usr/local/bin/ \
-        /assets

Dockerfile.ubi8

-ARG CI_REGISTRY_IMAGE="registry.gitlab.com/gitlab-org/build/cng"
-ARG TAG="master"
-ARG FROM_IMAGE="$CI_REGISTRY_IMAGE/gitlab-toolbox"
-FROM ${FROM_IMAGE}:${TAG}

build-scripts/build.sh

+#!/bin/bash
+
+# NOTICE: This script requires `docker`.
+
+set -euxo pipefail
+
+TAG=${1:-14.2.0}
+REPOSITORY=${2:-}
+DOCKER_OPTS=${DOCKER_OPTS:-""}
+
+imageName() {
+  printf "${REPOSITORY}${1}:${TAG}"
+}
+
+buildImage() {
+  IMAGE="${1}"
+  CONTEXT="${IMAGE%*-ee}"
+  {
+    docker build \
+      -t "$(imageName ${IMAGE})" . \
+      ${DOCKER_OPTS:-} | tee ${CONTEXT}.out
+  } || {
+    echo "${CONTEXT}" >> failed.log
+  }
+}
+
+# Cleanup log outputs from previous build
+rm -f *.out failed.log
+
+DOCKER_OPTS="$DOCKER_OPTS --build-arg RAILS_IMAGE=$(imageName gitlab-rails)"
+buildImage gitlab-toolbox

build-scripts/cleanup.sh

+#!/bin/bash
+
+set -euxo pipefail
+
+rm -f *.tar.gz *.out failed.log

hardening_manifest.yaml

@@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-toolbox"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-  - "14.1.2"
+  - "14.2.0"
   - "latest"
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "gitlab/gitlab/gitlab-rails"
-  BASE_TAG: "14.1.2"
+  BASE_TAG: "14.2.0"
 # Docker image labels
 labels:
   org.opencontainers.image.title: "Gitlab Toolbox"
@@ -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: "14.1.2"
+  org.opencontainers.image.version: "14.2.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"
@@ -46,4 +46,14 @@ maintainers:
     name: "Adam Martin"
     username: "adam.martin"
     cht_member: true
-
+resources: 
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.2.0-ubi8/gitlab-toolbox-ee.tar.gz"
+    filename: "gitlab-toolbox-ee.tar.gz"
+    validation:
+      type: "sha256"
+      value: "d0b2020e9ba41367ea3bb36e1fabc924ca7fb8241224e386924f2822aa5a44a4"
+  - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.2.0-ubi8/gitlab-python.tar.gz"
+    filename: "gitlab-python.tar.gz"
+    validation:
+      type: "sha256"
+      value: "c7c279f90687febbfb537c17f43b6db9dc0d1916feb7e99bdd40c17e61fe0064"