diff --git a/Dockerfile b/Dockerfile index 7950b09dfc76e317b0f161b21456901b6bd9ab3f..cf829ac4eec434ee59800519e17a6f69df009ecb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -ARG GITLAB_VERSION=v12.9.4-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 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.9.4 +ARG UBI_IMAGE=${BASE_REGISTRY}/redhat/ubi/ubi8:8.1 +ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} 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.1 ARG GITLAB_USER=git ARG DNF_OPTS diff --git a/Jenkinsfile b/Jenkinsfile index b04df0868f3744e98a656989d20ae11a23cdbe43..e1ad57830684051cd72b36d15dc5f265617519c6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,3 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: "12.9.4") +dccscrPipeline(version: "12.10.1") diff --git a/build-scripts/build.sh b/build-scripts/build.sh index 580b83b237fd7c5bf40e1ae0d390ef5cc78ebb4b..b75587e1dee69b6e1280ab5e6b14c28e84ec098c 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.1} REPOSITORY=${2:-} DOCKER_OPTS=${DOCKER_OPTS:-""} diff --git a/download.json b/download.json index 7063e08a4c3b196bccae0239203eb48d7b89ccdb..ca330add9147329a1c8834ac0bb2ae4dbb91f411 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.1-ubi8.tar", + "filename": "ubi8-build-dependencies-v12.10.1-ubi8.tar", "validation": { "type": "sha256", - "value": "e03f5054afc554cd4ed5560e6146e85bd8e76538fa86a233f8a68143755d7085" + "value": "41a140d74e91f5ceb8222746ad856e67d1e3e606c7fe0093864b068cb46709c2" } } ] } diff --git a/gitconfig b/gitconfig index 487a625f6800fd5078c55bc3dee5485f0b7f6bd8..ffa9cb356528a52b0d0ede3350b7ad5b04d87b76 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 a4d5ff03e989b414185f2c67c58180f37bb687d3..86910eb58d8dde8e4d585dc5a22c8507bffd399d 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