From c4c4ee1cf8ecfa9b5ab4b5805710d6f428cff9cd 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.json | 6 +++--- gitconfig | 3 +++ scripts/process-wrapper | 6 +++++- 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7950b09..26332a7 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 GIT_IMAGE=${BASE_REGISTRY}/gitlab/gitlab/git-base:12.9.4 +ARG GIT_IMAGE=${BASE_REGISTRY}/gitlab/gitlab/git-base:12.10.0 FROM ${UBI_IMAGE} AS builder @@ -19,7 +19,7 @@ RUN /build-scripts/prepare.sh "/opt/${PACKAGE_NAME}" FROM ${GIT_IMAGE} -ARG GITALY_SERVER_VERSION=v12.9.4 +ARG GITALY_SERVER_VERSION=v12.10.0 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/Jenkinsfile b/Jenkinsfile index b04df08..01dd35f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,3 @@ @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 580b83b..b7f9a8f 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.json b/download.json index 7063e08..3b6d0b6 100644 --- a/download.json +++ b/download.json @@ -1,10 +1,10 @@ { "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/gitconfig b/gitconfig index 487a625..ffa9cb3 100644 --- a/gitconfig +++ b/gitconfig @@ -8,6 +8,7 @@ writeBitmaps = true [pack] threads = 1 + useSparse = true [receive] fsckobjects = true advertisepushoptions = true @@ -15,3 +16,5 @@ hiderefs = ^refs/tmp/ hiderefs = ^refs/keep-around/ hiderefs = ^refs/remotes/ +[fetch] + writeCommitGraph = true diff --git a/scripts/process-wrapper b/scripts/process-wrapper index a4d5ff0..86910eb 100755 --- a/scripts/process-wrapper +++ b/scripts/process-wrapper @@ -7,6 +7,10 @@ GITALY_CONFIG_FILE="${GITALY_CONFIG_FILE:-$CONFIG_TEMPLATE_DIRECTORY/config.toml echo "Starting Gitaly" /usr/local/bin/gitaly "$GITALY_CONFIG_FILE" >> /var/log/gitaly/gitaly.log 2>&1 & -tail -f /var/log/gitaly/* +if command -v xtail >/dev/null; then + xtail /var/log/gitaly +else + tail -f /var/log/gitaly/* +fi wait -- GitLab From 58385e04c7b0090eb561c5535be723700cf9a54c 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 | 6 +++--- Jenkinsfile | 2 +- build-scripts/build.sh | 2 +- download.json | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 26332a7..f676a7f 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 GIT_IMAGE=${BASE_REGISTRY}/gitlab/gitlab/git-base:12.10.0 +ARG GIT_IMAGE=${BASE_REGISTRY}/gitlab/gitlab/git-base:12.10.1 FROM ${UBI_IMAGE} AS builder @@ -19,7 +19,7 @@ RUN /build-scripts/prepare.sh "/opt/${PACKAGE_NAME}" FROM ${GIT_IMAGE} -ARG GITALY_SERVER_VERSION=v12.10.0 +ARG GITALY_SERVER_VERSION=v12.10.1 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/Jenkinsfile b/Jenkinsfile index 01dd35f..e1ad578 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,3 @@ @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 b7f9a8f..b75587e 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.json b/download.json index 3b6d0b6..ca330ad 100644 --- a/download.json +++ b/download.json @@ -1,10 +1,10 @@ { "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 dbb9b8cab673bd0ff4a5aaa56875f1b1e3fc6842 Mon Sep 17 00:00:00 2001 From: DJ Mountney Date: Fri, 24 Apr 2020 17:12:35 -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 f676a7f..cf829ac 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/git-base +ARG BASE_TAG=12.10.1 -ARG UBI_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -ARG GIT_IMAGE=${BASE_REGISTRY}/gitlab/gitlab/git-base:12.10.1 +ARG UBI_IMAGE=${BASE_REGISTRY}/redhat/ubi/ubi8:8.1 +ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${UBI_IMAGE} AS builder -- GitLab