From c3228c20e3c1bbda3cfc882f50a3ea0dfd3e06b1 Mon Sep 17 00:00:00 2001 From: intec_bf Date: Thu, 14 Jan 2021 19:48:43 +0100 Subject: [PATCH] upgrade Gitlab CE to 13.7.4 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 56 ++++++++++++------------- 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 +- 11 files changed, 46 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 950b406e..f6a79d8c 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. + +**13.7.4** +- gitlab: upgrade CE to v13.7.4 + **13.7.3** - gitlab: upgrade CE to v13.7.3 - gitlab-pages: upgrade to v1.34.0 diff --git a/Dockerfile b/Dockerfile index 92a0cfbe..578bb952 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:bionic-20201119 -ARG VERSION=13.7.3 +ARG VERSION=13.7.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=13.14.0 \ GITLAB_WORKHORSE_VERSION=8.58.2 \ GITLAB_PAGES_VERSION=1.34.0 \ - GITALY_SERVER_VERSION=13.7.3 \ + GITALY_SERVER_VERSION=13.7.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 165f77f3..ab058505 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.7.3 +# sameersbn/gitlab:13.7.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.7.3 +docker pull sameersbn/gitlab:13.7.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` ## Database @@ -264,7 +264,7 @@ docker run --name gitlab -d \ --env 'DB_NAME=gitlabhq_production' \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` #### Linking to PostgreSQL Container @@ -308,7 +308,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-postgresql:postgresql \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command: ```bash docker run --name gitlab -d [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:sanitize + sameersbn/gitlab:13.7.4 app:sanitize ``` ### Piwik @@ -1144,7 +1144,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:rake gitlab:backup:create + sameersbn/gitlab:13.7.4 app:rake gitlab:backup:create ``` A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter. @@ -1179,14 +1179,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:rake db:setup + sameersbn/gitlab:13.7.4 app:rake db:setup ``` Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:rake gitlab:backup:restore + sameersbn/gitlab:13.7.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. @@ -1195,14 +1195,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.7.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.7.3 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.7.4 # Choose to restore from 1515629493 ``` @@ -1245,7 +1245,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:rake gitlab:env:info + sameersbn/gitlab:13.7.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1258,7 +1258,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:rake gitlab:import:repos + sameersbn/gitlab:13.7.4 app:rake gitlab:import:repos ``` Or @@ -1289,7 +1289,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:rake gitlab:import:repos + sameersbn/gitlab:13.7.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1313,12 +1313,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.7.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher. +> Upgrading to `sameersbn/gitlab:13.7.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.7.3 +docker pull sameersbn/gitlab:13.7.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1344,7 +1344,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.7.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.7.4 ``` ## Shell Access @@ -1382,7 +1382,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.7.3 + image: sameersbn/gitlab:13.7.4 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index f74186a7..59abc597 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.7.3 +13.7.4 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 64019cbb..9453d2c6 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:13.6.1 + image: sameersbn/gitlab:13.7.4 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 18ad24e0..d96a93f2 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.6.1 + image: sameersbn/gitlab:13.7.4 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index e1e1fad2..1c9f385d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.7.3 + image: sameersbn/gitlab:13.7.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index f1488450..1db06b96 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:13.7.3 app:rake gitlab:backup:create + sameersbn/gitlab:13.7.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:13.7.3 app:rake gitlab:backup:restore + sameersbn/gitlab:13.7.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:13.7.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.7.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:13.7.3 +docker pull sameersbn/gitlab:13.7.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:13.7.3 +sameersbn/gitlab:13.7.4 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 38f1dcb3..b3ee20b7 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.6.1 + image: sameersbn/gitlab:13.7.4 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 64fde522..fdaa1936 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.7.3 + image: sameersbn/gitlab:13.7.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 acbacbca..c34529c4 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.7.3 + image: sameersbn/gitlab:13.7.4 env: - name: TZ value: Asia/Kolkata