From 366a6e1d2538e69390a7ca2dfd727bf4b758df57 Mon Sep 17 00:00:00 2001 From: Erwin Junge Date: Thu, 8 Jul 2021 08:43:53 +0200 Subject: [PATCH] upgrade GitLab CE to 14.0.4 --- Changelog.md | 4 ++++ Dockerfile | 4 ++-- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++++----- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 10 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Changelog.md b/Changelog.md index 173bccde..ce74f528 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.0.4** +- gitlab: upgrade CE to v14.0.4 +- gitaly: upgrade to v14.0.4 + **14.0.3** - gitlab: upgrade CE to v14.0.3 - gitaly: upgrade to v14.0.3 diff --git a/Dockerfile b/Dockerfile index e2bb39e8..6dfa6657 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210609 -ARG VERSION=14.0.3 +ARG VERSION=14.0.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.5 \ GITLAB_SHELL_VERSION=13.19.0 \ GITLAB_PAGES_VERSION=1.40.0 \ - GITALY_SERVER_VERSION=14.0.3 \ + GITALY_SERVER_VERSION=14.0.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/VERSION b/VERSION index de29f675..560dec00 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.0.3 +14.0.4 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index cf1db44b..22273562 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.3 + image: sameersbn/gitlab:14.0.4 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 564921f1..f9085b02 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.0.3 + image: sameersbn/gitlab:14.0.4 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 3e7867e6..838e4c39 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.3 + image: sameersbn/gitlab:14.0.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 895442aa..7c8ae425 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.3 app:rake gitlab:backup:create + sameersbn/gitlab:14.0.4 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.3 app:rake gitlab:backup:restore + sameersbn/gitlab:14.0.4 app:rake gitlab:backup:restore ``` The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.0.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.0.3 +docker pull sameersbn/gitlab:14.0.4 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.0.3 +sameersbn/gitlab:14.0.4 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 58256bd1..315866e8 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.3 + image: sameersbn/gitlab:14.0.4 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index dd8d8018..919bae4b 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.3 + image: sameersbn/gitlab:14.0.4 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 61549969..4d5b51de 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.0.3 + image: sameersbn/gitlab:14.0.4 env: - name: TZ value: Asia/Kolkata