diff --git a/Dockerfile b/Dockerfile index 2af2bad56b09c0c8ac4061f6d9e329a4b1d639f9..b13698177742784520c7a78bf88aa08c59798565 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG GITLAB_VERSION=v13.12.2-ubi8 +ARG GITLAB_VERSION=v14.0.0-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=redhat/ubi/ubi8 diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 4074cbb522d96ec180d2afc00f023aaa57c81d0f..d4a2e34aed136e077abc5bcee37dd7a6ca6ba782 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-13.12.2} +TAG=${1:-14.0.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 4f1155bf820f879acddae74ddf7851c624856eba..fbaad2d4cf856b2d14045c3b4fe5a8f13f64e122 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,7 +5,7 @@ name: "gitlab/gitlab/gitlab-ruby" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: - - "13.12.2" + - "14.0.0" - "latest" # Build args passed to Dockerfile ARGs args: @@ -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.12.2" + org.opencontainers.image.version: "14.0.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.12.2-ubi8/gitlab-ruby.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.0-ubi8/gitlab-ruby.tar.gz" filename: "gitlab-ruby.tar.gz" validation: type: "sha256" - value: "819488e37214635287cc59e0ebc2860c02f4e1831320c5bebe939631be5f1bab" + value: "62dfecf71cbfd837e323bf24a394f354fdc9a8083abadf2519e14c0ccfba88f6" diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh index 3db699bdb07e869fe38a6576ea0dcec9da66e877..280c2fb92c79a0fa6dd06e5df2115c68811b1212 100755 --- a/scripts/entrypoint.sh +++ b/scripts/entrypoint.sh @@ -4,4 +4,4 @@ set -xe /scripts/set-config "${CONFIG_TEMPLATE_DIRECTORY}" "${CONFIG_DIRECTORY:=$CONFIG_TEMPLATE_DIRECTORY}" -exec "$@" +exec /scripts/exec-env "$@" diff --git a/scripts/exec-env b/scripts/exec-env new file mode 100755 index 0000000000000000000000000000000000000000..7130888c31e6ee210af7a41f81179836c56610c0 --- /dev/null +++ b/scripts/exec-env @@ -0,0 +1,14 @@ +#!/bin/bash + +ENVIRONMENT_DIR=/etc/gitlab/environment +if [ -d $ENVIRONMENT_DIR ]; then + # find all the files, export their content under their name. + for f in $(find -P $ENVIRONMENT_DIR -maxdepth 1 -type f) ; do + size=$(stat -c%s "$f") + if [ "$size" -gt 0 ]; then + export $(basename "$f")=$(cat "$f") + fi + done +fi + +exec "$@" \ No newline at end of file