From cdf4d8dd7a475a24f6fa460cf303327d5deb51b6 Mon Sep 17 00:00:00 2001 From: Patrick Oberdorf Date: Sun, 7 Jul 2019 18:03:20 +0200 Subject: [PATCH] Upgrade GitLab CE to 12.0.2 --- Changelog.md | 3 ++ Dockerfile | 2 +- README.md | 56 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 40 insertions(+), 37 deletions(-) diff --git a/Changelog.md b/Changelog.md index 4d42e61e..2dc66c5b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,9 @@ 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-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**12.0.2** +- gitlab: upgrade CE to v12.0.2 + **12.0.1** - gitlab: upgrade CE to v12.0.1 diff --git a/Dockerfile b/Dockerfile index 7f487562..068b263e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.0.1 +ARG VERSION=12.0.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index 64892512..acb23b21 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab) [![](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:12.0.1 +# sameersbn/gitlab:12.0.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -128,7 +128,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab) ```bash -docker pull sameersbn/gitlab:12.0.1 +docker pull sameersbn/gitlab:12.0.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -197,7 +197,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:12.0.1 + sameersbn/gitlab:12.0.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -232,7 +232,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:12.0.1 + sameersbn/gitlab:12.0.2 ``` ## Database @@ -265,7 +265,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:12.0.1 + sameersbn/gitlab:12.0.2 ``` #### Linking to PostgreSQL Container @@ -309,7 +309,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:12.0.1 + sameersbn/gitlab:12.0.2 ``` 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: @@ -363,7 +363,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:12.0.1 + sameersbn/gitlab:12.0.2 ``` #### Linking to MySQL Container @@ -406,7 +406,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-mysql:mysql \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:12.0.1 + sameersbn/gitlab:12.0.2 ``` Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images: @@ -433,7 +433,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:12.0.1 + sameersbn/gitlab:12.0.2 ``` ### Linking to Redis Container @@ -460,7 +460,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.0.1 + sameersbn/gitlab:12.0.2 ``` ### Mail @@ -473,7 +473,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:12.0.1 + sameersbn/gitlab:12.0.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -493,7 +493,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:12.0.1 + sameersbn/gitlab:12.0.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -570,7 +570,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:12.0.1 + sameersbn/gitlab:12.0.2 ``` 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. @@ -586,7 +586,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:12.0.1 + sameersbn/gitlab:12.0.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -609,7 +609,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:12.0.1 + sameersbn/gitlab:12.0.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -657,7 +657,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:12.0.1 + sameersbn/gitlab:12.0.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -830,14 +830,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:12.0.1 + sameersbn/gitlab:12.0.2 ``` 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:12.0.1 app:sanitize + sameersbn/gitlab:12.0.2 app:sanitize ``` ### Piwik @@ -1188,7 +1188,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.0.1 app:rake gitlab:backup:create + sameersbn/gitlab:12.0.2 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. @@ -1223,14 +1223,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.0.1 app:rake db:setup + sameersbn/gitlab:12.0.2 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:12.0.1 app:rake gitlab:backup:restore + sameersbn/gitlab:12.0.2 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. @@ -1239,7 +1239,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.0.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.0.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1289,7 +1289,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:12.0.1 app:rake gitlab:env:info + sameersbn/gitlab:12.0.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1302,7 +1302,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.0.1 app:rake gitlab:import:repos + sameersbn/gitlab:12.0.2 app:rake gitlab:import:repos ``` Or @@ -1333,7 +1333,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.0.1 app:rake gitlab:import:repos + sameersbn/gitlab:12.0.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1355,12 +1355,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.0.1` 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:12.0.2` 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:12.0.1 +docker pull sameersbn/gitlab:12.0.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1386,7 +1386,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:12.0.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.0.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index b700dc1d..f36e00ab 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.0.1 +12.0.2 diff --git a/docker-compose.yml b/docker-compose.yml index 81944e0a..2da0a9b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.0.1 + image: sameersbn/gitlab:12.0.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 8f3a4f6e..ccd13859 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -284,7 +284,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:12.0.1 app:rake gitlab:backup:create + sameersbn/gitlab:12.0.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -300,7 +300,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:12.0.1 app:rake gitlab:backup:restore + sameersbn/gitlab:12.0.2 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. @@ -309,7 +309,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.0.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.0.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -320,7 +320,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:12.0.1 +docker pull sameersbn/gitlab:12.0.2 ``` - **Step 2**: Stop and remove the currently running image @@ -373,7 +373,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:12.0.1 +sameersbn/gitlab:12.0.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 757a46d4..c6864038 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.0.1 + image: sameersbn/gitlab:12.0.2 env: - name: TZ value: Asia/Kolkata