From e93016da86e484ae3035d0e5c7f8cba898af5208 Mon Sep 17 00:00:00 2001 From: GitLab Release Tools Bot Date: Wed, 22 Apr 2020 09:54:07 -0700 Subject: [PATCH 1/3] Update GitLab to the 12.10.0 release --- Dockerfile | 6 +++--- Jenkinsfile | 2 +- build-scripts/build.sh | 2 +- download.yaml | 6 +++--- scripts/process-wrapper | 10 ++++++++-- sshd_config | 2 +- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index d633c68..6aa0721 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -ARG GITLAB_VERSION=v12.9.4-ubi8 +ARG GITLAB_VERSION=v12.10.0-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=redhat/ubi/ubi8 ARG BASE_TAG=8.1 ARG UBI_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -ARG RUBY_IMAGE=${BASE_REGISTRY}/gitlab/gitlab/gitlab-ruby:12.9.4 +ARG RUBY_IMAGE=${BASE_REGISTRY}/gitlab/gitlab/gitlab-ruby:12.10.0 FROM ${UBI_IMAGE} AS builder @@ -19,7 +19,7 @@ RUN /build-scripts/prepare.sh "/opt/${PACKAGE_NAME}" FROM ${RUBY_IMAGE} -ARG GITLAB_SHELL_VERSION=v12.0.0 +ARG GITLAB_SHELL_VERSION=v12.2.0 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/Jenkinsfile b/Jenkinsfile index e84163b..65a992a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "12.9.4") +dccscrPipeline(version: "12.10.0") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index e504db5..5ba09d6 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-12.9.4} +TAG=${1:-12.10.0} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.yaml b/download.yaml index 698bb37..9b20c2c 100644 --- a/download.yaml +++ b/download.yaml @@ -1,6 +1,6 @@ resources: - - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v12.9.4-ubi8.tar" - filename: "ubi8-build-dependencies-v12.9.4-ubi8.tar" + - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v12.10.0-ubi8.tar" + filename: "ubi8-build-dependencies-v12.10.0-ubi8.tar" validation: type: "sha256" - value: "e03f5054afc554cd4ed5560e6146e85bd8e76538fa86a233f8a68143755d7085" + value: "01cb16f7a766e0c9786b9edc5777d3d5157146f92daca6d790bfe0d453d8fc1f" diff --git a/scripts/process-wrapper b/scripts/process-wrapper index 334be33..32673dc 100755 --- a/scripts/process-wrapper +++ b/scripts/process-wrapper @@ -22,10 +22,16 @@ else fi echo "Starting OpenSSH" -touch /var/log/gitlab-shell/ssh.log /usr/sbin/sshd -E /var/log/gitlab-shell/ssh.log & echo "Tailing Logs" -tail -f /var/log/gitlab-shell/* + +if command -v xtail >/dev/null; then + xtail /var/log/gitlab-shell +else + touch /var/log/gitlab-shell/ssh.log + tail -f /var/log/gitlab-shell/* +fi + wait diff --git a/sshd_config b/sshd_config index 9578dd9..577aa91 100644 --- a/sshd_config +++ b/sshd_config @@ -50,7 +50,7 @@ PermitRootLogin no #PermitEmptyPasswords no # Change to no to disable s/key passwords -#ChallengeResponseAuthentication yes +ChallengeResponseAuthentication no # Kerberos options #KerberosAuthentication no -- GitLab From 1d65cdc7cda7011a75f32b026f8a227e1344b204 Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Fri, 24 Apr 2020 08:04:15 -0700 Subject: [PATCH 2/3] Update to the GitLab 12.10.1 patch release --- Dockerfile | 4 ++-- Jenkinsfile | 2 +- build-scripts/build.sh | 2 +- download.yaml | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6aa0721..568383d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -ARG GITLAB_VERSION=v12.10.0-ubi8 +ARG GITLAB_VERSION=v12.10.1-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 ARG BASE_IMAGE=redhat/ubi/ubi8 ARG BASE_TAG=8.1 ARG UBI_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -ARG RUBY_IMAGE=${BASE_REGISTRY}/gitlab/gitlab/gitlab-ruby:12.10.0 +ARG RUBY_IMAGE=${BASE_REGISTRY}/gitlab/gitlab/gitlab-ruby:12.10.1 FROM ${UBI_IMAGE} AS builder diff --git a/Jenkinsfile b/Jenkinsfile index 65a992a..a51f360 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,2 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "12.10.0") +dccscrPipeline(version: "12.10.1") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 5ba09d6..46b9db9 100755 --- a/build-scripts/build.sh +++ b/build-scripts/build.sh @@ -4,7 +4,7 @@ set -euxo pipefail -TAG=${1:-12.10.0} +TAG=${1:-12.10.1} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.yaml b/download.yaml index 9b20c2c..d0fc296 100644 --- a/download.yaml +++ b/download.yaml @@ -1,6 +1,6 @@ resources: - - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v12.10.0-ubi8.tar" - filename: "ubi8-build-dependencies-v12.10.0-ubi8.tar" + - url: "https://gitlab-ubi.s3.us-east-2.amazonaws.com/ubi8-build-dependencies-v12.10.1-ubi8.tar" + filename: "ubi8-build-dependencies-v12.10.1-ubi8.tar" validation: type: "sha256" - value: "01cb16f7a766e0c9786b9edc5777d3d5157146f92daca6d790bfe0d453d8fc1f" + value: "41a140d74e91f5ceb8222746ad856e67d1e3e606c7fe0093864b068cb46709c2" -- GitLab From 81c4cb56ea48d96c9bcdce2cf2d2a791840eb4be Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Fri, 24 Apr 2020 17:19:26 -0700 Subject: [PATCH 3/3] Updated GitLab to the latest release --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 568383d..0ba44b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ ARG GITLAB_VERSION=v12.10.1-ubi8 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082 -ARG BASE_IMAGE=redhat/ubi/ubi8 -ARG BASE_TAG=8.1 +ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby +ARG BASE_TAG=12.10.1 -ARG UBI_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -ARG RUBY_IMAGE=${BASE_REGISTRY}/gitlab/gitlab/gitlab-ruby:12.10.1 +ARG UBI_IMAGE=${BASE_REGISTRY}/redhat/ubi/ubi8:8.1 +ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${UBI_IMAGE} AS builder -- GitLab