diff --git a/Dockerfile b/Dockerfile index 95c6c99e33531d5f2ca69768da277c5b0f89ac73..11e0add6e1d7b033188ac952b1bff7bee8dc7d5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -ARG GITLAB_VERSION=v14.0.5-ubi8 +ARG GITLAB_VERSION=v14.1.0-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby -ARG BASE_TAG=14.0.5 +ARG BASE_TAG=14.1.0 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 89f9d67e417122d324a5aef313400a1896ac2e58..98320d9163d6d427f0884ffccbc037aefb311e49 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-14.0.5} +TAG=${1:-14.1.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index aa0536996079ade255a64ace4b2388a45b99521a..cb747e9020591d83a7b5353bfacdcf1635888e4e 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitlab-shell" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: - - "14.0.5" + - "14.1.0" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "gitlab/gitlab/gitlab-ruby" - BASE_TAG: "14.0.5" + BASE_TAG: "14.1.0" # Docker image labels labels: org.opencontainers.image.title: "Gitlab Shell" @@ -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.0.5" + org.opencontainers.image.version: "14.1.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" @@ -42,19 +42,23 @@ maintainers: - name: "Al Fontaine" username: "alfontaine" email: "alan.fontaine@centauricorp.com" + - email: "adam.martin@rancherfederal.com" + name: "Adam Martin" + username: "adam.martin" + cht_member: true resources: - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.5-ubi8/gitlab-shell.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.0-ubi8/gitlab-shell.tar.gz" filename: "gitlab-shell.tar.gz" validation: type: "sha256" - value: "bc540e190f952e500a11c952d407c6b582381de2d47e830cb2c60ddeb5d47a7d" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.5-ubi8/gitlab-logger.tar.gz" + value: "b751209699f715f1b16380811290b4c43320049eb74e0bc7b899ee4e60b5b598" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.0-ubi8/gitlab-logger.tar.gz" filename: "gitlab-logger.tar.gz" validation: type: "sha256" - value: "7a889bef692990d4b7581b23c5a1f3a0b320ed3bb33c38bde30b5cc3afb72d63" - - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.0.5-ubi8/gitlab-gomplate.tar.gz" + value: "674bc89c3f6e577236feeadccc6adb3f380e014f8f474004ff96f93f3144eb28" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.0-ubi8/gitlab-gomplate.tar.gz" filename: "gitlab-gomplate.tar.gz" validation: type: "sha256" - value: "8e6aad0d7c5940bc8955aa2bb9f53954840e481e762236bec71a535913b02778" + value: "b73f3650e5634a1d24c593dd0ffe30ef107e01f77d29b2641c7ea12f3f9efe48" diff --git a/scripts/authorized_keys b/scripts/authorized_keys index 48fc646a1d4bc4c5e9623feb9c39f3c302ebe6a1..481e1a23792027925ebf9b2b51ef43d5d5d86a0b 100755 --- a/scripts/authorized_keys +++ b/scripts/authorized_keys @@ -1,5 +1,5 @@ #!/bin/bash if [[ "$1" == "git" ]]; then - /srv/gitlab-shell/bin/authorized_keys $2 + /srv/gitlab-shell/bin/gitlab-shell-authorized-keys-check git $1 $2 fi