diff --git a/Dockerfile b/Dockerfile index e7a91ff316193b2373facb54611c6c4203c81c43..7fd944c00307108083e8b7a7ef146ba5b45f0dd0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,19 @@ -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/git-base -ARG BASE_TAG=14.0.5 +ARG BASE_TAG=14.1.0 ARG GIT_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${GIT_IMAGE} -ARG GITALY_SERVER_VERSION=v14.0.5 +ARG GITALY_SERVER_VERSION=v14.1.0 ARG GITLAB_USER=git ARG DNF_OPTS ADD gitaly.tar.gz / +ADD gitlab-logger.tar.gz /usr/local/bin COPY scripts/ /scripts/ COPY config.toml /etc/gitaly/config.toml diff --git a/build-scripts/build.sh b/build-scripts/build.sh index ada12d536883424b2bf2a2a8e1865f1113a58f6a..3e127a8110807668a42dde211502fae7f0ecf745 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 e27da8f7771dcb405fa79d62d3c60b4d93e05e41..560c20bbc3c57927095aaec43f71af7c2893d38a 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -5,12 +5,12 @@ name: "gitlab/gitlab/gitaly" # 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/git-base" - BASE_TAG: "14.0.5" + BASE_TAG: "14.1.0" # Docker image labels labels: org.opencontainers.image.title: "Gitlab Gitaly" @@ -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,9 +42,18 @@ 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/gitaly.tar.gz" + - url: "https://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v14.1.0-ubi8/gitaly.tar.gz" filename: "gitaly.tar.gz" validation: type: "sha256" - value: "db1a8435f33aa715aa3fa4cd16fd72eda8443f6332c18d2be3761af2b9fe057a" + value: "1f193334b749dc3b12d1da9d46f6cc4f990ad159c3ac470d293c6a92a094bb57" + - 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: "674bc89c3f6e577236feeadccc6adb3f380e014f8f474004ff96f93f3144eb28" diff --git a/scripts/process-wrapper b/scripts/process-wrapper index 86910eb58d8dde8e4d585dc5a22c8507bffd399d..91a8ce549014026408abedf44bc889bc8f44a2d9 100755 --- a/scripts/process-wrapper +++ b/scripts/process-wrapper @@ -7,7 +7,9 @@ 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 & -if command -v xtail >/dev/null; then +if [ "${USE_GITLAB_LOGGER-0}" -eq 1 ]; then + /usr/local/bin/gitlab-logger --json /var/log/gitaly +elif command -v xtail >/dev/null; then xtail /var/log/gitaly else tail -f /var/log/gitaly/*