From 5a64416ebcccbb1f1e2f7cf7063f144ad714e9b1 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 24 Jan 2018 20:32:34 +0100 Subject: [PATCH 001/508] Upgrade GitLab CE to 10.4.0 --- 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 00be9108..bee6205d 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. +**10.4.0** +- gitlab: upgrade CE to v10.4.0 + **10.3.6** - gitlab: upgrade CE to v10.3.6 diff --git a/Dockerfile b/Dockerfile index 01cd9db6..8dec3e5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:14.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.3.6 \ +ENV GITLAB_VERSION=10.4.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.8.3 \ GITLAB_SHELL_VERSION=5.10.2 \ diff --git a/README.md b/README.md index 980424a3..e3404399 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:10.3.6 +# sameersbn/gitlab:10.4.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.3.6 +docker pull sameersbn/gitlab:10.4.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.3.6 + sameersbn/gitlab:10.4.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.3.6 + sameersbn/gitlab:10.4.0 ``` ## Database @@ -263,7 +263,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:10.3.6 + sameersbn/gitlab:10.4.0 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.3.6 + sameersbn/gitlab:10.4.0 ``` 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: @@ -361,7 +361,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:10.3.6 + sameersbn/gitlab:10.4.0 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.3.6 + sameersbn/gitlab:10.4.0 ``` 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: @@ -431,7 +431,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:10.3.6 + sameersbn/gitlab:10.4.0 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.3.6 + sameersbn/gitlab:10.4.0 ``` ### Mail @@ -471,7 +471,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:10.3.6 + sameersbn/gitlab:10.4.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.3.6 + sameersbn/gitlab:10.4.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.3.6 + sameersbn/gitlab:10.4.0 ``` 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. @@ -584,7 +584,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:10.3.6 + sameersbn/gitlab:10.4.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.3.6 + sameersbn/gitlab:10.4.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.3.6 + sameersbn/gitlab:10.4.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.3.6 + sameersbn/gitlab:10.4.0 ``` 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:10.3.6 app:sanitize + sameersbn/gitlab:10.4.0 app:sanitize ``` ### Piwik @@ -1057,7 +1057,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.3.6 app:rake gitlab:backup:create + sameersbn/gitlab:10.4.0 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. @@ -1085,14 +1085,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.3.6 app:rake db:setup + sameersbn/gitlab:10.4.0 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:10.3.6 app:rake gitlab:backup:restore + sameersbn/gitlab:10.4.0 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. @@ -1101,7 +1101,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.3.6 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1150,7 +1150,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:10.3.6 app:rake gitlab:env:info + sameersbn/gitlab:10.4.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1163,7 +1163,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.3.6 app:rake gitlab:import:repos + sameersbn/gitlab:10.4.0 app:rake gitlab:import:repos ``` Or @@ -1194,7 +1194,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.3.6 app:rake gitlab:import:repos + sameersbn/gitlab:10.4.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1216,12 +1216,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.3.6` 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:10.4.0` 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:10.3.6 +docker pull sameersbn/gitlab:10.4.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1247,7 +1247,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:10.3.6 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.4.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index 709c7796..816c0711 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.3.6 +10.4.0 diff --git a/docker-compose.yml b/docker-compose.yml index 32757530..868e13c1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.3.6 + image: sameersbn/gitlab:10.4.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 5829440e..3de2243c 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:10.3.6 app:rake gitlab:backup:create + sameersbn/gitlab:10.4.0 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:10.3.6 app:rake gitlab:backup:restore + sameersbn/gitlab:10.4.0 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:10.3.6 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.4.0 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:10.3.6 +docker pull sameersbn/gitlab:10.4.0 ``` - **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:10.3.6 +sameersbn/gitlab:10.4.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 429a1edf..f4c7db58 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.3.6 + image: sameersbn/gitlab:10.4.0 env: - name: TZ value: Asia/Kolkata From 7ae99c01d6b2bc1a0ac8c9c25722c131226b77c0 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 22 Jan 2018 20:54:46 +0100 Subject: [PATCH 002/508] Remove unused redis bin configuration. Signed-off-by: solidnerd --- assets/runtime/config/gitlab-shell/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/runtime/config/gitlab-shell/config.yml b/assets/runtime/config/gitlab-shell/config.yml index 0166e2e6..0ea24f2c 100644 --- a/assets/runtime/config/gitlab-shell/config.yml +++ b/assets/runtime/config/gitlab-shell/config.yml @@ -37,7 +37,6 @@ custom_hooks_dir: "{{GITLAB_SHELL_INSTALL_DIR}}/hooks" # Redis settings used for pushing commit notices to gitlab redis: - bin: /usr/bin/redis-cli host: "{{REDIS_HOST}}" port: {{REDIS_PORT}} # pass: redispass # Allows you to specify the password for Redis From 359fe7de5925805d8be8988eab0374b8f734a37b Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 22 Jan 2018 20:55:06 +0100 Subject: [PATCH 003/508] Update gitlab-shell to 5.11.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8dec3e5c..57e85afd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=10.4.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.8.3 \ - GITLAB_SHELL_VERSION=5.10.2 \ + GITLAB_SHELL_VERSION=5.11.0 \ GITLAB_WORKHORSE_VERSION=3.3.1 \ GITLAB_PAGES_VERSION=0.6.0 \ GITALY_SERVER_VERSION=0.59.2 \ From 169ec31ac0e9b4849143b0f6b09eb7dbff72a830 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 22 Jan 2018 20:58:16 +0100 Subject: [PATCH 004/508] Update gitaly config.toml Signed-off-by: solidnerd --- assets/runtime/config/gitaly/config.toml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/assets/runtime/config/gitaly/config.toml b/assets/runtime/config/gitaly/config.toml index 46e44e37..88f84678 100644 --- a/assets/runtime/config/gitaly/config.toml +++ b/assets/runtime/config/gitaly/config.toml @@ -39,6 +39,16 @@ path = "{{GITLAB_REPOS_DIR}}" # The directory where gitaly-ruby is installed dir = "/home/git/gitaly/ruby" +# # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) +# max_rss = 300000000 +# +# # Grace period before a gitaly-ruby process is forcibly terminated after exceeding max_rss (seconds) +# graceful_restart_timeout = "10m" +# +# # Time that gitaly-ruby memory must remain high before a restart (seconds) +# restart_delay = "5m" + + [gitlab-shell] # The directory where gitlab-shell is installed dir = "/home/git/gitlab-shell" From 34f29082e62322a2b5696c7d1b182956ab813d62 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 22 Jan 2018 20:58:29 +0100 Subject: [PATCH 005/508] Update gitaly to 0.66.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 57e85afd..d6da29cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ENV GITLAB_VERSION=10.4.0 \ GITLAB_SHELL_VERSION=5.11.0 \ GITLAB_WORKHORSE_VERSION=3.3.1 \ GITLAB_PAGES_VERSION=0.6.0 \ - GITALY_SERVER_VERSION=0.59.2 \ + GITALY_SERVER_VERSION=0.66.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 33427dac44e586bd9a2b74fd92d25c0511968e4d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 24 Jan 2018 20:39:18 +0100 Subject: [PATCH 006/508] Upgrade to ubuntu xenial (16.04) with 20180124 tag Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d6da29cc..9ad4d876 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM sameersbn/ubuntu:14.04.20180124 +FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=10.4.0 \ From d6f8e711757bc24f6cb1e81632b16a8a7143351e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 26 Jan 2018 17:21:48 +0100 Subject: [PATCH 007/508] Update libmysqlclient18 to libmysqlclient20 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9ad4d876..bb8750e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E60 && DEBIAN_FRONTEND=noninteractive apt-get install -y supervisor logrotate locales curl \ nginx openssh-server mysql-client postgresql-client redis-tools \ git-core ruby${RUBY_VERSION} python2.7 python-docutils nodejs yarn gettext-base \ - libmysqlclient18 libpq5 zlib1g libyaml-0-2 libssl1.0.0 \ + libmysqlclient20 libpq5 zlib1g libyaml-0-2 libssl1.0.0 \ libgdbm3 libreadline6 libncurses5 libffi6 \ libxml2 libxslt1.1 libcurl3 libicu52 \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ From a7db86c8fded49b4ffd88b64f71a8749c5fd268e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 26 Jan 2018 17:22:13 +0100 Subject: [PATCH 008/508] Update libicu52 to libicu55 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bb8750e1..9509b4cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,7 +42,7 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E60 git-core ruby${RUBY_VERSION} python2.7 python-docutils nodejs yarn gettext-base \ libmysqlclient20 libpq5 zlib1g libyaml-0-2 libssl1.0.0 \ libgdbm3 libreadline6 libncurses5 libffi6 \ - libxml2 libxslt1.1 libcurl3 libicu52 \ + libxml2 libxslt1.1 libcurl3 libicu55 \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \ From 81f54f7135fd6e6b04d92c8e1dbee093cf0a499e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 26 Jan 2018 17:22:50 +0100 Subject: [PATCH 009/508] Replace re2 manual install with libre2-dev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since we are using xenial now. It’s also possible to cleanup this build instruction. Signed-off-by: solidnerd --- Dockerfile | 1 + assets/build/install.sh | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9509b4cb..876b3e96 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,6 +43,7 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E60 libmysqlclient20 libpq5 zlib1g libyaml-0-2 libssl1.0.0 \ libgdbm3 libreadline6 libncurses5 libffi6 \ libxml2 libxslt1.1 libcurl3 libicu55 \ + libre2-dev \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \ diff --git a/assets/build/install.sh b/assets/build/install.sh index 76396d59..0c5e7cda 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -29,19 +29,6 @@ exec_as_git() { apt-get update DEBIAN_FRONTEND=noninteractive apt-get install -y ${BUILD_DEPENDENCIES} -# Install RE2 library wich became dependencie since 9.3.8 version -# https://gitlab.com/gitlab-org/gitlab-ce/issues/35342 -DEBIAN_FRONTEND=noninteractive apt-get install -y checkinstall -cd /tmp -git clone https://github.com/google/re2.git -cd re2/ && make && make test -checkinstall -D --install=no -y --pkgname=re2 --pkgversion=1-current -dpkg -i re2_1-current-1_amd64.deb -ldconfig -cd - -rm -rf /tmp/re2 -DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove checkinstall - # PaX-mark ruby # Applying the mark late here does make the build usable on PaX kernels, but # still the build itself must be executed on a non-PaX kernel. It's done here From c388bdda2cf16b34eaad4a017208735c96cffaee Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 26 Jan 2018 17:23:36 +0100 Subject: [PATCH 010/508] Update preinstalled respositories to ubuntu 16.04 (xenial) Signed-off-by: solidnerd --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 876b3e96..48ef6971 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,15 +25,15 @@ ENV GITLAB_INSTALL_DIR="${GITLAB_HOME}/gitlab" \ GITLAB_RUNTIME_DIR="${GITLAB_CACHE_DIR}/runtime" RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \ - && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu trusty main" >> /etc/apt/sources.list \ + && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu xenial main" >> /etc/apt/sources.list \ && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 80F70E11F0F0D5F10CB20E62F5DA5F09C3173AA6 \ - && echo "deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu trusty main" >> /etc/apt/sources.list \ + && echo "deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu xenial main" >> /etc/apt/sources.list \ && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 8B3981E7A6852F782CC4951600A6F0A3C300EE8C \ - && echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu trusty main" >> /etc/apt/sources.list \ + && echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu xenial main" >> /etc/apt/sources.list \ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ - && echo 'deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ + && echo 'deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo 'deb https://deb.nodesource.com/node_8.x trusty main' > /etc/apt/sources.list.d/nodesource.list \ + && echo 'deb https://deb.nodesource.com/node_8.x xenial main' > /etc/apt/sources.list.d/nodesource.list \ && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo 'deb https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \ && apt-get update \ From dbe49107de6cb94c9d628dad70a5de7bc0cb72ce Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 26 Jan 2018 17:24:01 +0100 Subject: [PATCH 011/508] Add Kerberos dev libs for omnibus-auth-kerberos package Signed-off-by: solidnerd --- assets/build/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index 0c5e7cda..b7b383c2 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -14,7 +14,7 @@ BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \ libmysqlclient-dev libpq-dev zlib1g-dev libyaml-dev libssl-dev \ libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \ libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev \ - gettext" + gettext libkrb5-dev" ## Execute a command as GITLAB_USER exec_as_git() { From 6292383d85680eabb289b5d21cd8ebb3a3c27b11 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 26 Jan 2018 17:24:39 +0100 Subject: [PATCH 012/508] Add tzdata This is required from timefel ruby gem Signed-off-by: solidnerd --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 48ef6971..2b1ab6ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,6 +44,7 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E60 libgdbm3 libreadline6 libncurses5 libffi6 \ libxml2 libxslt1.1 libcurl3 libicu55 \ libre2-dev \ + tzdata \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \ From e7020715a24a11570ef84ab7aaa66349bf8f91b1 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 26 Jan 2018 17:24:52 +0100 Subject: [PATCH 013/508] Update golang to 1.9.3 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2b1ab6ff..80d08a95 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=10.4.0 \ RUBY_VERSION=2.3 \ - GOLANG_VERSION=1.8.3 \ + GOLANG_VERSION=1.9.3 \ GITLAB_SHELL_VERSION=5.11.0 \ GITLAB_WORKHORSE_VERSION=3.3.1 \ GITLAB_PAGES_VERSION=0.6.0 \ From e3e9c2a3b751d3691b308dff1fd4a47261353430 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 28 Jan 2018 20:55:42 +0100 Subject: [PATCH 014/508] Update Changelog for 10.4.0 --- Changelog.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog.md b/Changelog.md index bee6205d..edfbac50 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,8 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **10.4.0** - gitlab: upgrade CE to v10.4.0 +- docker: upgrade to ubuntu xenial as baseimage +- golang: update to 1.9.3 **10.3.6** - gitlab: upgrade CE to v10.3.6 From 4f227f2e89c54cd4b95516140900ab75ed0342a2 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 28 Jan 2018 20:58:45 +0100 Subject: [PATCH 015/508] release 10.4.0 From c430eee8fbf25ac9f5a659a80cc87885f385d67b Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 28 Jan 2018 21:00:55 +0100 Subject: [PATCH 016/508] Upgrade GitLab CE to 10.4.1 --- 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 edfbac50..b4f025cb 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. +**10.4.1** +- gitlab: upgrade CE to v10.4.1 + **10.4.0** - gitlab: upgrade CE to v10.4.0 - docker: upgrade to ubuntu xenial as baseimage diff --git a/Dockerfile b/Dockerfile index 80d08a95..dc20225f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.4.0 \ +ENV GITLAB_VERSION=10.4.1 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.3 \ GITLAB_SHELL_VERSION=5.11.0 \ diff --git a/README.md b/README.md index e3404399..6c1adbac 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:10.4.0 +# sameersbn/gitlab:10.4.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.4.0 +docker pull sameersbn/gitlab:10.4.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.4.0 + sameersbn/gitlab:10.4.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.4.0 + sameersbn/gitlab:10.4.1 ``` ## Database @@ -263,7 +263,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:10.4.0 + sameersbn/gitlab:10.4.1 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.4.0 + sameersbn/gitlab:10.4.1 ``` 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: @@ -361,7 +361,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:10.4.0 + sameersbn/gitlab:10.4.1 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.4.0 + sameersbn/gitlab:10.4.1 ``` 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: @@ -431,7 +431,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:10.4.0 + sameersbn/gitlab:10.4.1 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.4.0 + sameersbn/gitlab:10.4.1 ``` ### Mail @@ -471,7 +471,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:10.4.0 + sameersbn/gitlab:10.4.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.4.0 + sameersbn/gitlab:10.4.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.4.0 + sameersbn/gitlab:10.4.1 ``` 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. @@ -584,7 +584,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:10.4.0 + sameersbn/gitlab:10.4.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.4.0 + sameersbn/gitlab:10.4.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.4.0 + sameersbn/gitlab:10.4.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.4.0 + sameersbn/gitlab:10.4.1 ``` 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:10.4.0 app:sanitize + sameersbn/gitlab:10.4.1 app:sanitize ``` ### Piwik @@ -1057,7 +1057,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.0 app:rake gitlab:backup:create + sameersbn/gitlab:10.4.1 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. @@ -1085,14 +1085,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.0 app:rake db:setup + sameersbn/gitlab:10.4.1 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:10.4.0 app:rake gitlab:backup:restore + sameersbn/gitlab:10.4.1 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. @@ -1101,7 +1101,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1150,7 +1150,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:10.4.0 app:rake gitlab:env:info + sameersbn/gitlab:10.4.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1163,7 +1163,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.0 app:rake gitlab:import:repos + sameersbn/gitlab:10.4.1 app:rake gitlab:import:repos ``` Or @@ -1194,7 +1194,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.0 app:rake gitlab:import:repos + sameersbn/gitlab:10.4.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1216,12 +1216,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.4.0` 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:10.4.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:10.4.0 +docker pull sameersbn/gitlab:10.4.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1247,7 +1247,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:10.4.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.4.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 816c0711..da772b97 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.4.0 +10.4.1 diff --git a/docker-compose.yml b/docker-compose.yml index 868e13c1..2cbb2c30 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.4.0 + image: sameersbn/gitlab:10.4.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 3de2243c..6c8bb15f 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:10.4.0 app:rake gitlab:backup:create + sameersbn/gitlab:10.4.1 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:10.4.0 app:rake gitlab:backup:restore + sameersbn/gitlab:10.4.1 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:10.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.4.1 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:10.4.0 +docker pull sameersbn/gitlab:10.4.1 ``` - **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:10.4.0 +sameersbn/gitlab:10.4.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index f4c7db58..eea569e5 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.4.0 + image: sameersbn/gitlab:10.4.1 env: - name: TZ value: Asia/Kolkata From 7d95a8201dca1033bc77aee997879d41cdc1df20 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 28 Jan 2018 21:17:21 +0100 Subject: [PATCH 017/508] release 10.4.1 From 17edf061ad3c182a2f415256e2ea781fd02a39b8 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 30 Jan 2018 11:11:39 +0100 Subject: [PATCH 018/508] Upgrade GitLab CE to 10.4.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 b4f025cb..c7d3cd2f 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. +**10.4.2** +- gitlab: upgrade CE to v10.4.2 + **10.4.1** - gitlab: upgrade CE to v10.4.1 diff --git a/Dockerfile b/Dockerfile index dc20225f..128ec578 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.4.1 \ +ENV GITLAB_VERSION=10.4.2 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.3 \ GITLAB_SHELL_VERSION=5.11.0 \ diff --git a/README.md b/README.md index 6c1adbac..8a9da7e1 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:10.4.1 +# sameersbn/gitlab:10.4.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.4.1 +docker pull sameersbn/gitlab:10.4.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.4.1 + sameersbn/gitlab:10.4.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.4.1 + sameersbn/gitlab:10.4.2 ``` ## Database @@ -263,7 +263,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:10.4.1 + sameersbn/gitlab:10.4.2 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.4.1 + sameersbn/gitlab:10.4.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: @@ -361,7 +361,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:10.4.1 + sameersbn/gitlab:10.4.2 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.4.1 + sameersbn/gitlab:10.4.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: @@ -431,7 +431,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:10.4.1 + sameersbn/gitlab:10.4.2 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.4.1 + sameersbn/gitlab:10.4.2 ``` ### Mail @@ -471,7 +471,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:10.4.1 + sameersbn/gitlab:10.4.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.4.1 + sameersbn/gitlab:10.4.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.4.1 + sameersbn/gitlab:10.4.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. @@ -584,7 +584,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:10.4.1 + sameersbn/gitlab:10.4.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.4.1 + sameersbn/gitlab:10.4.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.4.1 + sameersbn/gitlab:10.4.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.4.1 + sameersbn/gitlab:10.4.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:10.4.1 app:sanitize + sameersbn/gitlab:10.4.2 app:sanitize ``` ### Piwik @@ -1057,7 +1057,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.1 app:rake gitlab:backup:create + sameersbn/gitlab:10.4.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. @@ -1085,14 +1085,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.1 app:rake db:setup + sameersbn/gitlab:10.4.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:10.4.1 app:rake gitlab:backup:restore + sameersbn/gitlab:10.4.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. @@ -1101,7 +1101,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.4.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1150,7 +1150,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:10.4.1 app:rake gitlab:env:info + sameersbn/gitlab:10.4.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1163,7 +1163,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.1 app:rake gitlab:import:repos + sameersbn/gitlab:10.4.2 app:rake gitlab:import:repos ``` Or @@ -1194,7 +1194,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.1 app:rake gitlab:import:repos + sameersbn/gitlab:10.4.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1216,12 +1216,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.4.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:10.4.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:10.4.1 +docker pull sameersbn/gitlab:10.4.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1247,7 +1247,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:10.4.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.4.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index da772b97..bb13e7c9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.4.1 +10.4.2 diff --git a/docker-compose.yml b/docker-compose.yml index 2cbb2c30..a4db071b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.4.1 + image: sameersbn/gitlab:10.4.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 6c8bb15f..b07047a4 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:10.4.1 app:rake gitlab:backup:create + sameersbn/gitlab:10.4.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:10.4.1 app:rake gitlab:backup:restore + sameersbn/gitlab:10.4.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:10.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.4.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:10.4.1 +docker pull sameersbn/gitlab:10.4.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:10.4.1 +sameersbn/gitlab:10.4.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index eea569e5..6d245ca7 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.4.1 + image: sameersbn/gitlab:10.4.2 env: - name: TZ value: Asia/Kolkata From 4217abc531cba3f9d418b3a1853f488a54c5ce89 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 30 Jan 2018 11:26:40 +0100 Subject: [PATCH 019/508] release 10.4.2 From 5e17cd8a240afad8ed1191b40335fc0df727b458 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 3 Feb 2018 09:31:52 +0100 Subject: [PATCH 020/508] Remove rsa1 ssh_host_key MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This means that the SSH 1 protocol wouldn’t be supported anymore. Signed-off-by: solidnerd --- assets/runtime/functions | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index 620eed15..8f12f4c7 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1338,7 +1338,6 @@ generate_ssh_host_keys() { sed -i "s|HostKey /etc/ssh/|HostKey ${GITLAB_DATA_DIR}/ssh/|g" /etc/ssh/sshd_config if [[ ! -e ${GITLAB_DATA_DIR}/ssh/ssh_host_rsa_key ]]; then echo -n "Generating OpenSSH host keys... " - generate_ssh_key rsa1 ${GITLAB_DATA_DIR}/ssh/ssh_host_key generate_ssh_key rsa ${GITLAB_DATA_DIR}/ssh/ssh_host_rsa_key generate_ssh_key dsa ${GITLAB_DATA_DIR}/ssh/ssh_host_dsa_key generate_ssh_key ecdsa ${GITLAB_DATA_DIR}/ssh/ssh_host_ecdsa_key From 9f8618b0817d84497a65d4aa2d03e989a77e3648 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 3 Feb 2018 09:43:49 +0100 Subject: [PATCH 021/508] Update to 10.4.2-1 Signed-off-by: solidnerd --- Changelog.md | 3 ++ README.md | 56 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++---- kubernetes/gitlab-rc.yml | 2 +- 6 files changed, 39 insertions(+), 36 deletions(-) diff --git a/Changelog.md b/Changelog.md index c7d3cd2f..dfb06be2 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. +**10.4.2-1** +- FIXED SSH Host Key generation through droping the support for rsa1 + **10.4.2** - gitlab: upgrade CE to v10.4.2 diff --git a/README.md b/README.md index 8a9da7e1..27ef90ad 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:10.4.2 +# sameersbn/gitlab:10.4.2-1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.4.2 +docker pull sameersbn/gitlab:10.4.2-1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.4.2 + sameersbn/gitlab:10.4.2-1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.4.2 + sameersbn/gitlab:10.4.2-1 ``` ## Database @@ -263,7 +263,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:10.4.2 + sameersbn/gitlab:10.4.2-1 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.4.2 + sameersbn/gitlab:10.4.2-1 ``` 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: @@ -361,7 +361,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:10.4.2 + sameersbn/gitlab:10.4.2-1 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.4.2 + sameersbn/gitlab:10.4.2-1 ``` 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: @@ -431,7 +431,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:10.4.2 + sameersbn/gitlab:10.4.2-1 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.4.2 + sameersbn/gitlab:10.4.2-1 ``` ### Mail @@ -471,7 +471,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:10.4.2 + sameersbn/gitlab:10.4.2-1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.4.2 + sameersbn/gitlab:10.4.2-1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.4.2 + sameersbn/gitlab:10.4.2-1 ``` 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. @@ -584,7 +584,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:10.4.2 + sameersbn/gitlab:10.4.2-1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.4.2 + sameersbn/gitlab:10.4.2-1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.4.2 + sameersbn/gitlab:10.4.2-1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.4.2 + sameersbn/gitlab:10.4.2-1 ``` 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:10.4.2 app:sanitize + sameersbn/gitlab:10.4.2-1 app:sanitize ``` ### Piwik @@ -1057,7 +1057,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.2 app:rake gitlab:backup:create + sameersbn/gitlab:10.4.2-1 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. @@ -1085,14 +1085,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.2 app:rake db:setup + sameersbn/gitlab:10.4.2-1 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:10.4.2 app:rake gitlab:backup:restore + sameersbn/gitlab:10.4.2-1 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. @@ -1101,7 +1101,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.4.2-1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1150,7 +1150,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:10.4.2 app:rake gitlab:env:info + sameersbn/gitlab:10.4.2-1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1163,7 +1163,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.2 app:rake gitlab:import:repos + sameersbn/gitlab:10.4.2-1 app:rake gitlab:import:repos ``` Or @@ -1194,7 +1194,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.2 app:rake gitlab:import:repos + sameersbn/gitlab:10.4.2-1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1216,12 +1216,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.4.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. +> Upgrading to `sameersbn/gitlab:10.4.2-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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:10.4.2 +docker pull sameersbn/gitlab:10.4.2-1 ``` - **Step 2**: Stop and remove the currently running image @@ -1247,7 +1247,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:10.4.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.4.2-1 ``` ## Shell Access diff --git a/VERSION b/VERSION index bb13e7c9..d48c4aac 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.4.2 +10.4.2-1 diff --git a/docker-compose.yml b/docker-compose.yml index a4db071b..9a59bc8d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.4.2 + image: sameersbn/gitlab:10.4.2-1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index b07047a4..35df45ac 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:10.4.2 app:rake gitlab:backup:create + sameersbn/gitlab:10.4.2-1 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:10.4.2 app:rake gitlab:backup:restore + sameersbn/gitlab:10.4.2-1 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:10.4.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.4.2-1 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:10.4.2 +docker pull sameersbn/gitlab:10.4.2-1 ``` - **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:10.4.2 +sameersbn/gitlab:10.4.2-1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 6d245ca7..50d16834 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.4.2 + image: sameersbn/gitlab:10.4.2-1 env: - name: TZ value: Asia/Kolkata From f0ab52a983e015eb7be6357be65feaf7eb1d1115 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 3 Feb 2018 09:51:57 +0100 Subject: [PATCH 022/508] release 10.4.2-1 From 51066080c020c8e4bdd093a707976155799567aa Mon Sep 17 00:00:00 2001 From: Waldemar Reusch Date: Sun, 18 Feb 2018 20:54:39 +0100 Subject: [PATCH 023/508] Upgrade GitLab CE to 10.4.3 --- 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 dfb06be2..24204968 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. +**10.4.3** +- gitlab: upgrade CE to v10.4.3 + **10.4.2-1** - FIXED SSH Host Key generation through droping the support for rsa1 diff --git a/Dockerfile b/Dockerfile index 128ec578..d8bb18fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.4.2 \ +ENV GITLAB_VERSION=10.4.3 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.3 \ GITLAB_SHELL_VERSION=5.11.0 \ diff --git a/README.md b/README.md index 27ef90ad..a20e9338 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:10.4.2-1 +# sameersbn/gitlab:10.4.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.4.2-1 +docker pull sameersbn/gitlab:10.4.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.4.2-1 + sameersbn/gitlab:10.4.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.4.2-1 + sameersbn/gitlab:10.4.3 ``` ## Database @@ -263,7 +263,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:10.4.2-1 + sameersbn/gitlab:10.4.3 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.4.2-1 + sameersbn/gitlab:10.4.3 ``` 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: @@ -361,7 +361,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:10.4.2-1 + sameersbn/gitlab:10.4.3 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.4.2-1 + sameersbn/gitlab:10.4.3 ``` 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: @@ -431,7 +431,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:10.4.2-1 + sameersbn/gitlab:10.4.3 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.4.2-1 + sameersbn/gitlab:10.4.3 ``` ### Mail @@ -471,7 +471,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:10.4.2-1 + sameersbn/gitlab:10.4.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.4.2-1 + sameersbn/gitlab:10.4.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.4.2-1 + sameersbn/gitlab:10.4.3 ``` 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. @@ -584,7 +584,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:10.4.2-1 + sameersbn/gitlab:10.4.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.4.2-1 + sameersbn/gitlab:10.4.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.4.2-1 + sameersbn/gitlab:10.4.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.4.2-1 + sameersbn/gitlab:10.4.3 ``` 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:10.4.2-1 app:sanitize + sameersbn/gitlab:10.4.3 app:sanitize ``` ### Piwik @@ -1057,7 +1057,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.2-1 app:rake gitlab:backup:create + sameersbn/gitlab:10.4.3 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. @@ -1085,14 +1085,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.2-1 app:rake db:setup + sameersbn/gitlab:10.4.3 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:10.4.2-1 app:rake gitlab:backup:restore + sameersbn/gitlab:10.4.3 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. @@ -1101,7 +1101,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.2-1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.4.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1150,7 +1150,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:10.4.2-1 app:rake gitlab:env:info + sameersbn/gitlab:10.4.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1163,7 +1163,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.2-1 app:rake gitlab:import:repos + sameersbn/gitlab:10.4.3 app:rake gitlab:import:repos ``` Or @@ -1194,7 +1194,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.2-1 app:rake gitlab:import:repos + sameersbn/gitlab:10.4.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1216,12 +1216,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.4.2-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:10.4.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:10.4.2-1 +docker pull sameersbn/gitlab:10.4.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1247,7 +1247,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:10.4.2-1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.4.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index d48c4aac..44c1a861 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.4.2-1 +10.4.3 diff --git a/docker-compose.yml b/docker-compose.yml index 9a59bc8d..0ef5bfe3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.4.2-1 + image: sameersbn/gitlab:10.4.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 35df45ac..bb8e918b 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:10.4.2-1 app:rake gitlab:backup:create + sameersbn/gitlab:10.4.3 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:10.4.2-1 app:rake gitlab:backup:restore + sameersbn/gitlab:10.4.3 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:10.4.2-1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.4.3 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:10.4.2-1 +docker pull sameersbn/gitlab:10.4.3 ``` - **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:10.4.2-1 +sameersbn/gitlab:10.4.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 50d16834..16f79a5c 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.4.2-1 + image: sameersbn/gitlab:10.4.3 env: - name: TZ value: Asia/Kolkata From 285b7361b5cf7f3c9523c50f43a8c73964778205 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Feb 2018 00:20:36 +0100 Subject: [PATCH 024/508] release 10.4.3 From ecdeebb4a6500e6dc664fca3b81397084d4606b8 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Feb 2018 09:01:05 +0100 Subject: [PATCH 025/508] Upgrade GitLab CE to 10.4.4 --- 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 24204968..3446defd 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. +**10.4.4** +- gitlab: upgrade CE to v10.4.4 + **10.4.3** - gitlab: upgrade CE to v10.4.3 diff --git a/Dockerfile b/Dockerfile index d8bb18fa..a53fa7fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.4.3 \ +ENV GITLAB_VERSION=10.4.4 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.3 \ GITLAB_SHELL_VERSION=5.11.0 \ diff --git a/README.md b/README.md index a20e9338..22ee9bd6 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:10.4.3 +# sameersbn/gitlab:10.4.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.4.3 +docker pull sameersbn/gitlab:10.4.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.4.3 + sameersbn/gitlab:10.4.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.4.3 + sameersbn/gitlab:10.4.4 ``` ## Database @@ -263,7 +263,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:10.4.3 + sameersbn/gitlab:10.4.4 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.4.3 + sameersbn/gitlab:10.4.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: @@ -361,7 +361,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:10.4.3 + sameersbn/gitlab:10.4.4 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.4.3 + sameersbn/gitlab:10.4.4 ``` 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: @@ -431,7 +431,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:10.4.3 + sameersbn/gitlab:10.4.4 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.4.3 + sameersbn/gitlab:10.4.4 ``` ### Mail @@ -471,7 +471,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:10.4.3 + sameersbn/gitlab:10.4.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.4.3 + sameersbn/gitlab:10.4.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.4.3 + sameersbn/gitlab:10.4.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. @@ -584,7 +584,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:10.4.3 + sameersbn/gitlab:10.4.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.4.3 + sameersbn/gitlab:10.4.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.4.3 + sameersbn/gitlab:10.4.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.4.3 + sameersbn/gitlab:10.4.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:10.4.3 app:sanitize + sameersbn/gitlab:10.4.4 app:sanitize ``` ### Piwik @@ -1057,7 +1057,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.3 app:rake gitlab:backup:create + sameersbn/gitlab:10.4.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. @@ -1085,14 +1085,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.3 app:rake db:setup + sameersbn/gitlab:10.4.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:10.4.3 app:rake gitlab:backup:restore + sameersbn/gitlab:10.4.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. @@ -1101,7 +1101,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.4.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1150,7 +1150,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:10.4.3 app:rake gitlab:env:info + sameersbn/gitlab:10.4.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1163,7 +1163,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.3 app:rake gitlab:import:repos + sameersbn/gitlab:10.4.4 app:rake gitlab:import:repos ``` Or @@ -1194,7 +1194,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.3 app:rake gitlab:import:repos + sameersbn/gitlab:10.4.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1216,12 +1216,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.4.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:10.4.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:10.4.3 +docker pull sameersbn/gitlab:10.4.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1247,7 +1247,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:10.4.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.4.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index 44c1a861..622a6f75 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.4.3 +10.4.4 diff --git a/docker-compose.yml b/docker-compose.yml index 0ef5bfe3..a9467250 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.4.3 + image: sameersbn/gitlab:10.4.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index bb8e918b..a1f0698a 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:10.4.3 app:rake gitlab:backup:create + sameersbn/gitlab:10.4.4 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:10.4.3 app:rake gitlab:backup:restore + sameersbn/gitlab:10.4.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. @@ -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:10.4.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.4.4 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:10.4.3 +docker pull sameersbn/gitlab:10.4.4 ``` - **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:10.4.3 +sameersbn/gitlab:10.4.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 16f79a5c..f1727247 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.4.3 + image: sameersbn/gitlab:10.4.4 env: - name: TZ value: Asia/Kolkata From 8b7704c5d47b2413038087cc0ba95044abd751ac Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Feb 2018 09:27:21 +0100 Subject: [PATCH 026/508] release 10.4.4 From f56efe5c10c5c4350d6ea04d7d855ba2fe6f8ac6 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Feb 2018 09:31:33 +0100 Subject: [PATCH 027/508] Upgrade GitLab CE to 10.5.0 --- 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 3446defd..5a47e3c8 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. +**10.5.0** +- gitlab: upgrade CE to v10.5.0 + **10.4.4** - gitlab: upgrade CE to v10.4.4 diff --git a/Dockerfile b/Dockerfile index a53fa7fa..bd8db50e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.4.4 \ +ENV GITLAB_VERSION=10.5.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.3 \ GITLAB_SHELL_VERSION=5.11.0 \ diff --git a/README.md b/README.md index 22ee9bd6..f6c486f7 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:10.4.4 +# sameersbn/gitlab:10.5.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.4.4 +docker pull sameersbn/gitlab:10.5.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.4.4 + sameersbn/gitlab:10.5.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.4.4 + sameersbn/gitlab:10.5.0 ``` ## Database @@ -263,7 +263,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:10.4.4 + sameersbn/gitlab:10.5.0 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.4.4 + sameersbn/gitlab:10.5.0 ``` 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: @@ -361,7 +361,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:10.4.4 + sameersbn/gitlab:10.5.0 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.4.4 + sameersbn/gitlab:10.5.0 ``` 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: @@ -431,7 +431,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:10.4.4 + sameersbn/gitlab:10.5.0 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.4.4 + sameersbn/gitlab:10.5.0 ``` ### Mail @@ -471,7 +471,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:10.4.4 + sameersbn/gitlab:10.5.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.4.4 + sameersbn/gitlab:10.5.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.4.4 + sameersbn/gitlab:10.5.0 ``` 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. @@ -584,7 +584,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:10.4.4 + sameersbn/gitlab:10.5.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.4.4 + sameersbn/gitlab:10.5.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.4.4 + sameersbn/gitlab:10.5.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.4.4 + sameersbn/gitlab:10.5.0 ``` 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:10.4.4 app:sanitize + sameersbn/gitlab:10.5.0 app:sanitize ``` ### Piwik @@ -1057,7 +1057,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.4 app:rake gitlab:backup:create + sameersbn/gitlab:10.5.0 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. @@ -1085,14 +1085,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.4 app:rake db:setup + sameersbn/gitlab:10.5.0 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:10.4.4 app:rake gitlab:backup:restore + sameersbn/gitlab:10.5.0 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. @@ -1101,7 +1101,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1150,7 +1150,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:10.4.4 app:rake gitlab:env:info + sameersbn/gitlab:10.5.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1163,7 +1163,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.4 app:rake gitlab:import:repos + sameersbn/gitlab:10.5.0 app:rake gitlab:import:repos ``` Or @@ -1194,7 +1194,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.4.4 app:rake gitlab:import:repos + sameersbn/gitlab:10.5.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1216,12 +1216,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.4.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. +> Upgrading to `sameersbn/gitlab:10.5.0` 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:10.4.4 +docker pull sameersbn/gitlab:10.5.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1247,7 +1247,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:10.4.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.5.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index 622a6f75..2cf514e3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.4.4 +10.5.0 diff --git a/docker-compose.yml b/docker-compose.yml index a9467250..2eacb407 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.4.4 + image: sameersbn/gitlab:10.5.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index a1f0698a..810aec6b 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:10.4.4 app:rake gitlab:backup:create + sameersbn/gitlab:10.5.0 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:10.4.4 app:rake gitlab:backup:restore + sameersbn/gitlab:10.5.0 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:10.4.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.5.0 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:10.4.4 +docker pull sameersbn/gitlab:10.5.0 ``` - **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:10.4.4 +sameersbn/gitlab:10.5.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index f1727247..e576110f 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.4.4 + image: sameersbn/gitlab:10.5.0 env: - name: TZ value: Asia/Kolkata From d5a97ca280b44c46db994c1288af864f7e254757 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Feb 2018 09:36:03 +0100 Subject: [PATCH 028/508] Update gitlab-shell to 6.0.3 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bd8db50e..9c288fc2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=10.5.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.3 \ - GITLAB_SHELL_VERSION=5.11.0 \ GITLAB_WORKHORSE_VERSION=3.3.1 \ + GITLAB_SHELL_VERSION=6.0.3 \ GITLAB_PAGES_VERSION=0.6.0 \ GITALY_SERVER_VERSION=0.66.0 \ GITLAB_USER="git" \ From f533ab3a9d4130909bad8a284d52fb050b79a602 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Feb 2018 09:36:29 +0100 Subject: [PATCH 029/508] Update gitlab-workhorse to 3.6.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9c288fc2..f15ab765 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=10.5.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.3 \ - GITLAB_WORKHORSE_VERSION=3.3.1 \ GITLAB_SHELL_VERSION=6.0.3 \ + GITLAB_WORKHORSE_VERSION=3.6.0 \ GITLAB_PAGES_VERSION=0.6.0 \ GITALY_SERVER_VERSION=0.66.0 \ GITLAB_USER="git" \ From 3f839952f49cfd55ea992f673bfa997c8aad5ca9 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Feb 2018 09:37:04 +0100 Subject: [PATCH 030/508] Update gitaly to 0.81.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f15ab765..604f6cae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ENV GITLAB_VERSION=10.5.0 \ GITLAB_SHELL_VERSION=6.0.3 \ GITLAB_WORKHORSE_VERSION=3.6.0 \ GITLAB_PAGES_VERSION=0.6.0 \ - GITALY_SERVER_VERSION=0.66.0 \ + GITALY_SERVER_VERSION=0.81.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 82b3592f23e7ccaddd9979e5281f39e1b7077d92 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Feb 2018 09:37:26 +0100 Subject: [PATCH 031/508] Remove direct redis integration from gitlab-shell Signed-off-by: solidnerd --- assets/runtime/config/gitlab-shell/config.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/assets/runtime/config/gitlab-shell/config.yml b/assets/runtime/config/gitlab-shell/config.yml index 0ea24f2c..2e8e3a2d 100644 --- a/assets/runtime/config/gitlab-shell/config.yml +++ b/assets/runtime/config/gitlab-shell/config.yml @@ -35,23 +35,6 @@ secret_file: "{{GITLAB_SHELL_INSTALL_DIR}}/.gitlab_shell_secret" # Default is hooks in the gitlab-shell directory. custom_hooks_dir: "{{GITLAB_SHELL_INSTALL_DIR}}/hooks" -# Redis settings used for pushing commit notices to gitlab -redis: - host: "{{REDIS_HOST}}" - port: {{REDIS_PORT}} - # pass: redispass # Allows you to specify the password for Redis - database: {{REDIS_DB_NUMBER}} - # socket: /var/run/redis/redis.sock # Comment out this line if you want to use TCP or Sentinel - namespace: resque:gitlab - # sentinels: - # - - # host: 127.0.0.1 - # port: 26380 - # - - # host: 127.0.0.1 - # port: 26381 - - # Log file. # Default is gitlab-shell.log in the root directory. log_file: "{{GITLAB_LOG_DIR}}/gitlab-shell/gitlab-shell.log" From 501bd390f6b2e89680d9186b8c3076d0bb7636af Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Feb 2018 10:01:09 +0100 Subject: [PATCH 032/508] Fix Typo Signed-off-by: solidnerd --- assets/runtime/env-defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 5b0f2dbe..33dd58f2 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -97,7 +97,7 @@ GITLAB_PIPELINE_SCHEDULE_WORKER_CRON=${GITLAB_PIPELINE_SCHEDULE_WORKER_CRON:-"19 GITLAB_LFS_ENABLED=${GITLAB_LFS_ENABLED:-true} GITLAB_LFS_OBJECTS_DIR="${GITLAB_LFS_OBJECTS_DIR:-$GITLAB_SHARED_DIR/lfs-objects}" -## Mattermose +## Mattermost GITLAB_MATTERMOST_ENABLED=${GITLAB_MATTERMOST_ENABLED:-false} GITLAB_MATTERMOST_URL=${GITLAB_MATTERMOST_URL:-https://mattermost.example.com} From 52b669a7a3e36a1d51699435139e83210e723073 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Feb 2018 10:02:51 +0100 Subject: [PATCH 033/508] Add GITLAB_UPLOADS_STORAGE_PATH and GITLAB_UPLOADS_BASE_DIR --- Changelog.md | 2 ++ README.md | 2 ++ assets/runtime/config/gitlabhq/gitlab.yml | 7 +++++++ assets/runtime/env-defaults | 4 ++++ assets/runtime/functions | 8 ++++++++ 5 files changed, 23 insertions(+) diff --git a/Changelog.md b/Changelog.md index 5a47e3c8..fdccb5dc 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,8 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **10.5.0** - gitlab: upgrade CE to v10.5.0 +- Add `GITLAB_UPLOADS_STORAGE_PATH` +- Add `GITLAB_UPLOADS_BASE_DIR` **10.4.4** - gitlab: upgrade CE to v10.4.4 diff --git a/README.md b/README.md index f6c486f7..afe9d2a1 100644 --- a/README.md +++ b/README.md @@ -849,6 +849,8 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON` | Cron notation for the Gitlab pipeline schedule worker. Defaults to `'0 */12 * * *'` | | `GITLAB_LFS_ENABLED` | Enable/Disable Git LFS support. Defaults to `true`. | | `GITLAB_LFS_OBJECTS_DIR` | Directory to store the lfs-objects. Defaults to `$GITLAB_SHARED_DIR/lfs-objects` | +| `GITLAB_UPLOADS_STORAGE_PATH` | The location where uploads objects are stored. Defaults to `$GITLAB_SHARED_DIR/public`. | +| `GITLAB_UPLOADS_BASE_DIR` | Mapping for the `GITLAB_UPLOADS_STORAGE_PATH`. Defaults to `uploads/-/system` | | `GITLAB_MATTERMOST_ENABLED` | Enable/Disable GitLab Mattermost for *Add Mattermost button*. Defaults to `false`. | | `GITLAB_MATTERMOST_URL` | Sets Mattermost URL. Defaults to `https://mattermost.example.com`. | | `GITLAB_BACKUP_SCHEDULE` | Setup cron job to automatic backups. Possible values `disable`, `daily`, `weekly` or `monthly`. Disabled by default | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index a2973187..51fb1a4d 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -155,6 +155,13 @@ production: &base # The location where LFS objects are stored (default: shared/lfs-objects). storage_path: {{GITLAB_LFS_OBJECTS_DIR}} + ## Uploads (attachments, avatars, etc...) + uploads: + # The location where uploads objects are stored (default: public/). + storage_path: {{GITLAB_UPLOADS_STORAGE_PATH}} + base_dir: {{GITLAB_UPLOADS_BASE_DIR}} + + ## GitLab Pages pages: enabled: {{GITLAB_PAGES_ENABLED}} diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 33dd58f2..57c20bd8 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -97,6 +97,10 @@ GITLAB_PIPELINE_SCHEDULE_WORKER_CRON=${GITLAB_PIPELINE_SCHEDULE_WORKER_CRON:-"19 GITLAB_LFS_ENABLED=${GITLAB_LFS_ENABLED:-true} GITLAB_LFS_OBJECTS_DIR="${GITLAB_LFS_OBJECTS_DIR:-$GITLAB_SHARED_DIR/lfs-objects}" +## Uploads +GITLAB_UPLOADS_STORAGE_PATH="${GITLAB_UPLOADS_STORAGE_PATH:-$GITLAB_SHARED_DIR/public}" +GITLAB_UPLOADS_BASE_DIR="${GITLAB_UPLOADS_BASE_DIR:-uploads/-/system}" + ## Mattermost GITLAB_MATTERMOST_ENABLED=${GITLAB_MATTERMOST_ENABLED:-false} GITLAB_MATTERMOST_URL=${GITLAB_MATTERMOST_URL:-https://mattermost.example.com} diff --git a/assets/runtime/functions b/assets/runtime/functions index 8f12f4c7..2241ca97 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -949,6 +949,13 @@ gitlab_configure_lfs() { GITLAB_LFS_OBJECTS_DIR } +gitlab_configure_uploads() { + echo "Configuring gitlab::uploads..." + update_template ${GITLAB_CONFIG} \ + GITLAB_UPLOADS_STORAGE_PATH \ + GITLAB_UPLOADS_BASE_DIR +} + gitlab_configure_mattermost() { echo "Configuring gitlab::mattermost..." update_template ${GITLAB_CONFIG} \ @@ -1461,6 +1468,7 @@ configure_gitlab() { gitlab_configure_ci gitlab_configure_artifacts gitlab_configure_lfs + gitlab_configure_uploads gitlab_configure_mattermost gitlab_configure_project_features gitlab_configure_mail_delivery From 96e2a8fca6e8326467d58efe785a85c28ccc72e9 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Feb 2018 10:17:18 +0100 Subject: [PATCH 034/508] Add LDAP_LOWERCASE_USERNAMES Signed-off-by: solidnerd --- Changelog.md | 1 + README.md | 1 + assets/runtime/config/gitlabhq/gitlab.yml | 3 +++ assets/runtime/env-defaults | 1 + assets/runtime/functions | 1 + 5 files changed, 7 insertions(+) diff --git a/Changelog.md b/Changelog.md index fdccb5dc..8bca3c3b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o - gitlab: upgrade CE to v10.5.0 - Add `GITLAB_UPLOADS_STORAGE_PATH` - Add `GITLAB_UPLOADS_BASE_DIR` +- Add `LDAP_LOWERCASE_USERNAMES` **10.4.4** - gitlab: upgrade CE to v10.4.4 diff --git a/README.md b/README.md index afe9d2a1..1f575b64 100644 --- a/README.md +++ b/README.md @@ -961,6 +961,7 @@ Below is the complete list of available options that can be used to customize yo | `LDAP_BLOCK_AUTO_CREATED_USERS` | Locks down those users until they have been cleared by the admin. Defaults to `false`. | | `LDAP_BASE` | Base where we can search for users. No default. | | `LDAP_USER_FILTER` | Filter LDAP users. No default. | +| `LDAP_LOWERCASE_USERNAMES` | GitLab will lower case the username for the LDAP Server. Defaults to `false` | | `OAUTH_ENABLED` | Enable OAuth support. Defaults to `true` if any of the support OAuth providers is configured, else defaults to `false`. | | `OAUTH_AUTO_SIGN_IN_WITH_PROVIDER` | Automatically sign in with a specific OAuth provider without showing GitLab sign-in page. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default. | | `OAUTH_ALLOW_SSO` | Comma separated list of oauth providers for single sign-on. This allows users to login without having a user account. The account is created automatically when authentication is successful. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default. | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 51fb1a4d..c35baf3f 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -342,6 +342,9 @@ production: &base first_name: 'givenName' last_name: 'sn' + # If lowercase_usernames is enabled, GitLab will lower case the username. + lowercase_usernames: {{LDAP_LOWERCASE_USERNAMES}} + # GitLab EE only: add more LDAP servers # Choose an ID made of a-z and 0-9 . This ID will be stored in the database # so that GitLab can remember which LDAP server a user belongs to. diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 57c20bd8..6d9f7003 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -242,6 +242,7 @@ LDAP_ACTIVE_DIRECTORY=${LDAP_ACTIVE_DIRECTORY:-true} LDAP_BLOCK_AUTO_CREATED_USERS=${LDAP_BLOCK_AUTO_CREATED_USERS:-false} LDAP_BASE=${LDAP_BASE:-} LDAP_USER_FILTER=${LDAP_USER_FILTER:-} +LDAP_LOWERCASE_USERNAMES="${LDAP_LOWERCASE_USERNAMES:-false}" LDAP_LABEL=${LDAP_LABEL:-LDAP} LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN=${LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN:-} case ${LDAP_UID} in diff --git a/assets/runtime/functions b/assets/runtime/functions index 2241ca97..6c6a1f2b 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -455,6 +455,7 @@ gitlab_configure_ldap() { LDAP_BLOCK_AUTO_CREATED_USERS \ LDAP_BASE \ LDAP_USER_FILTER \ + LDAP_LOWERCASE_USERNAMES \ LDAP_LABEL } From b4bb8536c769a8298433a80850da7dfcb900fe96 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Feb 2018 10:20:42 +0100 Subject: [PATCH 035/508] Sync upstream gitlab.yml Signed-off-by: solidnerd --- assets/runtime/config/gitlabhq/gitlab.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index c35baf3f..02481124 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -185,15 +185,17 @@ production: &base host: '{{GITLAB_MATTERMOST_URL}}' ## Gravatar - ## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html + ## If using gravatar.com, there's nothing to change here. For Libravatar + ## you'll need to provide the custom URLs. For more information, + ## see: https://docs.gitlab.com/ee/customization/libravatar.html gravatar: enabled: {{GITLAB_GRAVATAR_ENABLED}} # Use user avatar image from Gravatar.com (default: true) # gravatar urls: possible placeholders: %{hash} %{size} %{email} %{username} - plain_url: "{{GITLAB_GRAVATAR_HTTP_URL}}" # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon + plain_url: "{{GITLAB_GRAVATAR_HTTP_URL}}" # default: https://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon ssl_url: "{{GITLAB_GRAVATAR_HTTPS_URL}}" # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon ## Auxiliary jobs - # Periodically executed jobs, to self-heal Gitlab, do external synchronizations, etc. + # Periodically executed jobs, to self-heal GitLab, do external synchronizations, etc. # Please read here for more information: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job cron_jobs: # Flag stuck CI jobs as failed @@ -216,6 +218,10 @@ production: &base repository_archive_cache_worker: cron: "0 * * * *" + # Verify custom GitLab Pages domains + pages_domain_verification_cron_worker: + cron: "*/15 * * * *" + registry: enabled: {{GITLAB_REGISTRY_ENABLED}} host: {{GITLAB_REGISTRY_HOST}} From bb2ac822e08dee45470388bf219d777090c6b750 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Feb 2018 10:27:22 +0100 Subject: [PATCH 036/508] Update Go to 1.9.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 604f6cae..74ff0275 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=10.5.0 \ RUBY_VERSION=2.3 \ - GOLANG_VERSION=1.9.3 \ + GOLANG_VERSION=1.9.4 \ GITLAB_SHELL_VERSION=6.0.3 \ GITLAB_WORKHORSE_VERSION=3.6.0 \ GITLAB_PAGES_VERSION=0.6.0 \ From ef46bf40f9abc8b5b170ee2387df2f02b0411c19 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Feb 2018 13:13:32 +0100 Subject: [PATCH 037/508] release 10.5.0 From f415045f5223f1bb0bbe5105c9a0b22f260589a9 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Feb 2018 13:16:06 +0100 Subject: [PATCH 038/508] Upgrade GitLab CE to 10.5.1 --- 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 8bca3c3b..70855969 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. +**10.5.1** +- gitlab: upgrade CE to v10.5.1 + **10.5.0** - gitlab: upgrade CE to v10.5.0 - Add `GITLAB_UPLOADS_STORAGE_PATH` diff --git a/Dockerfile b/Dockerfile index 74ff0275..7a709812 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.5.0 \ +ENV GITLAB_VERSION=10.5.1 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.4 \ GITLAB_SHELL_VERSION=6.0.3 \ diff --git a/README.md b/README.md index 1f575b64..a8c631ff 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:10.5.0 +# sameersbn/gitlab:10.5.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.5.0 +docker pull sameersbn/gitlab:10.5.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.5.0 + sameersbn/gitlab:10.5.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.5.0 + sameersbn/gitlab:10.5.1 ``` ## Database @@ -263,7 +263,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:10.5.0 + sameersbn/gitlab:10.5.1 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.5.0 + sameersbn/gitlab:10.5.1 ``` 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: @@ -361,7 +361,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:10.5.0 + sameersbn/gitlab:10.5.1 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.5.0 + sameersbn/gitlab:10.5.1 ``` 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: @@ -431,7 +431,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:10.5.0 + sameersbn/gitlab:10.5.1 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.5.0 + sameersbn/gitlab:10.5.1 ``` ### Mail @@ -471,7 +471,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:10.5.0 + sameersbn/gitlab:10.5.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.5.0 + sameersbn/gitlab:10.5.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.5.0 + sameersbn/gitlab:10.5.1 ``` 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. @@ -584,7 +584,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:10.5.0 + sameersbn/gitlab:10.5.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.5.0 + sameersbn/gitlab:10.5.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.5.0 + sameersbn/gitlab:10.5.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.5.0 + sameersbn/gitlab:10.5.1 ``` 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:10.5.0 app:sanitize + sameersbn/gitlab:10.5.1 app:sanitize ``` ### Piwik @@ -1060,7 +1060,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.0 app:rake gitlab:backup:create + sameersbn/gitlab:10.5.1 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. @@ -1088,14 +1088,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.0 app:rake db:setup + sameersbn/gitlab:10.5.1 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:10.5.0 app:rake gitlab:backup:restore + sameersbn/gitlab:10.5.1 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. @@ -1104,7 +1104,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.5.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1153,7 +1153,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:10.5.0 app:rake gitlab:env:info + sameersbn/gitlab:10.5.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1166,7 +1166,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.0 app:rake gitlab:import:repos + sameersbn/gitlab:10.5.1 app:rake gitlab:import:repos ``` Or @@ -1197,7 +1197,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.0 app:rake gitlab:import:repos + sameersbn/gitlab:10.5.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1219,12 +1219,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.5.0` 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:10.5.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:10.5.0 +docker pull sameersbn/gitlab:10.5.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1250,7 +1250,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:10.5.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.5.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 2cf514e3..4a6e70e9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.5.0 +10.5.1 diff --git a/docker-compose.yml b/docker-compose.yml index 2eacb407..3fc499c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.5.0 + image: sameersbn/gitlab:10.5.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 810aec6b..7559a2f9 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:10.5.0 app:rake gitlab:backup:create + sameersbn/gitlab:10.5.1 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:10.5.0 app:rake gitlab:backup:restore + sameersbn/gitlab:10.5.1 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:10.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.5.1 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:10.5.0 +docker pull sameersbn/gitlab:10.5.1 ``` - **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:10.5.0 +sameersbn/gitlab:10.5.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index e576110f..4a707be5 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.5.0 + image: sameersbn/gitlab:10.5.1 env: - name: TZ value: Asia/Kolkata From 7672e063bccfd81a8d2d538ffdb5cb23183b29f4 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Feb 2018 16:06:48 +0100 Subject: [PATCH 039/508] release 10.5.1 From b86f2a92baf1a74a2338459c296b83e5f5a55b52 Mon Sep 17 00:00:00 2001 From: xNevo Date: Wed, 28 Feb 2018 22:15:49 +0100 Subject: [PATCH 040/508] Upgrade GitLab CE to 10.5.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 70855969..57cd50a5 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. +**10.5.2** +- gitlab: upgrade CE to v10.5.2 + **10.5.1** - gitlab: upgrade CE to v10.5.1 diff --git a/Dockerfile b/Dockerfile index 7a709812..e3b02fc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.5.1 \ +ENV GITLAB_VERSION=10.5.2 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.4 \ GITLAB_SHELL_VERSION=6.0.3 \ diff --git a/README.md b/README.md index a8c631ff..2c959218 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:10.5.1 +# sameersbn/gitlab:10.5.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.5.1 +docker pull sameersbn/gitlab:10.5.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.5.1 + sameersbn/gitlab:10.5.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.5.1 + sameersbn/gitlab:10.5.2 ``` ## Database @@ -263,7 +263,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:10.5.1 + sameersbn/gitlab:10.5.2 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.5.1 + sameersbn/gitlab:10.5.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: @@ -361,7 +361,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:10.5.1 + sameersbn/gitlab:10.5.2 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.5.1 + sameersbn/gitlab:10.5.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: @@ -431,7 +431,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:10.5.1 + sameersbn/gitlab:10.5.2 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.5.1 + sameersbn/gitlab:10.5.2 ``` ### Mail @@ -471,7 +471,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:10.5.1 + sameersbn/gitlab:10.5.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.5.1 + sameersbn/gitlab:10.5.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.5.1 + sameersbn/gitlab:10.5.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. @@ -584,7 +584,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:10.5.1 + sameersbn/gitlab:10.5.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.5.1 + sameersbn/gitlab:10.5.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.5.1 + sameersbn/gitlab:10.5.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.5.1 + sameersbn/gitlab:10.5.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:10.5.1 app:sanitize + sameersbn/gitlab:10.5.2 app:sanitize ``` ### Piwik @@ -1060,7 +1060,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.1 app:rake gitlab:backup:create + sameersbn/gitlab:10.5.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. @@ -1088,14 +1088,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.1 app:rake db:setup + sameersbn/gitlab:10.5.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:10.5.1 app:rake gitlab:backup:restore + sameersbn/gitlab:10.5.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. @@ -1104,7 +1104,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.5.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1153,7 +1153,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:10.5.1 app:rake gitlab:env:info + sameersbn/gitlab:10.5.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1166,7 +1166,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.1 app:rake gitlab:import:repos + sameersbn/gitlab:10.5.2 app:rake gitlab:import:repos ``` Or @@ -1197,7 +1197,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.1 app:rake gitlab:import:repos + sameersbn/gitlab:10.5.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1219,12 +1219,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.5.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:10.5.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:10.5.1 +docker pull sameersbn/gitlab:10.5.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1250,7 +1250,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:10.5.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.5.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index 4a6e70e9..a9760d35 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.5.1 +10.5.2 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 3fc499c9..1e49db5a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.5.1 + image: sameersbn/gitlab:10.5.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 7559a2f9..1470ebc3 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:10.5.1 app:rake gitlab:backup:create + sameersbn/gitlab:10.5.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:10.5.1 app:rake gitlab:backup:restore + sameersbn/gitlab:10.5.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:10.5.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.5.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:10.5.1 +docker pull sameersbn/gitlab:10.5.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:10.5.1 +sameersbn/gitlab:10.5.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 4a707be5..7d04fc16 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.5.1 + image: sameersbn/gitlab:10.5.2 env: - name: TZ value: Asia/Kolkata From ff0e1ce1ce376ff892e4a494d7f8b770ffb7a46c Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 17 Mar 2018 11:46:49 +0100 Subject: [PATCH 041/508] Fix default upload dir --- assets/runtime/env-defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 6d9f7003..e2270d53 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -98,7 +98,7 @@ GITLAB_LFS_ENABLED=${GITLAB_LFS_ENABLED:-true} GITLAB_LFS_OBJECTS_DIR="${GITLAB_LFS_OBJECTS_DIR:-$GITLAB_SHARED_DIR/lfs-objects}" ## Uploads -GITLAB_UPLOADS_STORAGE_PATH="${GITLAB_UPLOADS_STORAGE_PATH:-$GITLAB_SHARED_DIR/public}" +GITLAB_UPLOADS_STORAGE_PATH="${GITLAB_UPLOADS_STORAGE_PATH:-$GITLAB_INSTALL_DIR/public}" GITLAB_UPLOADS_BASE_DIR="${GITLAB_UPLOADS_BASE_DIR:-uploads/-/system}" ## Mattermost From d6c55b9317ce2a05992888e9283c87847be08a38 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 17 Mar 2018 11:50:46 +0100 Subject: [PATCH 042/508] Update Changelog.md --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index 57cd50a5..f35ac1d5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **10.5.2** - gitlab: upgrade CE to v10.5.2 +- Fix `GITLAB_UPLOADS_STORAGE_PATH` **10.5.1** - gitlab: upgrade CE to v10.5.1 From a796c5609db04b12afb4d22b2b44372c5584808d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 17 Mar 2018 11:55:24 +0100 Subject: [PATCH 043/508] release 10.5.2 From f3bd35fc32700b511d51456d92883fffb1cd4494 Mon Sep 17 00:00:00 2001 From: Kiina Date: Mon, 12 Mar 2018 13:59:56 +0100 Subject: [PATCH 044/508] Upgrade GitLab CE to 10.5.3 --- 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 f35ac1d5..e99f0e51 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. +**10.5.3** +- gitlab: upgrade CE to v10.5.3 + **10.5.2** - gitlab: upgrade CE to v10.5.2 - Fix `GITLAB_UPLOADS_STORAGE_PATH` diff --git a/Dockerfile b/Dockerfile index e3b02fc9..ca96c769 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.5.2 \ +ENV GITLAB_VERSION=10.5.3 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.4 \ GITLAB_SHELL_VERSION=6.0.3 \ diff --git a/README.md b/README.md index 2c959218..d179820f 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:10.5.2 +# sameersbn/gitlab:10.5.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.5.2 +docker pull sameersbn/gitlab:10.5.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.5.2 + sameersbn/gitlab:10.5.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.5.2 + sameersbn/gitlab:10.5.3 ``` ## Database @@ -263,7 +263,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:10.5.2 + sameersbn/gitlab:10.5.3 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.5.2 + sameersbn/gitlab:10.5.3 ``` 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: @@ -361,7 +361,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:10.5.2 + sameersbn/gitlab:10.5.3 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.5.2 + sameersbn/gitlab:10.5.3 ``` 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: @@ -431,7 +431,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:10.5.2 + sameersbn/gitlab:10.5.3 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.5.2 + sameersbn/gitlab:10.5.3 ``` ### Mail @@ -471,7 +471,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:10.5.2 + sameersbn/gitlab:10.5.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.5.2 + sameersbn/gitlab:10.5.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.5.2 + sameersbn/gitlab:10.5.3 ``` 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. @@ -584,7 +584,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:10.5.2 + sameersbn/gitlab:10.5.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.5.2 + sameersbn/gitlab:10.5.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.5.2 + sameersbn/gitlab:10.5.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.5.2 + sameersbn/gitlab:10.5.3 ``` 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:10.5.2 app:sanitize + sameersbn/gitlab:10.5.3 app:sanitize ``` ### Piwik @@ -1060,7 +1060,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.2 app:rake gitlab:backup:create + sameersbn/gitlab:10.5.3 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. @@ -1088,14 +1088,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.2 app:rake db:setup + sameersbn/gitlab:10.5.3 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:10.5.2 app:rake gitlab:backup:restore + sameersbn/gitlab:10.5.3 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. @@ -1104,7 +1104,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.5.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1153,7 +1153,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:10.5.2 app:rake gitlab:env:info + sameersbn/gitlab:10.5.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1166,7 +1166,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.2 app:rake gitlab:import:repos + sameersbn/gitlab:10.5.3 app:rake gitlab:import:repos ``` Or @@ -1197,7 +1197,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.2 app:rake gitlab:import:repos + sameersbn/gitlab:10.5.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1219,12 +1219,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.5.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. +> Upgrading to `sameersbn/gitlab:10.5.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:10.5.2 +docker pull sameersbn/gitlab:10.5.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1250,7 +1250,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:10.5.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.5.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index a9760d35..1e9c35fa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.5.2 \ No newline at end of file +10.5.3 diff --git a/docker-compose.yml b/docker-compose.yml index 1e49db5a..e93185c7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.5.2 + image: sameersbn/gitlab:10.5.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 1470ebc3..095907b3 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:10.5.2 app:rake gitlab:backup:create + sameersbn/gitlab:10.5.3 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:10.5.2 app:rake gitlab:backup:restore + sameersbn/gitlab:10.5.3 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:10.5.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.5.3 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:10.5.2 +docker pull sameersbn/gitlab:10.5.3 ``` - **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:10.5.2 +sameersbn/gitlab:10.5.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 7d04fc16..a8fa77ed 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.5.2 + image: sameersbn/gitlab:10.5.3 env: - name: TZ value: Asia/Kolkata From ed976d5ed354683b2885c9f7d7dae7bc690cd2cc Mon Sep 17 00:00:00 2001 From: Kiina Date: Mon, 12 Mar 2018 16:06:43 +0100 Subject: [PATCH 045/508] Update gitlab-pages to 0.6.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ca96c769..fb345fd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ENV GITLAB_VERSION=10.5.3 \ GOLANG_VERSION=1.9.4 \ GITLAB_SHELL_VERSION=6.0.3 \ GITLAB_WORKHORSE_VERSION=3.6.0 \ - GITLAB_PAGES_VERSION=0.6.0 \ + GITLAB_PAGES_VERSION=0.6.1 \ GITALY_SERVER_VERSION=0.81.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ From 1b2dd547e0ac051e84c5114ed29811a914b6a5c3 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 17 Mar 2018 12:28:09 +0100 Subject: [PATCH 046/508] release 10.5.3 From 72a7626b2f2990fdd841659170756fe1b61b44b5 Mon Sep 17 00:00:00 2001 From: Kiina Date: Mon, 12 Mar 2018 14:00:50 +0100 Subject: [PATCH 047/508] Upgrade GitLab CE to 10.5.4 --- 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 e99f0e51..2ef437a5 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. +**10.5.4** +- gitlab: upgrade CE to v10.5.4 + **10.5.3** - gitlab: upgrade CE to v10.5.3 diff --git a/Dockerfile b/Dockerfile index fb345fd9..858beacc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.5.3 \ +ENV GITLAB_VERSION=10.5.4 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.4 \ GITLAB_SHELL_VERSION=6.0.3 \ diff --git a/README.md b/README.md index d179820f..2c73e82b 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:10.5.3 +# sameersbn/gitlab:10.5.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.5.3 +docker pull sameersbn/gitlab:10.5.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.5.3 + sameersbn/gitlab:10.5.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.5.3 + sameersbn/gitlab:10.5.4 ``` ## Database @@ -263,7 +263,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:10.5.3 + sameersbn/gitlab:10.5.4 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.5.3 + sameersbn/gitlab:10.5.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: @@ -361,7 +361,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:10.5.3 + sameersbn/gitlab:10.5.4 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.5.3 + sameersbn/gitlab:10.5.4 ``` 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: @@ -431,7 +431,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:10.5.3 + sameersbn/gitlab:10.5.4 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.5.3 + sameersbn/gitlab:10.5.4 ``` ### Mail @@ -471,7 +471,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:10.5.3 + sameersbn/gitlab:10.5.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.5.3 + sameersbn/gitlab:10.5.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.5.3 + sameersbn/gitlab:10.5.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. @@ -584,7 +584,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:10.5.3 + sameersbn/gitlab:10.5.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.5.3 + sameersbn/gitlab:10.5.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.5.3 + sameersbn/gitlab:10.5.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.5.3 + sameersbn/gitlab:10.5.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:10.5.3 app:sanitize + sameersbn/gitlab:10.5.4 app:sanitize ``` ### Piwik @@ -1060,7 +1060,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.3 app:rake gitlab:backup:create + sameersbn/gitlab:10.5.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. @@ -1088,14 +1088,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.3 app:rake db:setup + sameersbn/gitlab:10.5.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:10.5.3 app:rake gitlab:backup:restore + sameersbn/gitlab:10.5.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. @@ -1104,7 +1104,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.5.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1153,7 +1153,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:10.5.3 app:rake gitlab:env:info + sameersbn/gitlab:10.5.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1166,7 +1166,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.3 app:rake gitlab:import:repos + sameersbn/gitlab:10.5.4 app:rake gitlab:import:repos ``` Or @@ -1197,7 +1197,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.3 app:rake gitlab:import:repos + sameersbn/gitlab:10.5.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1219,12 +1219,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.5.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:10.5.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:10.5.3 +docker pull sameersbn/gitlab:10.5.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1250,7 +1250,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:10.5.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.5.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index 1e9c35fa..927fa808 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.5.3 +10.5.4 diff --git a/docker-compose.yml b/docker-compose.yml index e93185c7..aa34a769 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.5.3 + image: sameersbn/gitlab:10.5.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 095907b3..05fc8408 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:10.5.3 app:rake gitlab:backup:create + sameersbn/gitlab:10.5.4 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:10.5.3 app:rake gitlab:backup:restore + sameersbn/gitlab:10.5.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. @@ -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:10.5.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.5.4 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:10.5.3 +docker pull sameersbn/gitlab:10.5.4 ``` - **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:10.5.3 +sameersbn/gitlab:10.5.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index a8fa77ed..2e2c7aad 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.5.3 + image: sameersbn/gitlab:10.5.4 env: - name: TZ value: Asia/Kolkata From 95b352533a4c336e6cc0ef3ed82d2b35059edf6e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 17 Mar 2018 12:29:24 +0100 Subject: [PATCH 048/508] release 10.5.4 From f3bdc7b268912cad751550cd33f497cca7551869 Mon Sep 17 00:00:00 2001 From: Kiina Date: Fri, 16 Mar 2018 13:44:22 +0100 Subject: [PATCH 049/508] Upgrade GitLab CE to 10.5.5 --- 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 2ef437a5..a9767ee1 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. +**10.5.5** +- gitlab: upgrade CE to v10.5.5 + **10.5.4** - gitlab: upgrade CE to v10.5.4 diff --git a/Dockerfile b/Dockerfile index 858beacc..2cb6595a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.5.4 \ +ENV GITLAB_VERSION=10.5.5 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.4 \ GITLAB_SHELL_VERSION=6.0.3 \ diff --git a/README.md b/README.md index 2c73e82b..df98df7b 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:10.5.4 +# sameersbn/gitlab:10.5.5 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.5.4 +docker pull sameersbn/gitlab:10.5.5 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.5.4 + sameersbn/gitlab:10.5.5 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.5.4 + sameersbn/gitlab:10.5.5 ``` ## Database @@ -263,7 +263,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:10.5.4 + sameersbn/gitlab:10.5.5 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.5.4 + sameersbn/gitlab:10.5.5 ``` 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: @@ -361,7 +361,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:10.5.4 + sameersbn/gitlab:10.5.5 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.5.4 + sameersbn/gitlab:10.5.5 ``` 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: @@ -431,7 +431,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:10.5.4 + sameersbn/gitlab:10.5.5 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.5.4 + sameersbn/gitlab:10.5.5 ``` ### Mail @@ -471,7 +471,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:10.5.4 + sameersbn/gitlab:10.5.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.5.4 + sameersbn/gitlab:10.5.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.5.4 + sameersbn/gitlab:10.5.5 ``` 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. @@ -584,7 +584,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:10.5.4 + sameersbn/gitlab:10.5.5 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.5.4 + sameersbn/gitlab:10.5.5 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.5.4 + sameersbn/gitlab:10.5.5 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.5.4 + sameersbn/gitlab:10.5.5 ``` 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:10.5.4 app:sanitize + sameersbn/gitlab:10.5.5 app:sanitize ``` ### Piwik @@ -1060,7 +1060,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.4 app:rake gitlab:backup:create + sameersbn/gitlab:10.5.5 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. @@ -1088,14 +1088,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.4 app:rake db:setup + sameersbn/gitlab:10.5.5 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:10.5.4 app:rake gitlab:backup:restore + sameersbn/gitlab:10.5.5 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. @@ -1104,7 +1104,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.5.5 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1153,7 +1153,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:10.5.4 app:rake gitlab:env:info + sameersbn/gitlab:10.5.5 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1166,7 +1166,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.4 app:rake gitlab:import:repos + sameersbn/gitlab:10.5.5 app:rake gitlab:import:repos ``` Or @@ -1197,7 +1197,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.4 app:rake gitlab:import:repos + sameersbn/gitlab:10.5.5 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1219,12 +1219,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.5.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. +> Upgrading to `sameersbn/gitlab:10.5.5` 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:10.5.4 +docker pull sameersbn/gitlab:10.5.5 ``` - **Step 2**: Stop and remove the currently running image @@ -1250,7 +1250,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:10.5.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.5.5 ``` ## Shell Access diff --git a/VERSION b/VERSION index 927fa808..23b7528b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.5.4 +10.5.5 diff --git a/docker-compose.yml b/docker-compose.yml index aa34a769..6b1eadae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.5.4 + image: sameersbn/gitlab:10.5.5 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 05fc8408..efeec411 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:10.5.4 app:rake gitlab:backup:create + sameersbn/gitlab:10.5.5 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:10.5.4 app:rake gitlab:backup:restore + sameersbn/gitlab:10.5.5 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:10.5.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.5.5 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:10.5.4 +docker pull sameersbn/gitlab:10.5.5 ``` - **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:10.5.4 +sameersbn/gitlab:10.5.5 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 2e2c7aad..377c75ff 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.5.4 + image: sameersbn/gitlab:10.5.5 env: - name: TZ value: Asia/Kolkata From 10b04428df9bcf890f6967c5beed21be11b7fc55 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 17 Mar 2018 12:30:30 +0100 Subject: [PATCH 050/508] release 10.5.5 From cb96b058692442e10cec306a4328022fe087b809 Mon Sep 17 00:00:00 2001 From: Pieter Lange Date: Wed, 21 Mar 2018 00:18:04 +0100 Subject: [PATCH 051/508] Upgrade to 10.5.6 --- 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 a9767ee1..ce928ce5 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. +**10.5.6** +- gitlab: security upgrade CE to v10.5.6 + **10.5.5** - gitlab: upgrade CE to v10.5.5 diff --git a/Dockerfile b/Dockerfile index 2cb6595a..6b367017 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.5.5 \ +ENV GITLAB_VERSION=10.5.6 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.4 \ GITLAB_SHELL_VERSION=6.0.3 \ diff --git a/README.md b/README.md index df98df7b..54b1a18d 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:10.5.5 +# sameersbn/gitlab:10.5.6 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.5.5 +docker pull sameersbn/gitlab:10.5.6 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.5.5 + sameersbn/gitlab:10.5.6 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.5.5 + sameersbn/gitlab:10.5.6 ``` ## Database @@ -263,7 +263,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:10.5.5 + sameersbn/gitlab:10.5.6 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.5.5 + sameersbn/gitlab:10.5.6 ``` 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: @@ -361,7 +361,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:10.5.5 + sameersbn/gitlab:10.5.6 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.5.5 + sameersbn/gitlab:10.5.6 ``` 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: @@ -431,7 +431,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:10.5.5 + sameersbn/gitlab:10.5.6 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.5.5 + sameersbn/gitlab:10.5.6 ``` ### Mail @@ -471,7 +471,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:10.5.5 + sameersbn/gitlab:10.5.6 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.5.5 + sameersbn/gitlab:10.5.6 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.5.5 + sameersbn/gitlab:10.5.6 ``` 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. @@ -584,7 +584,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:10.5.5 + sameersbn/gitlab:10.5.6 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.5.5 + sameersbn/gitlab:10.5.6 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.5.5 + sameersbn/gitlab:10.5.6 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.5.5 + sameersbn/gitlab:10.5.6 ``` 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:10.5.5 app:sanitize + sameersbn/gitlab:10.5.6 app:sanitize ``` ### Piwik @@ -1060,7 +1060,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.5 app:rake gitlab:backup:create + sameersbn/gitlab:10.5.6 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. @@ -1088,14 +1088,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.5 app:rake db:setup + sameersbn/gitlab:10.5.6 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:10.5.5 app:rake gitlab:backup:restore + sameersbn/gitlab:10.5.6 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. @@ -1104,7 +1104,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.5.6 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1153,7 +1153,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:10.5.5 app:rake gitlab:env:info + sameersbn/gitlab:10.5.6 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1166,7 +1166,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.5 app:rake gitlab:import:repos + sameersbn/gitlab:10.5.6 app:rake gitlab:import:repos ``` Or @@ -1197,7 +1197,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.5 app:rake gitlab:import:repos + sameersbn/gitlab:10.5.6 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1219,12 +1219,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.5.5` 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:10.5.6` 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:10.5.5 +docker pull sameersbn/gitlab:10.5.6 ``` - **Step 2**: Stop and remove the currently running image @@ -1250,7 +1250,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:10.5.5 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.5.6 ``` ## Shell Access diff --git a/VERSION b/VERSION index 23b7528b..3b240570 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.5.5 +10.5.6 diff --git a/docker-compose.yml b/docker-compose.yml index 6b1eadae..7d9777ba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.5.5 + image: sameersbn/gitlab:10.5.6 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index efeec411..2fe72d9a 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:10.5.5 app:rake gitlab:backup:create + sameersbn/gitlab:10.5.6 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:10.5.5 app:rake gitlab:backup:restore + sameersbn/gitlab:10.5.6 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:10.5.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.5.6 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:10.5.5 +docker pull sameersbn/gitlab:10.5.6 ``` - **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:10.5.5 +sameersbn/gitlab:10.5.6 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 377c75ff..e7ec290b 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.5.5 + image: sameersbn/gitlab:10.5.6 env: - name: TZ value: Asia/Kolkata From 17caf128b9a41cf99cf489e7093b150de07b8bf2 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 21 Mar 2018 23:27:00 +0100 Subject: [PATCH 052/508] release 10.5.6 From be94efa2db7f7b01933653c045897981b3a40acb Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 22 Mar 2018 14:08:46 +0100 Subject: [PATCH 053/508] Upgrade GitLab CE to 10.6.0 --- 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 ce928ce5..0fe962ae 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. +**10.6.0** +- gitlab: upgrade CE to v10.6.0 + **10.5.6** - gitlab: security upgrade CE to v10.5.6 diff --git a/Dockerfile b/Dockerfile index 6b367017..e6d0880f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.5.6 \ +ENV GITLAB_VERSION=10.6.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.4 \ GITLAB_SHELL_VERSION=6.0.3 \ diff --git a/README.md b/README.md index 54b1a18d..f953f93b 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:10.5.6 +# sameersbn/gitlab:10.6.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.5.6 +docker pull sameersbn/gitlab:10.6.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.5.6 + sameersbn/gitlab:10.6.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.5.6 + sameersbn/gitlab:10.6.0 ``` ## Database @@ -263,7 +263,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:10.5.6 + sameersbn/gitlab:10.6.0 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.5.6 + sameersbn/gitlab:10.6.0 ``` 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: @@ -361,7 +361,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:10.5.6 + sameersbn/gitlab:10.6.0 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.5.6 + sameersbn/gitlab:10.6.0 ``` 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: @@ -431,7 +431,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:10.5.6 + sameersbn/gitlab:10.6.0 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.5.6 + sameersbn/gitlab:10.6.0 ``` ### Mail @@ -471,7 +471,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:10.5.6 + sameersbn/gitlab:10.6.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.5.6 + sameersbn/gitlab:10.6.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.5.6 + sameersbn/gitlab:10.6.0 ``` 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. @@ -584,7 +584,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:10.5.6 + sameersbn/gitlab:10.6.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.5.6 + sameersbn/gitlab:10.6.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.5.6 + sameersbn/gitlab:10.6.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.5.6 + sameersbn/gitlab:10.6.0 ``` 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:10.5.6 app:sanitize + sameersbn/gitlab:10.6.0 app:sanitize ``` ### Piwik @@ -1060,7 +1060,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.6 app:rake gitlab:backup:create + sameersbn/gitlab:10.6.0 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. @@ -1088,14 +1088,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.6 app:rake db:setup + sameersbn/gitlab:10.6.0 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:10.5.6 app:rake gitlab:backup:restore + sameersbn/gitlab:10.6.0 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. @@ -1104,7 +1104,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.6 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.6.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1153,7 +1153,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:10.5.6 app:rake gitlab:env:info + sameersbn/gitlab:10.6.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1166,7 +1166,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.6 app:rake gitlab:import:repos + sameersbn/gitlab:10.6.0 app:rake gitlab:import:repos ``` Or @@ -1197,7 +1197,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.5.6 app:rake gitlab:import:repos + sameersbn/gitlab:10.6.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1219,12 +1219,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.5.6` 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:10.6.0` 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:10.5.6 +docker pull sameersbn/gitlab:10.6.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1250,7 +1250,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:10.5.6 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.6.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index 3b240570..d1dd3f90 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.5.6 +10.6.0 diff --git a/docker-compose.yml b/docker-compose.yml index 7d9777ba..e27719b5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.5.6 + image: sameersbn/gitlab:10.6.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 2fe72d9a..07a31cf1 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:10.5.6 app:rake gitlab:backup:create + sameersbn/gitlab:10.6.0 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:10.5.6 app:rake gitlab:backup:restore + sameersbn/gitlab:10.6.0 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:10.5.6 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.6.0 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:10.5.6 +docker pull sameersbn/gitlab:10.6.0 ``` - **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:10.5.6 +sameersbn/gitlab:10.6.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index e7ec290b..ccc2d1c6 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.5.6 + image: sameersbn/gitlab:10.6.0 env: - name: TZ value: Asia/Kolkata From ada56646abacc16d7f6e54ea563c2f439f274e55 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 22 Mar 2018 14:55:22 +0100 Subject: [PATCH 054/508] Update gitlab-shell to 6.0.4 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e6d0880f..1b568bd0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,10 +4,10 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=10.6.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.4 \ - GITLAB_SHELL_VERSION=6.0.3 \ GITLAB_WORKHORSE_VERSION=3.6.0 \ GITLAB_PAGES_VERSION=0.6.1 \ GITALY_SERVER_VERSION=0.81.0 \ + GITLAB_SHELL_VERSION=6.0.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 2c5208c1aba7097cceced6862db02201f4b5cde6 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 22 Mar 2018 14:55:40 +0100 Subject: [PATCH 055/508] Update gitlab-workhorse to 4.0.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1b568bd0..1e516316 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,10 +4,10 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=10.6.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.4 \ - GITLAB_WORKHORSE_VERSION=3.6.0 \ GITLAB_PAGES_VERSION=0.6.1 \ GITALY_SERVER_VERSION=0.81.0 \ GITLAB_SHELL_VERSION=6.0.4 \ + GITLAB_WORKHORSE_VERSION=4.0.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 0036e79ae27cb6cf4e174d1bba47476b1c04c296 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 22 Mar 2018 14:56:03 +0100 Subject: [PATCH 056/508] Update gitaly to 0.91.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1e516316..d0574db2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,9 @@ ENV GITLAB_VERSION=10.6.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.4 \ GITLAB_PAGES_VERSION=0.6.1 \ - GITALY_SERVER_VERSION=0.81.0 \ GITLAB_SHELL_VERSION=6.0.4 \ GITLAB_WORKHORSE_VERSION=4.0.0 \ + GITALY_SERVER_VERSION=0.91.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 427935af2ccc3b67a3fe141ff8d6e2eae7b451d4 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 22 Mar 2018 14:56:23 +0100 Subject: [PATCH 057/508] Update gitlab-pages to 0.7.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d0574db2..a9d950c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,9 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=10.6.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.4 \ - GITLAB_PAGES_VERSION=0.6.1 \ GITLAB_SHELL_VERSION=6.0.4 \ GITLAB_WORKHORSE_VERSION=4.0.0 \ + GITLAB_PAGES_VERSION=0.7.1 \ GITALY_SERVER_VERSION=0.91.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ From 428e37a821f94af03e72201420ee2874be8834b4 Mon Sep 17 00:00:00 2001 From: "Klos, Jan" Date: Sun, 25 Mar 2018 04:45:01 +0200 Subject: [PATCH 058/508] fix "unknown group 'syslog'" error preventing logrotate from functioning --- assets/build/install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/build/install.sh b/assets/build/install.sh index b7b383c2..6b4b9c2d 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -206,6 +206,9 @@ sed -i \ -e "s|error_log /var/log/nginx/error.log;|error_log ${GITLAB_LOG_DIR}/nginx/error.log;|" \ /etc/nginx/nginx.conf +# fix "unknown group 'syslog'" error preventing logrotate from functioning +sed -i "s|^su root syslog$|su root root|" /etc/logrotate.conf + # configure supervisord log rotation cat > /etc/logrotate.d/supervisord < Date: Thu, 29 Mar 2018 07:43:17 +0200 Subject: [PATCH 059/508] release 10.6.0 From f4ca7ec984dbae5f9d7bf6b173f2b177e4430636 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 29 Mar 2018 07:45:33 +0200 Subject: [PATCH 060/508] Upgrade GitLab CE to 10.6.1 --- 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 0fe962ae..4f5c9931 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. +**10.6.1** +- gitlab: upgrade CE to v10.6.1 + **10.6.0** - gitlab: upgrade CE to v10.6.0 diff --git a/Dockerfile b/Dockerfile index a9d950c8..519d89f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.6.0 \ +ENV GITLAB_VERSION=10.6.1 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.4 \ GITLAB_SHELL_VERSION=6.0.4 \ diff --git a/README.md b/README.md index f953f93b..48a5e622 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:10.6.0 +# sameersbn/gitlab:10.6.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.6.0 +docker pull sameersbn/gitlab:10.6.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.6.0 + sameersbn/gitlab:10.6.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.6.0 + sameersbn/gitlab:10.6.1 ``` ## Database @@ -263,7 +263,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:10.6.0 + sameersbn/gitlab:10.6.1 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.6.0 + sameersbn/gitlab:10.6.1 ``` 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: @@ -361,7 +361,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:10.6.0 + sameersbn/gitlab:10.6.1 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.6.0 + sameersbn/gitlab:10.6.1 ``` 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: @@ -431,7 +431,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:10.6.0 + sameersbn/gitlab:10.6.1 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.6.0 + sameersbn/gitlab:10.6.1 ``` ### Mail @@ -471,7 +471,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:10.6.0 + sameersbn/gitlab:10.6.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.6.0 + sameersbn/gitlab:10.6.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.6.0 + sameersbn/gitlab:10.6.1 ``` 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. @@ -584,7 +584,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:10.6.0 + sameersbn/gitlab:10.6.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.6.0 + sameersbn/gitlab:10.6.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.6.0 + sameersbn/gitlab:10.6.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.6.0 + sameersbn/gitlab:10.6.1 ``` 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:10.6.0 app:sanitize + sameersbn/gitlab:10.6.1 app:sanitize ``` ### Piwik @@ -1060,7 +1060,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.0 app:rake gitlab:backup:create + sameersbn/gitlab:10.6.1 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. @@ -1088,14 +1088,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.0 app:rake db:setup + sameersbn/gitlab:10.6.1 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:10.6.0 app:rake gitlab:backup:restore + sameersbn/gitlab:10.6.1 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. @@ -1104,7 +1104,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.6.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1153,7 +1153,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:10.6.0 app:rake gitlab:env:info + sameersbn/gitlab:10.6.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1166,7 +1166,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.0 app:rake gitlab:import:repos + sameersbn/gitlab:10.6.1 app:rake gitlab:import:repos ``` Or @@ -1197,7 +1197,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.0 app:rake gitlab:import:repos + sameersbn/gitlab:10.6.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1219,12 +1219,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.6.0` 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:10.6.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:10.6.0 +docker pull sameersbn/gitlab:10.6.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1250,7 +1250,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:10.6.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.6.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index d1dd3f90..04ada833 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.6.0 +10.6.1 diff --git a/docker-compose.yml b/docker-compose.yml index e27719b5..667738bf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.6.0 + image: sameersbn/gitlab:10.6.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 07a31cf1..1efa1053 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:10.6.0 app:rake gitlab:backup:create + sameersbn/gitlab:10.6.1 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:10.6.0 app:rake gitlab:backup:restore + sameersbn/gitlab:10.6.1 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:10.6.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.6.1 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:10.6.0 +docker pull sameersbn/gitlab:10.6.1 ``` - **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:10.6.0 +sameersbn/gitlab:10.6.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index ccc2d1c6..4baa95e6 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.6.0 + image: sameersbn/gitlab:10.6.1 env: - name: TZ value: Asia/Kolkata From 73540f9fcb3b1d105cae05eb6f4c13c463c88af5 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 31 Mar 2018 08:51:22 +0200 Subject: [PATCH 061/508] release 10.6.1 From 97a3a766d63c4df0d0c0cf0beca03c9853907483 Mon Sep 17 00:00:00 2001 From: "Klos, Jan" Date: Fri, 30 Mar 2018 10:48:27 +0200 Subject: [PATCH 062/508] update gitlab ce to 10.6.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 4f5c9931..8362c4f3 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. +**10.6.2** +- gitlab: upgrade CE to v10.6.2 + **10.6.1** - gitlab: upgrade CE to v10.6.1 diff --git a/Dockerfile b/Dockerfile index 519d89f9..92c99ac9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.6.1 \ +ENV GITLAB_VERSION=10.6.2 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.4 \ GITLAB_SHELL_VERSION=6.0.4 \ diff --git a/README.md b/README.md index 48a5e622..718842b7 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:10.6.1 +# sameersbn/gitlab:10.6.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.6.1 +docker pull sameersbn/gitlab:10.6.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.6.1 + sameersbn/gitlab:10.6.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.6.1 + sameersbn/gitlab:10.6.2 ``` ## Database @@ -263,7 +263,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:10.6.1 + sameersbn/gitlab:10.6.2 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.6.1 + sameersbn/gitlab:10.6.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: @@ -361,7 +361,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:10.6.1 + sameersbn/gitlab:10.6.2 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.6.1 + sameersbn/gitlab:10.6.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: @@ -431,7 +431,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:10.6.1 + sameersbn/gitlab:10.6.2 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.6.1 + sameersbn/gitlab:10.6.2 ``` ### Mail @@ -471,7 +471,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:10.6.1 + sameersbn/gitlab:10.6.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.6.1 + sameersbn/gitlab:10.6.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.6.1 + sameersbn/gitlab:10.6.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. @@ -584,7 +584,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:10.6.1 + sameersbn/gitlab:10.6.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.6.1 + sameersbn/gitlab:10.6.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.6.1 + sameersbn/gitlab:10.6.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.6.1 + sameersbn/gitlab:10.6.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:10.6.1 app:sanitize + sameersbn/gitlab:10.6.2 app:sanitize ``` ### Piwik @@ -1060,7 +1060,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.1 app:rake gitlab:backup:create + sameersbn/gitlab:10.6.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. @@ -1088,14 +1088,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.1 app:rake db:setup + sameersbn/gitlab:10.6.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:10.6.1 app:rake gitlab:backup:restore + sameersbn/gitlab:10.6.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. @@ -1104,7 +1104,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.6.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1153,7 +1153,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:10.6.1 app:rake gitlab:env:info + sameersbn/gitlab:10.6.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1166,7 +1166,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.1 app:rake gitlab:import:repos + sameersbn/gitlab:10.6.2 app:rake gitlab:import:repos ``` Or @@ -1197,7 +1197,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.1 app:rake gitlab:import:repos + sameersbn/gitlab:10.6.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1219,12 +1219,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.6.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:10.6.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:10.6.1 +docker pull sameersbn/gitlab:10.6.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1250,7 +1250,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:10.6.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.6.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index 04ada833..6842906c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.6.1 +10.6.2 diff --git a/docker-compose.yml b/docker-compose.yml index 667738bf..4bb38aa8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.6.1 + image: sameersbn/gitlab:10.6.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 1efa1053..abd3b5c3 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:10.6.1 app:rake gitlab:backup:create + sameersbn/gitlab:10.6.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:10.6.1 app:rake gitlab:backup:restore + sameersbn/gitlab:10.6.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:10.6.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.6.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:10.6.1 +docker pull sameersbn/gitlab:10.6.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:10.6.1 +sameersbn/gitlab:10.6.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 4baa95e6..3b0cd884 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.6.1 + image: sameersbn/gitlab:10.6.2 env: - name: TZ value: Asia/Kolkata From ed8ef411cb86cea25e6280f5f87bb85c1e172fec Mon Sep 17 00:00:00 2001 From: "Klos, Jan" Date: Fri, 30 Mar 2018 10:49:04 +0200 Subject: [PATCH 063/508] update golang to 1.9.5 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 8362c4f3..a3f3c770 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **10.6.2** - gitlab: upgrade CE to v10.6.2 +- golang: update to 1.9.5 **10.6.1** - gitlab: upgrade CE to v10.6.1 diff --git a/Dockerfile b/Dockerfile index 92c99ac9..b29f30d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=10.6.2 \ RUBY_VERSION=2.3 \ - GOLANG_VERSION=1.9.4 \ + GOLANG_VERSION=1.9.5 \ GITLAB_SHELL_VERSION=6.0.4 \ GITLAB_WORKHORSE_VERSION=4.0.0 \ GITLAB_PAGES_VERSION=0.7.1 \ From 159226206990ca3272dd38a1dafa9efb99ad5a18 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 4 Apr 2018 12:19:10 +0200 Subject: [PATCH 064/508] release 10.6.2 From e56b05963e86be76c6d17d9c6068a0d49e1e4306 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 5 Apr 2018 10:28:50 +0200 Subject: [PATCH 065/508] Upgrade GitLab CE to 10.6.3 --- 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 a3f3c770..754dbcc9 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. +**10.6.3** +- gitlab: upgrade CE to v10.6.3 + **10.6.2** - gitlab: upgrade CE to v10.6.2 - golang: update to 1.9.5 diff --git a/Dockerfile b/Dockerfile index b29f30d0..750bb40a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.6.2 \ +ENV GITLAB_VERSION=10.6.3 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.5 \ GITLAB_SHELL_VERSION=6.0.4 \ diff --git a/README.md b/README.md index 718842b7..c7dfe3e1 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:10.6.2 +# sameersbn/gitlab:10.6.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.6.2 +docker pull sameersbn/gitlab:10.6.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.6.2 + sameersbn/gitlab:10.6.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.6.2 + sameersbn/gitlab:10.6.3 ``` ## Database @@ -263,7 +263,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:10.6.2 + sameersbn/gitlab:10.6.3 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.6.2 + sameersbn/gitlab:10.6.3 ``` 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: @@ -361,7 +361,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:10.6.2 + sameersbn/gitlab:10.6.3 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.6.2 + sameersbn/gitlab:10.6.3 ``` 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: @@ -431,7 +431,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:10.6.2 + sameersbn/gitlab:10.6.3 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.6.2 + sameersbn/gitlab:10.6.3 ``` ### Mail @@ -471,7 +471,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:10.6.2 + sameersbn/gitlab:10.6.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.6.2 + sameersbn/gitlab:10.6.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.6.2 + sameersbn/gitlab:10.6.3 ``` 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. @@ -584,7 +584,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:10.6.2 + sameersbn/gitlab:10.6.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.6.2 + sameersbn/gitlab:10.6.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.6.2 + sameersbn/gitlab:10.6.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.6.2 + sameersbn/gitlab:10.6.3 ``` 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:10.6.2 app:sanitize + sameersbn/gitlab:10.6.3 app:sanitize ``` ### Piwik @@ -1060,7 +1060,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.2 app:rake gitlab:backup:create + sameersbn/gitlab:10.6.3 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. @@ -1088,14 +1088,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.2 app:rake db:setup + sameersbn/gitlab:10.6.3 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:10.6.2 app:rake gitlab:backup:restore + sameersbn/gitlab:10.6.3 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. @@ -1104,7 +1104,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.6.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1153,7 +1153,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:10.6.2 app:rake gitlab:env:info + sameersbn/gitlab:10.6.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1166,7 +1166,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.2 app:rake gitlab:import:repos + sameersbn/gitlab:10.6.3 app:rake gitlab:import:repos ``` Or @@ -1197,7 +1197,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.2 app:rake gitlab:import:repos + sameersbn/gitlab:10.6.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1219,12 +1219,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.6.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. +> Upgrading to `sameersbn/gitlab:10.6.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:10.6.2 +docker pull sameersbn/gitlab:10.6.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1250,7 +1250,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:10.6.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.6.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index 6842906c..15c6f3e7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.6.2 +10.6.3 diff --git a/docker-compose.yml b/docker-compose.yml index 4bb38aa8..e9622512 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.6.2 + image: sameersbn/gitlab:10.6.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index abd3b5c3..f53e41f4 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:10.6.2 app:rake gitlab:backup:create + sameersbn/gitlab:10.6.3 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:10.6.2 app:rake gitlab:backup:restore + sameersbn/gitlab:10.6.3 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:10.6.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.6.3 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:10.6.2 +docker pull sameersbn/gitlab:10.6.3 ``` - **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:10.6.2 +sameersbn/gitlab:10.6.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 3b0cd884..a831f1f2 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.6.2 + image: sameersbn/gitlab:10.6.3 env: - name: TZ value: Asia/Kolkata From 498d3cbf141b52146a18a284bab3336bb86655f1 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 5 Apr 2018 14:51:31 +0200 Subject: [PATCH 066/508] release 10.6.3 From ab6934a1f3fb18b759b9ac00cc7337955f849a4e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 10 Apr 2018 11:33:30 +0200 Subject: [PATCH 067/508] Upgrade GitLab CE to 10.6.4 --- 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 754dbcc9..fcb93860 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. +**10.6.4** +- gitlab: upgrade CE to v10.6.4 + **10.6.3** - gitlab: upgrade CE to v10.6.3 diff --git a/Dockerfile b/Dockerfile index 750bb40a..619d7753 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.6.3 \ +ENV GITLAB_VERSION=10.6.4 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.5 \ GITLAB_SHELL_VERSION=6.0.4 \ diff --git a/README.md b/README.md index c7dfe3e1..959404b7 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:10.6.3 +# sameersbn/gitlab:10.6.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.6.3 +docker pull sameersbn/gitlab:10.6.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.6.3 + sameersbn/gitlab:10.6.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.6.3 + sameersbn/gitlab:10.6.4 ``` ## Database @@ -263,7 +263,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:10.6.3 + sameersbn/gitlab:10.6.4 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.6.3 + sameersbn/gitlab:10.6.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: @@ -361,7 +361,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:10.6.3 + sameersbn/gitlab:10.6.4 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.6.3 + sameersbn/gitlab:10.6.4 ``` 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: @@ -431,7 +431,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:10.6.3 + sameersbn/gitlab:10.6.4 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.6.3 + sameersbn/gitlab:10.6.4 ``` ### Mail @@ -471,7 +471,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:10.6.3 + sameersbn/gitlab:10.6.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.6.3 + sameersbn/gitlab:10.6.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.6.3 + sameersbn/gitlab:10.6.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. @@ -584,7 +584,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:10.6.3 + sameersbn/gitlab:10.6.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.6.3 + sameersbn/gitlab:10.6.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.6.3 + sameersbn/gitlab:10.6.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.6.3 + sameersbn/gitlab:10.6.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:10.6.3 app:sanitize + sameersbn/gitlab:10.6.4 app:sanitize ``` ### Piwik @@ -1060,7 +1060,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.3 app:rake gitlab:backup:create + sameersbn/gitlab:10.6.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. @@ -1088,14 +1088,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.3 app:rake db:setup + sameersbn/gitlab:10.6.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:10.6.3 app:rake gitlab:backup:restore + sameersbn/gitlab:10.6.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. @@ -1104,7 +1104,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.6.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1153,7 +1153,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:10.6.3 app:rake gitlab:env:info + sameersbn/gitlab:10.6.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1166,7 +1166,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.3 app:rake gitlab:import:repos + sameersbn/gitlab:10.6.4 app:rake gitlab:import:repos ``` Or @@ -1197,7 +1197,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.3 app:rake gitlab:import:repos + sameersbn/gitlab:10.6.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1219,12 +1219,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.6.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:10.6.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:10.6.3 +docker pull sameersbn/gitlab:10.6.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1250,7 +1250,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:10.6.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.6.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index 15c6f3e7..827886a6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.6.3 +10.6.4 diff --git a/docker-compose.yml b/docker-compose.yml index e9622512..d02ed090 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.6.3 + image: sameersbn/gitlab:10.6.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index f53e41f4..ecb28735 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:10.6.3 app:rake gitlab:backup:create + sameersbn/gitlab:10.6.4 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:10.6.3 app:rake gitlab:backup:restore + sameersbn/gitlab:10.6.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. @@ -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:10.6.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.6.4 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:10.6.3 +docker pull sameersbn/gitlab:10.6.4 ``` - **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:10.6.3 +sameersbn/gitlab:10.6.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index a831f1f2..eb8f3cf1 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.6.3 + image: sameersbn/gitlab:10.6.4 env: - name: TZ value: Asia/Kolkata From 7e35505a31bf490402e168948ac219cd82bfb317 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 10 Apr 2018 23:17:35 +0200 Subject: [PATCH 068/508] release 10.6.4 From 635e93987b36df087daadcc89df59fc1c654b064 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 21 Apr 2018 19:02:00 +0200 Subject: [PATCH 069/508] Upgrade GitLab CE to 10.7.0 --- 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 fcb93860..6af36756 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. +**10.7.0** +- gitlab: upgrade CE to v10.7.0 + **10.6.4** - gitlab: upgrade CE to v10.6.4 diff --git a/Dockerfile b/Dockerfile index 619d7753..a4f39b96 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.6.4 \ +ENV GITLAB_VERSION=10.7.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.5 \ GITLAB_SHELL_VERSION=6.0.4 \ diff --git a/README.md b/README.md index 959404b7..cbdad52f 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:10.6.4 +# sameersbn/gitlab:10.7.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.6.4 +docker pull sameersbn/gitlab:10.7.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.6.4 + sameersbn/gitlab:10.7.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.6.4 + sameersbn/gitlab:10.7.0 ``` ## Database @@ -263,7 +263,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:10.6.4 + sameersbn/gitlab:10.7.0 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.6.4 + sameersbn/gitlab:10.7.0 ``` 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: @@ -361,7 +361,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:10.6.4 + sameersbn/gitlab:10.7.0 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.6.4 + sameersbn/gitlab:10.7.0 ``` 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: @@ -431,7 +431,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:10.6.4 + sameersbn/gitlab:10.7.0 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.6.4 + sameersbn/gitlab:10.7.0 ``` ### Mail @@ -471,7 +471,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:10.6.4 + sameersbn/gitlab:10.7.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.6.4 + sameersbn/gitlab:10.7.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.6.4 + sameersbn/gitlab:10.7.0 ``` 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. @@ -584,7 +584,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:10.6.4 + sameersbn/gitlab:10.7.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.6.4 + sameersbn/gitlab:10.7.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.6.4 + sameersbn/gitlab:10.7.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.6.4 + sameersbn/gitlab:10.7.0 ``` 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:10.6.4 app:sanitize + sameersbn/gitlab:10.7.0 app:sanitize ``` ### Piwik @@ -1060,7 +1060,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.4 app:rake gitlab:backup:create + sameersbn/gitlab:10.7.0 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. @@ -1088,14 +1088,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.4 app:rake db:setup + sameersbn/gitlab:10.7.0 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:10.6.4 app:rake gitlab:backup:restore + sameersbn/gitlab:10.7.0 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. @@ -1104,7 +1104,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.7.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1153,7 +1153,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:10.6.4 app:rake gitlab:env:info + sameersbn/gitlab:10.7.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1166,7 +1166,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.4 app:rake gitlab:import:repos + sameersbn/gitlab:10.7.0 app:rake gitlab:import:repos ``` Or @@ -1197,7 +1197,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.6.4 app:rake gitlab:import:repos + sameersbn/gitlab:10.7.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1219,12 +1219,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.6.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. +> Upgrading to `sameersbn/gitlab:10.7.0` 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:10.6.4 +docker pull sameersbn/gitlab:10.7.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1250,7 +1250,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:10.6.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.7.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index 827886a6..1bcdaf5f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.6.4 +10.7.0 diff --git a/docker-compose.yml b/docker-compose.yml index d02ed090..fb693868 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.6.4 + image: sameersbn/gitlab:10.7.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ecb28735..816bfe06 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:10.6.4 app:rake gitlab:backup:create + sameersbn/gitlab:10.7.0 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:10.6.4 app:rake gitlab:backup:restore + sameersbn/gitlab:10.7.0 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:10.6.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.7.0 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:10.6.4 +docker pull sameersbn/gitlab:10.7.0 ``` - **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:10.6.4 +sameersbn/gitlab:10.7.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index eb8f3cf1..ab6d38c7 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.6.4 + image: sameersbn/gitlab:10.7.0 env: - name: TZ value: Asia/Kolkata From 614e2134e771ffeddd7c244e52039219aadfc3da Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 21 Apr 2018 19:04:44 +0200 Subject: [PATCH 070/508] Update gitlab-shell to 7.1.2 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a4f39b96..0f53b735 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,10 +4,10 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=10.7.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.5 \ - GITLAB_SHELL_VERSION=6.0.4 \ GITLAB_WORKHORSE_VERSION=4.0.0 \ GITLAB_PAGES_VERSION=0.7.1 \ GITALY_SERVER_VERSION=0.91.0 \ + GITLAB_SHELL_VERSION=7.1.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From e2101e3e750f47d49959ad414c7053161ddb8177 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 21 Apr 2018 19:05:03 +0200 Subject: [PATCH 071/508] Update gitlab-workhorse to 4.1.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0f53b735..15952e9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,10 +4,10 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=10.7.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.5 \ - GITLAB_WORKHORSE_VERSION=4.0.0 \ GITLAB_PAGES_VERSION=0.7.1 \ GITALY_SERVER_VERSION=0.91.0 \ GITLAB_SHELL_VERSION=7.1.2 \ + GITLAB_WORKHORSE_VERSION=4.1.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From bf3a9ca68c279fd797c55d3fc09bf4a2bbbebd10 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 21 Apr 2018 19:05:30 +0200 Subject: [PATCH 072/508] update gitlab-pages to 0.8.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 15952e9f..787321b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,10 +4,10 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=10.7.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.5 \ - GITLAB_PAGES_VERSION=0.7.1 \ GITALY_SERVER_VERSION=0.91.0 \ GITLAB_SHELL_VERSION=7.1.2 \ GITLAB_WORKHORSE_VERSION=4.1.0 \ + GITLAB_PAGES_VERSION=0.8.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 0575981febde99a9db2bfe7813102ca930ef9020 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 21 Apr 2018 19:05:49 +0200 Subject: [PATCH 073/508] update gitaly to 0.95.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 787321b0..b9393d7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,10 +4,10 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=10.7.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.5 \ - GITALY_SERVER_VERSION=0.91.0 \ GITLAB_SHELL_VERSION=7.1.2 \ GITLAB_WORKHORSE_VERSION=4.1.0 \ GITLAB_PAGES_VERSION=0.8.0 \ + GITALY_SERVER_VERSION=0.95.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 6111c2e375693acbe57728bb66d8a6ead23d6a66 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 29 Apr 2018 09:25:02 +0200 Subject: [PATCH 074/508] Add GITLAB_SIDEKIQ_LOG_FORMAT Signed-off-by: solidnerd --- Changelog.md | 1 + README.md | 1 + assets/runtime/config/gitlabhq/gitlab.yml | 5 +++++ assets/runtime/env-defaults | 1 + assets/runtime/functions | 5 ++++- 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 6af36756..f9ad653a 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **10.7.0** - gitlab: upgrade CE to v10.7.0 +- ADD `GITLAB_SIDEKIQ_LOG_FORMAT` **10.6.4** - gitlab: upgrade CE to v10.6.4 diff --git a/README.md b/README.md index cbdad52f..e9afa4ae 100644 --- a/README.md +++ b/README.md @@ -914,6 +914,7 @@ Below is the complete list of available options that can be used to customize yo | `SIDEKIQ_CONCURRENCY` | The number of concurrent sidekiq jobs to run. Defaults to `25` | | `SIDEKIQ_SHUTDOWN_TIMEOUT` | Timeout for sidekiq shutdown. Defaults to `4` | | `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | Non-zero value enables the SidekiqMemoryKiller. Defaults to `1000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html) | +| `GITLAB_SIDEKIQ_LOG_FORMAT` | Sidekiq log format that will be used. Defaults to `default` | | `DB_ADAPTER` | The database type. Possible values: `mysql2`, `postgresql`. Defaults to `postgresql`. | | `DB_ENCODING` | The database encoding. For `DB_ADAPTER` values `postresql` and `mysql2`, this parameter defaults to `unicode` and `utf8` respectively. | | `DB_COLLATION` | The database collation. Defaults to `utf8_general_ci` for `DB_ADAPTER` `mysql2`. This parameter is not supported for `DB_ADAPTER` `postresql` and will be removed. | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 02481124..23c2f28b 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -194,6 +194,11 @@ production: &base plain_url: "{{GITLAB_GRAVATAR_HTTP_URL}}" # default: https://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon ssl_url: "{{GITLAB_GRAVATAR_HTTPS_URL}}" # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon + + ## Sidekiq + sidekiq: + log_format: {{GITLAB_SIDEKIQ_LOG_FORMAT}} # (json is also supported) + ## Auxiliary jobs # Periodically executed jobs, to self-heal GitLab, do external synchronizations, etc. # Please read here for more information: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index e2270d53..0abcfe85 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -57,6 +57,7 @@ REDIS_DB_NUMBER=${REDIS_DB_NUMBER:-0} SIDEKIQ_SHUTDOWN_TIMEOUT=${SIDEKIQ_SHUTDOWN_TIMEOUT:-4} SIDEKIQ_CONCURRENCY=${SIDEKIQ_CONCURRENCY:-25} SIDEKIQ_MEMORY_KILLER_MAX_RSS=${SIDEKIQ_MEMORY_KILLER_MAX_RSS:-1000000} +GITLAB_SIDEKIQ_LOG_FORMAT=${GITLAB_SIDEKIQ_LOG_FORMAT:-default} ## UNICORN UNICORN_WORKERS=${UNICORN_WORKERS:-3} diff --git a/assets/runtime/functions b/assets/runtime/functions index 6c6a1f2b..5255aba3 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -294,7 +294,6 @@ gitlab_configure_monitoring() { GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED \ GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS \ GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT - } gitlab_configure_gitlab_workhorse() { @@ -742,6 +741,10 @@ gitlab_configure_secrets() { gitlab_configure_sidekiq() { echo "Configuring gitlab::sidekiq..." + # configure gitlab sidekiq log format + update_template ${GITLAB_CONFIG} \ + GITLAB_SIDEKIQ_LOG_FORMAT + # configure sidekiq update_template /etc/supervisor/conf.d/sidekiq.conf \ SIDEKIQ_CONCURRENCY \ From fdc26d2dd54bb556f71c358cd3ab8c97a0582aff Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 29 Apr 2018 10:46:50 +0200 Subject: [PATCH 075/508] Add GITLAB_ARTIFACTS_OBJECT_STORE_* Signed-off-by: solidnerd --- Changelog.md | 11 +++++++++++ README.md | 11 +++++++++++ assets/runtime/config/gitlabhq/gitlab.yml | 14 ++++++++++++++ assets/runtime/env-defaults | 13 +++++++++++++ assets/runtime/functions | 14 ++++++++++++++ 5 files changed, 63 insertions(+) diff --git a/Changelog.md b/Changelog.md index f9ad653a..68d0c0ba 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,17 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **10.7.0** - gitlab: upgrade CE to v10.7.0 - ADD `GITLAB_SIDEKIQ_LOG_FORMAT` +- ADD `GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED` +- ADD `GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY` +- ADD `GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD` +- ADD `GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD` +- ADD `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER` +- ADD `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` +- ADD `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` +- ADD `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION` +- ADD `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST` +- ADD `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` +- ADD `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` **10.6.4** - gitlab: upgrade CE to v10.6.4 diff --git a/README.md b/README.md index e9afa4ae..7bac7593 100644 --- a/README.md +++ b/README.md @@ -846,6 +846,17 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_SHARED_DIR` | The directory to store the build artifacts. Defaults to `/home/git/data/shared` | | `GITLAB_ARTIFACTS_ENABLED` | Enable/Disable GitLab artifacts support. Defaults to `true`. | | `GITLAB_ARTIFACTS_DIR` | Directory to store the artifacts. Defaults to `$GITLAB_SHARED_DIR/artifacts` | +| `GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED` | Enables Object Store for Artifacts that will be remote stored. Defaults to `false` | +| `GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the artifacts. Defaults to `artifacts` | +| `GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD` | Temporary option to limit automatic upload. Defaults to `false` | +| `GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD` | Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` | +| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. Currently only AWS is supported. Defaults to `AWS` | +| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `AWS_ACCESS_KEY_ID` | +| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `AWS_SECRET_ACCESS_KEY` | +| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `us-east-1` | +| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `s3.amazonaws.com` | +| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil` | +| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` | | `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON` | Cron notation for the Gitlab pipeline schedule worker. Defaults to `'0 */12 * * *'` | | `GITLAB_LFS_ENABLED` | Enable/Disable Git LFS support. Defaults to `true`. | | `GITLAB_LFS_OBJECTS_DIR` | Directory to store the lfs-objects. Defaults to `$GITLAB_SHARED_DIR/lfs-objects` | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 23c2f28b..662de91c 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -148,6 +148,20 @@ production: &base enabled: {{GITLAB_ARTIFACTS_ENABLED}} # The location where build artifacts are stored (default: shared/artifacts). path: {{GITLAB_ARTIFACTS_DIR}} + object_store: + enabled: {{GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED}} + remote_directory: {{GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name + background_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true) + proxy_download: {{GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage + connection: + provider: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER}} # Only AWS supported at the moment + aws_access_key_id: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID}} + aws_secret_access_key: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}} + region: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION}} + host: '{{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com + endpoint: '{{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil + path_style: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' + ## Git LFS lfs: diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 0abcfe85..7ba0bf6f 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -91,6 +91,19 @@ GITLAB_WORKHORSE_TIMEOUT=${GITLAB_WORKHORSE_TIMEOUT:-5m0s} GITLAB_ARTIFACTS_ENABLED=${GITLAB_ARTIFACTS_ENABLED:-true} GITLAB_ARTIFACTS_DIR="${GITLAB_ARTIFACTS_DIR:-$GITLAB_SHARED_DIR/artifacts}" +GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED=${GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED:-false} +GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY:-artifacts} +GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD=${GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD:-false} +GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD=${GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD:-false} +GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER:-AWS} +GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-AWS_ACCESS_KEY_ID} +GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-AWS_SECRET_ACCESS_KEY} +GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION:-us-east-1} +GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST:-s3.amazonaws.com} +GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-nil} +GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-true} + + ## Cron Jobs GITLAB_PIPELINE_SCHEDULE_WORKER_CRON=${GITLAB_PIPELINE_SCHEDULE_WORKER_CRON:-"19 * * * *"} diff --git a/assets/runtime/functions b/assets/runtime/functions index 5255aba3..5c9c56cc 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -944,6 +944,20 @@ gitlab_configure_artifacts() { update_template ${GITLAB_CONFIG} \ GITLAB_ARTIFACTS_ENABLED \ GITLAB_ARTIFACTS_DIR + + echo "Configuring gitlab::artifacts:object_store" + update_template ${GITLAB_CONFIG} \ + GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED \ + GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY \ + GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD \ + GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD \ + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER \ + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \ + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \ + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION \ + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST \ + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE } gitlab_configure_lfs() { From 79eb0a7e9a00c41f15ba4cd0922b70e0d40e4910 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 29 Apr 2018 10:47:35 +0200 Subject: [PATCH 076/508] Add GITLAB_LFS_OBJECT_STORE_* Signed-off-by: solidnerd --- Changelog.md | 12 ++++++++++++ README.md | 11 +++++++++++ assets/runtime/config/gitlabhq/gitlab.yml | 15 +++++++++++++++ assets/runtime/env-defaults | 13 +++++++++++++ assets/runtime/functions | 15 +++++++++++++++ 5 files changed, 66 insertions(+) diff --git a/Changelog.md b/Changelog.md index 68d0c0ba..574957be 100644 --- a/Changelog.md +++ b/Changelog.md @@ -18,6 +18,18 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o - ADD `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` - ADD `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` +- ADD `GITLAB_LFS_OBJECT_STORE_ENABLED` +- ADD `GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY` +- ADD `GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD` +- ADD `GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD` +- ADD `GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD` +- ADD `GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER` +- ADD `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` +- ADD `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` +- ADD `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION` +- ADD `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST` +- ADD `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` +- ADD `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` **10.6.4** - gitlab: upgrade CE to v10.6.4 diff --git a/README.md b/README.md index 7bac7593..e3a1722f 100644 --- a/README.md +++ b/README.md @@ -860,6 +860,17 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON` | Cron notation for the Gitlab pipeline schedule worker. Defaults to `'0 */12 * * *'` | | `GITLAB_LFS_ENABLED` | Enable/Disable Git LFS support. Defaults to `true`. | | `GITLAB_LFS_OBJECTS_DIR` | Directory to store the lfs-objects. Defaults to `$GITLAB_SHARED_DIR/lfs-objects` | +| `GITLAB_LFS_OBJECT_STORE_ENABLED` | Enables Object Store for LFS that will be remote stored. Defaults to `false` | +| `GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the LFS. Defaults to `lfs-object` | +| `GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD` | Temporary option to limit automatic upload. Defaults to `false` | +| `GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD` | Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` | +| `GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. Currently only AWS is supported. Defaults to `AWS` | +| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `AWS_ACCESS_KEY_ID` | +| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `AWS_SECRET_ACCESS_KEY` | +| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `us-east-1` | +| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `s3.amazonaws.com` | +| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil` | +| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` | | `GITLAB_UPLOADS_STORAGE_PATH` | The location where uploads objects are stored. Defaults to `$GITLAB_SHARED_DIR/public`. | | `GITLAB_UPLOADS_BASE_DIR` | Mapping for the `GITLAB_UPLOADS_STORAGE_PATH`. Defaults to `uploads/-/system` | | `GITLAB_MATTERMOST_ENABLED` | Enable/Disable GitLab Mattermost for *Add Mattermost button*. Defaults to `false`. | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 662de91c..4aa74e8c 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -168,6 +168,21 @@ production: &base enabled: {{GITLAB_LFS_ENABLED}} # The location where LFS objects are stored (default: shared/lfs-objects). storage_path: {{GITLAB_LFS_OBJECTS_DIR}} + object_store: + enabled: {{GITLAB_LFS_OBJECT_STORE_ENABLED}} + remote_directory: {{GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name + direct_upload: {{GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD}} # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false) + background_upload: {{GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true) + proxy_download: {{GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage + connection: + provider: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER}} # Only AWS supported at the moment + aws_access_key_id: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID}} + aws_secret_access_key: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}} + region: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION}} + host: '{{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com + endpoint: '{{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil + path_style: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' + ## Uploads (attachments, avatars, etc...) uploads: diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 7ba0bf6f..c1b063bc 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -111,6 +111,19 @@ GITLAB_PIPELINE_SCHEDULE_WORKER_CRON=${GITLAB_PIPELINE_SCHEDULE_WORKER_CRON:-"19 GITLAB_LFS_ENABLED=${GITLAB_LFS_ENABLED:-true} GITLAB_LFS_OBJECTS_DIR="${GITLAB_LFS_OBJECTS_DIR:-$GITLAB_SHARED_DIR/lfs-objects}" +GITLAB_LFS_OBJECT_STORE_ENABLED=${GITLAB_LFS_OBJECT_STORE_ENABLED:-false} +GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY:-lfs-objects} +GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD=${GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD:-false} +GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD=${GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD:-false} +GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD=${GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD:-false} +GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER:-AWS} +GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-AWS_ACCESS_KEY_ID} +GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-AWS_SECRET_ACCESS_KEY} +GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION:-us-east-1} +GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST:-s3.amazonaws.com} +GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-nil} +GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-true} + ## Uploads GITLAB_UPLOADS_STORAGE_PATH="${GITLAB_UPLOADS_STORAGE_PATH:-$GITLAB_INSTALL_DIR/public}" GITLAB_UPLOADS_BASE_DIR="${GITLAB_UPLOADS_BASE_DIR:-uploads/-/system}" diff --git a/assets/runtime/functions b/assets/runtime/functions index 5c9c56cc..7cfe0d5e 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -965,6 +965,21 @@ gitlab_configure_lfs() { update_template ${GITLAB_CONFIG} \ GITLAB_LFS_ENABLED \ GITLAB_LFS_OBJECTS_DIR + + echo "Configuring gitlab::lfs:object_store" + update_template ${GITLAB_CONFIG} \ + GITLAB_LFS_OBJECT_STORE_ENABLED \ + GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY \ + GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD \ + GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD \ + GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD \ + GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER \ + GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \ + GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \ + GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION \ + GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST \ + GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ + GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE } gitlab_configure_uploads() { From 0bf46bf73b99de1fd5fc1370b7192b30a8e98fba Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 29 Apr 2018 10:47:59 +0200 Subject: [PATCH 077/508] Add GITLAB_UPLOADS_OBJECT_STORE_* Signed-off-by: solidnerd --- Changelog.md | 14 ++++++++++++++ README.md | 11 +++++++++++ assets/runtime/config/gitlabhq/gitlab.yml | 15 +++++++++++++++ assets/runtime/env-defaults | 14 ++++++++++++++ assets/runtime/functions | 17 +++++++++++++++++ 5 files changed, 71 insertions(+) diff --git a/Changelog.md b/Changelog.md index 574957be..466b87e4 100644 --- a/Changelog.md +++ b/Changelog.md @@ -30,6 +30,20 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o - ADD `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST` - ADD `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` - ADD `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` + +- ADD `GITLAB_UPLOADS_OBJECT_STORE_ENABLED` +- ADD `GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY` +- ADD `GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD` +- ADD `GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD` +- ADD `GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD` +- ADD `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER` +- ADD `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` +- ADD `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` +- ADD `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION` +- ADD `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST` +- ADD `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` +- ADD `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` + **10.6.4** - gitlab: upgrade CE to v10.6.4 diff --git a/README.md b/README.md index e3a1722f..b31bd01c 100644 --- a/README.md +++ b/README.md @@ -873,6 +873,17 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` | | `GITLAB_UPLOADS_STORAGE_PATH` | The location where uploads objects are stored. Defaults to `$GITLAB_SHARED_DIR/public`. | | `GITLAB_UPLOADS_BASE_DIR` | Mapping for the `GITLAB_UPLOADS_STORAGE_PATH`. Defaults to `uploads/-/system` | +| `GITLAB_UPLOADS_OBJECT_STORE_ENABLED` | Enables Object Store for UPLOADS that will be remote stored. Defaults to `false` | +| `GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the UPLOADS. Defaults to `uploads` | +| `GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD` | Temporary option to limit automatic upload. Defaults to `false` | +| `GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD` | Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` | +| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. Currently only AWS is supported. Defaults to `AWS` | +| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `AWS_ACCESS_KEY_ID` | +| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `AWS_SECRET_ACCESS_KEY` | +| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `us-east-1` | +| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `s3.amazonaws.com` | +| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil` | +| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` | | `GITLAB_MATTERMOST_ENABLED` | Enable/Disable GitLab Mattermost for *Add Mattermost button*. Defaults to `false`. | | `GITLAB_MATTERMOST_URL` | Sets Mattermost URL. Defaults to `https://mattermost.example.com`. | | `GITLAB_BACKUP_SCHEDULE` | Setup cron job to automatic backups. Possible values `disable`, `daily`, `weekly` or `monthly`. Disabled by default | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 4aa74e8c..3361a1c4 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -189,6 +189,21 @@ production: &base # The location where uploads objects are stored (default: public/). storage_path: {{GITLAB_UPLOADS_STORAGE_PATH}} base_dir: {{GITLAB_UPLOADS_BASE_DIR}} + object_store: + enabled: {{GITLAB_UPLOADS_OBJECT_STORE_ENABLED}} + remote_directory: {{GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name + direct_upload: {{GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD}} # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false) + background_upload: {{GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true) + proxy_download: {{GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage + connection: + provider: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER}} # Only AWS supported at the moment + aws_access_key_id: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID}} + aws_secret_access_key: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}} + region: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION}} + host: '{{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com + endpoint: '{{GITLAB_UPLOADS_ENDPOINT_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil + path_style: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' + ## GitLab Pages diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index c1b063bc..f419afa1 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -128,6 +128,19 @@ GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_LFS_OBJECT_STORE_CONN GITLAB_UPLOADS_STORAGE_PATH="${GITLAB_UPLOADS_STORAGE_PATH:-$GITLAB_INSTALL_DIR/public}" GITLAB_UPLOADS_BASE_DIR="${GITLAB_UPLOADS_BASE_DIR:-uploads/-/system}" +GITLAB_UPLOADS_OBJECT_STORE_ENABLED=${GITLAB_UPLOADS_OBJECT_STORE_ENABLED:-false} +GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY:-uploads} +GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD=${GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD:-false} +GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD=${GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD:-false} +GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD=${GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD:-false} +GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER:-AWS} +GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-AWS_ACCESS_KEY_ID} +GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-AWS_SECRET_ACCESS_KEY} +GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION:-us-east-1} +GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST:-s3.amazonaws.com} +GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-nil} +GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-true} + ## Mattermost GITLAB_MATTERMOST_ENABLED=${GITLAB_MATTERMOST_ENABLED:-false} GITLAB_MATTERMOST_URL=${GITLAB_MATTERMOST_URL:-https://mattermost.example.com} @@ -411,3 +424,4 @@ GITLAB_MONITORING_IP_WHITELIST=${GITLAB_MONITORING_IP_WHITELIST:-"0.0.0.0/8"} GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED=${GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED:-true} GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS=${GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS:-"0.0.0.0"} GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT=${GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT:-3807} + diff --git a/assets/runtime/functions b/assets/runtime/functions index 7cfe0d5e..e8bfa43b 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -987,6 +987,23 @@ gitlab_configure_uploads() { update_template ${GITLAB_CONFIG} \ GITLAB_UPLOADS_STORAGE_PATH \ GITLAB_UPLOADS_BASE_DIR + + echo "Configuring gitlab::uploads:object_store" + update_template ${GITLAB_CONFIG} \ + GITLAB_UPLOADS_OBJECT_STORE_ENABLED \ + GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY \ + GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD \ + GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD \ + GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD \ + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER \ + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \ + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \ + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION \ + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST \ + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE +} + } gitlab_configure_mattermost() { From d2f1262dfa658811db04dfe37ce32e562fe401e9 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 29 Apr 2018 14:23:05 +0200 Subject: [PATCH 078/508] Delete Object Store config when it's not used --- assets/runtime/functions | 99 +++++++++++++++++++++++----------------- 1 file changed, 56 insertions(+), 43 deletions(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index e8bfa43b..eaf34a2b 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -940,68 +940,81 @@ gitlab_configure_ci() { } gitlab_configure_artifacts() { + if [[ ${GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED} == true ]]; then + echo "Configuring gitlab::artifacts:object_store" + update_template ${GITLAB_CONFIG} \ + GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED \ + GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY \ + GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD \ + GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD \ + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER \ + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \ + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \ + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION \ + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST \ + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE + else + exec_as_git sed -i -e "/path: {{GITLAB_ARTIFACTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG} + fi + echo "Configuring gitlab::artifacts..." update_template ${GITLAB_CONFIG} \ GITLAB_ARTIFACTS_ENABLED \ GITLAB_ARTIFACTS_DIR - - echo "Configuring gitlab::artifacts:object_store" - update_template ${GITLAB_CONFIG} \ - GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED \ - GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY \ - GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD \ - GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD \ - GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER \ - GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \ - GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \ - GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION \ - GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST \ - GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ - GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE } gitlab_configure_lfs() { + if [[ ${GITLAB_LFS_OBJECT_STORE_ENABLED} == true ]]; then + echo "Configuring gitlab::lfs:object_store" + update_template ${GITLAB_CONFIG} \ + GITLAB_LFS_OBJECT_STORE_ENABLED \ + GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY \ + GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD \ + GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD \ + GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD \ + GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER \ + GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \ + GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \ + GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION \ + GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST \ + GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ + GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE + else + exec_as_git sed -i -e "/path: {{GITLAB_LFS_OBJECTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG} + fi + echo "Configuring gitlab::lfs..." update_template ${GITLAB_CONFIG} \ GITLAB_LFS_ENABLED \ GITLAB_LFS_OBJECTS_DIR - - echo "Configuring gitlab::lfs:object_store" - update_template ${GITLAB_CONFIG} \ - GITLAB_LFS_OBJECT_STORE_ENABLED \ - GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY \ - GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD \ - GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD \ - GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD \ - GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER \ - GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \ - GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \ - GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION \ - GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST \ - GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ - GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE } gitlab_configure_uploads() { + if [[ ${GITLAB_UPLOADS_OBJECT_STORE_ENABLED} == true ]]; then + echo "Configuring gitlab::uploads:object_store" + update_template ${GITLAB_CONFIG} \ + GITLAB_UPLOADS_OBJECT_STORE_ENABLED \ + GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY \ + GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD \ + GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD \ + GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD \ + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER \ + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \ + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \ + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION \ + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST \ + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE + else + exec_as_git sed -i -e "/base_dir: {{GITLAB_UPLOADS_BASE_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG} + fi + echo "Configuring gitlab::uploads..." update_template ${GITLAB_CONFIG} \ GITLAB_UPLOADS_STORAGE_PATH \ GITLAB_UPLOADS_BASE_DIR - echo "Configuring gitlab::uploads:object_store" - update_template ${GITLAB_CONFIG} \ - GITLAB_UPLOADS_OBJECT_STORE_ENABLED \ - GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY \ - GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD \ - GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD \ - GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD \ - GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER \ - GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \ - GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \ - GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION \ - GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST \ - GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ - GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE } } From e7e507004bd9c5dd90a56672218c25d06e096760 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 1 May 2018 11:03:20 +0200 Subject: [PATCH 079/508] release 10.7.0 From 3a2f3dc2da7a9480b971047f90699ddad59a646d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 1 May 2018 11:04:26 +0200 Subject: [PATCH 080/508] Upgrade GitLab CE to 10.7.1 --- 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 466b87e4..0530aa34 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. +**10.7.1** +- gitlab: upgrade CE to v10.7.1 + **10.7.0** - gitlab: upgrade CE to v10.7.0 - ADD `GITLAB_SIDEKIQ_LOG_FORMAT` diff --git a/Dockerfile b/Dockerfile index b9393d7f..85337744 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.7.0 \ +ENV GITLAB_VERSION=10.7.1 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.5 \ GITLAB_SHELL_VERSION=7.1.2 \ diff --git a/README.md b/README.md index b31bd01c..3b7c216c 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:10.7.0 +# sameersbn/gitlab:10.7.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.7.0 +docker pull sameersbn/gitlab:10.7.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.7.0 + sameersbn/gitlab:10.7.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.7.0 + sameersbn/gitlab:10.7.1 ``` ## Database @@ -263,7 +263,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:10.7.0 + sameersbn/gitlab:10.7.1 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.7.0 + sameersbn/gitlab:10.7.1 ``` 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: @@ -361,7 +361,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:10.7.0 + sameersbn/gitlab:10.7.1 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.7.0 + sameersbn/gitlab:10.7.1 ``` 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: @@ -431,7 +431,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:10.7.0 + sameersbn/gitlab:10.7.1 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.7.0 + sameersbn/gitlab:10.7.1 ``` ### Mail @@ -471,7 +471,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:10.7.0 + sameersbn/gitlab:10.7.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.7.0 + sameersbn/gitlab:10.7.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.7.0 + sameersbn/gitlab:10.7.1 ``` 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. @@ -584,7 +584,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:10.7.0 + sameersbn/gitlab:10.7.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.7.0 + sameersbn/gitlab:10.7.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.7.0 + sameersbn/gitlab:10.7.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.7.0 + sameersbn/gitlab:10.7.1 ``` 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:10.7.0 app:sanitize + sameersbn/gitlab:10.7.1 app:sanitize ``` ### Piwik @@ -1094,7 +1094,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.0 app:rake gitlab:backup:create + sameersbn/gitlab:10.7.1 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. @@ -1122,14 +1122,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.0 app:rake db:setup + sameersbn/gitlab:10.7.1 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:10.7.0 app:rake gitlab:backup:restore + sameersbn/gitlab:10.7.1 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. @@ -1138,7 +1138,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.7.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1187,7 +1187,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:10.7.0 app:rake gitlab:env:info + sameersbn/gitlab:10.7.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.0 app:rake gitlab:import:repos + sameersbn/gitlab:10.7.1 app:rake gitlab:import:repos ``` Or @@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.0 app:rake gitlab:import:repos + sameersbn/gitlab:10.7.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.7.0` 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:10.7.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:10.7.0 +docker pull sameersbn/gitlab:10.7.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1284,7 +1284,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:10.7.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.7.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 1bcdaf5f..17dfec88 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.7.0 +10.7.1 diff --git a/docker-compose.yml b/docker-compose.yml index fb693868..882216af 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.7.0 + image: sameersbn/gitlab:10.7.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 816bfe06..69fca081 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:10.7.0 app:rake gitlab:backup:create + sameersbn/gitlab:10.7.1 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:10.7.0 app:rake gitlab:backup:restore + sameersbn/gitlab:10.7.1 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:10.7.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.7.1 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:10.7.0 +docker pull sameersbn/gitlab:10.7.1 ``` - **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:10.7.0 +sameersbn/gitlab:10.7.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index ab6d38c7..62d1cabb 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.7.0 + image: sameersbn/gitlab:10.7.1 env: - name: TZ value: Asia/Kolkata From 9543f1297e185ae8528653a94212282e662e65a1 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 1 May 2018 11:27:02 +0200 Subject: [PATCH 081/508] Remove duplicated curly bracket --- assets/runtime/functions | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index eaf34a2b..30d8f307 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1013,10 +1013,7 @@ gitlab_configure_uploads() { echo "Configuring gitlab::uploads..." update_template ${GITLAB_CONFIG} \ GITLAB_UPLOADS_STORAGE_PATH \ - GITLAB_UPLOADS_BASE_DIR - -} - + GITLAB_UPLOADS_BASE_DIR } gitlab_configure_mattermost() { From 48eb13a8df9c22822a193c15982826a35fdb1846 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 1 May 2018 14:28:21 +0200 Subject: [PATCH 082/508] release 10.7.1 From 155a511e04823dd3ecbc15d86c1f4eb5247b322f Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 1 May 2018 14:51:31 +0200 Subject: [PATCH 083/508] Upgrade GitLab CE to 10.7.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 0530aa34..562afd52 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. +**10.7.2** +- gitlab: upgrade CE to v10.7.2 + **10.7.1** - gitlab: upgrade CE to v10.7.1 diff --git a/Dockerfile b/Dockerfile index 85337744..2c109021 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.7.1 \ +ENV GITLAB_VERSION=10.7.2 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.5 \ GITLAB_SHELL_VERSION=7.1.2 \ diff --git a/README.md b/README.md index 3b7c216c..e5be5086 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:10.7.1 +# sameersbn/gitlab:10.7.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.7.1 +docker pull sameersbn/gitlab:10.7.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.7.1 + sameersbn/gitlab:10.7.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.7.1 + sameersbn/gitlab:10.7.2 ``` ## Database @@ -263,7 +263,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:10.7.1 + sameersbn/gitlab:10.7.2 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.7.1 + sameersbn/gitlab:10.7.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: @@ -361,7 +361,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:10.7.1 + sameersbn/gitlab:10.7.2 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.7.1 + sameersbn/gitlab:10.7.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: @@ -431,7 +431,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:10.7.1 + sameersbn/gitlab:10.7.2 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.7.1 + sameersbn/gitlab:10.7.2 ``` ### Mail @@ -471,7 +471,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:10.7.1 + sameersbn/gitlab:10.7.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.7.1 + sameersbn/gitlab:10.7.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.7.1 + sameersbn/gitlab:10.7.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. @@ -584,7 +584,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:10.7.1 + sameersbn/gitlab:10.7.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.7.1 + sameersbn/gitlab:10.7.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.7.1 + sameersbn/gitlab:10.7.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.7.1 + sameersbn/gitlab:10.7.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:10.7.1 app:sanitize + sameersbn/gitlab:10.7.2 app:sanitize ``` ### Piwik @@ -1094,7 +1094,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.1 app:rake gitlab:backup:create + sameersbn/gitlab:10.7.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. @@ -1122,14 +1122,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.1 app:rake db:setup + sameersbn/gitlab:10.7.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:10.7.1 app:rake gitlab:backup:restore + sameersbn/gitlab:10.7.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. @@ -1138,7 +1138,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.7.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1187,7 +1187,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:10.7.1 app:rake gitlab:env:info + sameersbn/gitlab:10.7.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.1 app:rake gitlab:import:repos + sameersbn/gitlab:10.7.2 app:rake gitlab:import:repos ``` Or @@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.1 app:rake gitlab:import:repos + sameersbn/gitlab:10.7.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.7.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:10.7.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:10.7.1 +docker pull sameersbn/gitlab:10.7.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1284,7 +1284,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:10.7.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.7.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index 17dfec88..4cbfc3a6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.7.1 +10.7.2 diff --git a/docker-compose.yml b/docker-compose.yml index 882216af..54ddd282 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.7.1 + image: sameersbn/gitlab:10.7.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 69fca081..1605b0bf 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:10.7.1 app:rake gitlab:backup:create + sameersbn/gitlab:10.7.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:10.7.1 app:rake gitlab:backup:restore + sameersbn/gitlab:10.7.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:10.7.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.7.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:10.7.1 +docker pull sameersbn/gitlab:10.7.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:10.7.1 +sameersbn/gitlab:10.7.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 62d1cabb..8a100746 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.7.1 + image: sameersbn/gitlab:10.7.2 env: - name: TZ value: Asia/Kolkata From e3a70c6e02f3623d5b458f085b2f5befa8ee9709 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 1 May 2018 14:54:05 +0200 Subject: [PATCH 084/508] Upgrade gitaly to 0.96.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2c109021..d4f44481 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ENV GITLAB_VERSION=10.7.2 \ GITLAB_SHELL_VERSION=7.1.2 \ GITLAB_WORKHORSE_VERSION=4.1.0 \ GITLAB_PAGES_VERSION=0.8.0 \ - GITALY_SERVER_VERSION=0.95.0 \ + GITALY_SERVER_VERSION=0.96.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 57c3a20976de461442e709311afdb076ebd9b8ec Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 1 May 2018 15:10:22 +0200 Subject: [PATCH 085/508] release 10.7.2 From 2052c0ec2c70cbfb2eb4107f8bd549ce0d89e3a2 Mon Sep 17 00:00:00 2001 From: Even Holthe Date: Fri, 4 May 2018 09:31:58 +0200 Subject: [PATCH 086/508] Upgrade GitLab CE to 10.7.3 --- 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 562afd52..34cd669d 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. +**10.7.3** +- gitlab: upgrade CE to v10.7.3 + **10.7.2** - gitlab: upgrade CE to v10.7.2 diff --git a/Dockerfile b/Dockerfile index d4f44481..263e63e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.7.2 \ +ENV GITLAB_VERSION=10.7.3 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.5 \ GITLAB_SHELL_VERSION=7.1.2 \ diff --git a/README.md b/README.md index e5be5086..063e0acc 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:10.7.2 +# sameersbn/gitlab:10.7.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.7.2 +docker pull sameersbn/gitlab:10.7.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.7.2 + sameersbn/gitlab:10.7.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.7.2 + sameersbn/gitlab:10.7.3 ``` ## Database @@ -263,7 +263,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:10.7.2 + sameersbn/gitlab:10.7.3 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.7.2 + sameersbn/gitlab:10.7.3 ``` 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: @@ -361,7 +361,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:10.7.2 + sameersbn/gitlab:10.7.3 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.7.2 + sameersbn/gitlab:10.7.3 ``` 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: @@ -431,7 +431,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:10.7.2 + sameersbn/gitlab:10.7.3 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.7.2 + sameersbn/gitlab:10.7.3 ``` ### Mail @@ -471,7 +471,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:10.7.2 + sameersbn/gitlab:10.7.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.7.2 + sameersbn/gitlab:10.7.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.7.2 + sameersbn/gitlab:10.7.3 ``` 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. @@ -584,7 +584,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:10.7.2 + sameersbn/gitlab:10.7.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.7.2 + sameersbn/gitlab:10.7.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.7.2 + sameersbn/gitlab:10.7.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.7.2 + sameersbn/gitlab:10.7.3 ``` 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:10.7.2 app:sanitize + sameersbn/gitlab:10.7.3 app:sanitize ``` ### Piwik @@ -1094,7 +1094,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.2 app:rake gitlab:backup:create + sameersbn/gitlab:10.7.3 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. @@ -1122,14 +1122,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.2 app:rake db:setup + sameersbn/gitlab:10.7.3 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:10.7.2 app:rake gitlab:backup:restore + sameersbn/gitlab:10.7.3 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. @@ -1138,7 +1138,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.7.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1187,7 +1187,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:10.7.2 app:rake gitlab:env:info + sameersbn/gitlab:10.7.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.2 app:rake gitlab:import:repos + sameersbn/gitlab:10.7.3 app:rake gitlab:import:repos ``` Or @@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.2 app:rake gitlab:import:repos + sameersbn/gitlab:10.7.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.7.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. +> Upgrading to `sameersbn/gitlab:10.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:10.7.2 +docker pull sameersbn/gitlab:10.7.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1284,7 +1284,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:10.7.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.7.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index 4cbfc3a6..992a0120 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.7.2 +10.7.3 diff --git a/docker-compose.yml b/docker-compose.yml index 54ddd282..e849e6e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.7.2 + image: sameersbn/gitlab:10.7.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 1605b0bf..a0eb259b 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:10.7.2 app:rake gitlab:backup:create + sameersbn/gitlab:10.7.3 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:10.7.2 app:rake gitlab:backup:restore + sameersbn/gitlab:10.7.3 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:10.7.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.7.3 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:10.7.2 +docker pull sameersbn/gitlab:10.7.3 ``` - **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:10.7.2 +sameersbn/gitlab:10.7.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 8a100746..441debe5 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.7.2 + image: sameersbn/gitlab:10.7.3 env: - name: TZ value: Asia/Kolkata From eef9056f6bd2cf1f84d0bfa46eb65d2e25d9dcef Mon Sep 17 00:00:00 2001 From: Even Holthe Date: Fri, 4 May 2018 09:34:51 +0200 Subject: [PATCH 087/508] Upgrade GitLab Pages to 0.8.1 See https://gitlab.com/gitlab-org/gitlab-ce/blob/v10.7.3/GITLAB_PAGES_VERSION --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 263e63e1..885ba1ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ENV GITLAB_VERSION=10.7.3 \ GOLANG_VERSION=1.9.5 \ GITLAB_SHELL_VERSION=7.1.2 \ GITLAB_WORKHORSE_VERSION=4.1.0 \ - GITLAB_PAGES_VERSION=0.8.0 \ + GITLAB_PAGES_VERSION=0.8.1 \ GITALY_SERVER_VERSION=0.96.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ From f48936a97e635fe2506bfce400a1578d5ed02f94 Mon Sep 17 00:00:00 2001 From: Even Holthe Date: Tue, 8 May 2018 10:19:36 +0200 Subject: [PATCH 088/508] Update Go to 1.9.6 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 885ba1ee..b6392bb3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=10.7.3 \ RUBY_VERSION=2.3 \ - GOLANG_VERSION=1.9.5 \ + GOLANG_VERSION=1.9.6 \ GITLAB_SHELL_VERSION=7.1.2 \ GITLAB_WORKHORSE_VERSION=4.1.0 \ GITLAB_PAGES_VERSION=0.8.1 \ From d3ee4ee10065c0b8a40b7d3bd4211cd0ba160940 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 15 May 2018 15:19:42 +0200 Subject: [PATCH 089/508] release 10.7.3 From 07094553f0a66e8822ccb05d40c5091d8be7fdfd Mon Sep 17 00:00:00 2001 From: lucianomores Date: Tue, 15 May 2018 11:43:49 -0300 Subject: [PATCH 090/508] Fix uploads object storage aws endpoint variable --- assets/runtime/config/gitlabhq/gitlab.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 3361a1c4..55804be2 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -201,7 +201,7 @@ production: &base aws_secret_access_key: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}} region: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION}} host: '{{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com - endpoint: '{{GITLAB_UPLOADS_ENDPOINT_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil + endpoint: '{{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil path_style: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' From a2658f558bae93d4a683ffa58203a495b81cfa8d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 21 May 2018 19:39:48 +0200 Subject: [PATCH 091/508] Upgrade GitLab CE to 10.7.4 --- 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 34cd669d..1a6e2428 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. +**10.7.4** +- gitlab: upgrade CE to v10.7.4 + **10.7.3** - gitlab: upgrade CE to v10.7.3 diff --git a/Dockerfile b/Dockerfile index b6392bb3..de35c783 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.7.3 \ +ENV GITLAB_VERSION=10.7.4 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.6 \ GITLAB_SHELL_VERSION=7.1.2 \ diff --git a/README.md b/README.md index 063e0acc..644765c8 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:10.7.3 +# sameersbn/gitlab:10.7.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.7.3 +docker pull sameersbn/gitlab:10.7.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.7.3 + sameersbn/gitlab:10.7.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.7.3 + sameersbn/gitlab:10.7.4 ``` ## Database @@ -263,7 +263,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:10.7.3 + sameersbn/gitlab:10.7.4 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.7.3 + sameersbn/gitlab:10.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: @@ -361,7 +361,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:10.7.3 + sameersbn/gitlab:10.7.4 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.7.3 + sameersbn/gitlab:10.7.4 ``` 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: @@ -431,7 +431,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:10.7.3 + sameersbn/gitlab:10.7.4 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.7.3 + sameersbn/gitlab:10.7.4 ``` ### Mail @@ -471,7 +471,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:10.7.3 + sameersbn/gitlab:10.7.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.7.3 + sameersbn/gitlab:10.7.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.7.3 + sameersbn/gitlab:10.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. @@ -584,7 +584,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:10.7.3 + sameersbn/gitlab:10.7.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.7.3 + sameersbn/gitlab:10.7.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.7.3 + sameersbn/gitlab:10.7.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.7.3 + sameersbn/gitlab:10.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:10.7.3 app:sanitize + sameersbn/gitlab:10.7.4 app:sanitize ``` ### Piwik @@ -1094,7 +1094,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.3 app:rake gitlab:backup:create + sameersbn/gitlab:10.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. @@ -1122,14 +1122,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.3 app:rake db:setup + sameersbn/gitlab:10.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:10.7.3 app:rake gitlab:backup:restore + sameersbn/gitlab:10.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. @@ -1138,7 +1138,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.7.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1187,7 +1187,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:10.7.3 app:rake gitlab:env:info + sameersbn/gitlab:10.7.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.3 app:rake gitlab:import:repos + sameersbn/gitlab:10.7.4 app:rake gitlab:import:repos ``` Or @@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.3 app:rake gitlab:import:repos + sameersbn/gitlab:10.7.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.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:10.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:10.7.3 +docker pull sameersbn/gitlab:10.7.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1284,7 +1284,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:10.7.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.7.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index 992a0120..36e155c4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.7.3 +10.7.4 diff --git a/docker-compose.yml b/docker-compose.yml index e849e6e8..a050da50 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.7.3 + image: sameersbn/gitlab:10.7.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index a0eb259b..cb710166 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:10.7.3 app:rake gitlab:backup:create + sameersbn/gitlab:10.7.4 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:10.7.3 app:rake gitlab:backup:restore + sameersbn/gitlab:10.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. @@ -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:10.7.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.7.4 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:10.7.3 +docker pull sameersbn/gitlab:10.7.4 ``` - **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:10.7.3 +sameersbn/gitlab:10.7.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 441debe5..2fe2ee36 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.7.3 + image: sameersbn/gitlab:10.7.4 env: - name: TZ value: Asia/Kolkata From 3d99d5b341a7d65c56b3cb2ac059f87e25e93909 Mon Sep 17 00:00:00 2001 From: Niclas Mietz Date: Mon, 21 May 2018 20:27:28 +0200 Subject: [PATCH 092/508] Update Changelog for 10.7.4 --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index 1a6e2428..0ff59a13 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **10.7.4** - gitlab: upgrade CE to v10.7.4 +- FIX `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` **10.7.3** - gitlab: upgrade CE to v10.7.3 From c0efa513069fcd0d460110b7d88358a3aed00925 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 21 May 2018 20:27:50 +0200 Subject: [PATCH 093/508] release 10.7.4 From a76a3a6f738a289cc3b2afae747200a8a4df8761 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 21 May 2018 20:29:23 +0200 Subject: [PATCH 094/508] Upgrade GitLab CE to 10.8.0 --- 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 0ff59a13..dd0ea9f3 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. +**10.8.0** +- gitlab: upgrade CE to v10.8.0 + **10.7.4** - gitlab: upgrade CE to v10.7.4 - FIX `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` diff --git a/Dockerfile b/Dockerfile index de35c783..dbacf9a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.7.4 \ +ENV GITLAB_VERSION=10.8.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.6 \ GITLAB_SHELL_VERSION=7.1.2 \ diff --git a/README.md b/README.md index 644765c8..cc245e91 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:10.7.4 +# sameersbn/gitlab:10.8.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.7.4 +docker pull sameersbn/gitlab:10.8.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.7.4 + sameersbn/gitlab:10.8.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.7.4 + sameersbn/gitlab:10.8.0 ``` ## Database @@ -263,7 +263,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:10.7.4 + sameersbn/gitlab:10.8.0 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.7.4 + sameersbn/gitlab:10.8.0 ``` 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: @@ -361,7 +361,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:10.7.4 + sameersbn/gitlab:10.8.0 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.7.4 + sameersbn/gitlab:10.8.0 ``` 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: @@ -431,7 +431,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:10.7.4 + sameersbn/gitlab:10.8.0 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.7.4 + sameersbn/gitlab:10.8.0 ``` ### Mail @@ -471,7 +471,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:10.7.4 + sameersbn/gitlab:10.8.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.7.4 + sameersbn/gitlab:10.8.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.7.4 + sameersbn/gitlab:10.8.0 ``` 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. @@ -584,7 +584,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:10.7.4 + sameersbn/gitlab:10.8.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.7.4 + sameersbn/gitlab:10.8.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.7.4 + sameersbn/gitlab:10.8.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.7.4 + sameersbn/gitlab:10.8.0 ``` 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:10.7.4 app:sanitize + sameersbn/gitlab:10.8.0 app:sanitize ``` ### Piwik @@ -1094,7 +1094,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.4 app:rake gitlab:backup:create + sameersbn/gitlab:10.8.0 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. @@ -1122,14 +1122,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.4 app:rake db:setup + sameersbn/gitlab:10.8.0 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:10.7.4 app:rake gitlab:backup:restore + sameersbn/gitlab:10.8.0 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. @@ -1138,7 +1138,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.8.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1187,7 +1187,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:10.7.4 app:rake gitlab:env:info + sameersbn/gitlab:10.8.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.4 app:rake gitlab:import:repos + sameersbn/gitlab:10.8.0 app:rake gitlab:import:repos ``` Or @@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.7.4 app:rake gitlab:import:repos + sameersbn/gitlab:10.8.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.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. +> Upgrading to `sameersbn/gitlab:10.8.0` 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:10.7.4 +docker pull sameersbn/gitlab:10.8.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1284,7 +1284,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:10.7.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.8.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index 36e155c4..2a3262d8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.7.4 +10.8.0 diff --git a/docker-compose.yml b/docker-compose.yml index a050da50..765e7fc7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.7.4 + image: sameersbn/gitlab:10.8.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index cb710166..3484691b 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:10.7.4 app:rake gitlab:backup:create + sameersbn/gitlab:10.8.0 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:10.7.4 app:rake gitlab:backup:restore + sameersbn/gitlab:10.8.0 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:10.7.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.8.0 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:10.7.4 +docker pull sameersbn/gitlab:10.8.0 ``` - **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:10.7.4 +sameersbn/gitlab:10.8.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 2fe2ee36..4e67d601 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.7.4 + image: sameersbn/gitlab:10.8.0 env: - name: TZ value: Asia/Kolkata From cc68774aa15042efddf046782011230f1fd971bb Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 21 May 2018 20:30:28 +0200 Subject: [PATCH 095/508] Update gitlab-workhorse to 4.2.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dbacf9a0..0d8f23ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,9 @@ ENV GITLAB_VERSION=10.8.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.6 \ GITLAB_SHELL_VERSION=7.1.2 \ - GITLAB_WORKHORSE_VERSION=4.1.0 \ GITLAB_PAGES_VERSION=0.8.1 \ GITALY_SERVER_VERSION=0.96.1 \ + GITLAB_WORKHORSE_VERSION=4.2.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 5ee2c4aa97699c66535e59bbd6edc46c5ac32604 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 21 May 2018 20:30:52 +0200 Subject: [PATCH 096/508] Update gitlab-pages to 0.9.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0d8f23ea..b374caa1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,9 @@ ENV GITLAB_VERSION=10.8.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.6 \ GITLAB_SHELL_VERSION=7.1.2 \ - GITLAB_PAGES_VERSION=0.8.1 \ GITALY_SERVER_VERSION=0.96.1 \ GITLAB_WORKHORSE_VERSION=4.2.0 \ + GITLAB_PAGES_VERSION=0.9.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 3c6cb12d7a6b5cef226de61cb3bf6f8b9ad5713a Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 21 May 2018 20:31:04 +0200 Subject: [PATCH 097/508] Update gitaly to 0.100.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b374caa1..8ebfb6aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,9 @@ ENV GITLAB_VERSION=10.8.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.6 \ GITLAB_SHELL_VERSION=7.1.2 \ - GITALY_SERVER_VERSION=0.96.1 \ GITLAB_WORKHORSE_VERSION=4.2.0 \ GITLAB_PAGES_VERSION=0.9.1 \ + GITALY_SERVER_VERSION=0.100.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 474fe9f17b962b142173b0627e2d3d247d3fc0cd Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Fri, 9 Mar 2018 12:21:51 +1000 Subject: [PATCH 098/508] Add Docker Swarm config file, and Swar&compose config file support Signed-off-by: Sven Dowideit --- .gitignore | 1 - README.md | 14 +- assets/runtime/functions | 8 ++ contrib/docker-swarm/docker-compose.yml | 162 ++++++++++++++++++++++++ contrib/docker-swarm/gitlab.config | 3 + contrib/docker-swarm/gitlab.secret | 13 ++ 6 files changed, 199 insertions(+), 2 deletions(-) create mode 100644 contrib/docker-swarm/docker-compose.yml create mode 100644 contrib/docker-swarm/gitlab.config create mode 100644 contrib/docker-swarm/gitlab.secret diff --git a/.gitignore b/.gitignore index eb601196..23a34d32 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ *.gem *.tar.gz -docker-compose.yml diff --git a/README.md b/README.md index 644765c8..f32eb685 100644 --- a/README.md +++ b/README.md @@ -803,7 +803,8 @@ These options should contain something like: ### Available Configuration Parameters -*Please refer the docker run command options for the `--env-file` flag where you can specify all required environment variables in a single file. This will save you from writing a potentially long docker run command. Alternatively you can use docker-compose.* +*Please refer the docker run command options for the `--env-file` flag where you can specify all required environment variables in a single file. This will save you from writing a potentially long docker run command. Alternatively you can use docker-compose. docker-compose users and Docker Swarm mode users can also use the [secrets and config file options](#docker-secrets-and-configs)* + Below is the complete list of available options that can be used to customize your gitlab installation. @@ -1078,6 +1079,17 @@ Below is the complete list of available options that can be used to customize yo | `RACK_ATTACK_BANTIME` | Number of seconds an IP should be banned after too many auth attempts. Defaults to `3600`. | | `GITLAB_WORKHORSE_TIMEOUT` | Timeout for gitlab workhorse http proxy. Defaults to `5m0s`. | +### Docker secrets and configs + +All the above environment variables can be put into a [secrets](https://docs.docker.com/compose/compose-file/#secrets) or [config](https://docs.docker.com/compose/compose-file/#configs) file +and then both docker-compose and Docker Swarm can import them into your gitlab container. + +On startup, the gitlab container will source env vars from a config file labeled `gitlab-config`, and then a secrets file labeled `gitlab-secrets` (both mounted in the default locations). + +See the exmample `config/docker-swarm/docker-compose.yml` file, and the example `gitlab.config` and `gitlab.secrets` file. + +If you're not using one of these files, then don't include its entry in the docker-compose file. + # Maintenance ## Creating backups diff --git a/assets/runtime/functions b/assets/runtime/functions index 30d8f307..4797588d 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1,5 +1,13 @@ #!/bin/bash set -e + +for file in /gitlab-configs /run/secrets/gitlab-secrets; do + if [[ -e "$file" ]]; then + echo "Loading $file" + source "$file" + fi +done +echo "Loading ${GITLAB_RUNTIME_DIR}/env-defaults" source ${GITLAB_RUNTIME_DIR}/env-defaults SYSCONF_TEMPLATES_DIR="${GITLAB_RUNTIME_DIR}/config" diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml new file mode 100644 index 00000000..30d52f90 --- /dev/null +++ b/contrib/docker-swarm/docker-compose.yml @@ -0,0 +1,162 @@ +version: '3.4' + +services: + redis: + restart: always + image: sameersbn/redis:latest + command: + - --loglevel warning + volumes: + - /srv/docker/gitlab/redis:/var/lib/redis:Z + + postgresql: + restart: always + image: sameersbn/postgresql:9.6-2 + volumes: + - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z + environment: + - DB_USER=gitlab + - DB_PASS=password + - DB_NAME=gitlabhq_production + - DB_EXTENSION=pg_trgm + + gitlab: + restart: always + image: sameersbn/gitlab:10.7.2 + depends_on: + - redis + - postgresql + ports: + - "10080:80" + - "10022:22" + volumes: + - /srv/docker/gitlab/gitlab:/home/git/data:Z + configs: + - gitlab-configs + secrets: + - gitlab-secrets + environment: + - DEBUG=false + + - DB_ADAPTER=postgresql + - DB_HOST=postgresql + - DB_PORT=5432 + - DB_USER=gitlab + - DB_PASS=password + - DB_NAME=gitlabhq_production + + - REDIS_HOST=redis + - REDIS_PORT=6379 + + - TZ=Asia/Kolkata + - GITLAB_TIMEZONE=Kolkata + + - GITLAB_HTTPS=false + - SSL_SELF_SIGNED=false + + - GITLAB_HOST=localhost + - GITLAB_PORT=10080 + - GITLAB_SSH_PORT=10022 + - GITLAB_RELATIVE_URL_ROOT= + - GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alphanumeric-string + - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string + - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string + + - GITLAB_ROOT_PASSWORD= + - GITLAB_ROOT_EMAIL= + + - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true + - GITLAB_NOTIFY_PUSHER=false + + - GITLAB_EMAIL=notifications@example.com + - GITLAB_EMAIL_REPLY_TO=noreply@example.com + - GITLAB_INCOMING_EMAIL_ADDRESS=reply@example.com + + - GITLAB_BACKUP_SCHEDULE=daily + - GITLAB_BACKUP_TIME=01:00 + + - SMTP_ENABLED=false + - SMTP_DOMAIN=www.example.com + - SMTP_HOST=smtp.gmail.com + - SMTP_PORT=587 + - SMTP_USER=mailer@example.com + - SMTP_PASS=password + - SMTP_STARTTLS=true + - SMTP_AUTHENTICATION=login + + - IMAP_ENABLED=false + - IMAP_HOST=imap.gmail.com + - IMAP_PORT=993 + - IMAP_USER=mailer@example.com + - IMAP_PASS=password + - IMAP_SSL=true + - IMAP_STARTTLS=false + + - OAUTH_ENABLED=false + - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER= + - OAUTH_ALLOW_SSO= + - OAUTH_BLOCK_AUTO_CREATED_USERS=true + - OAUTH_AUTO_LINK_LDAP_USER=false + - OAUTH_AUTO_LINK_SAML_USER=false + - OAUTH_EXTERNAL_PROVIDERS= + + - OAUTH_CAS3_LABEL=cas3 + - OAUTH_CAS3_SERVER= + - OAUTH_CAS3_DISABLE_SSL_VERIFICATION=false + - OAUTH_CAS3_LOGIN_URL=/cas/login + - OAUTH_CAS3_VALIDATE_URL=/cas/p3/serviceValidate + - OAUTH_CAS3_LOGOUT_URL=/cas/logout + + - OAUTH_GOOGLE_API_KEY= + - OAUTH_GOOGLE_APP_SECRET= + - OAUTH_GOOGLE_RESTRICT_DOMAIN= + + - OAUTH_FACEBOOK_API_KEY= + - OAUTH_FACEBOOK_APP_SECRET= + + - OAUTH_TWITTER_API_KEY= + - OAUTH_TWITTER_APP_SECRET= + + - OAUTH_GITHUB_API_KEY= + - OAUTH_GITHUB_APP_SECRET= + - OAUTH_GITHUB_URL= + - OAUTH_GITHUB_VERIFY_SSL= + + - OAUTH_GITLAB_API_KEY= + - OAUTH_GITLAB_APP_SECRET= + + - OAUTH_BITBUCKET_API_KEY= + - OAUTH_BITBUCKET_APP_SECRET= + + - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL= + - OAUTH_SAML_IDP_CERT_FINGERPRINT= + - OAUTH_SAML_IDP_SSO_TARGET_URL= + - OAUTH_SAML_ISSUER= + - OAUTH_SAML_LABEL="Our SAML Provider" + - OAUTH_SAML_NAME_IDENTIFIER_FORMAT=urn:oasis:names:tc:SAML:2.0:nameid-format:transient + - OAUTH_SAML_GROUPS_ATTRIBUTE= + - OAUTH_SAML_EXTERNAL_GROUPS= + - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL= + - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME= + - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME= + - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME= + + - OAUTH_CROWD_SERVER_URL= + - OAUTH_CROWD_APP_NAME= + - OAUTH_CROWD_APP_PASSWORD= + + - OAUTH_AUTH0_CLIENT_ID= + - OAUTH_AUTH0_CLIENT_SECRET= + - OAUTH_AUTH0_DOMAIN= + + - OAUTH_AZURE_API_KEY= + - OAUTH_AZURE_API_SECRET= + - OAUTH_AZURE_TENANT_ID= + +configs: + gitlab-configs: + file: ./gitlab.configs + +secrets: + gitlab-secrets: + file: ./gitlab.secrets diff --git a/contrib/docker-swarm/gitlab.config b/contrib/docker-swarm/gitlab.config new file mode 100644 index 00000000..898f5209 --- /dev/null +++ b/contrib/docker-swarm/gitlab.config @@ -0,0 +1,3 @@ +# config file to be sourced on startup - will over-ride any env set in the docker-compose.yml + +TEST=none diff --git a/contrib/docker-swarm/gitlab.secret b/contrib/docker-swarm/gitlab.secret new file mode 100644 index 00000000..488566e3 --- /dev/null +++ b/contrib/docker-swarm/gitlab.secret @@ -0,0 +1,13 @@ +# config file to be sourced on startup - will over-ride any env set in the docker-compose.yml + +LDAP_ENABLED=true +LDAP_LABEL="LDAP login" +LDAP_HOST=pool.ldap.example.com +LDAP_PORT=3268 +LDAP_BIND_DN=the-ldap +LDAP_PASS=no-not-really +LDAP_BASE=ou=People,dc=example,dc=com +#LDAP_LOWERCASE_USERNAMES=true +##LDAP_USER_FILTER=uid={login} +##LDAP_UID= +# From 3c68a6f00bdea2bbd80d8c2b4a06715f35091c60 Mon Sep 17 00:00:00 2001 From: Niclas Mietz Date: Sat, 26 May 2018 10:38:00 +0200 Subject: [PATCH 099/508] Update changelog for swarm mode --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index dd0ea9f3..aefa5fa9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **10.8.0** - gitlab: upgrade CE to v10.8.0 +- Add support for swarm mode with docker-configs and docker secrets ([#1540](https://github.com/sameersbn/docker-gitlab/pull/1540)) **10.7.4** - gitlab: upgrade CE to v10.7.4 From d2fbf38d7e9ee87217673a02e55e4095b3abc1ab Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 26 May 2018 10:39:41 +0200 Subject: [PATCH 100/508] release 10.8.0 From 3f8b44af9253192076078b9dd4b0e922b125c814 Mon Sep 17 00:00:00 2001 From: Pieter Lange Date: Thu, 24 May 2018 23:53:25 +0200 Subject: [PATCH 101/508] Upgrade gitlab CE to 10.8.1 --- 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 aefa5fa9..d4efad77 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. +**10.8.1** +- gitlab: upgrade CE to v10.8.1 + **10.8.0** - gitlab: upgrade CE to v10.8.0 - Add support for swarm mode with docker-configs and docker secrets ([#1540](https://github.com/sameersbn/docker-gitlab/pull/1540)) diff --git a/Dockerfile b/Dockerfile index 8ebfb6aa..9b411e8b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.8.0 \ +ENV GITLAB_VERSION=10.8.1 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.6 \ GITLAB_SHELL_VERSION=7.1.2 \ diff --git a/README.md b/README.md index cb799f75..b8462290 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:10.8.0 +# sameersbn/gitlab:10.8.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.8.0 +docker pull sameersbn/gitlab:10.8.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.8.0 + sameersbn/gitlab:10.8.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.8.0 + sameersbn/gitlab:10.8.1 ``` ## Database @@ -263,7 +263,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:10.8.0 + sameersbn/gitlab:10.8.1 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.8.0 + sameersbn/gitlab:10.8.1 ``` 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: @@ -361,7 +361,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:10.8.0 + sameersbn/gitlab:10.8.1 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.8.0 + sameersbn/gitlab:10.8.1 ``` 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: @@ -431,7 +431,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:10.8.0 + sameersbn/gitlab:10.8.1 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.8.0 + sameersbn/gitlab:10.8.1 ``` ### Mail @@ -471,7 +471,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:10.8.0 + sameersbn/gitlab:10.8.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.8.0 + sameersbn/gitlab:10.8.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.8.0 + sameersbn/gitlab:10.8.1 ``` 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. @@ -584,7 +584,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:10.8.0 + sameersbn/gitlab:10.8.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.8.0 + sameersbn/gitlab:10.8.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.8.0 + sameersbn/gitlab:10.8.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.8.0 + sameersbn/gitlab:10.8.1 ``` 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:10.8.0 app:sanitize + sameersbn/gitlab:10.8.1 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.0 app:rake gitlab:backup:create + sameersbn/gitlab:10.8.1 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.0 app:rake db:setup + sameersbn/gitlab:10.8.1 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:10.8.0 app:rake gitlab:backup:restore + sameersbn/gitlab:10.8.1 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.8.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:10.8.0 app:rake gitlab:env:info + sameersbn/gitlab:10.8.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.0 app:rake gitlab:import:repos + sameersbn/gitlab:10.8.1 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.0 app:rake gitlab:import:repos + sameersbn/gitlab:10.8.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.8.0` 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:10.8.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:10.8.0 +docker pull sameersbn/gitlab:10.8.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:10.8.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.8.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 2a3262d8..90d0af61 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.8.0 +10.8.1 diff --git a/docker-compose.yml b/docker-compose.yml index 765e7fc7..e0956137 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.8.0 + image: sameersbn/gitlab:10.8.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 3484691b..26af2e8c 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:10.8.0 app:rake gitlab:backup:create + sameersbn/gitlab:10.8.1 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:10.8.0 app:rake gitlab:backup:restore + sameersbn/gitlab:10.8.1 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:10.8.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.8.1 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:10.8.0 +docker pull sameersbn/gitlab:10.8.1 ``` - **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:10.8.0 +sameersbn/gitlab:10.8.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 4e67d601..acfb9dcb 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.8.0 + image: sameersbn/gitlab:10.8.1 env: - name: TZ value: Asia/Kolkata From 8addb08983a73478adbd619967e887c480443adf Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 26 May 2018 10:41:50 +0200 Subject: [PATCH 102/508] release 10.8.1 From 1333e99fd715d39089b497494abdf20818b391aa Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 30 May 2018 12:01:54 +0200 Subject: [PATCH 103/508] Upgrade GitLab CE to 10.8.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 d4efad77..a1f0000a 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. +**10.8.2** +- gitlab: upgrade CE to v10.8.2 + **10.8.1** - gitlab: upgrade CE to v10.8.1 diff --git a/Dockerfile b/Dockerfile index 9b411e8b..a34d700b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.8.1 \ +ENV GITLAB_VERSION=10.8.2 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.6 \ GITLAB_SHELL_VERSION=7.1.2 \ diff --git a/README.md b/README.md index b8462290..855a4160 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:10.8.1 +# sameersbn/gitlab:10.8.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.8.1 +docker pull sameersbn/gitlab:10.8.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.8.1 + sameersbn/gitlab:10.8.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.8.1 + sameersbn/gitlab:10.8.2 ``` ## Database @@ -263,7 +263,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:10.8.1 + sameersbn/gitlab:10.8.2 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.8.1 + sameersbn/gitlab:10.8.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: @@ -361,7 +361,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:10.8.1 + sameersbn/gitlab:10.8.2 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.8.1 + sameersbn/gitlab:10.8.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: @@ -431,7 +431,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:10.8.1 + sameersbn/gitlab:10.8.2 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.8.1 + sameersbn/gitlab:10.8.2 ``` ### Mail @@ -471,7 +471,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:10.8.1 + sameersbn/gitlab:10.8.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.8.1 + sameersbn/gitlab:10.8.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.8.1 + sameersbn/gitlab:10.8.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. @@ -584,7 +584,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:10.8.1 + sameersbn/gitlab:10.8.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.8.1 + sameersbn/gitlab:10.8.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.8.1 + sameersbn/gitlab:10.8.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.8.1 + sameersbn/gitlab:10.8.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:10.8.1 app:sanitize + sameersbn/gitlab:10.8.2 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.1 app:rake gitlab:backup:create + sameersbn/gitlab:10.8.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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.1 app:rake db:setup + sameersbn/gitlab:10.8.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:10.8.1 app:rake gitlab:backup:restore + sameersbn/gitlab:10.8.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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.8.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:10.8.1 app:rake gitlab:env:info + sameersbn/gitlab:10.8.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.1 app:rake gitlab:import:repos + sameersbn/gitlab:10.8.2 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.1 app:rake gitlab:import:repos + sameersbn/gitlab:10.8.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.8.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:10.8.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:10.8.1 +docker pull sameersbn/gitlab:10.8.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:10.8.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.8.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index 90d0af61..0444ef9d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.8.1 +10.8.2 diff --git a/docker-compose.yml b/docker-compose.yml index e0956137..34baa215 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.8.1 + image: sameersbn/gitlab:10.8.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 26af2e8c..ced2e809 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:10.8.1 app:rake gitlab:backup:create + sameersbn/gitlab:10.8.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:10.8.1 app:rake gitlab:backup:restore + sameersbn/gitlab:10.8.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:10.8.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.8.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:10.8.1 +docker pull sameersbn/gitlab:10.8.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:10.8.1 +sameersbn/gitlab:10.8.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index acfb9dcb..8772254d 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.8.1 + image: sameersbn/gitlab:10.8.2 env: - name: TZ value: Asia/Kolkata From e593e21c6802fefa97c7b5540381ec03863f82c5 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 1 Jun 2018 19:22:46 +0200 Subject: [PATCH 104/508] release 10.8.2 From f31c4d71e0e0f54341615a8a11f13a6ba69d75c9 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 30 May 2018 12:40:12 +0200 Subject: [PATCH 105/508] Start proccess before wait Signed-off-by: solidnerd --- entrypoint.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/entrypoint.sh b/entrypoint.sh index 3d9a85d6..c846969b 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -15,7 +15,11 @@ case ${1} in case ${1} in app:start) + /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf & + SUPERVISOR_PID=$! migrate_database + kill -15 $SUPERVISOR_PID + wait $SUPERVISOR_PID rm -rf /var/run/supervisor.sock exec /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf ;; From 399a426ac2a3aae89a3e8c6f37f1a9658507dcd6 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 1 Jun 2018 19:29:38 +0200 Subject: [PATCH 106/508] Upgrade GitLab CE to 10.8.3 --- 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 a1f0000a..54669743 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. +**10.8.3** +- gitlab: upgrade CE to v10.8.3 + **10.8.2** - gitlab: upgrade CE to v10.8.2 diff --git a/Dockerfile b/Dockerfile index a34d700b..fb70f152 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.8.2 \ +ENV GITLAB_VERSION=10.8.3 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.6 \ GITLAB_SHELL_VERSION=7.1.2 \ diff --git a/README.md b/README.md index 855a4160..b1a87269 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:10.8.2 +# sameersbn/gitlab:10.8.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.8.2 +docker pull sameersbn/gitlab:10.8.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.8.2 + sameersbn/gitlab:10.8.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.8.2 + sameersbn/gitlab:10.8.3 ``` ## Database @@ -263,7 +263,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:10.8.2 + sameersbn/gitlab:10.8.3 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.8.2 + sameersbn/gitlab:10.8.3 ``` 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: @@ -361,7 +361,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:10.8.2 + sameersbn/gitlab:10.8.3 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.8.2 + sameersbn/gitlab:10.8.3 ``` 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: @@ -431,7 +431,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:10.8.2 + sameersbn/gitlab:10.8.3 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.8.2 + sameersbn/gitlab:10.8.3 ``` ### Mail @@ -471,7 +471,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:10.8.2 + sameersbn/gitlab:10.8.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.8.2 + sameersbn/gitlab:10.8.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.8.2 + sameersbn/gitlab:10.8.3 ``` 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. @@ -584,7 +584,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:10.8.2 + sameersbn/gitlab:10.8.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.8.2 + sameersbn/gitlab:10.8.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.8.2 + sameersbn/gitlab:10.8.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.8.2 + sameersbn/gitlab:10.8.3 ``` 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:10.8.2 app:sanitize + sameersbn/gitlab:10.8.3 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.2 app:rake gitlab:backup:create + sameersbn/gitlab:10.8.3 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.2 app:rake db:setup + sameersbn/gitlab:10.8.3 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:10.8.2 app:rake gitlab:backup:restore + sameersbn/gitlab:10.8.3 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.8.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:10.8.2 app:rake gitlab:env:info + sameersbn/gitlab:10.8.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.2 app:rake gitlab:import:repos + sameersbn/gitlab:10.8.3 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.2 app:rake gitlab:import:repos + sameersbn/gitlab:10.8.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.8.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. +> Upgrading to `sameersbn/gitlab:10.8.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:10.8.2 +docker pull sameersbn/gitlab:10.8.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:10.8.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.8.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index 0444ef9d..a42f22da 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.8.2 +10.8.3 diff --git a/docker-compose.yml b/docker-compose.yml index 34baa215..0c14269a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.8.2 + image: sameersbn/gitlab:10.8.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ced2e809..7ec83693 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:10.8.2 app:rake gitlab:backup:create + sameersbn/gitlab:10.8.3 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:10.8.2 app:rake gitlab:backup:restore + sameersbn/gitlab:10.8.3 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:10.8.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.8.3 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:10.8.2 +docker pull sameersbn/gitlab:10.8.3 ``` - **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:10.8.2 +sameersbn/gitlab:10.8.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 8772254d..ebfcc8c0 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.8.2 + image: sameersbn/gitlab:10.8.3 env: - name: TZ value: Asia/Kolkata From f8b1b5fbbefa2907c4bf0ffecfba0be581e0032c Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 1 Jun 2018 19:31:12 +0200 Subject: [PATCH 107/508] Update gitlab-workhorse to 4.2.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fb70f152..80c88b11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ENV GITLAB_VERSION=10.8.3 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.6 \ GITLAB_SHELL_VERSION=7.1.2 \ - GITLAB_WORKHORSE_VERSION=4.2.0 \ + GITLAB_WORKHORSE_VERSION=4.2.1 \ GITLAB_PAGES_VERSION=0.9.1 \ GITALY_SERVER_VERSION=0.100.0 \ GITLAB_USER="git" \ From 6f8f66b9b89a3029f19f142e6d2e148ac73cb9a2 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 1 Jun 2018 19:31:24 +0200 Subject: [PATCH 108/508] Update gitaly to 0.100.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 80c88b11..ba05327f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ENV GITLAB_VERSION=10.8.3 \ GITLAB_SHELL_VERSION=7.1.2 \ GITLAB_WORKHORSE_VERSION=4.2.1 \ GITLAB_PAGES_VERSION=0.9.1 \ - GITALY_SERVER_VERSION=0.100.0 \ + GITALY_SERVER_VERSION=0.100.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From b3b624b20ce0bdab53d1767058f128fcee0cfed2 Mon Sep 17 00:00:00 2001 From: Niclas Mietz Date: Sun, 3 Jun 2018 22:43:41 +0200 Subject: [PATCH 109/508] Update Changelog.md --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index 54669743..338a7e5d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **10.8.3** - gitlab: upgrade CE to v10.8.3 +- Fix potential boot problems on clean setups [#1621](https://github.com/sameersbn/docker-gitlab/pull/1621) **10.8.2** - gitlab: upgrade CE to v10.8.2 From 29fa2ff0976f6b2ffd8c86c2748db0774607ad0b Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 3 Jun 2018 22:44:06 +0200 Subject: [PATCH 110/508] release 10.8.3 From 9b4f62f5e97865a3ef7a5fb8a400b23e36595d80 Mon Sep 17 00:00:00 2001 From: Adrien Ferrand Date: Mon, 4 Jun 2018 22:09:37 +0200 Subject: [PATCH 111/508] Correct entrypoint.sh causing bootloop in some cases (#1628) * Correct bootloop in some cases. Lines "kill -15 $SUPERVISOR_PID" then "wait $SUPERVISOR_PID" may fail if process is killed sufficiently fast. Command "ps -p" ensure process is still here before waiting to its state to change. * Less output --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index c846969b..3d810ef4 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -19,7 +19,7 @@ case ${1} in SUPERVISOR_PID=$! migrate_database kill -15 $SUPERVISOR_PID - wait $SUPERVISOR_PID + ps h -p $SUPERVISOR_PID > /dev/null && wait $SUPERVISOR_PID rm -rf /var/run/supervisor.sock exec /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf ;; From d4ca32819a86afd64d7dec162f8c9599069318fd Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 4 Jun 2018 22:17:08 +0200 Subject: [PATCH 112/508] prepare release for 10.8.3-1 Signed-off-by: solidnerd --- Changelog.md | 4 +++ README.md | 56 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++---- kubernetes/gitlab-rc.yml | 2 +- 6 files changed, 40 insertions(+), 36 deletions(-) diff --git a/Changelog.md b/Changelog.md index 338a7e5d..aa018a8c 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-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**10.8.3-1** +- Fix boot loops that were introduced during [#1621](https://github.com/sameersbn/docker-gitlab/pull/1621) and will be fixed with [#1628](https://github.com/sameersbn/docker-gitlab/pull/1628) + + **10.8.3** - gitlab: upgrade CE to v10.8.3 - Fix potential boot problems on clean setups [#1621](https://github.com/sameersbn/docker-gitlab/pull/1621) diff --git a/README.md b/README.md index b1a87269..7ad540ac 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:10.8.3 +# sameersbn/gitlab:10.8.3-1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.8.3 +docker pull sameersbn/gitlab:10.8.3-1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.8.3 + sameersbn/gitlab:10.8.3-1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.8.3 + sameersbn/gitlab:10.8.3-1 ``` ## Database @@ -263,7 +263,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:10.8.3 + sameersbn/gitlab:10.8.3-1 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.8.3 + sameersbn/gitlab:10.8.3-1 ``` 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: @@ -361,7 +361,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:10.8.3 + sameersbn/gitlab:10.8.3-1 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.8.3 + sameersbn/gitlab:10.8.3-1 ``` 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: @@ -431,7 +431,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:10.8.3 + sameersbn/gitlab:10.8.3-1 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.8.3 + sameersbn/gitlab:10.8.3-1 ``` ### Mail @@ -471,7 +471,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:10.8.3 + sameersbn/gitlab:10.8.3-1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.8.3 + sameersbn/gitlab:10.8.3-1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.8.3 + sameersbn/gitlab:10.8.3-1 ``` 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. @@ -584,7 +584,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:10.8.3 + sameersbn/gitlab:10.8.3-1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.8.3 + sameersbn/gitlab:10.8.3-1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.8.3 + sameersbn/gitlab:10.8.3-1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.8.3 + sameersbn/gitlab:10.8.3-1 ``` 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:10.8.3 app:sanitize + sameersbn/gitlab:10.8.3-1 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.3 app:rake gitlab:backup:create + sameersbn/gitlab:10.8.3-1 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.3 app:rake db:setup + sameersbn/gitlab:10.8.3-1 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:10.8.3 app:rake gitlab:backup:restore + sameersbn/gitlab:10.8.3-1 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.8.3-1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:10.8.3 app:rake gitlab:env:info + sameersbn/gitlab:10.8.3-1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.3 app:rake gitlab:import:repos + sameersbn/gitlab:10.8.3-1 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.3 app:rake gitlab:import:repos + sameersbn/gitlab:10.8.3-1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.8.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:10.8.3-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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:10.8.3 +docker pull sameersbn/gitlab:10.8.3-1 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:10.8.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.8.3-1 ``` ## Shell Access diff --git a/VERSION b/VERSION index a42f22da..1e644117 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.8.3 +10.8.3-1 diff --git a/docker-compose.yml b/docker-compose.yml index 0c14269a..f7089ad9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.8.3 + image: sameersbn/gitlab:10.8.3-1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 7ec83693..77f162f1 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:10.8.3 app:rake gitlab:backup:create + sameersbn/gitlab:10.8.3-1 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:10.8.3 app:rake gitlab:backup:restore + sameersbn/gitlab:10.8.3-1 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:10.8.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.8.3-1 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:10.8.3 +docker pull sameersbn/gitlab:10.8.3-1 ``` - **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:10.8.3 +sameersbn/gitlab:10.8.3-1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index ebfcc8c0..53603c4f 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.8.3 + image: sameersbn/gitlab:10.8.3-1 env: - name: TZ value: Asia/Kolkata From a749a3ac3c5523d48333695b292e1e0b0c470144 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 4 Jun 2018 22:18:54 +0200 Subject: [PATCH 113/508] release 10.8.3-1 From b7903e402f854ee53a381364391b63343c702b44 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 7 Jun 2018 07:15:19 +0200 Subject: [PATCH 114/508] Upgrade GitLab CE to 10.8.4 --- 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 aa018a8c..c12391b5 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. +**10.8.4** +- gitlab: upgrade CE to v10.8.4 + **10.8.3-1** - Fix boot loops that were introduced during [#1621](https://github.com/sameersbn/docker-gitlab/pull/1621) and will be fixed with [#1628](https://github.com/sameersbn/docker-gitlab/pull/1628) diff --git a/Dockerfile b/Dockerfile index ba05327f..c2321006 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.8.3 \ +ENV GITLAB_VERSION=10.8.4 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.6 \ GITLAB_SHELL_VERSION=7.1.2 \ diff --git a/README.md b/README.md index 7ad540ac..73a47612 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:10.8.3-1 +# sameersbn/gitlab:10.8.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.8.3-1 +docker pull sameersbn/gitlab:10.8.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.8.3-1 + sameersbn/gitlab:10.8.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.8.3-1 + sameersbn/gitlab:10.8.4 ``` ## Database @@ -263,7 +263,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:10.8.3-1 + sameersbn/gitlab:10.8.4 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.8.3-1 + sameersbn/gitlab:10.8.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: @@ -361,7 +361,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:10.8.3-1 + sameersbn/gitlab:10.8.4 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.8.3-1 + sameersbn/gitlab:10.8.4 ``` 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: @@ -431,7 +431,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:10.8.3-1 + sameersbn/gitlab:10.8.4 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.8.3-1 + sameersbn/gitlab:10.8.4 ``` ### Mail @@ -471,7 +471,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:10.8.3-1 + sameersbn/gitlab:10.8.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.8.3-1 + sameersbn/gitlab:10.8.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.8.3-1 + sameersbn/gitlab:10.8.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. @@ -584,7 +584,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:10.8.3-1 + sameersbn/gitlab:10.8.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.8.3-1 + sameersbn/gitlab:10.8.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.8.3-1 + sameersbn/gitlab:10.8.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.8.3-1 + sameersbn/gitlab:10.8.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:10.8.3-1 app:sanitize + sameersbn/gitlab:10.8.4 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.3-1 app:rake gitlab:backup:create + sameersbn/gitlab:10.8.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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.3-1 app:rake db:setup + sameersbn/gitlab:10.8.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:10.8.3-1 app:rake gitlab:backup:restore + sameersbn/gitlab:10.8.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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.3-1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.8.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:10.8.3-1 app:rake gitlab:env:info + sameersbn/gitlab:10.8.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.3-1 app:rake gitlab:import:repos + sameersbn/gitlab:10.8.4 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.3-1 app:rake gitlab:import:repos + sameersbn/gitlab:10.8.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.8.3-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:10.8.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:10.8.3-1 +docker pull sameersbn/gitlab:10.8.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:10.8.3-1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:10.8.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index 1e644117..704537e2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.8.3-1 +10.8.4 diff --git a/docker-compose.yml b/docker-compose.yml index f7089ad9..a7f1f1ee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.8.3-1 + image: sameersbn/gitlab:10.8.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 77f162f1..52bef536 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:10.8.3-1 app:rake gitlab:backup:create + sameersbn/gitlab:10.8.4 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:10.8.3-1 app:rake gitlab:backup:restore + sameersbn/gitlab:10.8.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. @@ -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:10.8.3-1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:10.8.4 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:10.8.3-1 +docker pull sameersbn/gitlab:10.8.4 ``` - **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:10.8.3-1 +sameersbn/gitlab:10.8.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 53603c4f..45614643 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.8.3-1 + image: sameersbn/gitlab:10.8.4 env: - name: TZ value: Asia/Kolkata From 4b65d7bb66a8afd1efc9d5cb68287ad32096bb3b Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 21 Jun 2018 09:47:52 +0200 Subject: [PATCH 115/508] release 10.8.4 From c6cb51a5041bcfd034cea86cc459bd874d9730ca Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 21 Jun 2018 12:44:50 +0200 Subject: [PATCH 116/508] Upgrade GitLab CE to 11.0.0 --- 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 c12391b5..e78317ab 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. +**11.0.0** +- gitlab: upgrade CE to v11.0.0 + **10.8.4** - gitlab: upgrade CE to v10.8.4 diff --git a/Dockerfile b/Dockerfile index c2321006..c1d2c937 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=10.8.4 \ +ENV GITLAB_VERSION=11.0.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.6 \ GITLAB_SHELL_VERSION=7.1.2 \ diff --git a/README.md b/README.md index 73a47612..aadb1dae 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:10.8.4 +# sameersbn/gitlab:11.0.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:10.8.4 +docker pull sameersbn/gitlab:11.0.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:10.8.4 + sameersbn/gitlab:11.0.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:10.8.4 + sameersbn/gitlab:11.0.0 ``` ## Database @@ -263,7 +263,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:10.8.4 + sameersbn/gitlab:11.0.0 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:10.8.4 + sameersbn/gitlab:11.0.0 ``` 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: @@ -361,7 +361,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:10.8.4 + sameersbn/gitlab:11.0.0 ``` #### Linking to MySQL Container @@ -404,7 +404,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:10.8.4 + sameersbn/gitlab:11.0.0 ``` 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: @@ -431,7 +431,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:10.8.4 + sameersbn/gitlab:11.0.0 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:10.8.4 + sameersbn/gitlab:11.0.0 ``` ### Mail @@ -471,7 +471,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:10.8.4 + sameersbn/gitlab:11.0.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:10.8.4 + sameersbn/gitlab:11.0.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:10.8.4 + sameersbn/gitlab:11.0.0 ``` 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. @@ -584,7 +584,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:10.8.4 + sameersbn/gitlab:11.0.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:10.8.4 + sameersbn/gitlab:11.0.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:10.8.4 + sameersbn/gitlab:11.0.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:10.8.4 + sameersbn/gitlab:11.0.0 ``` 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:10.8.4 app:sanitize + sameersbn/gitlab:11.0.0 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.0.0 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.4 app:rake db:setup + sameersbn/gitlab:11.0.0 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:10.8.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.0.0 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.0.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:10.8.4 app:rake gitlab:env:info + sameersbn/gitlab:11.0.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.0.0 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:10.8.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.0.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:10.8.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. +> Upgrading to `sameersbn/gitlab:11.0.0` 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:10.8.4 +docker pull sameersbn/gitlab:11.0.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:10.8.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.0.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index 704537e2..275283a1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.8.4 +11.0.0 diff --git a/docker-compose.yml b/docker-compose.yml index a7f1f1ee..0c71ef1a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:10.8.4 + image: sameersbn/gitlab:11.0.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 52bef536..3fab0ccb 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:10.8.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.0.0 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:10.8.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.0.0 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:10.8.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.0.0 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:10.8.4 +docker pull sameersbn/gitlab:11.0.0 ``` - **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:10.8.4 +sameersbn/gitlab:11.0.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 45614643..45a2940c 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:10.8.4 + image: sameersbn/gitlab:11.0.0 env: - name: TZ value: Asia/Kolkata From a9befda906d081602b8c81cbfa18dc1a471402a9 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 21 Jun 2018 12:45:47 +0200 Subject: [PATCH 117/508] Update gitlab-shell to 7.1.4 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c1d2c937..5aa4f349 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=11.0.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.6 \ - GITLAB_SHELL_VERSION=7.1.2 \ GITLAB_WORKHORSE_VERSION=4.2.1 \ + GITLAB_SHELL_VERSION=7.1.4 \ GITLAB_PAGES_VERSION=0.9.1 \ GITALY_SERVER_VERSION=0.100.1 \ GITLAB_USER="git" \ From 22840d86fa8085d3205a4ef668cce7b2d581522e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 21 Jun 2018 12:46:09 +0200 Subject: [PATCH 118/508] Update gitlab-workhorse to 4.3.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5aa4f349..589cf914 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=11.0.0 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.6 \ - GITLAB_WORKHORSE_VERSION=4.2.1 \ GITLAB_SHELL_VERSION=7.1.4 \ + GITLAB_WORKHORSE_VERSION=4.3.1 \ GITLAB_PAGES_VERSION=0.9.1 \ GITALY_SERVER_VERSION=0.100.1 \ GITLAB_USER="git" \ From 64a98ac0a752f1ca3e3e51c061a8abe4c76a688a Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 21 Jun 2018 12:46:21 +0200 Subject: [PATCH 119/508] Update gitaly to 0.105.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 589cf914..2a7f6396 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ENV GITLAB_VERSION=11.0.0 \ GITLAB_SHELL_VERSION=7.1.4 \ GITLAB_WORKHORSE_VERSION=4.3.1 \ GITLAB_PAGES_VERSION=0.9.1 \ - GITALY_SERVER_VERSION=0.100.1 \ + GITALY_SERVER_VERSION=0.105.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 1fa174d41f3f27632e332ff118403ac0a01ded1f Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 24 Jun 2018 13:03:28 +0200 Subject: [PATCH 120/508] release 11.0.0 From 053792a6b20521494a66826b59f0d089c6e60c9a Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 25 Jun 2018 20:53:42 +0200 Subject: [PATCH 121/508] Upgrade GitLab CE to 11.0.1 Signed-off-by: solidnerd --- 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 e78317ab..fcd43a3a 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. +**11.0.1** +- gitlab: upgrade CE to v11.0.1 + **11.0.0** - gitlab: upgrade CE to v11.0.0 diff --git a/Dockerfile b/Dockerfile index 2a7f6396..d28a63b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.0.0 \ +ENV GITLAB_VERSION=11.0.1 \ RUBY_VERSION=2.3 \ GOLANG_VERSION=1.9.6 \ GITLAB_SHELL_VERSION=7.1.4 \ diff --git a/README.md b/README.md index aadb1dae..685437dd 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:11.0.0 +# sameersbn/gitlab:11.0.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.0.0 +docker pull sameersbn/gitlab:11.0.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.0.0 + sameersbn/gitlab:11.0.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.0.0 + sameersbn/gitlab:11.0.1 ``` ## Database @@ -263,7 +263,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:11.0.0 + sameersbn/gitlab:11.0.1 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.0.0 + sameersbn/gitlab:11.0.1 ``` 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: @@ -361,7 +361,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:11.0.0 + sameersbn/gitlab:11.0.1 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.0.0 + sameersbn/gitlab:11.0.1 ``` 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: @@ -431,7 +431,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:11.0.0 + sameersbn/gitlab:11.0.1 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.0.0 + sameersbn/gitlab:11.0.1 ``` ### Mail @@ -471,7 +471,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:11.0.0 + sameersbn/gitlab:11.0.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.0.0 + sameersbn/gitlab:11.0.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.0.0 + sameersbn/gitlab:11.0.1 ``` 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. @@ -584,7 +584,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:11.0.0 + sameersbn/gitlab:11.0.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.0.0 + sameersbn/gitlab:11.0.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.0.0 + sameersbn/gitlab:11.0.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.0.0 + sameersbn/gitlab:11.0.1 ``` 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:11.0.0 app:sanitize + sameersbn/gitlab:11.0.1 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.0.1 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.0 app:rake db:setup + sameersbn/gitlab:11.0.1 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:11.0.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.0.1 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.0.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.0.0 app:rake gitlab:env:info + sameersbn/gitlab:11.0.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.0.1 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.0.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.0.0` 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:11.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.0.0 +docker pull sameersbn/gitlab:11.0.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.0.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.0.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 275283a1..07197380 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.0.0 +11.0.1 diff --git a/docker-compose.yml b/docker-compose.yml index 0c71ef1a..eb971121 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.0.0 + image: sameersbn/gitlab:11.0.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 3fab0ccb..b5565f12 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:11.0.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.0.1 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:11.0.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.0.1 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:11.0.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.0.1 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:11.0.0 +docker pull sameersbn/gitlab:11.0.1 ``` - **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:11.0.0 +sameersbn/gitlab:11.0.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 45a2940c..a724fd7c 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.0.0 + image: sameersbn/gitlab:11.0.1 env: - name: TZ value: Asia/Kolkata From 703b0a133fb4e1106dfaaa827055f1876b92f54e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 25 Jun 2018 21:16:27 +0200 Subject: [PATCH 122/508] release 11.0.1 From 28cac7c451ba387d602988e7fa76eddddd2f6197 Mon Sep 17 00:00:00 2001 From: Pieter Lange Date: Thu, 28 Jun 2018 10:42:56 +0200 Subject: [PATCH 123/508] Update gitlab CE to 11.0.2 Also updates go to 1.10.3 --- Changelog.md | 3 ++ Dockerfile | 4 +-- README.md | 56 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 41 insertions(+), 38 deletions(-) diff --git a/Changelog.md b/Changelog.md index fcd43a3a..93c275aa 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. +**11.0.2** +- gitlab: upgrade CE to v11.0.2 + **11.0.1** - gitlab: upgrade CE to v11.0.1 diff --git a/Dockerfile b/Dockerfile index d28a63b6..20193d80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ FROM sameersbn/ubuntu:16.04.20180124 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.0.1 \ +ENV GITLAB_VERSION=11.0.2 \ RUBY_VERSION=2.3 \ - GOLANG_VERSION=1.9.6 \ + GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=7.1.4 \ GITLAB_WORKHORSE_VERSION=4.3.1 \ GITLAB_PAGES_VERSION=0.9.1 \ diff --git a/README.md b/README.md index 685437dd..fb40be53 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:11.0.1 +# sameersbn/gitlab:11.0.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.0.1 +docker pull sameersbn/gitlab:11.0.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.0.1 + sameersbn/gitlab:11.0.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.0.1 + sameersbn/gitlab:11.0.2 ``` ## Database @@ -263,7 +263,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:11.0.1 + sameersbn/gitlab:11.0.2 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.0.1 + sameersbn/gitlab:11.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: @@ -361,7 +361,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:11.0.1 + sameersbn/gitlab:11.0.2 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.0.1 + sameersbn/gitlab:11.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: @@ -431,7 +431,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:11.0.1 + sameersbn/gitlab:11.0.2 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.0.1 + sameersbn/gitlab:11.0.2 ``` ### Mail @@ -471,7 +471,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:11.0.1 + sameersbn/gitlab:11.0.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.0.1 + sameersbn/gitlab:11.0.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.0.1 + sameersbn/gitlab:11.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. @@ -584,7 +584,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:11.0.1 + sameersbn/gitlab:11.0.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.0.1 + sameersbn/gitlab:11.0.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.0.1 + sameersbn/gitlab:11.0.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.0.1 + sameersbn/gitlab:11.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:11.0.1 app:sanitize + sameersbn/gitlab:11.0.2 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.1 app:rake db:setup + sameersbn/gitlab:11.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:11.0.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.0.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.0.1 app:rake gitlab:env:info + sameersbn/gitlab:11.0.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.0.2 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.0.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.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:11.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:11.0.1 +docker pull sameersbn/gitlab:11.0.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.0.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.0.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index 07197380..a1ea332d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.0.1 +11.0.2 diff --git a/docker-compose.yml b/docker-compose.yml index eb971121..4384dc24 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.0.1 + image: sameersbn/gitlab:11.0.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index b5565f12..d5164025 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:11.0.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.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:11.0.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.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:11.0.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.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:11.0.1 +docker pull sameersbn/gitlab:11.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:11.0.1 +sameersbn/gitlab:11.0.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index a724fd7c..68e2f0e2 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.0.1 + image: sameersbn/gitlab:11.0.2 env: - name: TZ value: Asia/Kolkata From 85dce303d848c01561c633dd53506c8fe159948f Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 8 Jul 2018 11:00:12 +0200 Subject: [PATCH 124/508] release 11.0.2 From ac150284a3f91b7dcf76ea4258329012411d7433 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 8 Jul 2018 14:10:27 +0200 Subject: [PATCH 125/508] Update base-image to 16.04.20190706 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 20193d80..9275d161 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM sameersbn/ubuntu:16.04.20180124 +FROM sameersbn/ubuntu:16.04.20190706 LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=11.0.2 \ From 9d1340574bb7b7e66fa628bf07601770d762c2b1 Mon Sep 17 00:00:00 2001 From: Peter Leitzen Date: Tue, 4 Apr 2017 11:14:38 +0200 Subject: [PATCH 126/508] Use Ruby 2.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9275d161..403df8cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM sameersbn/ubuntu:16.04.20190706 LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=11.0.2 \ - RUBY_VERSION=2.3 \ + RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=7.1.4 \ GITLAB_WORKHORSE_VERSION=4.3.1 \ From 0237f31f3db934cf8f242729003530e88ad089a7 Mon Sep 17 00:00:00 2001 From: Pieter Lange Date: Fri, 6 Jul 2018 10:37:43 +0200 Subject: [PATCH 127/508] Update gitlab to 11.0.3 --- 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 93c275aa..e23b1016 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. +**11.0.3** +- gitlab: upgrade CE to v11.0.3 + **11.0.2** - gitlab: upgrade CE to v11.0.2 diff --git a/Dockerfile b/Dockerfile index 403df8cb..03a1fc49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20190706 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.0.2 \ +ENV GITLAB_VERSION=11.0.3 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=7.1.4 \ diff --git a/README.md b/README.md index fb40be53..7a837601 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:11.0.2 +# sameersbn/gitlab:11.0.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.0.2 +docker pull sameersbn/gitlab:11.0.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.0.2 + sameersbn/gitlab:11.0.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.0.2 + sameersbn/gitlab:11.0.3 ``` ## Database @@ -263,7 +263,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:11.0.2 + sameersbn/gitlab:11.0.3 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.0.2 + sameersbn/gitlab:11.0.3 ``` 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: @@ -361,7 +361,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:11.0.2 + sameersbn/gitlab:11.0.3 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.0.2 + sameersbn/gitlab:11.0.3 ``` 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: @@ -431,7 +431,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:11.0.2 + sameersbn/gitlab:11.0.3 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.0.2 + sameersbn/gitlab:11.0.3 ``` ### Mail @@ -471,7 +471,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:11.0.2 + sameersbn/gitlab:11.0.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.0.2 + sameersbn/gitlab:11.0.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.0.2 + sameersbn/gitlab:11.0.3 ``` 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. @@ -584,7 +584,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:11.0.2 + sameersbn/gitlab:11.0.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.0.2 + sameersbn/gitlab:11.0.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.0.2 + sameersbn/gitlab:11.0.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.0.2 + sameersbn/gitlab:11.0.3 ``` 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:11.0.2 app:sanitize + sameersbn/gitlab:11.0.3 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.0.3 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.2 app:rake db:setup + sameersbn/gitlab:11.0.3 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:11.0.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.0.3 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.0.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.0.2 app:rake gitlab:env:info + sameersbn/gitlab:11.0.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.0.3 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.0.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.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. +> Upgrading to `sameersbn/gitlab:11.0.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.0.2 +docker pull sameersbn/gitlab:11.0.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.0.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.0.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index a1ea332d..e7e9473a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.0.2 +11.0.3 diff --git a/docker-compose.yml b/docker-compose.yml index 4384dc24..d180dfef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.0.2 + image: sameersbn/gitlab:11.0.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index d5164025..33177dd8 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:11.0.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.0.3 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:11.0.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.0.3 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:11.0.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.0.3 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:11.0.2 +docker pull sameersbn/gitlab:11.0.3 ``` - **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:11.0.2 +sameersbn/gitlab:11.0.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 68e2f0e2..14a0b390 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.0.2 + image: sameersbn/gitlab:11.0.3 env: - name: TZ value: Asia/Kolkata From c7cd6de5ad1c39289c2ff2d79b2009ff9e9a2622 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 9 Jul 2018 07:04:25 +0200 Subject: [PATCH 128/508] release 11.0.3 From 6c782137485c6558fcea90d26e03730e3aa7c457 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Mon, 9 Jul 2018 12:34:31 +0530 Subject: [PATCH 129/508] fix base image tag the base image was not tagged properly. fixed now --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 03a1fc49..4ece3f4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM sameersbn/ubuntu:16.04.20190706 +FROM sameersbn/ubuntu:16.04.20180706 LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=11.0.3 \ From ed0e712169fabe4cb085c6684bb6f9edf6b08caa Mon Sep 17 00:00:00 2001 From: Peter Leitzen Date: Mon, 9 Jul 2018 09:48:39 +0200 Subject: [PATCH 130/508] Mention Ruby update to 2.4 in Changelog [ci skip] --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index e23b1016..3cc8b9da 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **11.0.3** - gitlab: upgrade CE to v11.0.3 +- ruby: update to 2.4 **11.0.2** - gitlab: upgrade CE to v11.0.2 From 416d49863c68f11777fffe018d7581af75b11b77 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 17 Jul 2018 08:33:39 +0530 Subject: [PATCH 131/508] pin redis image to series 3.x --- README.md | 6 +++--- docker-compose.yml | 2 +- docs/docker-compose-registry.yml | 2 +- docs/s3_compatible_storage.md | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7a837601..326ceac4 100644 --- a/README.md +++ b/README.md @@ -181,7 +181,7 @@ Step 2. Launch a redis container ```bash docker run --name gitlab-redis -d \ --volume /srv/docker/gitlab/redis:/var/lib/redis \ - sameersbn/redis:latest + sameersbn/redis:3.0.6 ``` Step 3. Launch the gitlab container @@ -443,7 +443,7 @@ To illustrate linking with a redis container, we will use the [sameersbn/redis]( First, lets pull the redis image from the docker index. ```bash -docker pull sameersbn/redis:latest +docker pull sameersbn/redis:3.0.6 ``` Lets start the redis container @@ -451,7 +451,7 @@ Lets start the redis container ```bash docker run --name gitlab-redis -d \ --volume /srv/docker/gitlab/redis:/var/lib/redis \ - sameersbn/redis:latest + sameersbn/redis:3.0.6 ``` We are now ready to start the GitLab application. diff --git a/docker-compose.yml b/docker-compose.yml index d180dfef..3dc3836e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: redis: restart: always - image: sameersbn/redis:latest + image: sameersbn/redis:3.0.6 command: - --loglevel warning volumes: diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index ba87eea6..676dc10e 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -3,7 +3,7 @@ version: '2' services: redis: restart: always - image: sameersbn/redis:latest + image: sameersbn/redis:3.0.6 command: - --loglevel warning volumes: diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md index 3d627927..4acf714c 100644 --- a/docs/s3_compatible_storage.md +++ b/docs/s3_compatible_storage.md @@ -72,7 +72,7 @@ version: '2' services: redis: restart: always - image: sameersbn/redis:latest + image: sameersbn/redis:3.0.6 command: - --loglevel warning volumes: From 7fe507a0f399ad2242dea15aebaf01052d17fc5b Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 17 Jul 2018 08:34:23 +0530 Subject: [PATCH 132/508] ping mysql release to 5.7 series --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 326ceac4..5093926f 100644 --- a/README.md +++ b/README.md @@ -330,7 +330,7 @@ Assuming that your mysql data is available at `/srv/docker/gitlab/mysql` ```bash docker run --name gitlab-mysql -d \ --volume /srv/docker/gitlab/mysql:/var/lib/mysql \ - sameersbn/mysql:latest + sameersbn/mysql:5.7.22-1 ``` This will start a mysql container with your existing mysql data. Now login to the mysql container and create a user for the existing `gitlabhq_production` database. @@ -375,7 +375,7 @@ To illustrate linking with a mysql container, we will use the [sameersbn/mysql]( First, lets pull the mysql image from the docker index. ```bash -docker pull sameersbn/mysql:latest +docker pull sameersbn/mysql:5.7.22-1 ``` For data persistence lets create a store for the mysql and start the container. @@ -394,7 +394,7 @@ docker run --name gitlab-mysql -d \ --env 'DB_NAME=gitlabhq_production' \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --volume /srv/docker/gitlab/mysql:/var/lib/mysql \ - sameersbn/mysql:latest + sameersbn/mysql:5.7.22-1 ``` The above command will create a database named `gitlabhq_production` and also create a user named `gitlab` with the password `password` with full/remote access to the `gitlabhq_production` database. From a28268c1194147ea3b7e232c644937d2a0eef9a0 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 17 Jul 2018 08:34:41 +0530 Subject: [PATCH 133/508] bump to postgresql 10 --- README.md | 6 +++--- docker-compose.yml | 2 +- docs/s3_compatible_storage.md | 2 +- kubernetes/postgresql-rc.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 5093926f..94dd7f03 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,7 @@ docker run --name gitlab-postgresql -d \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --env 'DB_EXTENSION=pg_trgm' \ --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \ - sameersbn/postgresql:9.6-2 + sameersbn/postgresql:10 ``` Step 2. Launch a redis container @@ -277,7 +277,7 @@ To illustrate linking with a postgresql container, we will use the [sameersbn/po First, lets pull the postgresql image from the docker index. ```bash -docker pull sameersbn/postgresql:9.6-2 +docker pull sameersbn/postgresql:10 ``` For data persistence lets create a store for the postgresql and start the container. @@ -297,7 +297,7 @@ docker run --name gitlab-postgresql -d \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --env 'DB_EXTENSION=pg_trgm' \ --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \ - sameersbn/postgresql:9.6-2 + sameersbn/postgresql:10 ``` The above command will create a database named `gitlabhq_production` and also create a user named `gitlab` with the password `password` with access to the `gitlabhq_production` database. diff --git a/docker-compose.yml b/docker-compose.yml index 3dc3836e..67c4993a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: postgresql: restart: always - image: sameersbn/postgresql:9.6-2 + image: sameersbn/postgresql:10 volumes: - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z environment: diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md index 4acf714c..665b28a7 100644 --- a/docs/s3_compatible_storage.md +++ b/docs/s3_compatible_storage.md @@ -80,7 +80,7 @@ services: postgresql: restart: always - image: sameersbn/postgresql:9.6-2 + image: sameersbn/postgresql:10 volumes: - /tmp/docker/gitlab/postgresql:/var/lib/postgresql:Z environment: diff --git a/kubernetes/postgresql-rc.yml b/kubernetes/postgresql-rc.yml index 8e5db281..d5ce45aa 100644 --- a/kubernetes/postgresql-rc.yml +++ b/kubernetes/postgresql-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: postgresql - image: sameersbn/postgresql:9.6-2 + image: sameersbn/postgresql:10 env: - name: DB_USER value: gitlab From 61131dfa95f817416b46f4489af125901016c716 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 18 Jul 2018 09:23:22 +0200 Subject: [PATCH 134/508] Upgrade GitLab CE to 11.0.4 --- 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 3cc8b9da..eaed3d61 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. +**11.0.4** +- gitlab: upgrade CE to v11.0.4 + **11.0.3** - gitlab: upgrade CE to v11.0.3 - ruby: update to 2.4 diff --git a/Dockerfile b/Dockerfile index 4ece3f4c..1fd2eef4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180706 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.0.3 \ +ENV GITLAB_VERSION=11.0.4 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=7.1.4 \ diff --git a/README.md b/README.md index 7a837601..df306e2f 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:11.0.3 +# sameersbn/gitlab:11.0.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.0.3 +docker pull sameersbn/gitlab:11.0.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.0.3 + sameersbn/gitlab:11.0.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.0.3 + sameersbn/gitlab:11.0.4 ``` ## Database @@ -263,7 +263,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:11.0.3 + sameersbn/gitlab:11.0.4 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.0.3 + sameersbn/gitlab:11.0.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: @@ -361,7 +361,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:11.0.3 + sameersbn/gitlab:11.0.4 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.0.3 + sameersbn/gitlab:11.0.4 ``` 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: @@ -431,7 +431,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:11.0.3 + sameersbn/gitlab:11.0.4 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.0.3 + sameersbn/gitlab:11.0.4 ``` ### Mail @@ -471,7 +471,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:11.0.3 + sameersbn/gitlab:11.0.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.0.3 + sameersbn/gitlab:11.0.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.0.3 + sameersbn/gitlab:11.0.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. @@ -584,7 +584,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:11.0.3 + sameersbn/gitlab:11.0.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.0.3 + sameersbn/gitlab:11.0.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.0.3 + sameersbn/gitlab:11.0.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.0.3 + sameersbn/gitlab:11.0.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:11.0.3 app:sanitize + sameersbn/gitlab:11.0.4 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.0.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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.3 app:rake db:setup + sameersbn/gitlab:11.0.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:11.0.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.0.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.0.3 app:rake gitlab:env:info + sameersbn/gitlab:11.0.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.0.4 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.0.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.0.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:11.0.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:11.0.3 +docker pull sameersbn/gitlab:11.0.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.0.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.0.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index e7e9473a..210c4b16 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.0.3 +11.0.4 diff --git a/docker-compose.yml b/docker-compose.yml index d180dfef..1c802fa7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.0.3 + image: sameersbn/gitlab:11.0.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 33177dd8..521a2a82 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:11.0.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.0.4 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:11.0.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.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. @@ -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:11.0.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.0.4 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:11.0.3 +docker pull sameersbn/gitlab:11.0.4 ``` - **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:11.0.3 +sameersbn/gitlab:11.0.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 14a0b390..edb6cbc7 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.0.3 + image: sameersbn/gitlab:11.0.4 env: - name: TZ value: Asia/Kolkata From 53879add316598d0f8d4d8cbc2a350ac34b6baa1 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 18 Jul 2018 21:21:01 +0200 Subject: [PATCH 135/508] release 11.0.4 From fea54a7279798f82eea28635dcbacaff8af9b31e Mon Sep 17 00:00:00 2001 From: Tyler Baker Date: Thu, 19 Jul 2018 13:59:40 -0700 Subject: [PATCH 136/508] Ed25519 GPG key import fix This issue was raised in this thread: https://gitlab.com/gitlab-org/gitlab-ce/issues/36845, but only ever fixed in omnibus-gitlab. I was able to reproduce this issue with the v11.0.4 release of docker-gitlab. The fix was to add gnupg2 as runtime dep, and now Ed25519 GPG import fine. Signed-off-by: Tyler Baker --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1fd2eef4..6438e181 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E60 && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y supervisor logrotate locales curl \ nginx openssh-server mysql-client postgresql-client redis-tools \ - git-core ruby${RUBY_VERSION} python2.7 python-docutils nodejs yarn gettext-base \ + git-core gnupg2 ruby${RUBY_VERSION} python2.7 python-docutils nodejs yarn gettext-base \ libmysqlclient20 libpq5 zlib1g libyaml-0-2 libssl1.0.0 \ libgdbm3 libreadline6 libncurses5 libffi6 \ libxml2 libxslt1.1 libcurl3 libicu55 \ From 3dc7d0ef33b390d9e6dc66850a83b7eef1a5a8e9 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 21 Jul 2018 13:21:00 +0200 Subject: [PATCH 137/508] Upgrade GitLab CE to 11.1.0 --- 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 eaed3d61..c4138f69 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. +**11.1.0** +- gitlab: upgrade CE to v11.1.0 + **11.0.4** - gitlab: upgrade CE to v11.0.4 diff --git a/Dockerfile b/Dockerfile index 1fd2eef4..b4f12dee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180706 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.0.4 \ +ENV GITLAB_VERSION=11.1.0 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=7.1.4 \ diff --git a/README.md b/README.md index e0a00ad8..30c5e0ec 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:11.0.4 +# sameersbn/gitlab:11.1.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.0.4 +docker pull sameersbn/gitlab:11.1.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.0.4 + sameersbn/gitlab:11.1.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.0.4 + sameersbn/gitlab:11.1.0 ``` ## Database @@ -263,7 +263,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:11.0.4 + sameersbn/gitlab:11.1.0 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.0.4 + sameersbn/gitlab:11.1.0 ``` 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: @@ -361,7 +361,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:11.0.4 + sameersbn/gitlab:11.1.0 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.0.4 + sameersbn/gitlab:11.1.0 ``` 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: @@ -431,7 +431,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:11.0.4 + sameersbn/gitlab:11.1.0 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.0.4 + sameersbn/gitlab:11.1.0 ``` ### Mail @@ -471,7 +471,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:11.0.4 + sameersbn/gitlab:11.1.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.0.4 + sameersbn/gitlab:11.1.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.0.4 + sameersbn/gitlab:11.1.0 ``` 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. @@ -584,7 +584,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:11.0.4 + sameersbn/gitlab:11.1.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.0.4 + sameersbn/gitlab:11.1.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.0.4 + sameersbn/gitlab:11.1.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.0.4 + sameersbn/gitlab:11.1.0 ``` 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:11.0.4 app:sanitize + sameersbn/gitlab:11.1.0 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.1.0 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.4 app:rake db:setup + sameersbn/gitlab:11.1.0 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:11.0.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.1.0 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.1.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.0.4 app:rake gitlab:env:info + sameersbn/gitlab:11.1.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.1.0 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.0.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.1.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.0.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. +> Upgrading to `sameersbn/gitlab:11.1.0` 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:11.0.4 +docker pull sameersbn/gitlab:11.1.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.0.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.1.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index 210c4b16..68d8f15e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.0.4 +11.1.0 diff --git a/docker-compose.yml b/docker-compose.yml index d529d3cf..2582c712 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.0.4 + image: sameersbn/gitlab:11.1.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 521a2a82..b3b75fd2 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:11.0.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.1.0 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:11.0.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.1.0 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:11.0.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.1.0 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:11.0.4 +docker pull sameersbn/gitlab:11.1.0 ``` - **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:11.0.4 +sameersbn/gitlab:11.1.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index edb6cbc7..8737f757 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.0.4 + image: sameersbn/gitlab:11.1.0 env: - name: TZ value: Asia/Kolkata From b795b71f540f16c951c6a711bc7589a056977950 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 23 Jul 2018 09:06:34 +0200 Subject: [PATCH 138/508] Update gitLab-workhorse to 5.0.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b4f12dee..f876e208 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,9 @@ ENV GITLAB_VERSION=11.1.0 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=7.1.4 \ - GITLAB_WORKHORSE_VERSION=4.3.1 \ GITLAB_PAGES_VERSION=0.9.1 \ GITALY_SERVER_VERSION=0.105.0 \ + GITLAB_WORKHORSE_VERSION=5.0.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From bf19bb599e42a7ec3a292a49ee2a4a0acc5930be Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 23 Jul 2018 09:06:55 +0200 Subject: [PATCH 139/508] Update gitlab-pages to 1.0.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f876e208..6b4616e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,9 @@ ENV GITLAB_VERSION=11.1.0 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=7.1.4 \ - GITLAB_PAGES_VERSION=0.9.1 \ GITALY_SERVER_VERSION=0.105.0 \ GITLAB_WORKHORSE_VERSION=5.0.0 \ + GITLAB_PAGES_VERSION=1.0.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From df34792a56caf364ff420ccdde5e44e49fa7f3d8 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 23 Jul 2018 09:07:10 +0200 Subject: [PATCH 140/508] Update gitaly to 0.111.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6b4616e8..5016dae5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,9 @@ ENV GITLAB_VERSION=11.1.0 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=7.1.4 \ - GITALY_SERVER_VERSION=0.105.0 \ GITLAB_WORKHORSE_VERSION=5.0.0 \ GITLAB_PAGES_VERSION=1.0.0 \ + GITALY_SERVER_VERSION=0.111.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 795852e30e55ad86ceb47a918d59cc26654141c7 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 24 Jul 2018 11:10:53 +0200 Subject: [PATCH 141/508] release 11.1.0 From c445b673c730faf43f8dbcb2a895df175b3e7d62 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 24 Jul 2018 14:28:50 +0200 Subject: [PATCH 142/508] Upgrade GitLab CE to 11.1.1 --- 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 c4138f69..93e60a09 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. +**11.1.1** +- gitlab: upgrade CE to v11.1.1 + **11.1.0** - gitlab: upgrade CE to v11.1.0 diff --git a/Dockerfile b/Dockerfile index c21b926f..a698bc3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM sameersbn/ubuntu:16.04.20180706 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.1.0 \ +ENV GITLAB_VERSION=11.1.1 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=7.1.4 \ diff --git a/README.md b/README.md index 30c5e0ec..80affa3b 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:11.1.0 +# sameersbn/gitlab:11.1.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.1.0 +docker pull sameersbn/gitlab:11.1.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.1.0 + sameersbn/gitlab:11.1.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.1.0 + sameersbn/gitlab:11.1.1 ``` ## Database @@ -263,7 +263,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:11.1.0 + sameersbn/gitlab:11.1.1 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.1.0 + sameersbn/gitlab:11.1.1 ``` 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: @@ -361,7 +361,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:11.1.0 + sameersbn/gitlab:11.1.1 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.1.0 + sameersbn/gitlab:11.1.1 ``` 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: @@ -431,7 +431,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:11.1.0 + sameersbn/gitlab:11.1.1 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.1.0 + sameersbn/gitlab:11.1.1 ``` ### Mail @@ -471,7 +471,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:11.1.0 + sameersbn/gitlab:11.1.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.1.0 + sameersbn/gitlab:11.1.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.1.0 + sameersbn/gitlab:11.1.1 ``` 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. @@ -584,7 +584,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:11.1.0 + sameersbn/gitlab:11.1.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.1.0 + sameersbn/gitlab:11.1.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.1.0 + sameersbn/gitlab:11.1.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.1.0 + sameersbn/gitlab:11.1.1 ``` 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:11.1.0 app:sanitize + sameersbn/gitlab:11.1.1 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.1.1 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.0 app:rake db:setup + sameersbn/gitlab:11.1.1 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:11.1.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.1.1 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.1.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.1.0 app:rake gitlab:env:info + sameersbn/gitlab:11.1.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.1.1 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.1.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.1.0` 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:11.1.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.1.0 +docker pull sameersbn/gitlab:11.1.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.1.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.1.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 68d8f15e..668182d2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.1.0 +11.1.1 diff --git a/docker-compose.yml b/docker-compose.yml index 2582c712..5f707ab9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.1.0 + image: sameersbn/gitlab:11.1.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index b3b75fd2..a9439a9a 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:11.1.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.1.1 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:11.1.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.1.1 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:11.1.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.1.1 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:11.1.0 +docker pull sameersbn/gitlab:11.1.1 ``` - **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:11.1.0 +sameersbn/gitlab:11.1.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 8737f757..8fb87313 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.1.0 + image: sameersbn/gitlab:11.1.1 env: - name: TZ value: Asia/Kolkata From c3d043b4d53960e4dcff7111df43aefeb490104b Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 24 Jul 2018 14:30:30 +0200 Subject: [PATCH 143/508] Update gitaly to 0.111.2 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a698bc3c..a0643ea9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ENV GITLAB_VERSION=11.1.1 \ GITLAB_SHELL_VERSION=7.1.4 \ GITLAB_WORKHORSE_VERSION=5.0.0 \ GITLAB_PAGES_VERSION=1.0.0 \ - GITALY_SERVER_VERSION=0.111.1 \ + GITALY_SERVER_VERSION=0.111.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 46e45c92da958ed5562b1bd9ee101ecbe90a0b79 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Fri, 27 Jul 2018 11:07:56 +0530 Subject: [PATCH 144/508] baseimage: switch to official ubuntu:xenial-20180705 image --- Dockerfile | 15 +++++++++------ assets/build/install.sh | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index c21b926f..dfcba2bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM sameersbn/ubuntu:16.04.20180706 +FROM ubuntu:xenial-20180705 + LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=11.1.0 \ @@ -24,7 +25,10 @@ ENV GITLAB_INSTALL_DIR="${GITLAB_HOME}/gitlab" \ GITLAB_BUILD_DIR="${GITLAB_CACHE_DIR}/build" \ GITLAB_RUNTIME_DIR="${GITLAB_CACHE_DIR}/runtime" -RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \ +RUN apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ + wget ca-certificates apt-transport-https \ + && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \ && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu xenial main" >> /etc/apt/sources.list \ && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 80F70E11F0F0D5F10CB20E62F5DA5F09C3173AA6 \ && echo "deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu xenial main" >> /etc/apt/sources.list \ @@ -37,14 +41,13 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E60 && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo 'deb https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \ && apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y supervisor logrotate locales curl \ + && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ + sudo supervisor logrotate locales curl \ nginx openssh-server mysql-client postgresql-client redis-tools \ git-core gnupg2 ruby${RUBY_VERSION} python2.7 python-docutils nodejs yarn gettext-base \ libmysqlclient20 libpq5 zlib1g libyaml-0-2 libssl1.0.0 \ libgdbm3 libreadline6 libncurses5 libffi6 \ - libxml2 libxslt1.1 libcurl3 libicu55 \ - libre2-dev \ - tzdata \ + libxml2 libxslt1.1 libcurl3 libicu55 libre2-dev tzdata \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \ diff --git a/assets/build/install.sh b/assets/build/install.sh index 6b4b9c2d..1b944700 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -27,7 +27,7 @@ exec_as_git() { # install build dependencies for gem installation apt-get update -DEBIAN_FRONTEND=noninteractive apt-get install -y ${BUILD_DEPENDENCIES} +DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y ${BUILD_DEPENDENCIES} # PaX-mark ruby # Applying the mark late here does make the build usable on PaX kernels, but From 96c3e9e9836de5ece3efaf1a2d24cb66756a75ff Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Fri, 27 Jul 2018 16:47:09 +0530 Subject: [PATCH 145/508] clean up the $HOME/.cache directory after installation Yarn stores every package in a global cache in your user directory on the file system. This ends up to be around ~400M of extra utilized by the image and has no benefits whatsoever. Additionally `go` populates a build cache with will also be cleared when the ~/.cache directory is purged /cc @solidnerd --- assets/build/install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/build/install.sh b/assets/build/install.sh index 6b4b9c2d..2c91560d 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -386,3 +386,6 @@ EOF # purge build dependencies and cleanup apt DEBIAN_FRONTEND=noninteractive apt-get purge -y --auto-remove ${BUILD_DEPENDENCIES} rm -rf /var/lib/apt/lists/* + +# clean up caches +exec_as_git rm -rf ${GITLAB_HOME}/.cache From a489a7612e1a8cba3acd02da77523a724f794994 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 28 Jul 2018 10:04:00 +0200 Subject: [PATCH 146/508] release 11.1.1 From b20f80e214485f0de6f31ef882efb505ae1a307d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 28 Jul 2018 10:05:41 +0200 Subject: [PATCH 147/508] Upgrade GitLab CE to 11.1.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 93e60a09..f5563714 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. +**11.1.2** +- gitlab: upgrade CE to v11.1.2 + **11.1.1** - gitlab: upgrade CE to v11.1.1 diff --git a/Dockerfile b/Dockerfile index b771f990..1f0d2a3f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180705 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.1.1 \ +ENV GITLAB_VERSION=11.1.2 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=7.1.4 \ diff --git a/README.md b/README.md index 80affa3b..607dff5e 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:11.1.1 +# sameersbn/gitlab:11.1.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.1.1 +docker pull sameersbn/gitlab:11.1.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.1.1 + sameersbn/gitlab:11.1.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.1.1 + sameersbn/gitlab:11.1.2 ``` ## Database @@ -263,7 +263,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:11.1.1 + sameersbn/gitlab:11.1.2 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.1.1 + sameersbn/gitlab:11.1.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: @@ -361,7 +361,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:11.1.1 + sameersbn/gitlab:11.1.2 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.1.1 + sameersbn/gitlab:11.1.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: @@ -431,7 +431,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:11.1.1 + sameersbn/gitlab:11.1.2 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.1.1 + sameersbn/gitlab:11.1.2 ``` ### Mail @@ -471,7 +471,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:11.1.1 + sameersbn/gitlab:11.1.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.1.1 + sameersbn/gitlab:11.1.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.1.1 + sameersbn/gitlab:11.1.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. @@ -584,7 +584,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:11.1.1 + sameersbn/gitlab:11.1.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.1.1 + sameersbn/gitlab:11.1.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.1.1 + sameersbn/gitlab:11.1.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.1.1 + sameersbn/gitlab:11.1.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:11.1.1 app:sanitize + sameersbn/gitlab:11.1.2 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.1.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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.1 app:rake db:setup + sameersbn/gitlab:11.1.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:11.1.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.1.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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.1.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.1.1 app:rake gitlab:env:info + sameersbn/gitlab:11.1.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.1.2 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.1.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.1.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:11.1.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:11.1.1 +docker pull sameersbn/gitlab:11.1.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.1.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.1.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index 668182d2..e9ac13b0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.1.1 +11.1.2 diff --git a/docker-compose.yml b/docker-compose.yml index 5f707ab9..6a285949 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.1.1 + image: sameersbn/gitlab:11.1.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index a9439a9a..58b1842e 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:11.1.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.1.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:11.1.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.1.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:11.1.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.1.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:11.1.1 +docker pull sameersbn/gitlab:11.1.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:11.1.1 +sameersbn/gitlab:11.1.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 8fb87313..276449b9 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.1.1 + image: sameersbn/gitlab:11.1.2 env: - name: TZ value: Asia/Kolkata From d9491ff2f2b71d391b75fb43c154aa8f83040f6a Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 28 Jul 2018 10:36:53 +0200 Subject: [PATCH 148/508] release 11.1.2 From d4d348ef80c5df843c71e90d7befa5c60f8e8e22 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 28 Jul 2018 10:38:39 +0200 Subject: [PATCH 149/508] Upgrade GitLab CE to 11.1.3 --- 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 f5563714..747d8840 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. +**11.1.3** +- gitlab: upgrade CE to v11.1.3 + **11.1.2** - gitlab: upgrade CE to v11.1.2 diff --git a/Dockerfile b/Dockerfile index 1f0d2a3f..1686d65e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180705 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.1.2 \ +ENV GITLAB_VERSION=11.1.3 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=7.1.4 \ diff --git a/README.md b/README.md index 607dff5e..fdaed3c8 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:11.1.2 +# sameersbn/gitlab:11.1.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.1.2 +docker pull sameersbn/gitlab:11.1.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.1.2 + sameersbn/gitlab:11.1.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.1.2 + sameersbn/gitlab:11.1.3 ``` ## Database @@ -263,7 +263,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:11.1.2 + sameersbn/gitlab:11.1.3 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.1.2 + sameersbn/gitlab:11.1.3 ``` 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: @@ -361,7 +361,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:11.1.2 + sameersbn/gitlab:11.1.3 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.1.2 + sameersbn/gitlab:11.1.3 ``` 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: @@ -431,7 +431,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:11.1.2 + sameersbn/gitlab:11.1.3 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.1.2 + sameersbn/gitlab:11.1.3 ``` ### Mail @@ -471,7 +471,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:11.1.2 + sameersbn/gitlab:11.1.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.1.2 + sameersbn/gitlab:11.1.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.1.2 + sameersbn/gitlab:11.1.3 ``` 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. @@ -584,7 +584,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:11.1.2 + sameersbn/gitlab:11.1.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.1.2 + sameersbn/gitlab:11.1.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.1.2 + sameersbn/gitlab:11.1.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.1.2 + sameersbn/gitlab:11.1.3 ``` 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:11.1.2 app:sanitize + sameersbn/gitlab:11.1.3 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.1.3 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.2 app:rake db:setup + sameersbn/gitlab:11.1.3 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:11.1.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.1.3 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.1.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.1.2 app:rake gitlab:env:info + sameersbn/gitlab:11.1.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.1.3 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.1.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.1.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. +> Upgrading to `sameersbn/gitlab:11.1.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.1.2 +docker pull sameersbn/gitlab:11.1.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.1.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.1.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index e9ac13b0..427d8b7f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.1.2 +11.1.3 diff --git a/docker-compose.yml b/docker-compose.yml index 6a285949..d8511c8f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.1.2 + image: sameersbn/gitlab:11.1.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 58b1842e..ab8058d3 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:11.1.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.1.3 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:11.1.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.1.3 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:11.1.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.1.3 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:11.1.2 +docker pull sameersbn/gitlab:11.1.3 ``` - **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:11.1.2 +sameersbn/gitlab:11.1.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 276449b9..206c1b6e 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.1.2 + image: sameersbn/gitlab:11.1.3 env: - name: TZ value: Asia/Kolkata From e9caf8e3a1a76cb44b583686d78c56fc8c874f26 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Fri, 27 Jul 2018 17:37:14 +0530 Subject: [PATCH 150/508] redis: upgrade to sameersbn/redis:4.0.9-1 in samples closes #1666 --- README.md | 6 +++--- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.yml | 2 +- docs/docker-compose-registry.yml | 2 +- docs/s3_compatible_storage.md | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 607dff5e..576ff842 100644 --- a/README.md +++ b/README.md @@ -181,7 +181,7 @@ Step 2. Launch a redis container ```bash docker run --name gitlab-redis -d \ --volume /srv/docker/gitlab/redis:/var/lib/redis \ - sameersbn/redis:3.0.6 + sameersbn/redis:4.0.9-1 ``` Step 3. Launch the gitlab container @@ -443,7 +443,7 @@ To illustrate linking with a redis container, we will use the [sameersbn/redis]( First, lets pull the redis image from the docker index. ```bash -docker pull sameersbn/redis:3.0.6 +docker pull sameersbn/redis:4.0.9-1 ``` Lets start the redis container @@ -451,7 +451,7 @@ Lets start the redis container ```bash docker run --name gitlab-redis -d \ --volume /srv/docker/gitlab/redis:/var/lib/redis \ - sameersbn/redis:3.0.6 + sameersbn/redis:4.0.9-1 ``` We are now ready to start the GitLab application. diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 30d52f90..0d20c4cb 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.4' services: redis: restart: always - image: sameersbn/redis:latest + image: sameersbn/redis:4.0.9-1 command: - --loglevel warning volumes: diff --git a/docker-compose.yml b/docker-compose.yml index 6a285949..53dd1b10 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: redis: restart: always - image: sameersbn/redis:3.0.6 + image: sameersbn/redis:4.0.9-1 command: - --loglevel warning volumes: diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 676dc10e..1a8ba4b6 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -3,7 +3,7 @@ version: '2' services: redis: restart: always - image: sameersbn/redis:3.0.6 + image: sameersbn/redis:4.0.9-1 command: - --loglevel warning volumes: diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md index 665b28a7..adb4126f 100644 --- a/docs/s3_compatible_storage.md +++ b/docs/s3_compatible_storage.md @@ -72,7 +72,7 @@ version: '2' services: redis: restart: always - image: sameersbn/redis:3.0.6 + image: sameersbn/redis:4.0.9-1 command: - --loglevel warning volumes: From 2cf172e2a6d9c6ef38d2c7119463efb676440419 Mon Sep 17 00:00:00 2001 From: Niclas Mietz Date: Sun, 29 Jul 2018 07:50:44 +0200 Subject: [PATCH 151/508] Update Changelog.md --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index 747d8840..a0bfe759 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **11.1.3** - gitlab: upgrade CE to v11.1.3 +- Upgrade redis to 4.X **11.1.2** - gitlab: upgrade CE to v11.1.2 From 1e5bc66fec1c431624d318fd2e62f6a9d8188b07 Mon Sep 17 00:00:00 2001 From: Niclas Mietz Date: Sun, 29 Jul 2018 07:51:09 +0200 Subject: [PATCH 152/508] Update Changelog.md --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index a0bfe759..b110c093 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,7 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **11.1.3** - gitlab: upgrade CE to v11.1.3 -- Upgrade redis to 4.X +- Upgrade redis to 4.0.9-1 **11.1.2** - gitlab: upgrade CE to v11.1.2 From 79eaa5879e5c380e9bc348d24bf4c7c00d41c70d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 29 Jul 2018 07:52:36 +0200 Subject: [PATCH 153/508] release 11.1.3 From fb2c9fe336cbf7ff2c8a7612e68106246820c928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20-nexus-=20Mlyn=C3=A1=C5=99?= Date: Sun, 29 Jul 2018 19:28:51 +0200 Subject: [PATCH 154/508] Added unzip to system. It's needed for pages:deploy task --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1686d65e..ed8f74e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,7 @@ RUN apt-get update \ git-core gnupg2 ruby${RUBY_VERSION} python2.7 python-docutils nodejs yarn gettext-base \ libmysqlclient20 libpq5 zlib1g libyaml-0-2 libssl1.0.0 \ libgdbm3 libreadline6 libncurses5 libffi6 \ - libxml2 libxslt1.1 libcurl3 libicu55 libre2-dev tzdata \ + libxml2 libxslt1.1 libcurl3 libicu55 libre2-dev tzdata unzip \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \ From 7759ff01b4666e8f09514e1137ae08b9e472db10 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 31 Jul 2018 18:25:38 +0200 Subject: [PATCH 155/508] Upgrade GitLab CE to 11.1.4 --- 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 b110c093..d47007e6 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. +**11.1.4** +- gitlab: upgrade CE to v11.1.4 + **11.1.3** - gitlab: upgrade CE to v11.1.3 - Upgrade redis to 4.0.9-1 diff --git a/Dockerfile b/Dockerfile index 1686d65e..4fc4f3db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180705 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.1.3 \ +ENV GITLAB_VERSION=11.1.4 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=7.1.4 \ diff --git a/README.md b/README.md index 000fb013..a6ec43b4 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:11.1.3 +# sameersbn/gitlab:11.1.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.1.3 +docker pull sameersbn/gitlab:11.1.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.1.3 + sameersbn/gitlab:11.1.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.1.3 + sameersbn/gitlab:11.1.4 ``` ## Database @@ -263,7 +263,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:11.1.3 + sameersbn/gitlab:11.1.4 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.1.3 + sameersbn/gitlab:11.1.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: @@ -361,7 +361,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:11.1.3 + sameersbn/gitlab:11.1.4 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.1.3 + sameersbn/gitlab:11.1.4 ``` 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: @@ -431,7 +431,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:11.1.3 + sameersbn/gitlab:11.1.4 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.1.3 + sameersbn/gitlab:11.1.4 ``` ### Mail @@ -471,7 +471,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:11.1.3 + sameersbn/gitlab:11.1.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.1.3 + sameersbn/gitlab:11.1.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.1.3 + sameersbn/gitlab:11.1.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. @@ -584,7 +584,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:11.1.3 + sameersbn/gitlab:11.1.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.1.3 + sameersbn/gitlab:11.1.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.1.3 + sameersbn/gitlab:11.1.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.1.3 + sameersbn/gitlab:11.1.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:11.1.3 app:sanitize + sameersbn/gitlab:11.1.4 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.1.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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.3 app:rake db:setup + sameersbn/gitlab:11.1.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:11.1.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.1.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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.1.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.1.3 app:rake gitlab:env:info + sameersbn/gitlab:11.1.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.1.4 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.1.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.1.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:11.1.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:11.1.3 +docker pull sameersbn/gitlab:11.1.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.1.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.1.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index 427d8b7f..342b3b3b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.1.3 +11.1.4 diff --git a/docker-compose.yml b/docker-compose.yml index 3ceb7d0e..7e770a45 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.1.3 + image: sameersbn/gitlab:11.1.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ab8058d3..0fc3fa47 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:11.1.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.1.4 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:11.1.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.1.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. @@ -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:11.1.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.1.4 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:11.1.3 +docker pull sameersbn/gitlab:11.1.4 ``` - **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:11.1.3 +sameersbn/gitlab:11.1.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 206c1b6e..3f7ce225 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.1.3 + image: sameersbn/gitlab:11.1.4 env: - name: TZ value: Asia/Kolkata From 278443069f8c75f77ec66fa801d5c0acd0df65c5 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 31 Jul 2018 21:34:32 +0530 Subject: [PATCH 156/508] build: clean up unused artifacts leftover from the build stage --- assets/build/install.sh | 44 +++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index c1c42a33..b604f370 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -62,11 +62,15 @@ GITLAB_SHELL_VERSION=${GITLAB_SHELL_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_ GITLAB_WORKHORSE_VERSION=${GITLAB_WORKHOUSE_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_WORKHORSE_VERSION)} GITLAB_PAGES_VERSION=${GITLAB_PAGES_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_PAGES_VERSION)} -#download golang +# download golang echo "Downloading Go ${GOLANG_VERSION}..." wget -cnv https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz -P ${GITLAB_BUILD_DIR}/ tar -xf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz -C /tmp/ +# setup go toolchain path +export GOROOT=/tmp/go +export PATH=${GOROOT}/bin:$PATH + # install gitlab-shell echo "Downloading gitlab-shell v.${GITLAB_SHELL_VERSION}..." mkdir -p ${GITLAB_SHELL_INSTALL_DIR} @@ -76,47 +80,53 @@ rm -rf ${GITLAB_BUILD_DIR}/gitlab-shell-${GITLAB_SHELL_VERSION}.tar.gz chown -R ${GITLAB_USER}: ${GITLAB_SHELL_INSTALL_DIR} cd ${GITLAB_SHELL_INSTALL_DIR} -exec_as_git cp -a ${GITLAB_SHELL_INSTALL_DIR}/config.yml.example ${GITLAB_SHELL_INSTALL_DIR}/config.yml +exec_as_git cp -a config.yml.example config.yml if [[ -x ./bin/compile ]]; then echo "Compiling gitlab-shell golang executables..." - exec_as_git PATH=/tmp/go/bin:$PATH GOROOT=/tmp/go ./bin/compile + ./bin/compile + rm -rf go_build fi -exec_as_git ./bin/install +./bin/install # remove unused repositories directory created by gitlab-shell install -exec_as_git rm -rf ${GITLAB_HOME}/repositories +rm -rf ${GITLAB_HOME}/repositories # download gitlab-workhorse echo "Cloning gitlab-workhorse v.${GITLAB_WORKHORSE_VERSION}..." exec_as_git git clone -q -b v${GITLAB_WORKHORSE_VERSION} --depth 1 ${GITLAB_WORKHORSE_URL} ${GITLAB_WORKHORSE_INSTALL_DIR} chown -R ${GITLAB_USER}: ${GITLAB_WORKHORSE_INSTALL_DIR} -#install gitlab-workhorse -cd ${GITLAB_WORKHORSE_INSTALL_DIR} -PATH=/tmp/go/bin:$PATH GOROOT=/tmp/go make install +# install gitlab-workhorse +make -C ${GITLAB_WORKHORSE_INSTALL_DIR} install + +# we don't need to keep the sources around +rm -rf ${GITLAB_WORKHORSE_INSTALL_DIR} #download pages echo "Downloading gitlab-pages v.${GITLAB_PAGES_VERSION}..." exec_as_git git clone -q -b v${GITLAB_PAGES_VERSION} --depth 1 ${GITLAB_PAGES_URL} ${GITLAB_PAGES_INSTALL_DIR} chown -R ${GITLAB_USER}: ${GITLAB_PAGES_INSTALL_DIR} -#install gitlab-pages -cd ${GITLAB_PAGES_INSTALL_DIR} -PATH=/tmp/go/bin:$PATH GOROOT=/tmp/go make -cp -f gitlab-pages /usr/local/bin/ +# install gitlab-pages +make -C ${GITLAB_PAGES_INSTALL_DIR} +cp -f ${GITLAB_PAGES_INSTALL_DIR}/gitlab-pages /usr/local/bin/ + +# we don't need to keep the sources around +rm -rf ${GITLAB_PAGES_INSTALL_DIR} # download gitaly echo "Downloading gitaly v.${GITALY_SERVER_VERSION}..." exec_as_git git clone -q -b v${GITALY_SERVER_VERSION} --depth 1 ${GITLAB_GITALY_URL} ${GITLAB_GITALY_INSTALL_DIR} +cp ${GITLAB_GITALY_INSTALL_DIR}/config.toml.example ${GITLAB_GITALY_INSTALL_DIR}/config.toml chown -R ${GITLAB_USER}: ${GITLAB_GITALY_INSTALL_DIR} -# copy default config for gitaly -exec_as_git cp ${GITLAB_GITALY_INSTALL_DIR}/config.toml.example ${GITLAB_GITALY_INSTALL_DIR}/config.toml # install gitaly cd ${GITLAB_GITALY_INSTALL_DIR} -ln -sf /tmp/go /usr/local/go -PATH=/tmp/go/bin:$PATH make install && make clean -rm -f /usr/local/go +make install + +# cleanup unwanted stuff +rm -rf gitaly gitaly-ssh ruby/vendor/bundle/ruby/**/cache +make clean # remove go rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz /tmp/go From bf5c5d3a2398ef23124902c1c646f41defcd8e4d Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 1 Aug 2018 08:17:44 +0530 Subject: [PATCH 157/508] install: update gitlab-shell tarball url --- assets/build/install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index b604f370..4732870a 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -2,7 +2,7 @@ set -e GITLAB_CLONE_URL=https://gitlab.com/gitlab-org/gitlab-ce.git -GITLAB_SHELL_URL=https://gitlab.com/gitlab-org/gitlab-shell/repository/archive.tar.gz +GITLAB_SHELL_URL=https://gitlab.com/gitlab-org/gitlab-shell/-/archive/v${GITLAB_SHELL_VERSION}/gitlab-shell-v${GITLAB_SHELL_VERSION}.tar.bz2 GITLAB_WORKHORSE_URL=https://gitlab.com/gitlab-org/gitlab-workhorse.git GITLAB_PAGES_URL=https://gitlab.com/gitlab-org/gitlab-pages.git GITLAB_GITALY_URL=https://gitlab.com/gitlab-org/gitaly.git @@ -74,9 +74,9 @@ export PATH=${GOROOT}/bin:$PATH # install gitlab-shell echo "Downloading gitlab-shell v.${GITLAB_SHELL_VERSION}..." mkdir -p ${GITLAB_SHELL_INSTALL_DIR} -wget -cq ${GITLAB_SHELL_URL}?ref=v${GITLAB_SHELL_VERSION} -O ${GITLAB_BUILD_DIR}/gitlab-shell-${GITLAB_SHELL_VERSION}.tar.gz -tar xf ${GITLAB_BUILD_DIR}/gitlab-shell-${GITLAB_SHELL_VERSION}.tar.gz --strip 1 -C ${GITLAB_SHELL_INSTALL_DIR} -rm -rf ${GITLAB_BUILD_DIR}/gitlab-shell-${GITLAB_SHELL_VERSION}.tar.gz +wget -cq ${GITLAB_SHELL_URL} -O ${GITLAB_BUILD_DIR}/gitlab-shell-${GITLAB_SHELL_VERSION}.tar.bz2 +tar xf ${GITLAB_BUILD_DIR}/gitlab-shell-${GITLAB_SHELL_VERSION}.tar.bz2 --strip 1 -C ${GITLAB_SHELL_INSTALL_DIR} +rm -rf ${GITLAB_BUILD_DIR}/gitlab-shell-${GITLAB_SHELL_VERSION}.tar.bz2 chown -R ${GITLAB_USER}: ${GITLAB_SHELL_INSTALL_DIR} cd ${GITLAB_SHELL_INSTALL_DIR} From 3b17df4d95612676d9b766c762b80745509db39d Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 1 Aug 2018 10:52:25 +0530 Subject: [PATCH 158/508] use GOROOT variable whenever possible --- assets/build/install.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index 4732870a..bdd8de15 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -9,6 +9,11 @@ GITLAB_GITALY_URL=https://gitlab.com/gitlab-org/gitaly.git GEM_CACHE_DIR="${GITLAB_BUILD_DIR}/cache" +GOROOT=/tmp/go +PATH=${GOROOT}/bin:$PATH + +export GOROOT PATH + BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \ libc6-dev ruby${RUBY_VERSION}-dev \ libmysqlclient-dev libpq-dev zlib1g-dev libyaml-dev libssl-dev \ @@ -67,10 +72,6 @@ echo "Downloading Go ${GOLANG_VERSION}..." wget -cnv https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz -P ${GITLAB_BUILD_DIR}/ tar -xf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz -C /tmp/ -# setup go toolchain path -export GOROOT=/tmp/go -export PATH=${GOROOT}/bin:$PATH - # install gitlab-shell echo "Downloading gitlab-shell v.${GITLAB_SHELL_VERSION}..." mkdir -p ${GITLAB_SHELL_INSTALL_DIR} @@ -129,7 +130,7 @@ rm -rf gitaly gitaly-ssh ruby/vendor/bundle/ruby/**/cache make clean # remove go -rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz /tmp/go +rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz ${GOROOT} # remove HSTS config from the default headers, we configure it in nginx exec_as_git sed -i "/headers\['Strict-Transport-Security'\]/d" ${GITLAB_INSTALL_DIR}/app/controllers/application_controller.rb From a95766d652dc914e0c0c9c00f3f2bbb599edd9b9 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 1 Aug 2018 10:54:40 +0530 Subject: [PATCH 159/508] install: simplify gitlab-workhorse build steps --- Dockerfile | 1 - assets/build/install.sh | 13 ++++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index ed8f74e9..de718c9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,6 @@ ENV GITLAB_VERSION=11.1.3 \ ENV GITLAB_INSTALL_DIR="${GITLAB_HOME}/gitlab" \ GITLAB_SHELL_INSTALL_DIR="${GITLAB_HOME}/gitlab-shell" \ - GITLAB_WORKHORSE_INSTALL_DIR="${GITLAB_HOME}/gitlab-workhorse" \ GITLAB_PAGES_INSTALL_DIR="${GITLAB_HOME}/gitlab-pages" \ GITLAB_GITALY_INSTALL_DIR="${GITLAB_HOME}/gitaly" \ GITLAB_DATA_DIR="${GITLAB_HOME}/data" \ diff --git a/assets/build/install.sh b/assets/build/install.sh index bdd8de15..f3634d84 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -7,6 +7,8 @@ GITLAB_WORKHORSE_URL=https://gitlab.com/gitlab-org/gitlab-workhorse.git GITLAB_PAGES_URL=https://gitlab.com/gitlab-org/gitlab-pages.git GITLAB_GITALY_URL=https://gitlab.com/gitlab-org/gitaly.git +GITLAB_WORKHORSE_BUILD_DIR=/tmp/gitlab-workhorse + GEM_CACHE_DIR="${GITLAB_BUILD_DIR}/cache" GOROOT=/tmp/go @@ -94,14 +96,11 @@ rm -rf ${GITLAB_HOME}/repositories # download gitlab-workhorse echo "Cloning gitlab-workhorse v.${GITLAB_WORKHORSE_VERSION}..." -exec_as_git git clone -q -b v${GITLAB_WORKHORSE_VERSION} --depth 1 ${GITLAB_WORKHORSE_URL} ${GITLAB_WORKHORSE_INSTALL_DIR} -chown -R ${GITLAB_USER}: ${GITLAB_WORKHORSE_INSTALL_DIR} +git clone -q -b v${GITLAB_WORKHORSE_VERSION} --depth 1 ${GITLAB_WORKHORSE_URL} ${GITLAB_WORKHORSE_BUILD_DIR} +make -C ${GITLAB_WORKHORSE_BUILD_DIR} install -# install gitlab-workhorse -make -C ${GITLAB_WORKHORSE_INSTALL_DIR} install - -# we don't need to keep the sources around -rm -rf ${GITLAB_WORKHORSE_INSTALL_DIR} +# clean up +rm -rf ${GITLAB_WORKHORSE_BUILD_DIR} #download pages echo "Downloading gitlab-pages v.${GITLAB_PAGES_VERSION}..." From 571334f97e3e6b8c61bd51b3d8bd977c493f4523 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 1 Aug 2018 10:55:19 +0530 Subject: [PATCH 160/508] install: simplify gitlab-pages build steps --- Dockerfile | 1 - assets/build/install.sh | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index de718c9d..d8ff435d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,6 @@ ENV GITLAB_VERSION=11.1.3 \ ENV GITLAB_INSTALL_DIR="${GITLAB_HOME}/gitlab" \ GITLAB_SHELL_INSTALL_DIR="${GITLAB_HOME}/gitlab-shell" \ - GITLAB_PAGES_INSTALL_DIR="${GITLAB_HOME}/gitlab-pages" \ GITLAB_GITALY_INSTALL_DIR="${GITLAB_HOME}/gitaly" \ GITLAB_DATA_DIR="${GITLAB_HOME}/data" \ GITLAB_BUILD_DIR="${GITLAB_CACHE_DIR}/build" \ diff --git a/assets/build/install.sh b/assets/build/install.sh index f3634d84..5479ce1e 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -8,6 +8,7 @@ GITLAB_PAGES_URL=https://gitlab.com/gitlab-org/gitlab-pages.git GITLAB_GITALY_URL=https://gitlab.com/gitlab-org/gitaly.git GITLAB_WORKHORSE_BUILD_DIR=/tmp/gitlab-workhorse +GITLAB_PAGES_BUILD_DIR=/tmp/gitlab-pages GEM_CACHE_DIR="${GITLAB_BUILD_DIR}/cache" @@ -102,17 +103,16 @@ make -C ${GITLAB_WORKHORSE_BUILD_DIR} install # clean up rm -rf ${GITLAB_WORKHORSE_BUILD_DIR} -#download pages +# download gitlab-pages echo "Downloading gitlab-pages v.${GITLAB_PAGES_VERSION}..." -exec_as_git git clone -q -b v${GITLAB_PAGES_VERSION} --depth 1 ${GITLAB_PAGES_URL} ${GITLAB_PAGES_INSTALL_DIR} -chown -R ${GITLAB_USER}: ${GITLAB_PAGES_INSTALL_DIR} +git clone -q -b v${GITLAB_PAGES_VERSION} --depth 1 ${GITLAB_PAGES_URL} ${GITLAB_PAGES_BUILD_DIR} # install gitlab-pages -make -C ${GITLAB_PAGES_INSTALL_DIR} -cp -f ${GITLAB_PAGES_INSTALL_DIR}/gitlab-pages /usr/local/bin/ +make -C ${GITLAB_PAGES_BUILD_DIR} +cp -a ${GITLAB_PAGES_BUILD_DIR}/gitlab-pages /usr/local/bin/ -# we don't need to keep the sources around -rm -rf ${GITLAB_PAGES_INSTALL_DIR} +# clean up +rm -rf ${GITLAB_PAGES_BUILD_DIR} # download gitaly echo "Downloading gitaly v.${GITALY_SERVER_VERSION}..." From cdfa19d4f1ff041bee160bc1148082ead023583a Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 1 Aug 2018 10:55:56 +0530 Subject: [PATCH 161/508] install: simplify and optimize gitaly installation directory contents --- assets/build/install.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index 5479ce1e..56a484f3 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -9,6 +9,7 @@ GITLAB_GITALY_URL=https://gitlab.com/gitlab-org/gitaly.git GITLAB_WORKHORSE_BUILD_DIR=/tmp/gitlab-workhorse GITLAB_PAGES_BUILD_DIR=/tmp/gitlab-pages +GITLAB_GITALY_BUILD_DIR=/tmp/gitaly GEM_CACHE_DIR="${GITLAB_BUILD_DIR}/cache" @@ -114,19 +115,20 @@ cp -a ${GITLAB_PAGES_BUILD_DIR}/gitlab-pages /usr/local/bin/ # clean up rm -rf ${GITLAB_PAGES_BUILD_DIR} -# download gitaly +# download and build gitaly echo "Downloading gitaly v.${GITALY_SERVER_VERSION}..." -exec_as_git git clone -q -b v${GITALY_SERVER_VERSION} --depth 1 ${GITLAB_GITALY_URL} ${GITLAB_GITALY_INSTALL_DIR} -cp ${GITLAB_GITALY_INSTALL_DIR}/config.toml.example ${GITLAB_GITALY_INSTALL_DIR}/config.toml -chown -R ${GITLAB_USER}: ${GITLAB_GITALY_INSTALL_DIR} +git clone -q -b v${GITALY_SERVER_VERSION} --depth 1 ${GITLAB_GITALY_URL} ${GITLAB_GITALY_BUILD_DIR} # install gitaly -cd ${GITLAB_GITALY_INSTALL_DIR} -make install +make -C ${GITLAB_GITALY_BUILD_DIR} install +mkdir -p ${GITLAB_GITALY_INSTALL_DIR} +cp -a ${GITLAB_GITALY_BUILD_DIR}/ruby ${GITLAB_GITALY_INSTALL_DIR}/ +cp -a ${GITLAB_GITALY_BUILD_DIR}/config.toml.example ${GITLAB_GITALY_INSTALL_DIR}/config.toml +rm -rf ${GITLAB_GITALY_INSTALL_DIR}/ruby/vendor/bundle/ruby/**/cache +chown -R ${GITLAB_USER}: ${GITLAB_GITALY_INSTALL_DIR} -# cleanup unwanted stuff -rm -rf gitaly gitaly-ssh ruby/vendor/bundle/ruby/**/cache -make clean +# clean up +rm -rf ${GITLAB_GITALY_BUILD_DIR} # remove go rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz ${GOROOT} From 70e4a0580fd24d384a726fc8e631b8b0dc412190 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 1 Aug 2018 22:16:38 +0200 Subject: [PATCH 162/508] release 11.1.4 From 4b2ff6da0b7f2639504e0eb81952750ca63f605c Mon Sep 17 00:00:00 2001 From: Filipe Roque Date: Thu, 9 Aug 2018 11:35:54 +0100 Subject: [PATCH 163/508] correction for parsing dates from backups files, due to format change in version 9.2 see: https://docs.gitlab.com/ce/raketasks/backup_restore.html#backup-timestamp https://github.com/sameersbn/docker-gitlab/issues/1414 https://github.com/sameersbn/docker-gitlab/issues/1042#issuecomment-271522064 --- assets/runtime/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index 4797588d..f51f2e79 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1721,7 +1721,7 @@ execute_raketask() { echo for b in $(ls ${GITLAB_BACKUP_DIR} | grep _gitlab_backup | sort -r) do - echo "‣ $b (created at $(date --date="@${b%%_gitlab_backup.tar}" +'%d %b, %G - %H:%M:%S %Z'))" + echo "‣ $b (created at $(date --date="@${b%%_*_gitlab_backup.tar}" +'%d %b, %G - %H:%M:%S %Z'))" done echo From 79d73ab72b90003ec123c5a3c1fe627dab30e89c Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Sun, 19 Aug 2018 17:06:22 +0530 Subject: [PATCH 164/508] integrate with circleci --- .circleci/config.yml | 71 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000..802f0787 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,71 @@ +version: 2 +jobs: + build: + working_directory: /workdir + docker: + - image: docker:17.06.0-ce-git + environment: + IMAGE_NAME: "sameersbn/gitlab" + + steps: + - checkout + + - setup_remote_docker: + version: 17.06.0-ce + + - run: + name: Docker info + command: | + docker version + docker info + + - restore_cache: + keys: + - cache-{{ .Branch }} + paths: + - /cache/layers.tar + + - run: + name: Loading docker cache + command: | + if [[ -f /cache/layers.tar ]]; then + docker load -i /cache/layers.tar + fi + + - run: + name: Build docker image + command: | + docker build --cache-from=${IMAGE_NAME} -t ${IMAGE_NAME} . + + - run: + name: Launching container for testing + command: | + docker network create testnet + docker run --name gitlab -d --net testnet ${IMAGE_NAME} + + - run: + name: Testing image + command: | + echo "TODO" + + - run: + name: Generate docker build image cache + command: | + mkdir -p /cache + docker save -o /cache/layers.tar ${IMAGE_NAME} + + - save_cache: + key: cache-{{ .Branch }}-{{ epoch }} + paths: + - /cache/layers.tar + +workflows: + version: 2 + build-and-test: + jobs: + - build: + filters: + branches: + only: /.*/ + tags: + only: /.*/ From d4767da8f2d49597e14ebb983f8949e688f1495d Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 23 Aug 2018 16:18:41 +0530 Subject: [PATCH 165/508] remove travis integration --- .travis.yml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 61c89824..00000000 --- a/.travis.yml +++ /dev/null @@ -1,9 +0,0 @@ -sudo: required - -language: bash - -services: - - docker - -script: - - docker build -t sammeersbn/gitlab . From 5e1b586b33d2cff58f3f759f458ecf317b441b6e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 22 Aug 2018 08:59:12 +0200 Subject: [PATCH 166/508] Upgrade GitLab CE to 11.2.0 --- 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 d47007e6..32fee8a7 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. +**11.2.0** +- gitlab: upgrade CE to v11.2.0 + **11.1.4** - gitlab: upgrade CE to v11.1.4 diff --git a/Dockerfile b/Dockerfile index 18dd51d9..9489c40d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180705 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.1.4 \ +ENV GITLAB_VERSION=11.2.0 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=7.1.4 \ diff --git a/README.md b/README.md index a6ec43b4..ecfb458e 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:11.1.4 +# sameersbn/gitlab:11.2.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.1.4 +docker pull sameersbn/gitlab:11.2.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.1.4 + sameersbn/gitlab:11.2.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.1.4 + sameersbn/gitlab:11.2.0 ``` ## Database @@ -263,7 +263,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:11.1.4 + sameersbn/gitlab:11.2.0 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.1.4 + sameersbn/gitlab:11.2.0 ``` 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: @@ -361,7 +361,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:11.1.4 + sameersbn/gitlab:11.2.0 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.1.4 + sameersbn/gitlab:11.2.0 ``` 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: @@ -431,7 +431,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:11.1.4 + sameersbn/gitlab:11.2.0 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.1.4 + sameersbn/gitlab:11.2.0 ``` ### Mail @@ -471,7 +471,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:11.1.4 + sameersbn/gitlab:11.2.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.1.4 + sameersbn/gitlab:11.2.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.1.4 + sameersbn/gitlab:11.2.0 ``` 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. @@ -584,7 +584,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:11.1.4 + sameersbn/gitlab:11.2.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.1.4 + sameersbn/gitlab:11.2.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.1.4 + sameersbn/gitlab:11.2.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.1.4 + sameersbn/gitlab:11.2.0 ``` 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:11.1.4 app:sanitize + sameersbn/gitlab:11.2.0 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.2.0 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.4 app:rake db:setup + sameersbn/gitlab:11.2.0 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:11.1.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.2.0 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.2.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.1.4 app:rake gitlab:env:info + sameersbn/gitlab:11.2.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.2.0 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.1.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.2.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.1.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. +> Upgrading to `sameersbn/gitlab:11.2.0` 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:11.1.4 +docker pull sameersbn/gitlab:11.2.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.1.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.2.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index 342b3b3b..b85c6c7b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.1.4 +11.2.0 diff --git a/docker-compose.yml b/docker-compose.yml index 7e770a45..ea814383 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.1.4 + image: sameersbn/gitlab:11.2.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 0fc3fa47..3c209147 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:11.1.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.2.0 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:11.1.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.2.0 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:11.1.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.2.0 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:11.1.4 +docker pull sameersbn/gitlab:11.2.0 ``` - **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:11.1.4 +sameersbn/gitlab:11.2.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 3f7ce225..7c616e6e 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.1.4 + image: sameersbn/gitlab:11.2.0 env: - name: TZ value: Asia/Kolkata From 2c22cf8f9c76968e8768f8e0b361852a2e2cd104 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 22 Aug 2018 09:00:22 +0200 Subject: [PATCH 167/508] Update gitlab-shell to 8.1.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9489c40d..7c5d072d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=11.2.0 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ - GITLAB_SHELL_VERSION=7.1.4 \ GITLAB_WORKHORSE_VERSION=5.0.0 \ + GITLAB_SHELL_VERSION=8.1.1 \ GITLAB_PAGES_VERSION=1.0.0 \ GITALY_SERVER_VERSION=0.111.2 \ GITLAB_USER="git" \ From fe6740a90fc698933370f34ce24900cd5e186043 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 22 Aug 2018 09:00:36 +0200 Subject: [PATCH 168/508] Update gitlab-workhorse to 5.1.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7c5d072d..1a312c1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=11.2.0 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ - GITLAB_WORKHORSE_VERSION=5.0.0 \ GITLAB_SHELL_VERSION=8.1.1 \ + GITLAB_WORKHORSE_VERSION=5.1.0 \ GITLAB_PAGES_VERSION=1.0.0 \ GITALY_SERVER_VERSION=0.111.2 \ GITLAB_USER="git" \ From 600255321629796ed3a5a9c2a23a24f1b612afd5 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 22 Aug 2018 09:00:54 +0200 Subject: [PATCH 169/508] Update gitaly to 0.117.2 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1a312c1e..7b73ba59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=11.2.0 \ GITLAB_SHELL_VERSION=8.1.1 \ GITLAB_WORKHORSE_VERSION=5.1.0 \ GITLAB_PAGES_VERSION=1.0.0 \ - GITALY_SERVER_VERSION=0.111.2 \ + GITALY_SERVER_VERSION=0.117.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 0de94d23d1cf1c3065a39ac54bf474c9d58481ac Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 24 Aug 2018 21:54:36 +0200 Subject: [PATCH 170/508] Update baseimage to xenial-20180808 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7b73ba59..56906a27 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:xenial-20180705 +FROM ubuntu:xenial-20180808 LABEL maintainer="sameer@damagehead.com" From 91e05e4489a5e62602b7229dabeef73e5cf9ff4d Mon Sep 17 00:00:00 2001 From: Tobias Haber Date: Tue, 3 Jul 2018 15:32:40 +0200 Subject: [PATCH 171/508] Add GITLAB_DEFAULT_THEME --- assets/runtime/config/gitlabhq/gitlab.yml | 21 ++++++++++++++------- assets/runtime/env-defaults | 2 +- assets/runtime/functions | 1 + 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 55804be2..721450af 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -26,6 +26,8 @@ production: &base # 1. GitLab app settings # ========================== + + ## GitLab settings gitlab: ## Web server settings (note: host is the FQDN, do not include http://) @@ -75,13 +77,18 @@ production: &base default_can_create_group: {{GITLAB_CREATE_GROUP}} # default: true username_changing_enabled: {{GITLAB_USERNAME_CHANGE}} # default: true - User can change her username/namespace ## Default theme ID - ## 1 - Graphite - ## 2 - Charcoal - ## 3 - Green - ## 4 - Gray - ## 5 - Violet - ## 6 - Blue - # default_theme: 2 # default: 2 + ## 1 - Indigo + ## 2 - Dark + ## 3 - Light + ## 4 - Blue + ## 5 - Green + ## 6 - Light Indigo + ## 7 - Light Blue + ## 8 - Light Green + ## 9 - Red + ## 10 - Light Red + default_theme: {{GITLAB_DEFAULT_THEME}} + # Enable or disable user signups (first run only) signup_enabled: {{GITLAB_SIGNUP_ENABLED}} diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index f419afa1..0330ebd1 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -9,7 +9,7 @@ GITLAB_REPOS_DIR="${GITLAB_REPOS_DIR:-$GITLAB_DATA_DIR/repositories}" GITLAB_BUILDS_DIR="${GITLAB_BUILDS_DIR:-$GITLAB_DATA_DIR/builds}" GITLAB_DOWNLOADS_DIR="${GITLAB_DOWNLOADS_DIR:-$GITLAB_TEMP_DIR/downloads}" GITLAB_SHARED_DIR="${GITLAB_SHARED_DIR:-$GITLAB_DATA_DIR/shared}" - +GITLAB_DEFAULT_THEME=${GITLAB_DEFAULT_THEME:-2} GITLAB_HTTPS=${GITLAB_HTTPS:-false} GITLAB_HOST=${GITLAB_HOST:-localhost} GITLAB_CI_HOST=${GITLAB_CI_HOST:-} diff --git a/assets/runtime/functions b/assets/runtime/functions index 4797588d..dd7cea6c 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1519,6 +1519,7 @@ configure_gitlab() { GITLAB_SIGNUP_ENABLED \ GITLAB_PROJECTS_LIMIT \ GITLAB_USERNAME_CHANGE \ + GITLAB_DEFAULT_THEME \ GITLAB_CREATE_GROUP gitlab_configure_database From 40e5baf8e6a6d0ad5b7fbb4a4de99ce7e14e6d92 Mon Sep 17 00:00:00 2001 From: Niclas Mietz Date: Sat, 1 Sep 2018 11:02:04 +0200 Subject: [PATCH 172/508] Update Changelog.md --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index 32fee8a7..23c15c0b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **11.2.0** - gitlab: upgrade CE to v11.2.0 +- ADD `GITLAB_DEFAULT_THEME` **11.1.4** - gitlab: upgrade CE to v11.1.4 From 912b7036ed21b5d909e6414cae85b52c620acd44 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 1 Sep 2018 11:07:54 +0200 Subject: [PATCH 173/508] release 11.2.0 From 43c9bccf0bfaea85b8f1ebb88e3b270cb8365532 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 1 Sep 2018 11:15:19 +0200 Subject: [PATCH 174/508] Upgrade GitLab CE to 11.2.1 --- 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 23c15c0b..833dabd8 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. +**11.2.1** +- gitlab: upgrade CE to v11.2.1 + **11.2.0** - gitlab: upgrade CE to v11.2.0 - ADD `GITLAB_DEFAULT_THEME` diff --git a/Dockerfile b/Dockerfile index 875a71b1..fe60b4d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.2.0 \ +ENV GITLAB_VERSION=11.2.1 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=8.1.1 \ diff --git a/README.md b/README.md index ecfb458e..b812e22a 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:11.2.0 +# sameersbn/gitlab:11.2.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.2.0 +docker pull sameersbn/gitlab:11.2.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.2.0 + sameersbn/gitlab:11.2.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.2.0 + sameersbn/gitlab:11.2.1 ``` ## Database @@ -263,7 +263,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:11.2.0 + sameersbn/gitlab:11.2.1 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.2.0 + sameersbn/gitlab:11.2.1 ``` 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: @@ -361,7 +361,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:11.2.0 + sameersbn/gitlab:11.2.1 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.2.0 + sameersbn/gitlab:11.2.1 ``` 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: @@ -431,7 +431,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:11.2.0 + sameersbn/gitlab:11.2.1 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.2.0 + sameersbn/gitlab:11.2.1 ``` ### Mail @@ -471,7 +471,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:11.2.0 + sameersbn/gitlab:11.2.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.2.0 + sameersbn/gitlab:11.2.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.2.0 + sameersbn/gitlab:11.2.1 ``` 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. @@ -584,7 +584,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:11.2.0 + sameersbn/gitlab:11.2.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.2.0 + sameersbn/gitlab:11.2.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.2.0 + sameersbn/gitlab:11.2.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.2.0 + sameersbn/gitlab:11.2.1 ``` 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:11.2.0 app:sanitize + sameersbn/gitlab:11.2.1 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.2.1 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.0 app:rake db:setup + sameersbn/gitlab:11.2.1 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:11.2.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.2.1 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.2.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.2.0 app:rake gitlab:env:info + sameersbn/gitlab:11.2.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.2.1 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.2.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.2.0` 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:11.2.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.2.0 +docker pull sameersbn/gitlab:11.2.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.2.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.2.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index b85c6c7b..dc170a12 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.2.0 +11.2.1 diff --git a/docker-compose.yml b/docker-compose.yml index ea814383..2e696190 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.2.0 + image: sameersbn/gitlab:11.2.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 3c209147..5327cd82 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:11.2.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.2.1 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:11.2.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.2.1 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:11.2.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.2.1 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:11.2.0 +docker pull sameersbn/gitlab:11.2.1 ``` - **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:11.2.0 +sameersbn/gitlab:11.2.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 7c616e6e..1b5713f2 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.2.0 + image: sameersbn/gitlab:11.2.1 env: - name: TZ value: Asia/Kolkata From 675693448eed50ab7b4b231ff8105d61708eae4c Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 1 Sep 2018 11:54:24 +0200 Subject: [PATCH 175/508] release 11.2.1 From 085a1aa7a1085ddeb43bcd023e45df3a3b59dd5e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 1 Sep 2018 11:55:51 +0200 Subject: [PATCH 176/508] Upgrade GitLab CE to 11.2.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 833dabd8..f44efbfc 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. +**11.2.2** +- gitlab: upgrade CE to v11.2.2 + **11.2.1** - gitlab: upgrade CE to v11.2.1 diff --git a/Dockerfile b/Dockerfile index fe60b4d3..ddb9d259 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.2.1 \ +ENV GITLAB_VERSION=11.2.2 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=8.1.1 \ diff --git a/README.md b/README.md index b812e22a..d60ef006 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:11.2.1 +# sameersbn/gitlab:11.2.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.2.1 +docker pull sameersbn/gitlab:11.2.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.2.1 + sameersbn/gitlab:11.2.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.2.1 + sameersbn/gitlab:11.2.2 ``` ## Database @@ -263,7 +263,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:11.2.1 + sameersbn/gitlab:11.2.2 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.2.1 + sameersbn/gitlab:11.2.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: @@ -361,7 +361,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:11.2.1 + sameersbn/gitlab:11.2.2 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.2.1 + sameersbn/gitlab:11.2.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: @@ -431,7 +431,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:11.2.1 + sameersbn/gitlab:11.2.2 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.2.1 + sameersbn/gitlab:11.2.2 ``` ### Mail @@ -471,7 +471,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:11.2.1 + sameersbn/gitlab:11.2.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.2.1 + sameersbn/gitlab:11.2.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.2.1 + sameersbn/gitlab:11.2.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. @@ -584,7 +584,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:11.2.1 + sameersbn/gitlab:11.2.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.2.1 + sameersbn/gitlab:11.2.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.2.1 + sameersbn/gitlab:11.2.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.2.1 + sameersbn/gitlab:11.2.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:11.2.1 app:sanitize + sameersbn/gitlab:11.2.2 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.2.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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.1 app:rake db:setup + sameersbn/gitlab:11.2.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:11.2.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.2.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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.2.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.2.1 app:rake gitlab:env:info + sameersbn/gitlab:11.2.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.2.2 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.2.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.2.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:11.2.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:11.2.1 +docker pull sameersbn/gitlab:11.2.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.2.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.2.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index dc170a12..21198965 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.2.1 +11.2.2 diff --git a/docker-compose.yml b/docker-compose.yml index 2e696190..56b87e23 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.2.1 + image: sameersbn/gitlab:11.2.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 5327cd82..77deec15 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:11.2.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.2.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:11.2.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.2.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:11.2.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.2.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:11.2.1 +docker pull sameersbn/gitlab:11.2.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:11.2.1 +sameersbn/gitlab:11.2.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 1b5713f2..1f5802c7 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.2.1 + image: sameersbn/gitlab:11.2.2 env: - name: TZ value: Asia/Kolkata From 19826039b0ed19ab839a0ff44f1de697b4d1ef81 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 1 Sep 2018 12:11:05 +0200 Subject: [PATCH 177/508] release 11.2.2 From 11d98205c87e6ae375703769cc35828daf90d72f Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 1 Sep 2018 12:12:26 +0200 Subject: [PATCH 178/508] Upgrade GitLab CE to 11.2.3 --- 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 f44efbfc..a66c8b04 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. +**11.2.3** +- gitlab: upgrade CE to v11.2.3 + **11.2.2** - gitlab: upgrade CE to v11.2.2 diff --git a/Dockerfile b/Dockerfile index ddb9d259..04d04ebd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.2.2 \ +ENV GITLAB_VERSION=11.2.3 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=8.1.1 \ diff --git a/README.md b/README.md index d60ef006..6ea57065 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:11.2.2 +# sameersbn/gitlab:11.2.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.2.2 +docker pull sameersbn/gitlab:11.2.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.2.2 + sameersbn/gitlab:11.2.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.2.2 + sameersbn/gitlab:11.2.3 ``` ## Database @@ -263,7 +263,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:11.2.2 + sameersbn/gitlab:11.2.3 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.2.2 + sameersbn/gitlab:11.2.3 ``` 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: @@ -361,7 +361,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:11.2.2 + sameersbn/gitlab:11.2.3 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.2.2 + sameersbn/gitlab:11.2.3 ``` 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: @@ -431,7 +431,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:11.2.2 + sameersbn/gitlab:11.2.3 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.2.2 + sameersbn/gitlab:11.2.3 ``` ### Mail @@ -471,7 +471,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:11.2.2 + sameersbn/gitlab:11.2.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.2.2 + sameersbn/gitlab:11.2.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.2.2 + sameersbn/gitlab:11.2.3 ``` 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. @@ -584,7 +584,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:11.2.2 + sameersbn/gitlab:11.2.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.2.2 + sameersbn/gitlab:11.2.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.2.2 + sameersbn/gitlab:11.2.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.2.2 + sameersbn/gitlab:11.2.3 ``` 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:11.2.2 app:sanitize + sameersbn/gitlab:11.2.3 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.2.3 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.2 app:rake db:setup + sameersbn/gitlab:11.2.3 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:11.2.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.2.3 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.2.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.2.2 app:rake gitlab:env:info + sameersbn/gitlab:11.2.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.2.3 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.2.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.2.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. +> Upgrading to `sameersbn/gitlab:11.2.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.2.2 +docker pull sameersbn/gitlab:11.2.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.2.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.2.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index 21198965..1a8d3222 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.2.2 +11.2.3 diff --git a/docker-compose.yml b/docker-compose.yml index 56b87e23..7f6815ed 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.2.2 + image: sameersbn/gitlab:11.2.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 77deec15..87787bac 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:11.2.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.2.3 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:11.2.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.2.3 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:11.2.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.2.3 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:11.2.2 +docker pull sameersbn/gitlab:11.2.3 ``` - **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:11.2.2 +sameersbn/gitlab:11.2.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 1f5802c7..3f53c263 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.2.2 + image: sameersbn/gitlab:11.2.3 env: - name: TZ value: Asia/Kolkata From 5ee7b1d0bbdc02d491353f2596130ab96a84d953 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 1 Sep 2018 12:27:48 +0200 Subject: [PATCH 179/508] release 11.2.3 From 56b6c4245c59c9db177632505a099f3bb64c1bad Mon Sep 17 00:00:00 2001 From: Carl Kittelberger Date: Tue, 18 Sep 2018 17:03:10 +0200 Subject: [PATCH 180/508] Fix backup config stripping for when AWS & GCS are disabled --- assets/runtime/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index dd7cea6c..37a32b4d 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -859,7 +859,7 @@ gitlab_configure_backups() { GITLAB_BACKUP_ARCHIVE_PERMISSIONS gitlab_configure_backups_schedule if [[ ${AWS_BACKUPS} != true && ${GCS_BACKUPS} != true ]]; then - exec_as_git sed -i "/upload:/,/#end-gcs/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/\s\+upload:/,/#end-gcs/d" ${GITLAB_CONFIG} return 0 fi if [[ ${AWS_BACKUPS} == true && ${GCS_BACKUPS} == true ]]; then From 4e9f51ef0adefe23be128b8a0f108c05cd18c788 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 22 Sep 2018 08:53:49 +0200 Subject: [PATCH 181/508] Upgrade GitLab CE to 11.3.0 --- 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 a66c8b04..411d33f2 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. +**11.3.0** +- gitlab: upgrade CE to v11.3.0 + **11.2.3** - gitlab: upgrade CE to v11.2.3 diff --git a/Dockerfile b/Dockerfile index 04d04ebd..96e2005c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.2.3 \ +ENV GITLAB_VERSION=11.3.0 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=8.1.1 \ diff --git a/README.md b/README.md index 6ea57065..9bfeee28 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:11.2.3 +# sameersbn/gitlab:11.3.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.2.3 +docker pull sameersbn/gitlab:11.3.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.2.3 + sameersbn/gitlab:11.3.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.2.3 + sameersbn/gitlab:11.3.0 ``` ## Database @@ -263,7 +263,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:11.2.3 + sameersbn/gitlab:11.3.0 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.2.3 + sameersbn/gitlab:11.3.0 ``` 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: @@ -361,7 +361,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:11.2.3 + sameersbn/gitlab:11.3.0 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.2.3 + sameersbn/gitlab:11.3.0 ``` 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: @@ -431,7 +431,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:11.2.3 + sameersbn/gitlab:11.3.0 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.2.3 + sameersbn/gitlab:11.3.0 ``` ### Mail @@ -471,7 +471,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:11.2.3 + sameersbn/gitlab:11.3.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.2.3 + sameersbn/gitlab:11.3.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.2.3 + sameersbn/gitlab:11.3.0 ``` 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. @@ -584,7 +584,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:11.2.3 + sameersbn/gitlab:11.3.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.2.3 + sameersbn/gitlab:11.3.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.2.3 + sameersbn/gitlab:11.3.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.2.3 + sameersbn/gitlab:11.3.0 ``` 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:11.2.3 app:sanitize + sameersbn/gitlab:11.3.0 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.3.0 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.3 app:rake db:setup + sameersbn/gitlab:11.3.0 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:11.2.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.3.0 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.3.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.2.3 app:rake gitlab:env:info + sameersbn/gitlab:11.3.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.3.0 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.2.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.3.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.2.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:11.3.0` 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:11.2.3 +docker pull sameersbn/gitlab:11.3.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.2.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index 1a8d3222..f628d2ea 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.2.3 +11.3.0 diff --git a/docker-compose.yml b/docker-compose.yml index 7f6815ed..14c2d132 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.2.3 + image: sameersbn/gitlab:11.3.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 87787bac..1de1e9d5 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:11.2.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.3.0 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:11.2.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.3.0 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:11.2.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.3.0 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:11.2.3 +docker pull sameersbn/gitlab:11.3.0 ``` - **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:11.2.3 +sameersbn/gitlab:11.3.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 3f53c263..7bfcb08a 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.2.3 + image: sameersbn/gitlab:11.3.0 env: - name: TZ value: Asia/Kolkata From 06a27a6844b8865f48bf2c8694799c0448d5b8cc Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 22 Sep 2018 08:54:56 +0200 Subject: [PATCH 182/508] Update gitlab-shell to 8.3.3 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 96e2005c..4392bddc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,10 +5,10 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=11.3.0 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ - GITLAB_SHELL_VERSION=8.1.1 \ GITLAB_WORKHORSE_VERSION=5.1.0 \ GITLAB_PAGES_VERSION=1.0.0 \ GITALY_SERVER_VERSION=0.117.2 \ + GITLAB_SHELL_VERSION=8.3.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 77e9a42b293abd40bd584f2cca032259e54d0520 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 22 Sep 2018 08:55:13 +0200 Subject: [PATCH 183/508] Update gitlab-workhorse to 6.1.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4392bddc..3352982b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,10 +5,10 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=11.3.0 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ - GITLAB_WORKHORSE_VERSION=5.1.0 \ GITLAB_PAGES_VERSION=1.0.0 \ GITALY_SERVER_VERSION=0.117.2 \ GITLAB_SHELL_VERSION=8.3.3 \ + GITLAB_WORKHORSE_VERSION=6.1.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From c788356f8687c433310a96b084fb7e3d9a9af27d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 22 Sep 2018 08:55:27 +0200 Subject: [PATCH 184/508] Update gitlab-pages to 1.1.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3352982b..cb01b5d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,10 +5,10 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=11.3.0 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ - GITLAB_PAGES_VERSION=1.0.0 \ GITALY_SERVER_VERSION=0.117.2 \ GITLAB_SHELL_VERSION=8.3.3 \ GITLAB_WORKHORSE_VERSION=6.1.0 \ + GITLAB_PAGES_VERSION=1.1.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 42708dd8a0b2318c388da68681ff79e07fa1f0bb Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 22 Sep 2018 08:55:41 +0200 Subject: [PATCH 185/508] Update gitlay to 0.120.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cb01b5d6..8e7585cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,10 +5,10 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=11.3.0 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ - GITALY_SERVER_VERSION=0.117.2 \ GITLAB_SHELL_VERSION=8.3.3 \ GITLAB_WORKHORSE_VERSION=6.1.0 \ GITLAB_PAGES_VERSION=1.1.0 \ + GITALY_SERVER_VERSION=0.120.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 5efa8619af46c124b656f8b0861fbbc9bc0a424b Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 22 Sep 2018 09:14:04 +0200 Subject: [PATCH 186/508] Fix gitaly-ssh missing symlink * Opening a merge request from a branch within my fork towards the master of the upstream repo, this results in 503 errors. * Updating existing cross-fork merge request with new commits, they do not show up in the merge requests, neither do the diffs. However, the branch in the fork shows the newly added commit. FIXES #1721, #1712 --- assets/build/install.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/build/install.sh b/assets/build/install.sh index 56a484f3..7fc7c7a6 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -133,6 +133,10 @@ rm -rf ${GITLAB_GITALY_BUILD_DIR} # remove go rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz ${GOROOT} +# Fix for rebase in forks +echo "Linking $(which gitaly-ssh) to /" +ln -s $(which gitaly-ssh) / + # remove HSTS config from the default headers, we configure it in nginx exec_as_git sed -i "/headers\['Strict-Transport-Security'\]/d" ${GITLAB_INSTALL_DIR}/app/controllers/application_controller.rb From 923b98eab0a0f11286fdfada91a0d4980c269c4f Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 22 Sep 2018 09:47:28 +0200 Subject: [PATCH 187/508] Update Changelog --- Changelog.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Changelog.md b/Changelog.md index 411d33f2..925126c6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,9 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **11.3.0** - gitlab: upgrade CE to v11.3.0 +- Fix backup config stripping for when AWS & GCS backups are disabled [#1725](https://github.com/sameersbn/docker-gitlab/pull/1725) +- Correct Backup Date format for selective backups [#1699](https://github.com/sameersbn/docker-gitlab/pull/1699) +- Fix gitlay-ssh symlink to enable rebase/squash in forks **11.2.3** - gitlab: upgrade CE to v11.2.3 From abb4aaad8f1c5f360b1a209b66c7469e7ce5b939 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 22 Sep 2018 09:48:58 +0200 Subject: [PATCH 188/508] release 11.3.0 From bda29aef719000a3c2dcbc21688b61d6fe614c70 Mon Sep 17 00:00:00 2001 From: Even Holthe Date: Mon, 1 Oct 2018 21:28:05 +0200 Subject: [PATCH 189/508] Upgrade GitLab to 11.3.1 --- 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 925126c6..3e079987 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. +**11.3.1** +- gitlab: upgrade CE to v11.3.1 + **11.3.0** - gitlab: upgrade CE to v11.3.0 - Fix backup config stripping for when AWS & GCS backups are disabled [#1725](https://github.com/sameersbn/docker-gitlab/pull/1725) diff --git a/Dockerfile b/Dockerfile index 8e7585cc..a93b1be3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.3.0 \ +ENV GITLAB_VERSION=11.3.1 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=8.3.3 \ diff --git a/README.md b/README.md index 9bfeee28..ce336658 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:11.3.0 +# sameersbn/gitlab:11.3.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.3.0 +docker pull sameersbn/gitlab:11.3.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.3.0 + sameersbn/gitlab:11.3.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.3.0 + sameersbn/gitlab:11.3.1 ``` ## Database @@ -263,7 +263,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:11.3.0 + sameersbn/gitlab:11.3.1 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.3.0 + sameersbn/gitlab:11.3.1 ``` 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: @@ -361,7 +361,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:11.3.0 + sameersbn/gitlab:11.3.1 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.3.0 + sameersbn/gitlab:11.3.1 ``` 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: @@ -431,7 +431,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:11.3.0 + sameersbn/gitlab:11.3.1 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.3.0 + sameersbn/gitlab:11.3.1 ``` ### Mail @@ -471,7 +471,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:11.3.0 + sameersbn/gitlab:11.3.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.3.0 + sameersbn/gitlab:11.3.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.3.0 + sameersbn/gitlab:11.3.1 ``` 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. @@ -584,7 +584,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:11.3.0 + sameersbn/gitlab:11.3.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.3.0 + sameersbn/gitlab:11.3.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.3.0 + sameersbn/gitlab:11.3.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.3.0 + sameersbn/gitlab:11.3.1 ``` 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:11.3.0 app:sanitize + sameersbn/gitlab:11.3.1 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.3.1 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.0 app:rake db:setup + sameersbn/gitlab:11.3.1 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:11.3.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.3.1 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.3.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.3.0 app:rake gitlab:env:info + sameersbn/gitlab:11.3.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.3.1 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.3.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.3.0` 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:11.3.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.3.0 +docker pull sameersbn/gitlab:11.3.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.3.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index f628d2ea..0a47c95b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.3.0 +11.3.1 diff --git a/docker-compose.yml b/docker-compose.yml index 14c2d132..0648ba46 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.3.0 + image: sameersbn/gitlab:11.3.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 1de1e9d5..f6383034 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:11.3.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.3.1 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:11.3.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.3.1 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:11.3.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.3.1 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:11.3.0 +docker pull sameersbn/gitlab:11.3.1 ``` - **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:11.3.0 +sameersbn/gitlab:11.3.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 7bfcb08a..b7af19f9 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.3.0 + image: sameersbn/gitlab:11.3.1 env: - name: TZ value: Asia/Kolkata From 19ca9e11c6b0733963dfa9d52f28bfed77f1d1ad Mon Sep 17 00:00:00 2001 From: Even Holthe Date: Mon, 1 Oct 2018 21:31:20 +0200 Subject: [PATCH 190/508] Upgrade Gitaly to 0.120.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a93b1be3..91a4e85d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=11.3.1 \ GITLAB_SHELL_VERSION=8.3.3 \ GITLAB_WORKHORSE_VERSION=6.1.0 \ GITLAB_PAGES_VERSION=1.1.0 \ - GITALY_SERVER_VERSION=0.120.0 \ + GITALY_SERVER_VERSION=0.120.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From ab2fbb167430d9050891b1d1ad3455973aba4708 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 3 Oct 2018 17:40:47 +0200 Subject: [PATCH 191/508] release 11.3.1 From 8832dd221e54e37e4ee7676132ff4512a360bda8 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 3 Oct 2018 17:42:42 +0200 Subject: [PATCH 192/508] Upgrade GitLab CE to 11.3.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 3e079987..b85bd34d 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. +**11.3.2** +- gitlab: upgrade CE to v11.3.2 + **11.3.1** - gitlab: upgrade CE to v11.3.1 diff --git a/Dockerfile b/Dockerfile index 91a4e85d..b7e9e250 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.3.1 \ +ENV GITLAB_VERSION=11.3.2 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=8.3.3 \ diff --git a/README.md b/README.md index ce336658..147a90f0 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:11.3.1 +# sameersbn/gitlab:11.3.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.3.1 +docker pull sameersbn/gitlab:11.3.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.3.1 + sameersbn/gitlab:11.3.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.3.1 + sameersbn/gitlab:11.3.2 ``` ## Database @@ -263,7 +263,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:11.3.1 + sameersbn/gitlab:11.3.2 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.3.1 + sameersbn/gitlab:11.3.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: @@ -361,7 +361,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:11.3.1 + sameersbn/gitlab:11.3.2 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.3.1 + sameersbn/gitlab:11.3.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: @@ -431,7 +431,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:11.3.1 + sameersbn/gitlab:11.3.2 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.3.1 + sameersbn/gitlab:11.3.2 ``` ### Mail @@ -471,7 +471,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:11.3.1 + sameersbn/gitlab:11.3.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.3.1 + sameersbn/gitlab:11.3.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.3.1 + sameersbn/gitlab:11.3.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. @@ -584,7 +584,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:11.3.1 + sameersbn/gitlab:11.3.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.3.1 + sameersbn/gitlab:11.3.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.3.1 + sameersbn/gitlab:11.3.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.3.1 + sameersbn/gitlab:11.3.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:11.3.1 app:sanitize + sameersbn/gitlab:11.3.2 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.3.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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.1 app:rake db:setup + sameersbn/gitlab:11.3.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:11.3.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.3.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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.3.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.3.1 app:rake gitlab:env:info + sameersbn/gitlab:11.3.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.3.2 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.3.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.3.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:11.3.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:11.3.1 +docker pull sameersbn/gitlab:11.3.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.3.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index 0a47c95b..e21e53d2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.3.1 +11.3.2 diff --git a/docker-compose.yml b/docker-compose.yml index 0648ba46..8990993d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.3.1 + image: sameersbn/gitlab:11.3.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index f6383034..85ef79ac 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:11.3.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.3.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:11.3.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.3.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:11.3.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.3.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:11.3.1 +docker pull sameersbn/gitlab:11.3.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:11.3.1 +sameersbn/gitlab:11.3.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index b7af19f9..f91e9194 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.3.1 + image: sameersbn/gitlab:11.3.2 env: - name: TZ value: Asia/Kolkata From 003d1c31ad6c0f81267073420eeb3ee156f9fd5a Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 3 Oct 2018 18:19:50 +0200 Subject: [PATCH 193/508] release 11.3.2 From cd9c21ab4be1f9f63a308d499842a740edea49be Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 4 Oct 2018 11:08:12 +0200 Subject: [PATCH 194/508] Upgrade GitLab CE to 11.3.3 --- 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 b85bd34d..5f9a9ea1 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. +**11.3.3** +- gitlab: upgrade CE to v11.3.3 + **11.3.2** - gitlab: upgrade CE to v11.3.2 diff --git a/Dockerfile b/Dockerfile index b7e9e250..2fe1d175 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.3.2 \ +ENV GITLAB_VERSION=11.3.3 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=8.3.3 \ diff --git a/README.md b/README.md index 147a90f0..bdd8c2d2 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:11.3.2 +# sameersbn/gitlab:11.3.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.3.2 +docker pull sameersbn/gitlab:11.3.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.3.2 + sameersbn/gitlab:11.3.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.3.2 + sameersbn/gitlab:11.3.3 ``` ## Database @@ -263,7 +263,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:11.3.2 + sameersbn/gitlab:11.3.3 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.3.2 + sameersbn/gitlab:11.3.3 ``` 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: @@ -361,7 +361,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:11.3.2 + sameersbn/gitlab:11.3.3 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.3.2 + sameersbn/gitlab:11.3.3 ``` 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: @@ -431,7 +431,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:11.3.2 + sameersbn/gitlab:11.3.3 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.3.2 + sameersbn/gitlab:11.3.3 ``` ### Mail @@ -471,7 +471,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:11.3.2 + sameersbn/gitlab:11.3.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.3.2 + sameersbn/gitlab:11.3.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.3.2 + sameersbn/gitlab:11.3.3 ``` 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. @@ -584,7 +584,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:11.3.2 + sameersbn/gitlab:11.3.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.3.2 + sameersbn/gitlab:11.3.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.3.2 + sameersbn/gitlab:11.3.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.3.2 + sameersbn/gitlab:11.3.3 ``` 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:11.3.2 app:sanitize + sameersbn/gitlab:11.3.3 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.3.3 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.2 app:rake db:setup + sameersbn/gitlab:11.3.3 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:11.3.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.3.3 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.3.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.3.2 app:rake gitlab:env:info + sameersbn/gitlab:11.3.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.3.3 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.3.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.3.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. +> Upgrading to `sameersbn/gitlab:11.3.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.3.2 +docker pull sameersbn/gitlab:11.3.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.3.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index e21e53d2..3cbff0bc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.3.2 +11.3.3 diff --git a/docker-compose.yml b/docker-compose.yml index 8990993d..769ef92d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.3.2 + image: sameersbn/gitlab:11.3.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 85ef79ac..6681f2d2 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:11.3.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.3.3 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:11.3.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.3.3 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:11.3.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.3.3 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:11.3.2 +docker pull sameersbn/gitlab:11.3.3 ``` - **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:11.3.2 +sameersbn/gitlab:11.3.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index f91e9194..4af94e38 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.3.2 + image: sameersbn/gitlab:11.3.3 env: - name: TZ value: Asia/Kolkata From 1f095399d259f4ddeb80619d1fa01572fdea58b3 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 5 Oct 2018 03:40:25 +0200 Subject: [PATCH 195/508] release 11.3.3 From 3d9db85f3078a7fb926c7030568034dbd648b99b Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 5 Oct 2018 20:43:40 +0200 Subject: [PATCH 196/508] Upgrade GitLab CE to 11.3.4 --- 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 5f9a9ea1..63c4c8c2 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. +**11.3.4** +- gitlab: upgrade CE to v11.3.4 + **11.3.3** - gitlab: upgrade CE to v11.3.3 diff --git a/Dockerfile b/Dockerfile index 2fe1d175..2a42fe7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.3.3 \ +ENV GITLAB_VERSION=11.3.4 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=8.3.3 \ diff --git a/README.md b/README.md index bdd8c2d2..6d65db58 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:11.3.3 +# sameersbn/gitlab:11.3.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.3.3 +docker pull sameersbn/gitlab:11.3.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.3.3 + sameersbn/gitlab:11.3.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.3.3 + sameersbn/gitlab:11.3.4 ``` ## Database @@ -263,7 +263,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:11.3.3 + sameersbn/gitlab:11.3.4 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.3.3 + sameersbn/gitlab:11.3.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: @@ -361,7 +361,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:11.3.3 + sameersbn/gitlab:11.3.4 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.3.3 + sameersbn/gitlab:11.3.4 ``` 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: @@ -431,7 +431,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:11.3.3 + sameersbn/gitlab:11.3.4 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.3.3 + sameersbn/gitlab:11.3.4 ``` ### Mail @@ -471,7 +471,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:11.3.3 + sameersbn/gitlab:11.3.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.3.3 + sameersbn/gitlab:11.3.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.3.3 + sameersbn/gitlab:11.3.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. @@ -584,7 +584,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:11.3.3 + sameersbn/gitlab:11.3.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.3.3 + sameersbn/gitlab:11.3.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.3.3 + sameersbn/gitlab:11.3.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.3.3 + sameersbn/gitlab:11.3.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:11.3.3 app:sanitize + sameersbn/gitlab:11.3.4 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.3.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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.3 app:rake db:setup + sameersbn/gitlab:11.3.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:11.3.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.3.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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.3.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.3.3 app:rake gitlab:env:info + sameersbn/gitlab:11.3.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.3.4 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.3.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.3.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:11.3.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:11.3.3 +docker pull sameersbn/gitlab:11.3.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.3.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index 3cbff0bc..52025c04 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.3.3 +11.3.4 diff --git a/docker-compose.yml b/docker-compose.yml index 769ef92d..1643a55e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.3.3 + image: sameersbn/gitlab:11.3.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 6681f2d2..e8731451 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:11.3.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.3.4 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:11.3.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.3.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. @@ -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:11.3.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.3.4 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:11.3.3 +docker pull sameersbn/gitlab:11.3.4 ``` - **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:11.3.3 +sameersbn/gitlab:11.3.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 4af94e38..9a83a49a 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.3.3 + image: sameersbn/gitlab:11.3.4 env: - name: TZ value: Asia/Kolkata From f5f3ddd40b9c27064b71458fadab896222677f5d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 7 Oct 2018 01:30:56 +0200 Subject: [PATCH 197/508] release 11.3.4 From 6d6976c08b801229dc620fb0f86f88ee8c739085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ste=CC=81phane=20Klein?= Date: Sun, 16 Sep 2018 16:37:41 +0200 Subject: [PATCH 198/508] Add %h/.ssh/authorized_keys_proxy to AuthorizedKeysFile parameter in /etc/ssh/sshd_config to support ssh host forwarding to GitLab container --- assets/build/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/build/install.sh b/assets/build/install.sh index 7fc7c7a6..2216a698 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -210,6 +210,7 @@ sed -i \ -e "s|^[#]*UsePrivilegeSeparation yes|UsePrivilegeSeparation no|" \ -e "s|^[#]*PasswordAuthentication yes|PasswordAuthentication no|" \ -e "s|^[#]*LogLevel INFO|LogLevel VERBOSE|" \ + -e "s|^[#]*AuthorizedKeysFile.*|AuthorizedKeysFile %h/.ssh/authorized_keys %h/.ssh/authorized_keys_proxy|" \ /etc/ssh/sshd_config echo "UseDNS no" >> /etc/ssh/sshd_config From 5a477cbb373bfcb7a22e84a4ad4ed81c8ac420a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ste=CC=81phane=20Klein?= Date: Sun, 30 Sep 2018 22:02:26 +0200 Subject: [PATCH 199/508] =?UTF-8?q?Add=20=C2=AB=20Exposing=20ssh=20port=20?= =?UTF-8?q?in=20dockerized=20gitlab-ce=20=C2=BB=20section=20in=20README=20?= =?UTF-8?q?and=20contrib/expose-gitlab-ssh-port.sh=20configuration=20scrip?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ contrib/expose-gitlab-ssh-port.sh | 33 +++++++++++++++++++++++++++++++ docs/exposing-ssh-port.md | 8 ++++++++ 3 files changed, 43 insertions(+) create mode 100644 contrib/expose-gitlab-ssh-port.sh create mode 100644 docs/exposing-ssh-port.md diff --git a/README.md b/README.md index 6d65db58..eb8d5a13 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,7 @@ - [External Issue Trackers](#external-issue-trackers) - [Host UID / GID Mapping](#host-uid--gid-mapping) - [Piwik](#piwik) + - [Exposing ssh port in dockerized gitlab-ce](docs/exposing-ssh-port.md) - [Available Configuration Parameters](#available-configuration-parameters) - [Maintenance](#maintenance) - [Creating Backups](#creating-backups) @@ -801,6 +802,7 @@ These options should contain something like: - `PIWIK_URL=piwik.example.org` - `PIWIK_SITE_ID=42` + ### Available Configuration Parameters *Please refer the docker run command options for the `--env-file` flag where you can specify all required environment variables in a single file. This will save you from writing a potentially long docker run command. Alternatively you can use docker-compose. docker-compose users and Docker Swarm mode users can also use the [secrets and config file options](#docker-secrets-and-configs)* diff --git a/contrib/expose-gitlab-ssh-port.sh b/contrib/expose-gitlab-ssh-port.sh new file mode 100644 index 00000000..51f5339e --- /dev/null +++ b/contrib/expose-gitlab-ssh-port.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash +set -ev + +GITLAB_USERGROUP=${GITLAB_USERGROUP:-1010} +GITLAB_SSH_PORT=${GITLAB_SSH_PORT:-9922} + +if ! id -u git >> /dev/null 2>&1; then + groupadd -g ${GITLAB_USERGROUP} git + useradd -m -u ${GITLAB_USERGROUP} -g git -s /bin/sh -d /home/git git +fi +su git -c "mkdir -p /home/git/.ssh/" + +su git -c "if [ ! -f /home/git/.ssh/id_rsa ]; then ssh-keygen -t rsa -b 4096 -N \"\" -f /home/git/.ssh/id_rsa; fi" +su git -c "if [ -f /home/git/.ssh/id_rsa.pub ]; then mv /home/git/.ssh/id_rsa.pub /home/git/.ssh/authorized_keys_proxy; fi" + +mkdir -p /home/git/gitlab-shell/bin/ +rm -f /home/git/gitlab-shell/bin/gitlab-shell +tee -a /home/git/gitlab-shell/bin/gitlab-shell > /dev/null < Date: Mon, 15 Oct 2018 15:44:00 +0200 Subject: [PATCH 200/508] Upgrade GitLab CE to 11.3.5 --- 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 63c4c8c2..c0658249 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. +**11.3.5** +- gitlab: upgrade CE to v11.3.5 + **11.3.4** - gitlab: upgrade CE to v11.3.4 diff --git a/Dockerfile b/Dockerfile index 2a42fe7b..b523521c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.3.4 \ +ENV GITLAB_VERSION=11.3.5 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=8.3.3 \ diff --git a/README.md b/README.md index 6d65db58..36e8ca53 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:11.3.4 +# sameersbn/gitlab:11.3.5 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.3.4 +docker pull sameersbn/gitlab:11.3.5 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.3.4 + sameersbn/gitlab:11.3.5 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.3.4 + sameersbn/gitlab:11.3.5 ``` ## Database @@ -263,7 +263,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:11.3.4 + sameersbn/gitlab:11.3.5 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.3.4 + sameersbn/gitlab:11.3.5 ``` 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: @@ -361,7 +361,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:11.3.4 + sameersbn/gitlab:11.3.5 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.3.4 + sameersbn/gitlab:11.3.5 ``` 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: @@ -431,7 +431,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:11.3.4 + sameersbn/gitlab:11.3.5 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.3.4 + sameersbn/gitlab:11.3.5 ``` ### Mail @@ -471,7 +471,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:11.3.4 + sameersbn/gitlab:11.3.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.3.4 + sameersbn/gitlab:11.3.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.3.4 + sameersbn/gitlab:11.3.5 ``` 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. @@ -584,7 +584,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:11.3.4 + sameersbn/gitlab:11.3.5 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.3.4 + sameersbn/gitlab:11.3.5 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.3.4 + sameersbn/gitlab:11.3.5 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.3.4 + sameersbn/gitlab:11.3.5 ``` 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:11.3.4 app:sanitize + sameersbn/gitlab:11.3.5 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.3.5 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.4 app:rake db:setup + sameersbn/gitlab:11.3.5 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:11.3.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.3.5 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.3.5 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.3.4 app:rake gitlab:env:info + sameersbn/gitlab:11.3.5 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.3.5 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.3.5 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.3.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. +> Upgrading to `sameersbn/gitlab:11.3.5` 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:11.3.4 +docker pull sameersbn/gitlab:11.3.5 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.3.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.5 ``` ## Shell Access diff --git a/VERSION b/VERSION index 52025c04..96d641b7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.3.4 +11.3.5 diff --git a/docker-compose.yml b/docker-compose.yml index 1643a55e..cf663026 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.3.4 + image: sameersbn/gitlab:11.3.5 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index e8731451..f8c15772 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:11.3.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.3.5 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:11.3.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.3.5 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:11.3.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.3.5 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:11.3.4 +docker pull sameersbn/gitlab:11.3.5 ``` - **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:11.3.4 +sameersbn/gitlab:11.3.5 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 9a83a49a..46f7ad19 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.3.4 + image: sameersbn/gitlab:11.3.5 env: - name: TZ value: Asia/Kolkata From 3e8f11f91752ba022e1d466d2f9f2c4877472dab Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 17 Oct 2018 20:12:54 +0200 Subject: [PATCH 201/508] release 11.3.5 From e312966190f1cfafe046edede69747145e6774cf Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 17 Oct 2018 20:14:21 +0200 Subject: [PATCH 202/508] Upgrade GitLab CE to 11.3.6 --- 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 c0658249..e4d54378 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. +**11.3.6** +- gitlab: upgrade CE to v11.3.6 + **11.3.5** - gitlab: upgrade CE to v11.3.5 diff --git a/Dockerfile b/Dockerfile index b523521c..a9277c68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.3.5 \ +ENV GITLAB_VERSION=11.3.6 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=8.3.3 \ diff --git a/README.md b/README.md index 36e8ca53..618532ec 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:11.3.5 +# sameersbn/gitlab:11.3.6 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.3.5 +docker pull sameersbn/gitlab:11.3.6 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.3.5 + sameersbn/gitlab:11.3.6 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.3.5 + sameersbn/gitlab:11.3.6 ``` ## Database @@ -263,7 +263,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:11.3.5 + sameersbn/gitlab:11.3.6 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.3.5 + sameersbn/gitlab:11.3.6 ``` 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: @@ -361,7 +361,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:11.3.5 + sameersbn/gitlab:11.3.6 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.3.5 + sameersbn/gitlab:11.3.6 ``` 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: @@ -431,7 +431,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:11.3.5 + sameersbn/gitlab:11.3.6 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.3.5 + sameersbn/gitlab:11.3.6 ``` ### Mail @@ -471,7 +471,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:11.3.5 + sameersbn/gitlab:11.3.6 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.3.5 + sameersbn/gitlab:11.3.6 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.3.5 + sameersbn/gitlab:11.3.6 ``` 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. @@ -584,7 +584,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:11.3.5 + sameersbn/gitlab:11.3.6 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.3.5 + sameersbn/gitlab:11.3.6 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.3.5 + sameersbn/gitlab:11.3.6 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.3.5 + sameersbn/gitlab:11.3.6 ``` 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:11.3.5 app:sanitize + sameersbn/gitlab:11.3.6 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.5 app:rake gitlab:backup:create + sameersbn/gitlab:11.3.6 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.5 app:rake db:setup + sameersbn/gitlab:11.3.6 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:11.3.5 app:rake gitlab:backup:restore + sameersbn/gitlab:11.3.6 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.3.6 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.3.5 app:rake gitlab:env:info + sameersbn/gitlab:11.3.6 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.5 app:rake gitlab:import:repos + sameersbn/gitlab:11.3.6 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.5 app:rake gitlab:import:repos + sameersbn/gitlab:11.3.6 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.3.5` 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:11.3.6` 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:11.3.5 +docker pull sameersbn/gitlab:11.3.6 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.3.5 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.3.6 ``` ## Shell Access diff --git a/VERSION b/VERSION index 96d641b7..e9d88222 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.3.5 +11.3.6 diff --git a/docker-compose.yml b/docker-compose.yml index cf663026..1d1232da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.3.5 + image: sameersbn/gitlab:11.3.6 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index f8c15772..c13d54e9 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:11.3.5 app:rake gitlab:backup:create + sameersbn/gitlab:11.3.6 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:11.3.5 app:rake gitlab:backup:restore + sameersbn/gitlab:11.3.6 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:11.3.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.3.6 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:11.3.5 +docker pull sameersbn/gitlab:11.3.6 ``` - **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:11.3.5 +sameersbn/gitlab:11.3.6 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 46f7ad19..1de07094 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.3.5 + image: sameersbn/gitlab:11.3.6 env: - name: TZ value: Asia/Kolkata From 6d3b453e3a673be0b4170eafa8e6428118695a47 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 15 Oct 2018 17:11:33 +0200 Subject: [PATCH 203/508] Replace docker image with circleci image This will include also docker-compose so we can easier test the application. Signed-off-by: solidnerd --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 802f0787..26898fc7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,9 +1,8 @@ version: 2 jobs: build: - working_directory: /workdir docker: - - image: docker:17.06.0-ce-git + - image: circleci/golang:1-stretch-browsers-legacy environment: IMAGE_NAME: "sameersbn/gitlab" From 7af34a73b323278be729b4908643f5e6144f7707 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 15 Oct 2018 17:12:37 +0200 Subject: [PATCH 204/508] Enable build for all branches Signed-off-by: solidnerd --- .circleci/config.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 26898fc7..d02516bc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,9 +62,4 @@ workflows: version: 2 build-and-test: jobs: - - build: - filters: - branches: - only: /.*/ - tags: - only: /.*/ + - build From e81492dc8eea5ac50aa21be16ffdf3f7a17a577c Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 15 Oct 2018 17:13:01 +0200 Subject: [PATCH 205/508] Add simple test if gitlab starts after the changes Signed-off-by: solidnerd --- .circleci/config.yml | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d02516bc..851f63bc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: - checkout - setup_remote_docker: - version: 17.06.0-ce + version: 18.03.1-ce - run: name: Docker info @@ -18,17 +18,22 @@ jobs: docker version docker info + - restore_cache: keys: - cache-{{ .Branch }} paths: - - /cache/layers.tar + - /tmp/cache/layers.tar - run: name: Loading docker cache command: | - if [[ -f /cache/layers.tar ]]; then - docker load -i /cache/layers.tar + if [[ -f /tmp/cache/layers.tar ]]; then + echo "Loading cache ..." + docker load -i /tmp/cache/layers.tar + docker image ls + else + echo "Couldn't find any caches" fi - run: @@ -39,24 +44,25 @@ jobs: - run: name: Launching container for testing command: | - docker network create testnet - docker run --name gitlab -d --net testnet ${IMAGE_NAME} + docker-compose up -d + sleep 10 - run: name: Testing image command: | - echo "TODO" + docker run --network container:$(docker-compose ps -q gitlab) \ + appropriate/curl --retry 12 --retry-delay 5 --retry-connrefused http://localhost/explore - run: name: Generate docker build image cache command: | - mkdir -p /cache - docker save -o /cache/layers.tar ${IMAGE_NAME} + mkdir -p /tmp/cache/ + docker save -o /tmp/cache/layers.tar ${IMAGE_NAME} - save_cache: key: cache-{{ .Branch }}-{{ epoch }} paths: - - /cache/layers.tar + - /tmp/cache/layers.tar workflows: version: 2 From fd96c7dad0990f281a2600453a9453218f9a9104 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 19 Oct 2018 20:41:26 +0200 Subject: [PATCH 206/508] release 11.3.6 From a05c932bda2194b5c9443a24fcc4222fd7b445ef Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 19 Oct 2018 20:46:35 +0200 Subject: [PATCH 207/508] Upgrade GitLab CE to 11.4.0 --- 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 e4d54378..946bd3f6 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. +**11.4.0** +- gitlab: upgrade CE to v11.4.0 + **11.3.6** - gitlab: upgrade CE to v11.3.6 diff --git a/Dockerfile b/Dockerfile index a9277c68..22835d96 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20180808 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.3.6 \ +ENV GITLAB_VERSION=11.4.0 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=8.3.3 \ diff --git a/README.md b/README.md index 618532ec..269a5155 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:11.3.6 +# sameersbn/gitlab:11.4.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.3.6 +docker pull sameersbn/gitlab:11.4.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.3.6 + sameersbn/gitlab:11.4.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.3.6 + sameersbn/gitlab:11.4.0 ``` ## Database @@ -263,7 +263,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:11.3.6 + sameersbn/gitlab:11.4.0 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.3.6 + sameersbn/gitlab:11.4.0 ``` 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: @@ -361,7 +361,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:11.3.6 + sameersbn/gitlab:11.4.0 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.3.6 + sameersbn/gitlab:11.4.0 ``` 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: @@ -431,7 +431,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:11.3.6 + sameersbn/gitlab:11.4.0 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.3.6 + sameersbn/gitlab:11.4.0 ``` ### Mail @@ -471,7 +471,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:11.3.6 + sameersbn/gitlab:11.4.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.3.6 + sameersbn/gitlab:11.4.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.3.6 + sameersbn/gitlab:11.4.0 ``` 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. @@ -584,7 +584,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:11.3.6 + sameersbn/gitlab:11.4.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.3.6 + sameersbn/gitlab:11.4.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.3.6 + sameersbn/gitlab:11.4.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.3.6 + sameersbn/gitlab:11.4.0 ``` 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:11.3.6 app:sanitize + sameersbn/gitlab:11.4.0 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.6 app:rake gitlab:backup:create + sameersbn/gitlab:11.4.0 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.6 app:rake db:setup + sameersbn/gitlab:11.4.0 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:11.3.6 app:rake gitlab:backup:restore + sameersbn/gitlab:11.4.0 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.6 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.3.6 app:rake gitlab:env:info + sameersbn/gitlab:11.4.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.6 app:rake gitlab:import:repos + sameersbn/gitlab:11.4.0 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.3.6 app:rake gitlab:import:repos + sameersbn/gitlab:11.4.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.3.6` 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:11.4.0` 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:11.3.6 +docker pull sameersbn/gitlab:11.4.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.3.6 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index e9d88222..72773deb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.3.6 +11.4.0 diff --git a/docker-compose.yml b/docker-compose.yml index 1d1232da..3f94b9b7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.3.6 + image: sameersbn/gitlab:11.4.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index c13d54e9..38df49da 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:11.3.6 app:rake gitlab:backup:create + sameersbn/gitlab:11.4.0 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:11.3.6 app:rake gitlab:backup:restore + sameersbn/gitlab:11.4.0 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:11.3.6 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.4.0 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:11.3.6 +docker pull sameersbn/gitlab:11.4.0 ``` - **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:11.3.6 +sameersbn/gitlab:11.4.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 1de07094..5e6bec40 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.3.6 + image: sameersbn/gitlab:11.4.0 env: - name: TZ value: Asia/Kolkata From 3740f60201e93dae9071f238823afed274bcab44 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 19 Oct 2018 20:47:25 +0200 Subject: [PATCH 208/508] Update baseimage to xenial-20181005 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 22835d96..bc0319bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:xenial-20180808 +FROM ubuntu:xenial-20181005 LABEL maintainer="sameer@damagehead.com" From 987c8b8d66c5ec6539ff5b7f63579b93a5370915 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 19 Oct 2018 20:48:10 +0200 Subject: [PATCH 209/508] Update gitlab-workhorse to 7.0.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bc0319bc..0a32cd76 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ENV GITLAB_VERSION=11.4.0 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=8.3.3 \ - GITLAB_WORKHORSE_VERSION=6.1.0 \ + GITLAB_WORKHORSE_VERSION=7.0.0 \ GITLAB_PAGES_VERSION=1.1.0 \ GITALY_SERVER_VERSION=0.120.1 \ GITLAB_USER="git" \ From 2704b41d162dc70c9bfcd7c3e7e2f5403bbee054 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 19 Oct 2018 20:48:31 +0200 Subject: [PATCH 210/508] Update gitaly to 0.125.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0a32cd76..abe9325d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=11.4.0 \ GITLAB_SHELL_VERSION=8.3.3 \ GITLAB_WORKHORSE_VERSION=7.0.0 \ GITLAB_PAGES_VERSION=1.1.0 \ - GITALY_SERVER_VERSION=0.120.1 \ + GITALY_SERVER_VERSION=0.125.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 1a54c4db6e607c498e29e39b7d1be9eae5607813 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 19 Oct 2018 20:57:16 +0200 Subject: [PATCH 211/508] Update Changelog.md --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index 946bd3f6..5a33727d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **11.4.0** - gitlab: upgrade CE to v11.4.0 +- baseimage: upgrade to xenial-20181005 **11.3.6** - gitlab: upgrade CE to v11.3.6 From 9c17f73c213d0980f63b478b092d7745e444511a Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 19 Oct 2018 22:33:47 +0200 Subject: [PATCH 212/508] Tag also current version of the image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 851f63bc..7d65e065 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,7 +39,7 @@ jobs: - run: name: Build docker image command: | - docker build --cache-from=${IMAGE_NAME} -t ${IMAGE_NAME} . + docker build --cache-from=${IMAGE_NAME} -t ${IMAGE_NAME} -t ${IMAGE_NAME}:$(cat VERSION) . - run: name: Launching container for testing From 719a8a172e471db02bca3a9c9cd15d0057753b01 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 19 Oct 2018 23:35:26 +0200 Subject: [PATCH 213/508] release 11.4.0 From 78c8ca1a4da382e6d57df1a0cc85e1f6e8d2f9b2 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 29 Oct 2018 19:18:55 +0100 Subject: [PATCH 214/508] Upgrade GitLab CE to 11.4.1 --- 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 5a33727d..6ed07caa 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. +**11.4.1** +- gitlab: upgrade CE to v11.4.1 + **11.4.0** - gitlab: upgrade CE to v11.4.0 - baseimage: upgrade to xenial-20181005 diff --git a/Dockerfile b/Dockerfile index abe9325d..a03d29d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181005 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.4.0 \ +ENV GITLAB_VERSION=11.4.1 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=8.3.3 \ diff --git a/README.md b/README.md index 269a5155..9dfe6e8c 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:11.4.0 +# sameersbn/gitlab:11.4.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -126,7 +126,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:11.4.0 +docker pull sameersbn/gitlab:11.4.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -195,7 +195,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:11.4.0 + sameersbn/gitlab:11.4.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -230,7 +230,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:11.4.0 + sameersbn/gitlab:11.4.1 ``` ## Database @@ -263,7 +263,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:11.4.0 + sameersbn/gitlab:11.4.1 ``` #### Linking to PostgreSQL Container @@ -307,7 +307,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:11.4.0 + sameersbn/gitlab:11.4.1 ``` 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: @@ -361,7 +361,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:11.4.0 + sameersbn/gitlab:11.4.1 ``` #### Linking to MySQL Container @@ -404,7 +404,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:11.4.0 + sameersbn/gitlab:11.4.1 ``` 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: @@ -431,7 +431,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:11.4.0 + sameersbn/gitlab:11.4.1 ``` ### Linking to Redis Container @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.4.0 + sameersbn/gitlab:11.4.1 ``` ### Mail @@ -471,7 +471,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:11.4.0 + sameersbn/gitlab:11.4.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -491,7 +491,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:11.4.0 + sameersbn/gitlab:11.4.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -568,7 +568,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:11.4.0 + sameersbn/gitlab:11.4.1 ``` 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. @@ -584,7 +584,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:11.4.0 + sameersbn/gitlab:11.4.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -607,7 +607,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:11.4.0 + sameersbn/gitlab:11.4.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -655,7 +655,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:11.4.0 + sameersbn/gitlab:11.4.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -783,14 +783,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:11.4.0 + sameersbn/gitlab:11.4.1 ``` 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:11.4.0 app:sanitize + sameersbn/gitlab:11.4.1 app:sanitize ``` ### Piwik @@ -1106,7 +1106,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.4.1 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. @@ -1134,14 +1134,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.0 app:rake db:setup + sameersbn/gitlab:11.4.1 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:11.4.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.4.1 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. @@ -1150,7 +1150,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1199,7 +1199,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:11.4.0 app:rake gitlab:env:info + sameersbn/gitlab:11.4.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1212,7 +1212,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.4.1 app:rake gitlab:import:repos ``` Or @@ -1243,7 +1243,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.4.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1265,12 +1265,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.4.0` 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:11.4.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.4.0 +docker pull sameersbn/gitlab:11.4.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1296,7 +1296,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:11.4.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 72773deb..a6e5b12f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.4.0 +11.4.1 diff --git a/docker-compose.yml b/docker-compose.yml index 3f94b9b7..1716e1a1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.4.0 + image: sameersbn/gitlab:11.4.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 38df49da..c7b7592a 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:11.4.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.4.1 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:11.4.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.4.1 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:11.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.4.1 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:11.4.0 +docker pull sameersbn/gitlab:11.4.1 ``` - **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:11.4.0 +sameersbn/gitlab:11.4.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 5e6bec40..4ef8d8b1 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.4.0 + image: sameersbn/gitlab:11.4.1 env: - name: TZ value: Asia/Kolkata From 2c9206d1a45a6fa285d6305e3d90cd688e82e308 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 29 Oct 2018 19:39:16 +0100 Subject: [PATCH 215/508] Update changelog --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index 6ed07caa..1b59ec8f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **11.4.1** - gitlab: upgrade CE to v11.4.1 +- Add docs how to reuse ssh port [#1731](https://github.com/sameersbn/docker-gitlab/pull/1731) **11.4.0** - gitlab: upgrade CE to v11.4.0 From 2ea215be98f225e050382fc0e46d8f44f73a8a57 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 29 Oct 2018 19:39:58 +0100 Subject: [PATCH 216/508] release 11.4.1 From 387129f8112de1be646e552aed878cd5623daa29 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 29 Oct 2018 19:45:34 +0100 Subject: [PATCH 217/508] Upgrade GitLab CE to 11.4.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 1b59ec8f..4536367c 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. +**11.4.2** +- gitlab: upgrade CE to v11.4.2 + **11.4.1** - gitlab: upgrade CE to v11.4.1 - Add docs how to reuse ssh port [#1731](https://github.com/sameersbn/docker-gitlab/pull/1731) diff --git a/Dockerfile b/Dockerfile index a03d29d4..a1dbcc51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181005 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.4.1 \ +ENV GITLAB_VERSION=11.4.2 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=8.3.3 \ diff --git a/README.md b/README.md index c422276d..d54a43b0 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:11.4.1 +# sameersbn/gitlab:11.4.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -127,7 +127,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:11.4.1 +docker pull sameersbn/gitlab:11.4.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -196,7 +196,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:11.4.1 + sameersbn/gitlab:11.4.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -231,7 +231,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:11.4.1 + sameersbn/gitlab:11.4.2 ``` ## 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:11.4.1 + sameersbn/gitlab:11.4.2 ``` #### 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:11.4.1 + sameersbn/gitlab:11.4.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: @@ -362,7 +362,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:11.4.1 + sameersbn/gitlab:11.4.2 ``` #### Linking to MySQL Container @@ -405,7 +405,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:11.4.1 + sameersbn/gitlab:11.4.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: @@ -432,7 +432,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:11.4.1 + sameersbn/gitlab:11.4.2 ``` ### Linking to Redis Container @@ -459,7 +459,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.4.1 + sameersbn/gitlab:11.4.2 ``` ### Mail @@ -472,7 +472,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:11.4.1 + sameersbn/gitlab:11.4.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -492,7 +492,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:11.4.1 + sameersbn/gitlab:11.4.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -569,7 +569,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:11.4.1 + sameersbn/gitlab:11.4.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. @@ -585,7 +585,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:11.4.1 + sameersbn/gitlab:11.4.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -608,7 +608,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:11.4.1 + sameersbn/gitlab:11.4.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -656,7 +656,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:11.4.1 + sameersbn/gitlab:11.4.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -784,14 +784,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:11.4.1 + sameersbn/gitlab:11.4.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:11.4.1 app:sanitize + sameersbn/gitlab:11.4.2 app:sanitize ``` ### Piwik @@ -1108,7 +1108,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.4.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. @@ -1136,14 +1136,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.1 app:rake db:setup + sameersbn/gitlab:11.4.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:11.4.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.4.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. @@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.4.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1201,7 +1201,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:11.4.1 app:rake gitlab:env:info + sameersbn/gitlab:11.4.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1214,7 +1214,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.4.2 app:rake gitlab:import:repos ``` Or @@ -1245,7 +1245,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.4.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1267,12 +1267,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.4.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:11.4.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:11.4.1 +docker pull sameersbn/gitlab:11.4.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1298,7 +1298,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:11.4.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index a6e5b12f..3a3e396b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.4.1 +11.4.2 diff --git a/docker-compose.yml b/docker-compose.yml index 1716e1a1..10cfbd3f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.4.1 + image: sameersbn/gitlab:11.4.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index c7b7592a..4dafda4a 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:11.4.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.4.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:11.4.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.4.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:11.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.4.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:11.4.1 +docker pull sameersbn/gitlab:11.4.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:11.4.1 +sameersbn/gitlab:11.4.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 4ef8d8b1..047b6a09 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.4.1 + image: sameersbn/gitlab:11.4.2 env: - name: TZ value: Asia/Kolkata From 5a95e81a0d62e767dbf01487c17a93755f38bcd5 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 29 Oct 2018 20:08:49 +0100 Subject: [PATCH 218/508] release 11.4.2 From b89f464e92304c1a4fdf65f87f3e5d333f6a7be2 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 29 Oct 2018 20:10:15 +0100 Subject: [PATCH 219/508] Upgrade GitLab CE to 11.4.3 --- 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 4536367c..10614cbb 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. +**11.4.3** +- gitlab: upgrade CE to v11.4.3 + **11.4.2** - gitlab: upgrade CE to v11.4.2 diff --git a/Dockerfile b/Dockerfile index a1dbcc51..66b499a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181005 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.4.2 \ +ENV GITLAB_VERSION=11.4.3 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.3 \ GITLAB_SHELL_VERSION=8.3.3 \ diff --git a/README.md b/README.md index d54a43b0..73c6ba5c 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:11.4.2 +# sameersbn/gitlab:11.4.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -127,7 +127,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:11.4.2 +docker pull sameersbn/gitlab:11.4.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -196,7 +196,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:11.4.2 + sameersbn/gitlab:11.4.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -231,7 +231,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:11.4.2 + sameersbn/gitlab:11.4.3 ``` ## 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:11.4.2 + sameersbn/gitlab:11.4.3 ``` #### 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:11.4.2 + sameersbn/gitlab:11.4.3 ``` 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: @@ -362,7 +362,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:11.4.2 + sameersbn/gitlab:11.4.3 ``` #### Linking to MySQL Container @@ -405,7 +405,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:11.4.2 + sameersbn/gitlab:11.4.3 ``` 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: @@ -432,7 +432,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:11.4.2 + sameersbn/gitlab:11.4.3 ``` ### Linking to Redis Container @@ -459,7 +459,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.4.2 + sameersbn/gitlab:11.4.3 ``` ### Mail @@ -472,7 +472,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:11.4.2 + sameersbn/gitlab:11.4.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -492,7 +492,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:11.4.2 + sameersbn/gitlab:11.4.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -569,7 +569,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:11.4.2 + sameersbn/gitlab:11.4.3 ``` 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. @@ -585,7 +585,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:11.4.2 + sameersbn/gitlab:11.4.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -608,7 +608,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:11.4.2 + sameersbn/gitlab:11.4.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -656,7 +656,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:11.4.2 + sameersbn/gitlab:11.4.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -784,14 +784,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:11.4.2 + sameersbn/gitlab:11.4.3 ``` 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:11.4.2 app:sanitize + sameersbn/gitlab:11.4.3 app:sanitize ``` ### Piwik @@ -1108,7 +1108,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.4.3 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. @@ -1136,14 +1136,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.2 app:rake db:setup + sameersbn/gitlab:11.4.3 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:11.4.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.4.3 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. @@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.4.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1201,7 +1201,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:11.4.2 app:rake gitlab:env:info + sameersbn/gitlab:11.4.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1214,7 +1214,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.4.3 app:rake gitlab:import:repos ``` Or @@ -1245,7 +1245,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.4.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1267,12 +1267,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.4.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. +> Upgrading to `sameersbn/gitlab:11.4.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.4.2 +docker pull sameersbn/gitlab:11.4.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1298,7 +1298,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:11.4.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index 3a3e396b..72f04fb9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.4.2 +11.4.3 diff --git a/docker-compose.yml b/docker-compose.yml index 10cfbd3f..df14d95a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.4.2 + image: sameersbn/gitlab:11.4.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 4dafda4a..d967616d 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:11.4.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.4.3 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:11.4.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.4.3 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:11.4.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.4.3 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:11.4.2 +docker pull sameersbn/gitlab:11.4.3 ``` - **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:11.4.2 +sameersbn/gitlab:11.4.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 047b6a09..b2857598 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.4.2 + image: sameersbn/gitlab:11.4.3 env: - name: TZ value: Asia/Kolkata From b7e527920772484bd802c2b7515f47800c29a969 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 30 Oct 2018 07:24:55 +0100 Subject: [PATCH 220/508] release 11.4.3 From 186d6a062ed13e9517d94107b2ec6142a3f237bc Mon Sep 17 00:00:00 2001 From: "Klos, Jan" Date: Thu, 1 Nov 2018 23:14:04 +0100 Subject: [PATCH 221/508] upgrade golang to 1.10.4 --- Changelog.md | 3 +++ Dockerfile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 10614cbb..a4012119 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. +**11.4.4** +- golang: update to 1.10.4 + **11.4.3** - gitlab: upgrade CE to v11.4.3 diff --git a/Dockerfile b/Dockerfile index 66b499a8..322ce056 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="sameer@damagehead.com" ENV GITLAB_VERSION=11.4.3 \ RUBY_VERSION=2.4 \ - GOLANG_VERSION=1.10.3 \ + GOLANG_VERSION=1.10.4 \ GITLAB_SHELL_VERSION=8.3.3 \ GITLAB_WORKHORSE_VERSION=7.0.0 \ GITLAB_PAGES_VERSION=1.1.0 \ From 8d36cc2a361919162a9ca49b45cc01dbdf37b266 Mon Sep 17 00:00:00 2001 From: "Klos, Jan" Date: Thu, 1 Nov 2018 23:15:44 +0100 Subject: [PATCH 222/508] Upgrade GitLab CE to 11.4.4 --- Changelog.md | 1 + Dockerfile | 2 +- README.md | 56 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 37 deletions(-) diff --git a/Changelog.md b/Changelog.md index a4012119..29a04d80 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,7 @@ This file only reflects the changes that are made in this image. Please refer to https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab. **11.4.4** +- gitlab: upgrade CE to v11.4.4 - golang: update to 1.10.4 **11.4.3** diff --git a/Dockerfile b/Dockerfile index 322ce056..dcbf35e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181005 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.4.3 \ +ENV GITLAB_VERSION=11.4.4 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.4 \ GITLAB_SHELL_VERSION=8.3.3 \ diff --git a/README.md b/README.md index 73c6ba5c..1d587831 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:11.4.3 +# sameersbn/gitlab:11.4.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -127,7 +127,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:11.4.3 +docker pull sameersbn/gitlab:11.4.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -196,7 +196,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:11.4.3 + sameersbn/gitlab:11.4.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -231,7 +231,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:11.4.3 + sameersbn/gitlab:11.4.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:11.4.3 + sameersbn/gitlab:11.4.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:11.4.3 + sameersbn/gitlab:11.4.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: @@ -362,7 +362,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:11.4.3 + sameersbn/gitlab:11.4.4 ``` #### Linking to MySQL Container @@ -405,7 +405,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:11.4.3 + sameersbn/gitlab:11.4.4 ``` 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: @@ -432,7 +432,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:11.4.3 + sameersbn/gitlab:11.4.4 ``` ### Linking to Redis Container @@ -459,7 +459,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.4.3 + sameersbn/gitlab:11.4.4 ``` ### Mail @@ -472,7 +472,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:11.4.3 + sameersbn/gitlab:11.4.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -492,7 +492,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:11.4.3 + sameersbn/gitlab:11.4.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -569,7 +569,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:11.4.3 + sameersbn/gitlab:11.4.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. @@ -585,7 +585,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:11.4.3 + sameersbn/gitlab:11.4.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -608,7 +608,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:11.4.3 + sameersbn/gitlab:11.4.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -656,7 +656,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:11.4.3 + sameersbn/gitlab:11.4.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -784,14 +784,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:11.4.3 + sameersbn/gitlab:11.4.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:11.4.3 app:sanitize + sameersbn/gitlab:11.4.4 app:sanitize ``` ### Piwik @@ -1108,7 +1108,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.4.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. @@ -1136,14 +1136,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.3 app:rake db:setup + sameersbn/gitlab:11.4.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:11.4.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.4.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. @@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.4.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1201,7 +1201,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:11.4.3 app:rake gitlab:env:info + sameersbn/gitlab:11.4.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1214,7 +1214,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.4.4 app:rake gitlab:import:repos ``` Or @@ -1245,7 +1245,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.4.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1267,12 +1267,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.4.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:11.4.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:11.4.3 +docker pull sameersbn/gitlab:11.4.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1298,7 +1298,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:11.4.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index 72f04fb9..708f9d54 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.4.3 +11.4.4 diff --git a/docker-compose.yml b/docker-compose.yml index df14d95a..19dd72b7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.4.3 + image: sameersbn/gitlab:11.4.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index d967616d..570bdd54 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:11.4.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.4.4 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:11.4.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.4.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. @@ -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:11.4.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.4.4 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:11.4.3 +docker pull sameersbn/gitlab:11.4.4 ``` - **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:11.4.3 +sameersbn/gitlab:11.4.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index b2857598..b1b16700 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.4.3 + image: sameersbn/gitlab:11.4.4 env: - name: TZ value: Asia/Kolkata From cc72dc7bcf32e4da4c8785e1cf546fe1c84a9839 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 2 Nov 2018 11:10:36 +0100 Subject: [PATCH 223/508] release 11.4.4 From f018122380e25cd7e3290cd98cedf6f21fa41ba8 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 5 Nov 2018 07:44:55 +0100 Subject: [PATCH 224/508] Upgrade GitLab CE to 11.4.5 --- 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 29a04d80..2390ccc7 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. +**11.4.5** +- gitlab: upgrade CE to v11.4.5 + **11.4.4** - gitlab: upgrade CE to v11.4.4 - golang: update to 1.10.4 diff --git a/Dockerfile b/Dockerfile index dcbf35e6..ac7ea6e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181005 LABEL maintainer="sameer@damagehead.com" -ENV GITLAB_VERSION=11.4.4 \ +ENV GITLAB_VERSION=11.4.5 \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.4 \ GITLAB_SHELL_VERSION=8.3.3 \ diff --git a/README.md b/README.md index 1d587831..40bf1f04 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:11.4.4 +# sameersbn/gitlab:11.4.5 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -127,7 +127,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:11.4.4 +docker pull sameersbn/gitlab:11.4.5 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -196,7 +196,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:11.4.4 + sameersbn/gitlab:11.4.5 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -231,7 +231,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:11.4.4 + sameersbn/gitlab:11.4.5 ``` ## 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:11.4.4 + sameersbn/gitlab:11.4.5 ``` #### 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:11.4.4 + sameersbn/gitlab:11.4.5 ``` 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: @@ -362,7 +362,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:11.4.4 + sameersbn/gitlab:11.4.5 ``` #### Linking to MySQL Container @@ -405,7 +405,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:11.4.4 + sameersbn/gitlab:11.4.5 ``` 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: @@ -432,7 +432,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:11.4.4 + sameersbn/gitlab:11.4.5 ``` ### Linking to Redis Container @@ -459,7 +459,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.4.4 + sameersbn/gitlab:11.4.5 ``` ### Mail @@ -472,7 +472,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:11.4.4 + sameersbn/gitlab:11.4.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -492,7 +492,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:11.4.4 + sameersbn/gitlab:11.4.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -569,7 +569,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:11.4.4 + sameersbn/gitlab:11.4.5 ``` 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. @@ -585,7 +585,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:11.4.4 + sameersbn/gitlab:11.4.5 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -608,7 +608,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:11.4.4 + sameersbn/gitlab:11.4.5 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -656,7 +656,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:11.4.4 + sameersbn/gitlab:11.4.5 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -784,14 +784,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:11.4.4 + sameersbn/gitlab:11.4.5 ``` 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:11.4.4 app:sanitize + sameersbn/gitlab:11.4.5 app:sanitize ``` ### Piwik @@ -1108,7 +1108,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.4.5 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. @@ -1136,14 +1136,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.4 app:rake db:setup + sameersbn/gitlab:11.4.5 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:11.4.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.4.5 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. @@ -1152,7 +1152,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.4.5 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1201,7 +1201,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:11.4.4 app:rake gitlab:env:info + sameersbn/gitlab:11.4.5 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1214,7 +1214,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.4.5 app:rake gitlab:import:repos ``` Or @@ -1245,7 +1245,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.4.5 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1267,12 +1267,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.4.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. +> Upgrading to `sameersbn/gitlab:11.4.5` 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:11.4.4 +docker pull sameersbn/gitlab:11.4.5 ``` - **Step 2**: Stop and remove the currently running image @@ -1298,7 +1298,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:11.4.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.5 ``` ## Shell Access diff --git a/VERSION b/VERSION index 708f9d54..64d81d98 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.4.4 +11.4.5 diff --git a/docker-compose.yml b/docker-compose.yml index 19dd72b7..62e1bad5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.4.4 + image: sameersbn/gitlab:11.4.5 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 570bdd54..b385a6cb 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:11.4.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.4.5 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:11.4.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.4.5 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:11.4.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.4.5 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:11.4.4 +docker pull sameersbn/gitlab:11.4.5 ``` - **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:11.4.4 +sameersbn/gitlab:11.4.5 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index b1b16700..e84389f6 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.4.4 + image: sameersbn/gitlab:11.4.5 env: - name: TZ value: Asia/Kolkata From e8b1c729630fa5f78497398bf1ae87f8057c2738 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 5 Nov 2018 14:11:52 +0100 Subject: [PATCH 225/508] release 11.4.5 From 7f24c384fb91587479e8eea8311464a930d6db2d Mon Sep 17 00:00:00 2001 From: Maycon Lopes dos Santos Date: Fri, 6 Jul 2018 02:56:22 -0300 Subject: [PATCH 226/508] Added GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD to the templates GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD description fix number of args --- README.md | 1 + assets/runtime/config/gitlabhq/gitlab.yml | 1 + assets/runtime/env-defaults | 1 + assets/runtime/functions | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 40bf1f04..255d29df 100644 --- a/README.md +++ b/README.md @@ -851,6 +851,7 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_ARTIFACTS_DIR` | Directory to store the artifacts. Defaults to `$GITLAB_SHARED_DIR/artifacts` | | `GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED` | Enables Object Store for Artifacts that will be remote stored. Defaults to `false` | | `GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the artifacts. Defaults to `artifacts` | +| `GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD` | Set to true to enable direct upload of Artifacts without the need of local shared storage. Defaults to `false` | | `GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD` | Temporary option to limit automatic upload. Defaults to `false` | | `GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD` | Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` | | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. Currently only AWS is supported. Defaults to `AWS` | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 721450af..48308a09 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -158,6 +158,7 @@ production: &base object_store: enabled: {{GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED}} remote_directory: {{GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name + direct_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD}} # Set to true to enable direct upload of Artifacts without the need of local shared storage. background_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true) proxy_download: {{GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage connection: diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 0330ebd1..29ac89fb 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -93,6 +93,7 @@ GITLAB_ARTIFACTS_DIR="${GITLAB_ARTIFACTS_DIR:-$GITLAB_SHARED_DIR/artifacts}" GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED=${GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED:-false} GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY:-artifacts} +GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD=${GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD:-false} GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD=${GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD:-false} GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD=${GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD:-false} GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER:-AWS} diff --git a/assets/runtime/functions b/assets/runtime/functions index d9f63531..d41d689c 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -953,6 +953,7 @@ gitlab_configure_artifacts() { update_template ${GITLAB_CONFIG} \ GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED \ GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY \ + GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD \ GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD \ GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD \ GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER \ @@ -963,7 +964,7 @@ gitlab_configure_artifacts() { GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE else - exec_as_git sed -i -e "/path: {{GITLAB_ARTIFACTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG} + exec_as_git sed -i -e "/path: {{GITLAB_ARTIFACTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG} fi echo "Configuring gitlab::artifacts..." From 55da4ae7cfbb7ede998aa1036e9af3f1f5fa5809 Mon Sep 17 00:00:00 2001 From: Gert-Jan Timmer Date: Thu, 8 Nov 2018 12:14:29 +0100 Subject: [PATCH 227/508] Rewrite CI UPD .gitlab-ci.yml UPD: Dockerfile UPD: circle-ci.yml DEL: ci/gitlab -> moved to .gitlab-ci.yml ADD: Labels ADD: Docker Daemon build hook ADD: Build Arguments --- .circleci/config.yml | 7 +++++- .gitlab-ci.yml | 55 +++++++++++++++++++++++++++++++++++++++++--- CONTRIBUTING.md | 12 ++++++++++ Dockerfile | 17 ++++++++++++-- ci/gitlab | 15 ------------ hooks/build | 10 ++++++++ 6 files changed, 95 insertions(+), 21 deletions(-) create mode 100644 CONTRIBUTING.md delete mode 100755 ci/gitlab create mode 100644 hooks/build diff --git a/.circleci/config.yml b/.circleci/config.yml index 7d65e065..b58ff2ab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,7 +39,12 @@ jobs: - run: name: Build docker image command: | - docker build --cache-from=${IMAGE_NAME} -t ${IMAGE_NAME} -t ${IMAGE_NAME}:$(cat VERSION) . + docker build \ + --cache-from=${IMAGE_NAME} \ + --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ + --build-arg VCS_REF=`git rev-parse --short HEAD` \ + --build-arg VERSION=$(cat VERSION) \ + -t ${IMAGE_NAME}:$(cat VERSION) . - run: name: Launching container for testing diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 07ba61db..c712978b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,54 @@ -image: docker:dind +image: docker:18-git -deploy: +stages: + - build + +before_script: + - export VERSION=$(cat VERSION) + - export CI_REGISTRY=${CI_REGISTRY:-hub.docker.com} + - export CI_REGISTRY_USER=${CI_REGISTRY_USER:-gitlab-ci-token} + - export CI_REGISTRY_PASS=${CI_REGISTRY_PASS:-${CI_JOB_TOKEN}} + - export DOCKER_IMAGE=${DOCKER_IMAGE:-${CI_REGISTRY}/${CI_PROJECT_PATH}} + - | + if [ "${DOCKER_IMAGE}" = "/" ]; then + export DOCKER_IMAGE=sameersbn/gitlab + fi + +docker:build: + stage: build + only: + - master script: - - ci/gitlab + - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY} + - docker build + --build-arg VCS_REF=`git rev-parse --short HEAD` + --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` + --build-arg VERSION=${VERSION} + --tag ${DOCKER_IMAGE} . + - docker push ${DOCKER_IMAGE} + +docker:build:branches: + stage: build + only: + - branches + script: + - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY} + - docker build + --build-arg VCS_REF=`git rev-parse --short HEAD` + --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` + --build-arg VERSION=${VERSION} + --tag ${DOCKER_IMAGE}:${CI_COMMIT_REF_NAME/\//-} . + - docker push ${DOCKER_IMAGE}:${CI_COMMIT_REF_NAME/\//-} + +docker:build:release: + stage: build + only: + - tags + script: + - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY} + - docker build + --build-arg VCS_REF=`git rev-parse --short HEAD` + --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` + --build-arg VERSION=${VERSION} + --tag ${DOCKER_IMAGE}:${VERSION} . + - docker push ${DOCKER_IMAGE}:${VERSION} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..4d495a50 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,12 @@ +# Gitlab-CI Configuration + +When using your own gitlab instance, the provided .gitlab-ci.yml will be automatically be using the settings provided by the Gitlab Instance. If needed several options can be overriden. + +Overrides for these values can be set within the project, under `Settings` -> `CI/CD` -> `Variables`. + +| Variable | Default Value | Description | +| ------------------ | ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `CI_REGISTRY` | `hub.docker.com` | If available this will be automatically overriden by registry address which is configured within the Gitlab instance | +| `CI_REGISTRY_USER` | `gitlab-ci-token` | Username for the registry | +| `CI_REGISTRY_PASS` | `${CI_JOB_TOKEN}` | Password for the registry | +| `DOCKER_IMAGE` | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running Gitlan instance with the `${C_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within Gitlab. | diff --git a/Dockerfile b/Dockerfile index ac7ea6e3..f0fcfbc2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,21 @@ FROM ubuntu:xenial-20181005 -LABEL maintainer="sameer@damagehead.com" +ARG BUILD_DATE +ARG VCS_REF +ARG VERSION -ENV GITLAB_VERSION=11.4.5 \ +LABEL \ + maintainer="sameer@damagehead.com" \ + org.label-schema.schema-version="1.0" \ + org.label-schema.build-date=${BUILD_DATE} \ + org.label-schema.name=gitlab \ + org.label-schema.vendor=damagehead \ + org.label-schema.url="https://github.com/sameersbn/docker-gitlab" \ + org.label-schema.vcs-url="https://github.com/sameersbn/docker-gitlab.git" \ + org.label-schema.vcs-ref=${VCS_REF} \ + com.damagehead.gitlab.license=MIT + +ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.4 \ GITLAB_SHELL_VERSION=8.3.3 \ diff --git a/ci/gitlab b/ci/gitlab deleted file mode 100755 index 1b8736d5..00000000 --- a/ci/gitlab +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -set -e - -VERSION=$(cat VERSION) -DOCKER_REGISTRY_HOST=${DOCKER_REGISTRY_HOST:-hub.docker.com} -DOCKER_IMAGE=${DOCKER_IMAGE:-sameersbn/gitlab} - -docker build -t $DOCKER_IMAGE . - -docker tag $DOCKER_IMAGE $DOCKER_REGISTRY_HOST/$DOCKER_IMAGE:latest -docker tag $DOCKER_IMAGE $DOCKER_REGISTRY_HOST/$DOCKER_IMAGE:$VERSION - -docker push $DOCKER_REGISTRY_HOST/$DOCKER_IMAGE:latest -docker push $DOCKER_REGISTRY_HOST/$DOCKER_IMAGE:$VERSION diff --git a/hooks/build b/hooks/build new file mode 100644 index 00000000..8e732132 --- /dev/null +++ b/hooks/build @@ -0,0 +1,10 @@ +!/bin/bash + +# Docker Daemon Build Hook +# $IMAGE_NAME var is injected into the build so the tag is correct. + +docker build \ + --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ + --build-arg VCS_REF=`git rev-parse --short HEAD` \ + --build-arg VERSION=$(cat VERSION) \ + -t $IMAGE_NAME . From 06ecea88552d7abb755dafd0da987ab8672b2f6b Mon Sep 17 00:00:00 2001 From: Lewis Marshall Date: Wed, 7 Nov 2018 09:08:15 +0000 Subject: [PATCH 228/508] Make the chown of backup files optional --- README.md | 1 + assets/runtime/env-defaults | 2 +- assets/runtime/functions | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 255d29df..dfd0182a 100644 --- a/README.md +++ b/README.md @@ -844,6 +844,7 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_NOTIFY_PUSHER` | Add pusher to recipients list of broken build notification emails. Defaults to `false` | | `GITLAB_REPOS_DIR` | The git repositories folder in the container. Defaults to `/home/git/data/repositories` | | `GITLAB_BACKUP_DIR` | The backup folder in the container. Defaults to `/home/git/data/backups` | +| `GITLAB_BACKUP_DIR_CHOWN` | Optionally change ownership of backup files on start-up | Defaults to `true` | | `GITLAB_BUILDS_DIR` | The build traces directory. Defaults to `/home/git/data/builds` | | `GITLAB_DOWNLOADS_DIR` | The repository downloads directory. A temporary zip is created in this directory when users click **Download Zip** on a project. Defaults to `/home/git/data/tmp/downloads`. | | `GITLAB_SHARED_DIR` | The directory to store the build artifacts. Defaults to `/home/git/data/shared` | diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 29ac89fb..d2a4295b 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -5,6 +5,7 @@ DEBUG=${DEBUG:-$DEBUG_ENTRYPOINT} ## GITLAB CORE GITLAB_TEMP_DIR="${GITLAB_DATA_DIR}/tmp" GITLAB_BACKUP_DIR="${GITLAB_BACKUP_DIR:-$GITLAB_DATA_DIR/backups}" +GITLAB_BACKUP_DIR_CHOWN=${GITLAB_BACKUP_DIR_CHOWN:-true} GITLAB_REPOS_DIR="${GITLAB_REPOS_DIR:-$GITLAB_DATA_DIR/repositories}" GITLAB_BUILDS_DIR="${GITLAB_BUILDS_DIR:-$GITLAB_DATA_DIR/builds}" GITLAB_DOWNLOADS_DIR="${GITLAB_DOWNLOADS_DIR:-$GITLAB_TEMP_DIR/downloads}" @@ -425,4 +426,3 @@ GITLAB_MONITORING_IP_WHITELIST=${GITLAB_MONITORING_IP_WHITELIST:-"0.0.0.0/8"} GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED=${GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED:-true} GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS=${GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS:-"0.0.0.0"} GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT=${GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT:-3807} - diff --git a/assets/runtime/functions b/assets/runtime/functions index d41d689c..848b444c 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1329,7 +1329,9 @@ initialize_datadir() { # create the backups directory mkdir -p ${GITLAB_BACKUP_DIR} - chown ${GITLAB_USER}: ${GITLAB_BACKUP_DIR} + if [[ ${GITLAB_BACKUP_DIR_CHOWN} == true ]]; then + chown ${GITLAB_USER}: ${GITLAB_BACKUP_DIR} + fi # create the uploads directory mkdir -p ${GITLAB_DATA_DIR}/uploads From b545d7397af23c72814d5ab57aa231f188aecc54 Mon Sep 17 00:00:00 2001 From: Gert-Jan Timmer Date: Fri, 9 Nov 2018 08:47:01 +0100 Subject: [PATCH 229/508] Review Update * Fix: backticks * Fix: date format (change to RFC 3339 format) * Fix: default version * Fix: typo * Fix timeout during launching test fase * Add: --cache-from ***Note: --rfc-3389=s as argument for `date` not used. This is not available within alpine (BusyBox)*** --- .circleci/config.yml | 10 +++++----- .gitlab-ci.yml | 28 +++++++++++++++++----------- CONTRIBUTING.md | 12 ++++++------ Dockerfile | 2 +- hooks/build | 10 ++++++---- 5 files changed, 35 insertions(+), 27 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b58ff2ab..7b720897 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,7 +18,6 @@ jobs: docker version docker info - - restore_cache: keys: - cache-{{ .Branch }} @@ -40,9 +39,10 @@ jobs: name: Build docker image command: | docker build \ + --pull \ --cache-from=${IMAGE_NAME} \ - --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ - --build-arg VCS_REF=`git rev-parse --short HEAD` \ + --build-arg BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \ + --build-arg VCS_REF=$(git rev-parse --short HEAD) \ --build-arg VERSION=$(cat VERSION) \ -t ${IMAGE_NAME}:$(cat VERSION) . @@ -50,13 +50,13 @@ jobs: name: Launching container for testing command: | docker-compose up -d - sleep 10 + sleep 120 - run: name: Testing image command: | docker run --network container:$(docker-compose ps -q gitlab) \ - appropriate/curl --retry 12 --retry-delay 5 --retry-connrefused http://localhost/explore + appropriate/curl --retry 15 --retry-delay 5 --retry-connrefused http://localhost/explore - run: name: Generate docker build image cache diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c712978b..8f1c35ff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,9 +21,11 @@ docker:build: script: - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY} - docker build - --build-arg VCS_REF=`git rev-parse --short HEAD` - --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` - --build-arg VERSION=${VERSION} + --pull + --cache-from=${DOCKER_IMAGE} + --build-arg=VCS_REF=$(git rev-parse --short HEAD) + --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" + --build-arg=VERSION=${VERSION} --tag ${DOCKER_IMAGE} . - docker push ${DOCKER_IMAGE} @@ -34,11 +36,13 @@ docker:build:branches: script: - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY} - docker build - --build-arg VCS_REF=`git rev-parse --short HEAD` - --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` - --build-arg VERSION=${VERSION} - --tag ${DOCKER_IMAGE}:${CI_COMMIT_REF_NAME/\//-} . - - docker push ${DOCKER_IMAGE}:${CI_COMMIT_REF_NAME/\//-} + --pull + --cache-from=${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG} + --build-arg=VCS_REF=$(git rev-parse --short HEAD) + --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" + --build-arg=VERSION=${VERSION} + --tag ${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG} . + - docker push ${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG} docker:build:release: stage: build @@ -47,8 +51,10 @@ docker:build:release: script: - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY} - docker build - --build-arg VCS_REF=`git rev-parse --short HEAD` - --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` - --build-arg VERSION=${VERSION} + --pull + --cache-from=${DOCKER_IMAGE}:${VERSION} + --build-arg=VCS_REF=$(git rev-parse --short HEAD) + --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" + --build-arg=VERSION=${VERSION} --tag ${DOCKER_IMAGE}:${VERSION} . - docker push ${DOCKER_IMAGE}:${VERSION} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4d495a50..bd8fd424 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,9 +4,9 @@ When using your own gitlab instance, the provided .gitlab-ci.yml will be automat Overrides for these values can be set within the project, under `Settings` -> `CI/CD` -> `Variables`. -| Variable | Default Value | Description | -| ------------------ | ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `CI_REGISTRY` | `hub.docker.com` | If available this will be automatically overriden by registry address which is configured within the Gitlab instance | -| `CI_REGISTRY_USER` | `gitlab-ci-token` | Username for the registry | -| `CI_REGISTRY_PASS` | `${CI_JOB_TOKEN}` | Password for the registry | -| `DOCKER_IMAGE` | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running Gitlan instance with the `${C_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within Gitlab. | +| Variable | Default Value | Description | +| ------------------ | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| `CI_REGISTRY` | `hub.docker.com` | If available this will be automatically overriden by registry address which is configured within the Gitlab instance | +| `CI_REGISTRY_USER` | `gitlab-ci-token` | Username for the registry | +| `CI_REGISTRY_PASS` | `${CI_JOB_TOKEN}` | Password for the registry | +| `DOCKER_IMAGE` | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running Gitlab instance with the `${CI_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within Gitlab. | diff --git a/Dockerfile b/Dockerfile index f0fcfbc2..ba3d24e5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181005 ARG BUILD_DATE ARG VCS_REF -ARG VERSION +ARG VERSION=11.4.5 LABEL \ maintainer="sameer@damagehead.com" \ diff --git a/hooks/build b/hooks/build index 8e732132..e0e2f7bc 100644 --- a/hooks/build +++ b/hooks/build @@ -4,7 +4,9 @@ # $IMAGE_NAME var is injected into the build so the tag is correct. docker build \ - --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ - --build-arg VCS_REF=`git rev-parse --short HEAD` \ - --build-arg VERSION=$(cat VERSION) \ - -t $IMAGE_NAME . + --pull \ + --cache-from=${IMAGE_NAME} \ + --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \ + --build-arg=VCS_REF=$(git rev-parse --short HEAD) \ + --build-arg=VERSION=$(cat VERSION) \ + -t ${IMAGE_NAME} . From 5173f8861241986e7a61365d99d8cc7557ed0078 Mon Sep 17 00:00:00 2001 From: Waldemar Reusch Date: Sun, 18 Nov 2018 17:17:16 +0100 Subject: [PATCH 230/508] fix bootloop for rare race condition between kill and wait `wait` will throw an error if a process it waits for is terminated by an external signal. Together with `set -e` this will stop the whole entrypoint script. I guess this issues only crops up very rarely, as the `kill` command already waits for the supervisor process to shut down, and the test using `ps h -p $SUPERVISOR_PID` returns false and thus `wait` is never called. You can check the behavior using following simple script: ```bash #!/bin/bash #set -e echo "Testing wait command" sleep 20 & pid=$! kill $pid wait $pid echo $pid was terminated. ``` as long as `set -e` is commented out, `$pid was terminated` will print. If you enable `set -e`, the last line will not be printed, as the script fails in the `wait` command. --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 3d810ef4..7773ae70 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -19,7 +19,7 @@ case ${1} in SUPERVISOR_PID=$! migrate_database kill -15 $SUPERVISOR_PID - ps h -p $SUPERVISOR_PID > /dev/null && wait $SUPERVISOR_PID + ps h -p $SUPERVISOR_PID > /dev/null && wait $SUPERVISOR_PID || true rm -rf /var/run/supervisor.sock exec /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf ;; From 09a7a1c12d4f6f16afcd7761b9fa102ddce89b48 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 19 Nov 2018 07:42:52 +0100 Subject: [PATCH 231/508] Invalidate cache for all builds --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7b720897..8745a2a4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: - restore_cache: keys: - - cache-{{ .Branch }} + - cache-v2-{{ .Branch }} paths: - /tmp/cache/layers.tar @@ -65,7 +65,7 @@ jobs: docker save -o /tmp/cache/layers.tar ${IMAGE_NAME} - save_cache: - key: cache-{{ .Branch }}-{{ epoch }} + key: cache-v2-{{ .Branch }} paths: - /tmp/cache/layers.tar From 618d88b16a83656b3530152f8fda6928e7633c66 Mon Sep 17 00:00:00 2001 From: reusch Date: Mon, 19 Nov 2018 17:35:08 +0100 Subject: [PATCH 232/508] which -s flag is not universal --- kubernetes/deploy.sh | 2 +- kubernetes/teardown.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/deploy.sh b/kubernetes/deploy.sh index f899ff41..2e4982d2 100755 --- a/kubernetes/deploy.sh +++ b/kubernetes/deploy.sh @@ -1,6 +1,6 @@ #!/bin/bash -if ! which -s kubectl; then +if ! which kubectl > /dev/null; then echo "kubectl command not installed" exit 1 fi diff --git a/kubernetes/teardown.sh b/kubernetes/teardown.sh index 3937c4bc..3ee820fb 100755 --- a/kubernetes/teardown.sh +++ b/kubernetes/teardown.sh @@ -1,6 +1,6 @@ #!/bin/bash -if ! which -s kubectl; then +if ! which kubectl > /dev/null; then echo "kubectl command not installed" exit 1 fi From 86f49942733315e979d2bd0f9e6658855e0a62e0 Mon Sep 17 00:00:00 2001 From: Gert-Jan Timmer Date: Tue, 20 Nov 2018 16:51:28 +0100 Subject: [PATCH 233/508] fix double CI job Exclude master branch from docker:build:branches --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f1c35ff..6e8d57ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,8 @@ docker:build:branches: stage: build only: - branches + except: + - master script: - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY} - docker build From c872e80f5f61abc7657d78bc92c41768a6b1a150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?= Date: Wed, 21 Nov 2018 20:58:40 +0100 Subject: [PATCH 234/508] Upgrade GitLab to 11.4.6 --- 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 2390ccc7..36d0ad21 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. +**11.4.6** +- gitlab: upgrade CE to v11.4.6 + **11.4.5** - gitlab: upgrade CE to v11.4.5 diff --git a/Dockerfile b/Dockerfile index ba3d24e5..e069f615 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181005 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.4.5 +ARG VERSION=11.4.6 LABEL \ maintainer="sameer@damagehead.com" \ diff --git a/README.md b/README.md index dfd0182a..7c40065f 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:11.4.5 +# sameersbn/gitlab:11.4.6 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -127,7 +127,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:11.4.5 +docker pull sameersbn/gitlab:11.4.6 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -196,7 +196,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:11.4.5 + sameersbn/gitlab:11.4.6 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -231,7 +231,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:11.4.5 + sameersbn/gitlab:11.4.6 ``` ## 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:11.4.5 + sameersbn/gitlab:11.4.6 ``` #### 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:11.4.5 + sameersbn/gitlab:11.4.6 ``` 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: @@ -362,7 +362,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:11.4.5 + sameersbn/gitlab:11.4.6 ``` #### Linking to MySQL Container @@ -405,7 +405,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:11.4.5 + sameersbn/gitlab:11.4.6 ``` 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: @@ -432,7 +432,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:11.4.5 + sameersbn/gitlab:11.4.6 ``` ### Linking to Redis Container @@ -459,7 +459,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.4.5 + sameersbn/gitlab:11.4.6 ``` ### Mail @@ -472,7 +472,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:11.4.5 + sameersbn/gitlab:11.4.6 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -492,7 +492,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:11.4.5 + sameersbn/gitlab:11.4.6 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -569,7 +569,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:11.4.5 + sameersbn/gitlab:11.4.6 ``` 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. @@ -585,7 +585,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:11.4.5 + sameersbn/gitlab:11.4.6 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -608,7 +608,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:11.4.5 + sameersbn/gitlab:11.4.6 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -656,7 +656,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:11.4.5 + sameersbn/gitlab:11.4.6 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -784,14 +784,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:11.4.5 + sameersbn/gitlab:11.4.6 ``` 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:11.4.5 app:sanitize + sameersbn/gitlab:11.4.6 app:sanitize ``` ### Piwik @@ -1110,7 +1110,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.5 app:rake gitlab:backup:create + sameersbn/gitlab:11.4.6 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. @@ -1138,14 +1138,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.5 app:rake db:setup + sameersbn/gitlab:11.4.6 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:11.4.5 app:rake gitlab:backup:restore + sameersbn/gitlab:11.4.6 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. @@ -1154,7 +1154,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.4.6 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1203,7 +1203,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:11.4.5 app:rake gitlab:env:info + sameersbn/gitlab:11.4.6 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1216,7 +1216,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.5 app:rake gitlab:import:repos + sameersbn/gitlab:11.4.6 app:rake gitlab:import:repos ``` Or @@ -1247,7 +1247,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.5 app:rake gitlab:import:repos + sameersbn/gitlab:11.4.6 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1269,12 +1269,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.4.5` 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:11.4.6` 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:11.4.5 +docker pull sameersbn/gitlab:11.4.6 ``` - **Step 2**: Stop and remove the currently running image @@ -1300,7 +1300,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:11.4.5 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.6 ``` ## Shell Access diff --git a/VERSION b/VERSION index 64d81d98..9bde90d2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.4.5 +11.4.6 diff --git a/docker-compose.yml b/docker-compose.yml index 62e1bad5..59f2b727 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.4.5 + image: sameersbn/gitlab:11.4.6 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index b385a6cb..00eb1888 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:11.4.5 app:rake gitlab:backup:create + sameersbn/gitlab:11.4.6 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:11.4.5 app:rake gitlab:backup:restore + sameersbn/gitlab:11.4.6 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:11.4.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.4.6 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:11.4.5 +docker pull sameersbn/gitlab:11.4.6 ``` - **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:11.4.5 +sameersbn/gitlab:11.4.6 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index e84389f6..1ed48364 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.4.5 + image: sameersbn/gitlab:11.4.6 env: - name: TZ value: Asia/Kolkata From f7f6e0408411cff65f7ffe9c7d53769465267d92 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 22 Nov 2018 20:38:36 +0100 Subject: [PATCH 235/508] release 11.4.6 From 7b3e7cbbf76530841b4bbcdd682dcd5abc4baae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Constantin=20Wildf=C3=B6rster?= Date: Wed, 21 Nov 2018 21:01:19 +0100 Subject: [PATCH 236/508] Upgrade GitLab to 11.4.7 --- 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 36d0ad21..f747ae2e 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. +**11.4.7** +- gitlab: upgrade CE to v11.4.7 + **11.4.6** - gitlab: upgrade CE to v11.4.6 diff --git a/Dockerfile b/Dockerfile index e069f615..e8b88188 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181005 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.4.6 +ARG VERSION=11.4.7 LABEL \ maintainer="sameer@damagehead.com" \ diff --git a/README.md b/README.md index 7c40065f..bf7cdbcd 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:11.4.6 +# sameersbn/gitlab:11.4.7 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -127,7 +127,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:11.4.6 +docker pull sameersbn/gitlab:11.4.7 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -196,7 +196,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:11.4.6 + sameersbn/gitlab:11.4.7 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -231,7 +231,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:11.4.6 + sameersbn/gitlab:11.4.7 ``` ## 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:11.4.6 + sameersbn/gitlab:11.4.7 ``` #### 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:11.4.6 + sameersbn/gitlab:11.4.7 ``` 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: @@ -362,7 +362,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:11.4.6 + sameersbn/gitlab:11.4.7 ``` #### Linking to MySQL Container @@ -405,7 +405,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:11.4.6 + sameersbn/gitlab:11.4.7 ``` 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: @@ -432,7 +432,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:11.4.6 + sameersbn/gitlab:11.4.7 ``` ### Linking to Redis Container @@ -459,7 +459,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.4.6 + sameersbn/gitlab:11.4.7 ``` ### Mail @@ -472,7 +472,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:11.4.6 + sameersbn/gitlab:11.4.7 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -492,7 +492,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:11.4.6 + sameersbn/gitlab:11.4.7 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -569,7 +569,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:11.4.6 + sameersbn/gitlab:11.4.7 ``` 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. @@ -585,7 +585,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:11.4.6 + sameersbn/gitlab:11.4.7 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -608,7 +608,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:11.4.6 + sameersbn/gitlab:11.4.7 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -656,7 +656,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:11.4.6 + sameersbn/gitlab:11.4.7 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -784,14 +784,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:11.4.6 + sameersbn/gitlab:11.4.7 ``` 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:11.4.6 app:sanitize + sameersbn/gitlab:11.4.7 app:sanitize ``` ### Piwik @@ -1110,7 +1110,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.6 app:rake gitlab:backup:create + sameersbn/gitlab:11.4.7 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. @@ -1138,14 +1138,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.6 app:rake db:setup + sameersbn/gitlab:11.4.7 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:11.4.6 app:rake gitlab:backup:restore + sameersbn/gitlab:11.4.7 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. @@ -1154,7 +1154,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.6 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.4.7 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1203,7 +1203,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:11.4.6 app:rake gitlab:env:info + sameersbn/gitlab:11.4.7 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1216,7 +1216,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.6 app:rake gitlab:import:repos + sameersbn/gitlab:11.4.7 app:rake gitlab:import:repos ``` Or @@ -1247,7 +1247,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.6 app:rake gitlab:import:repos + sameersbn/gitlab:11.4.7 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1269,12 +1269,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.4.6` 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:11.4.7` 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:11.4.6 +docker pull sameersbn/gitlab:11.4.7 ``` - **Step 2**: Stop and remove the currently running image @@ -1300,7 +1300,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:11.4.6 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.4.7 ``` ## Shell Access diff --git a/VERSION b/VERSION index 9bde90d2..30fb042e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.4.6 +11.4.7 diff --git a/docker-compose.yml b/docker-compose.yml index 59f2b727..6eb99640 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.4.6 + image: sameersbn/gitlab:11.4.7 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 00eb1888..4c7f0f2a 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:11.4.6 app:rake gitlab:backup:create + sameersbn/gitlab:11.4.7 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:11.4.6 app:rake gitlab:backup:restore + sameersbn/gitlab:11.4.7 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:11.4.6 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.4.7 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:11.4.6 +docker pull sameersbn/gitlab:11.4.7 ``` - **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:11.4.6 +sameersbn/gitlab:11.4.7 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 1ed48364..bec307f1 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.4.6 + image: sameersbn/gitlab:11.4.7 env: - name: TZ value: Asia/Kolkata From d51ba2d5f1d0bf5e0066d6ac08b5657ca4c50e5e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 22 Nov 2018 20:42:08 +0100 Subject: [PATCH 237/508] release 11.4.7 From 0ad289d1c3b516a675ce367b88326f8dd5d3d2bc Mon Sep 17 00:00:00 2001 From: Niclas Mietz Date: Fri, 23 Nov 2018 11:01:58 +0100 Subject: [PATCH 238/508] Fix docker-hook --- hooks/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/build b/hooks/build index e0e2f7bc..0372272d 100644 --- a/hooks/build +++ b/hooks/build @@ -1,4 +1,4 @@ -!/bin/bash +#!/bin/bash # Docker Daemon Build Hook # $IMAGE_NAME var is injected into the build so the tag is correct. From ba10cbd9623857db4d1fa84af8cd45f15d553b00 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 23 Nov 2018 21:27:44 +0100 Subject: [PATCH 239/508] Add shellcheck to CI Signed-off-by: solidnerd --- .circleci/config.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8745a2a4..6b81234e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,21 @@ version: 2 jobs: + shellcheck: + docker: + - image: nlknguyen/alpine-shellcheck:v0.4.6 + steps: + - checkout + - run: + name: Check Docker Hub Hooks + command: | + find hooks -type f | wc -l + find hooks -type f | xargs shellcheck -e SC2086 --external-sources + - run: + name: Check Scripts + command: | + find . -type f -name '*.sh' | wc -l + find . -type f -name '*.sh' | xargs shellcheck -e SC2086 -e SC1090 --external-sources + build: docker: - image: circleci/golang:1-stretch-browsers-legacy @@ -73,4 +89,5 @@ workflows: version: 2 build-and-test: jobs: + - shellcheck - build From 9d5f0dbb0bad75fc4e9e8ccd14c61a35aae71db6 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 23 Nov 2018 21:28:10 +0100 Subject: [PATCH 240/508] Fix various shellcheck warnings and errors Signed-off-by: solidnerd --- assets/build/install.sh | 14 +++++++------- entrypoint.sh | 10 +++++++--- hooks/build | 4 ++-- kubernetes/deploy.sh | 4 +++- kubernetes/teardown.sh | 4 +++- 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index 2216a698..bd0e1124 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -27,8 +27,8 @@ BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \ ## Execute a command as GITLAB_USER exec_as_git() { - if [[ $(whoami) == ${GITLAB_USER} ]]; then - $@ + if [[ $(whoami) == "${GITLAB_USER}" ]]; then + "$@" else sudo -HEu ${GITLAB_USER} "$@" fi @@ -42,9 +42,9 @@ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y ${BUIL # Applying the mark late here does make the build usable on PaX kernels, but # still the build itself must be executed on a non-PaX kernel. It's done here # only for simplicity. -paxctl -Cm `which ruby${RUBY_VERSION}` +paxctl -Cm "$(command -v ruby${RUBY_VERSION})" # https://en.wikibooks.org/wiki/Grsecurity/Application-specific_Settings#Node.js -paxctl -Cm `which nodejs` +paxctl -Cm "$(command -v nodejs)" # remove the host keys generated during openssh-server installation rm -rf /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub @@ -134,8 +134,8 @@ rm -rf ${GITLAB_GITALY_BUILD_DIR} rm -rf ${GITLAB_BUILD_DIR}/go${GOLANG_VERSION}.linux-amd64.tar.gz ${GOROOT} # Fix for rebase in forks -echo "Linking $(which gitaly-ssh) to /" -ln -s $(which gitaly-ssh) / +echo "Linking $(command -v gitaly-ssh) to /" +ln -s "$(command -v gitaly-ssh)" / # remove HSTS config from the default headers, we configure it in nginx exec_as_git sed -i "/headers\['Strict-Transport-Security'\]/d" ${GITLAB_INSTALL_DIR}/app/controllers/application_controller.rb @@ -151,7 +151,7 @@ if [[ -d ${GEM_CACHE_DIR} ]]; then chown -R ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/vendor/cache fi -exec_as_git bundle install -j$(nproc) --deployment --without development test aws +exec_as_git bundle install -j"$(nproc)" --deployment --without development test aws # make sure everything in ${GITLAB_HOME} is owned by ${GITLAB_USER} user chown -R ${GITLAB_USER}: ${GITLAB_HOME} diff --git a/entrypoint.sh b/entrypoint.sh index 7773ae70..dee9f20e 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,6 +1,8 @@ #!/bin/bash set -e -source ${GITLAB_RUNTIME_DIR}/functions +set -o pipefail + +source "${GITLAB_RUNTIME_DIR}/functions" [[ $DEBUG == true ]] && set -x @@ -19,7 +21,9 @@ case ${1} in SUPERVISOR_PID=$! migrate_database kill -15 $SUPERVISOR_PID - ps h -p $SUPERVISOR_PID > /dev/null && wait $SUPERVISOR_PID || true + if ps h -p $SUPERVISOR_PID > /dev/null ; then + wait $SUPERVISOR_PID || true + fi rm -rf /var/run/supervisor.sock exec /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf ;; @@ -31,7 +35,7 @@ case ${1} in ;; app:rake) shift 1 - execute_raketask $@ + execute_raketask "$@" ;; esac ;; diff --git a/hooks/build b/hooks/build index 0372272d..ca490f82 100644 --- a/hooks/build +++ b/hooks/build @@ -7,6 +7,6 @@ docker build \ --pull \ --cache-from=${IMAGE_NAME} \ --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \ - --build-arg=VCS_REF=$(git rev-parse --short HEAD) \ - --build-arg=VERSION=$(cat VERSION) \ + --build-arg=VCS_REF="$(git rev-parse --short HEAD)" \ + --build-arg=VERSION="$(cat VERSION)" \ -t ${IMAGE_NAME} . diff --git a/kubernetes/deploy.sh b/kubernetes/deploy.sh index 2e4982d2..315c6b16 100755 --- a/kubernetes/deploy.sh +++ b/kubernetes/deploy.sh @@ -1,6 +1,8 @@ #!/bin/bash +set -e +set -o pipefail -if ! which kubectl > /dev/null; then +if ! command -v kubectl > /dev/null; then echo "kubectl command not installed" exit 1 fi diff --git a/kubernetes/teardown.sh b/kubernetes/teardown.sh index 3ee820fb..c4b3be9e 100755 --- a/kubernetes/teardown.sh +++ b/kubernetes/teardown.sh @@ -1,6 +1,8 @@ #!/bin/bash +set -e +set -o pipefail -if ! which kubectl > /dev/null; then +if ! command -v kubectl > /dev/null; then echo "kubectl command not installed" exit 1 fi From f13072d29279af35f90536a7599ef1d5fe58f2e4 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 22 Nov 2018 20:55:56 +0100 Subject: [PATCH 241/508] Upgrade GitLab CE to 11.5.0 Signed-off-by: solidnerd --- 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 f747ae2e..39d31101 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. +**11.5.0** +- gitlab: upgrade CE to v11.5.0 + **11.4.7** - gitlab: upgrade CE to v11.4.7 diff --git a/Dockerfile b/Dockerfile index e8b88188..8dccc287 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181005 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.4.7 +ARG VERSION=11.5.0 LABEL \ maintainer="sameer@damagehead.com" \ diff --git a/README.md b/README.md index bf7cdbcd..7e035f1a 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:11.4.7 +# sameersbn/gitlab:11.5.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -127,7 +127,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:11.4.7 +docker pull sameersbn/gitlab:11.5.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -196,7 +196,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:11.4.7 + sameersbn/gitlab:11.5.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -231,7 +231,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:11.4.7 + sameersbn/gitlab:11.5.0 ``` ## 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:11.4.7 + sameersbn/gitlab:11.5.0 ``` #### 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:11.4.7 + sameersbn/gitlab:11.5.0 ``` 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: @@ -362,7 +362,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:11.4.7 + sameersbn/gitlab:11.5.0 ``` #### Linking to MySQL Container @@ -405,7 +405,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:11.4.7 + sameersbn/gitlab:11.5.0 ``` 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: @@ -432,7 +432,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:11.4.7 + sameersbn/gitlab:11.5.0 ``` ### Linking to Redis Container @@ -459,7 +459,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.4.7 + sameersbn/gitlab:11.5.0 ``` ### Mail @@ -472,7 +472,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:11.4.7 + sameersbn/gitlab:11.5.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -492,7 +492,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:11.4.7 + sameersbn/gitlab:11.5.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -569,7 +569,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:11.4.7 + sameersbn/gitlab:11.5.0 ``` 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. @@ -585,7 +585,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:11.4.7 + sameersbn/gitlab:11.5.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -608,7 +608,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:11.4.7 + sameersbn/gitlab:11.5.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -656,7 +656,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:11.4.7 + sameersbn/gitlab:11.5.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -784,14 +784,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:11.4.7 + sameersbn/gitlab:11.5.0 ``` 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:11.4.7 app:sanitize + sameersbn/gitlab:11.5.0 app:sanitize ``` ### Piwik @@ -1110,7 +1110,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.7 app:rake gitlab:backup:create + sameersbn/gitlab:11.5.0 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. @@ -1138,14 +1138,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.7 app:rake db:setup + sameersbn/gitlab:11.5.0 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:11.4.7 app:rake gitlab:backup:restore + sameersbn/gitlab:11.5.0 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. @@ -1154,7 +1154,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.7 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1203,7 +1203,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:11.4.7 app:rake gitlab:env:info + sameersbn/gitlab:11.5.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1216,7 +1216,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.7 app:rake gitlab:import:repos + sameersbn/gitlab:11.5.0 app:rake gitlab:import:repos ``` Or @@ -1247,7 +1247,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.4.7 app:rake gitlab:import:repos + sameersbn/gitlab:11.5.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1269,12 +1269,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.4.7` 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:11.5.0` 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:11.4.7 +docker pull sameersbn/gitlab:11.5.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1300,7 +1300,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:11.4.7 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index 30fb042e..7ef69813 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.4.7 +11.5.0 diff --git a/docker-compose.yml b/docker-compose.yml index 6eb99640..89eacb1c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.4.7 + image: sameersbn/gitlab:11.5.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 4c7f0f2a..f4324949 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:11.4.7 app:rake gitlab:backup:create + sameersbn/gitlab:11.5.0 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:11.4.7 app:rake gitlab:backup:restore + sameersbn/gitlab:11.5.0 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:11.4.7 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.5.0 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:11.4.7 +docker pull sameersbn/gitlab:11.5.0 ``` - **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:11.4.7 +sameersbn/gitlab:11.5.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index bec307f1..39d65dea 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.4.7 + image: sameersbn/gitlab:11.5.0 env: - name: TZ value: Asia/Kolkata From a2da8fe2219354a2cd0e6c2708d89806a8c23fb4 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Nov 2018 12:47:33 +0100 Subject: [PATCH 242/508] Update gitlab-shell to 8.4.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8dccc287..6695669b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,10 +18,10 @@ LABEL \ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.4 \ - GITLAB_SHELL_VERSION=8.3.3 \ GITLAB_WORKHORSE_VERSION=7.0.0 \ GITLAB_PAGES_VERSION=1.1.0 \ GITALY_SERVER_VERSION=0.125.1 \ + GITLAB_SHELL_VERSION=8.4.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 2bd920a7a7873ae09fa1d0621e2c7bac1a474b1c Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Nov 2018 12:47:51 +0100 Subject: [PATCH 243/508] Update gitlab-workhorse to 7.1.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6695669b..77340f6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,10 +18,10 @@ LABEL \ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.4 \ - GITLAB_WORKHORSE_VERSION=7.0.0 \ GITLAB_PAGES_VERSION=1.1.0 \ GITALY_SERVER_VERSION=0.125.1 \ GITLAB_SHELL_VERSION=8.4.1 \ + GITLAB_WORKHORSE_VERSION=7.1.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From b369fc3bed10ef564ab9663f1a2241db7aa435cd Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Nov 2018 12:48:09 +0100 Subject: [PATCH 244/508] Update gitlab-pages to 1.3.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 77340f6e..6e767f6c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,10 +18,10 @@ LABEL \ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.4 \ - GITLAB_PAGES_VERSION=1.1.0 \ GITALY_SERVER_VERSION=0.125.1 \ GITLAB_SHELL_VERSION=8.4.1 \ GITLAB_WORKHORSE_VERSION=7.1.0 \ + GITLAB_PAGES_VERSION=1.3.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From eeb13341cfdce13ea7dcfc8ecb20d942ed698084 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Nov 2018 12:48:38 +0100 Subject: [PATCH 245/508] Update gitaly to 0.129.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6e767f6c..7338c8b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,10 +18,10 @@ LABEL \ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.4 \ - GITALY_SERVER_VERSION=0.125.1 \ GITLAB_SHELL_VERSION=8.4.1 \ GITLAB_WORKHORSE_VERSION=7.1.0 \ GITLAB_PAGES_VERSION=1.3.0 \ + GITALY_SERVER_VERSION=0.129.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From e2de4be09b5d2101e39c2ece621992a8b8cf653d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Nov 2018 12:53:58 +0100 Subject: [PATCH 246/508] Update base image to 20181113 --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7338c8b8..aa2d1464 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:xenial-20181005 +FROM ubuntu:xenial-20181113 ARG BUILD_DATE ARG VCS_REF @@ -18,10 +18,10 @@ LABEL \ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.4 \ + GITLAB_WORKHORSE_VERSION=7.0.0 \ + GITLAB_PAGES_VERSION=1.1.0 \ + GITALY_SERVER_VERSION=0.125.1 \ GITLAB_SHELL_VERSION=8.4.1 \ - GITLAB_WORKHORSE_VERSION=7.1.0 \ - GITLAB_PAGES_VERSION=1.3.0 \ - GITALY_SERVER_VERSION=0.129.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 029807a2bef0c7b7519f0bcf86b953d487ce0aab Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Nov 2018 12:56:00 +0100 Subject: [PATCH 247/508] Update to ruby 2.5 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index aa2d1464..bcee20f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,8 +16,8 @@ LABEL \ com.damagehead.gitlab.license=MIT ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=2.4 \ GOLANG_VERSION=1.10.4 \ + RUBY_VERSION=2.5 \ GITLAB_WORKHORSE_VERSION=7.0.0 \ GITLAB_PAGES_VERSION=1.1.0 \ GITALY_SERVER_VERSION=0.125.1 \ From 3bb8c0702d7683aa2088fc2da2d93508402e2e4d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Nov 2018 12:56:15 +0100 Subject: [PATCH 248/508] Update golang to 1.10.5 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bcee20f3..71ad4cb4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,8 +16,8 @@ LABEL \ com.damagehead.gitlab.license=MIT ENV GITLAB_VERSION=${VERSION} \ - GOLANG_VERSION=1.10.4 \ RUBY_VERSION=2.5 \ + GOLANG_VERSION=1.10.5 \ GITLAB_WORKHORSE_VERSION=7.0.0 \ GITLAB_PAGES_VERSION=1.1.0 \ GITALY_SERVER_VERSION=0.125.1 \ From 0a8f6bd872e88e2d536a6b5effc98343cf994bf5 Mon Sep 17 00:00:00 2001 From: Gert-Jan Timmer Date: Mon, 12 Nov 2018 19:24:29 +0100 Subject: [PATCH 249/508] Add: gitlab pages access control (11.5) Added gitlab pages access control (Introduced in gitlab 11.5). Fixes: #1769 --- README.md | 1 + assets/runtime/config/gitlabhq/gitlab.yml | 2 +- assets/runtime/env-defaults | 1 + assets/runtime/functions | 3 ++- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7e035f1a..7c2beefd 100644 --- a/README.md +++ b/README.md @@ -916,6 +916,7 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_PAGES_ARTIFACTS_SERVER` | Set to `true` to enable pages artifactsserver, enabled by default. | | `GITLAB_PAGES_EXTERNAL_HTTP` | Sets GitLab Pages external http to receive request on an independen port. Disabled by default | | `GITLAB_PAGES_EXTERNAL_HTTPS` | Sets GitLab Pages external https to receive request on an independen port. Disabled by default | +| `GITLAB_PAGES_ACCESS_CONTROL` | Set to `true` to enable access control for pages. Allows access to a Pages site to be controlled based on a user’s membership to that project. Disabled by default. | | `GITLAB_HTTPS` | Set to `true` to enable https support, disabled by default. | | `GITALY_CLIENT_PATH` | Set default path for gitaly. defaults to `/home/git/gitaly` | | `GITALY_TOKEN` | Set a gitaly token, blank by default. | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 48308a09..1c09c2c1 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -226,10 +226,10 @@ production: &base port: {{GITLAB_PAGES_PORT}} # Set to 443 if you serve the pages with HTTPS https: {{GITLAB_PAGES_HTTPS}} # Set to true if you serve the pages with HTTPS artifacts_server: {{GITLAB_PAGES_ARTIFACTS_SERVER}} + access_control: {{GITLAB_PAGES_ACCESS_CONTROL}} # If true, allows access to a Pages site to be controlled based on a user’s membership to that project external_http: {{GITLAB_PAGES_EXTERNAL_HTTP}} # If defined, enables custom domain support in GitLab Pages external_https: {{GITLAB_PAGES_EXTERNAL_HTTPS}} # If defined, enables custom domain and certificate support in GitLab Pages - ## Mattermost ## For enabling Add to Mattermost button mattermost: diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index d2a4295b..96a537f9 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -413,6 +413,7 @@ GITLAB_PAGES_ARTIFACTS_SERVER=${GITLAB_PAGES_ARTIFACTS_SERVER:-true} GITLAB_PAGES_HTTPS=${GITLAB_PAGES_HTTPS:-false} GITLAB_PAGES_EXTERNAL_HTTP=${GITLAB_PAGES_EXTERNAL_HTTP:-} GITLAB_PAGES_EXTERNAL_HTTPS=${GITLAB_PAGES_EXTERNAL_HTTPS:-} +GITLAB_PAGES_ACCESS_CONTROL=${GITLAB_PAGES_ACCESS_CONTROL:-false} ## Gitaly GITALY_CLIENT_PATH=${GITALY_CLIENT_PATH:-$GITLAB_GITALY_INSTALL_DIR} diff --git a/assets/runtime/functions b/assets/runtime/functions index 848b444c..ce851b98 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1073,7 +1073,8 @@ gitlab_configure_pages(){ GITLAB_PAGES_DOMAIN \ GITLAB_PAGES_PORT \ GITLAB_PAGES_HTTPS \ - GITLAB_PAGES_ARTIFACTS_SERVER + GITLAB_PAGES_ARTIFACTS_SERVER \ + GITLAB_PAGES_ACCESS_CONTROL if [[ -n ${GITLAB_PAGES_EXTERNAL_HTTP} ]]; then update_template ${GITLAB_CONFIG} \ From 19793c68e3c26b03a723c9ed08c6a378eeb3e636 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 25 Nov 2018 17:11:34 +0100 Subject: [PATCH 250/508] release 11.5.0 From 19ec07f6000a3eb69df5b99bd18a2d0e14a6d2e2 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 28 Nov 2018 19:39:50 +0100 Subject: [PATCH 251/508] Upgrade GitLab CE to 11.5.1 --- 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 39d31101..ee6c6298 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. +**11.5.1** +- gitlab: upgrade CE to v11.5.1 + **11.5.0** - gitlab: upgrade CE to v11.5.0 diff --git a/Dockerfile b/Dockerfile index 71ad4cb4..9c318423 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181113 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.5.0 +ARG VERSION=11.5.1 LABEL \ maintainer="sameer@damagehead.com" \ diff --git a/README.md b/README.md index 7c2beefd..768a382b 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:11.5.0 +# sameersbn/gitlab:11.5.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -127,7 +127,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:11.5.0 +docker pull sameersbn/gitlab:11.5.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -196,7 +196,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:11.5.0 + sameersbn/gitlab:11.5.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -231,7 +231,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:11.5.0 + sameersbn/gitlab:11.5.1 ``` ## 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:11.5.0 + sameersbn/gitlab:11.5.1 ``` #### 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:11.5.0 + sameersbn/gitlab:11.5.1 ``` 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: @@ -362,7 +362,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:11.5.0 + sameersbn/gitlab:11.5.1 ``` #### Linking to MySQL Container @@ -405,7 +405,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:11.5.0 + sameersbn/gitlab:11.5.1 ``` 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: @@ -432,7 +432,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:11.5.0 + sameersbn/gitlab:11.5.1 ``` ### Linking to Redis Container @@ -459,7 +459,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.5.0 + sameersbn/gitlab:11.5.1 ``` ### Mail @@ -472,7 +472,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:11.5.0 + sameersbn/gitlab:11.5.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -492,7 +492,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:11.5.0 + sameersbn/gitlab:11.5.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -569,7 +569,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:11.5.0 + sameersbn/gitlab:11.5.1 ``` 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. @@ -585,7 +585,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:11.5.0 + sameersbn/gitlab:11.5.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -608,7 +608,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:11.5.0 + sameersbn/gitlab:11.5.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -656,7 +656,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:11.5.0 + sameersbn/gitlab:11.5.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -784,14 +784,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:11.5.0 + sameersbn/gitlab:11.5.1 ``` 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:11.5.0 app:sanitize + sameersbn/gitlab:11.5.1 app:sanitize ``` ### Piwik @@ -1111,7 +1111,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.5.1 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. @@ -1139,14 +1139,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.0 app:rake db:setup + sameersbn/gitlab:11.5.1 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:11.5.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.5.1 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. @@ -1155,7 +1155,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.5.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1204,7 +1204,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:11.5.0 app:rake gitlab:env:info + sameersbn/gitlab:11.5.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1217,7 +1217,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.5.1 app:rake gitlab:import:repos ``` Or @@ -1248,7 +1248,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.5.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1270,12 +1270,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.5.0` 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:11.5.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.5.0 +docker pull sameersbn/gitlab:11.5.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1301,7 +1301,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:11.5.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 7ef69813..326ba189 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.5.0 +11.5.1 diff --git a/docker-compose.yml b/docker-compose.yml index 89eacb1c..3a917224 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.5.0 + image: sameersbn/gitlab:11.5.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index f4324949..f0427163 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:11.5.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.5.1 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:11.5.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.5.1 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:11.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.5.1 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:11.5.0 +docker pull sameersbn/gitlab:11.5.1 ``` - **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:11.5.0 +sameersbn/gitlab:11.5.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 39d65dea..826e11e0 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.5.0 + image: sameersbn/gitlab:11.5.1 env: - name: TZ value: Asia/Kolkata From d3323605e6a2521e26cea1780bb3f22161615c51 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 28 Nov 2018 20:47:44 +0100 Subject: [PATCH 252/508] release 11.5.1 From e60d5549bad17066bb48175745e870b6b8d94301 Mon Sep 17 00:00:00 2001 From: Dave Conroy <23528985+tiredofit@users.noreply.github.com> Date: Thu, 29 Nov 2018 11:36:16 -0800 Subject: [PATCH 253/508] Provide correct versions for dependencies Update Gitlab Shell to 8.4.1 Update Gitlab Workhorse to 7.1.3 Update Gitlab Pages to 1.3.1 Update Gitaly Server to 0.129.0 --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9c318423..545e21dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,10 +18,10 @@ LABEL \ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.10.5 \ - GITLAB_WORKHORSE_VERSION=7.0.0 \ - GITLAB_PAGES_VERSION=1.1.0 \ - GITALY_SERVER_VERSION=0.125.1 \ - GITLAB_SHELL_VERSION=8.4.1 \ + GITLAB_SHELL_VERSION="8.4.1" \ + GITLAB_WORKHORSE_VERSION="7.1.3" \ + GITLAB_PAGES_VERSION="1.3.1" \ + GITALY_SERVER_VERSION="0.129.0" GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From b584ba3472868cc00b782bd169df29ee0c165bae Mon Sep 17 00:00:00 2001 From: Dave Conroy <23528985+tiredofit@users.noreply.github.com> Date: Thu, 29 Nov 2018 22:11:16 -0800 Subject: [PATCH 254/508] Update Dockerfile Update Versions --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 545e21dd..c6d5b075 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION="8.4.1" \ GITLAB_WORKHORSE_VERSION="7.1.3" \ GITLAB_PAGES_VERSION="1.3.1" \ - GITALY_SERVER_VERSION="0.129.0" + GITALY_SERVER_VERSION="0.129.0" \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 4ac1096cc7dd37fba77d3653595fba0fd42b27dc Mon Sep 17 00:00:00 2001 From: Peter Leitzen Date: Fri, 30 Nov 2018 17:44:15 +0100 Subject: [PATCH 255/508] Fix spelling of GitLab --- CONTRIBUTING.md | 8 ++++---- README.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bd8fd424..f6f3fc40 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,12 +1,12 @@ -# Gitlab-CI Configuration +# GitLab-CI Configuration -When using your own gitlab instance, the provided .gitlab-ci.yml will be automatically be using the settings provided by the Gitlab Instance. If needed several options can be overriden. +When using your own gitlab instance, the provided .gitlab-ci.yml will be automatically be using the settings provided by the GitLab Instance. If needed several options can be overriden. Overrides for these values can be set within the project, under `Settings` -> `CI/CD` -> `Variables`. | Variable | Default Value | Description | | ------------------ | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| `CI_REGISTRY` | `hub.docker.com` | If available this will be automatically overriden by registry address which is configured within the Gitlab instance | +| `CI_REGISTRY` | `hub.docker.com` | If available this will be automatically overriden by registry address which is configured within the GitLab instance | | `CI_REGISTRY_USER` | `gitlab-ci-token` | Username for the registry | | `CI_REGISTRY_PASS` | `${CI_JOB_TOKEN}` | Password for the registry | -| `DOCKER_IMAGE` | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running Gitlab instance with the `${CI_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within Gitlab. | +| `DOCKER_IMAGE` | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running GitLab instance with the `${CI_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within GitLab. | diff --git a/README.md b/README.md index 768a382b..aa2ab1c2 100644 --- a/README.md +++ b/README.md @@ -862,7 +862,7 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `s3.amazonaws.com` | | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil` | | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` | -| `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON` | Cron notation for the Gitlab pipeline schedule worker. Defaults to `'0 */12 * * *'` | +| `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON` | Cron notation for the GitLab pipeline schedule worker. Defaults to `'0 */12 * * *'` | | `GITLAB_LFS_ENABLED` | Enable/Disable Git LFS support. Defaults to `true`. | | `GITLAB_LFS_OBJECTS_DIR` | Directory to store the lfs-objects. Defaults to `$GITLAB_SHARED_DIR/lfs-objects` | | `GITLAB_LFS_OBJECT_STORE_ENABLED` | Enables Object Store for LFS that will be remote stored. Defaults to `false` | From 354bf1e58fb8b7ab01f640a794f7bd7681b712d9 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 3 Dec 2018 08:50:41 +0100 Subject: [PATCH 256/508] Update docs and files for 11.5.1-1 Signed-off-by: solidnerd --- Changelog.md | 3 ++ README.md | 56 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++---- kubernetes/gitlab-rc.yml | 2 +- 6 files changed, 39 insertions(+), 36 deletions(-) diff --git a/Changelog.md b/Changelog.md index ee6c6298..75fc0cec 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. +**11.5.1-1** +- Fixed GitLab Dependencies + **11.5.1** - gitlab: upgrade CE to v11.5.1 diff --git a/README.md b/README.md index aa2ab1c2..629a6ebe 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:11.5.1 +# sameersbn/gitlab:11.5.1-1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -127,7 +127,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:11.5.1 +docker pull sameersbn/gitlab:11.5.1-1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -196,7 +196,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:11.5.1 + sameersbn/gitlab:11.5.1-1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -231,7 +231,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:11.5.1 + sameersbn/gitlab:11.5.1-1 ``` ## 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:11.5.1 + sameersbn/gitlab:11.5.1-1 ``` #### 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:11.5.1 + sameersbn/gitlab:11.5.1-1 ``` 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: @@ -362,7 +362,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:11.5.1 + sameersbn/gitlab:11.5.1-1 ``` #### Linking to MySQL Container @@ -405,7 +405,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:11.5.1 + sameersbn/gitlab:11.5.1-1 ``` 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: @@ -432,7 +432,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:11.5.1 + sameersbn/gitlab:11.5.1-1 ``` ### Linking to Redis Container @@ -459,7 +459,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.5.1 + sameersbn/gitlab:11.5.1-1 ``` ### Mail @@ -472,7 +472,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:11.5.1 + sameersbn/gitlab:11.5.1-1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -492,7 +492,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:11.5.1 + sameersbn/gitlab:11.5.1-1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -569,7 +569,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:11.5.1 + sameersbn/gitlab:11.5.1-1 ``` 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. @@ -585,7 +585,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:11.5.1 + sameersbn/gitlab:11.5.1-1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -608,7 +608,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:11.5.1 + sameersbn/gitlab:11.5.1-1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -656,7 +656,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:11.5.1 + sameersbn/gitlab:11.5.1-1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -784,14 +784,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:11.5.1 + sameersbn/gitlab:11.5.1-1 ``` 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:11.5.1 app:sanitize + sameersbn/gitlab:11.5.1-1 app:sanitize ``` ### Piwik @@ -1111,7 +1111,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.5.1-1 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. @@ -1139,14 +1139,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.1 app:rake db:setup + sameersbn/gitlab:11.5.1-1 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:11.5.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.5.1-1 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. @@ -1155,7 +1155,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.5.1-1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1204,7 +1204,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:11.5.1 app:rake gitlab:env:info + sameersbn/gitlab:11.5.1-1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1217,7 +1217,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.5.1-1 app:rake gitlab:import:repos ``` Or @@ -1248,7 +1248,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.5.1-1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1270,12 +1270,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.5.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:11.5.1-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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.5.1 +docker pull sameersbn/gitlab:11.5.1-1 ``` - **Step 2**: Stop and remove the currently running image @@ -1301,7 +1301,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:11.5.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.1-1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 326ba189..4d3032cb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.5.1 +11.5.1-1 diff --git a/docker-compose.yml b/docker-compose.yml index 3a917224..94506109 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.5.1 + image: sameersbn/gitlab:11.5.1-1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index f0427163..f8061cf7 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:11.5.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.5.1-1 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:11.5.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.5.1-1 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:11.5.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.5.1-1 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:11.5.1 +docker pull sameersbn/gitlab:11.5.1-1 ``` - **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:11.5.1 +sameersbn/gitlab:11.5.1-1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 826e11e0..221bc5ea 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.5.1 + image: sameersbn/gitlab:11.5.1-1 env: - name: TZ value: Asia/Kolkata From 191d18984469e4485ebc28aae0de3fe0bc1240b3 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 3 Dec 2018 12:21:21 +0100 Subject: [PATCH 257/508] Remove version build-arg use default of dockerfile instead Signed-off-by: solidnerd --- .circleci/config.yml | 1 - .gitlab-ci.yml | 3 --- 2 files changed, 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6b81234e..d9ff09bd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,7 +59,6 @@ jobs: --cache-from=${IMAGE_NAME} \ --build-arg BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \ --build-arg VCS_REF=$(git rev-parse --short HEAD) \ - --build-arg VERSION=$(cat VERSION) \ -t ${IMAGE_NAME}:$(cat VERSION) . - run: diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e8d57ad..675b0495 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,6 @@ docker:build: --cache-from=${DOCKER_IMAGE} --build-arg=VCS_REF=$(git rev-parse --short HEAD) --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" - --build-arg=VERSION=${VERSION} --tag ${DOCKER_IMAGE} . - docker push ${DOCKER_IMAGE} @@ -42,7 +41,6 @@ docker:build:branches: --cache-from=${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG} --build-arg=VCS_REF=$(git rev-parse --short HEAD) --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" - --build-arg=VERSION=${VERSION} --tag ${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG} . - docker push ${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG} @@ -57,6 +55,5 @@ docker:build:release: --cache-from=${DOCKER_IMAGE}:${VERSION} --build-arg=VCS_REF=$(git rev-parse --short HEAD) --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" - --build-arg=VERSION=${VERSION} --tag ${DOCKER_IMAGE}:${VERSION} . - docker push ${DOCKER_IMAGE}:${VERSION} From a2f79dab432670ff4fd928f75541ec3636db040b Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 10 Dec 2018 02:47:28 -0800 Subject: [PATCH 258/508] Update hook to build a little bit faster Signed-off-by: solidnerd --- hooks/build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hooks/build b/hooks/build index ca490f82..7cc38e87 100644 --- a/hooks/build +++ b/hooks/build @@ -3,9 +3,10 @@ # Docker Daemon Build Hook # $IMAGE_NAME var is injected into the build so the tag is correct. +docker pull ${DOCKER_REPO}:latest + docker build \ - --pull \ - --cache-from=${IMAGE_NAME} \ + --cache-from=${DOCKER_REPO}:latest \ --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \ --build-arg=VCS_REF="$(git rev-parse --short HEAD)" \ --build-arg=VERSION="$(cat VERSION)" \ From 4dfdc0dcfd47de5fc1d902210b1f2192df3f9aad Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 10 Dec 2018 03:00:50 -0800 Subject: [PATCH 259/508] release 11.5.1-1 From aedbf5be01cab8d350f02f10b2eb81c60accf9c2 Mon Sep 17 00:00:00 2001 From: Niclas Mietz Date: Mon, 10 Dec 2018 03:23:43 -0800 Subject: [PATCH 260/508] Remove vesion from docker hub hook --- hooks/build | 1 - 1 file changed, 1 deletion(-) diff --git a/hooks/build b/hooks/build index 7cc38e87..6b0c931c 100644 --- a/hooks/build +++ b/hooks/build @@ -9,5 +9,4 @@ docker build \ --cache-from=${DOCKER_REPO}:latest \ --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \ --build-arg=VCS_REF="$(git rev-parse --short HEAD)" \ - --build-arg=VERSION="$(cat VERSION)" \ -t ${IMAGE_NAME} . From f276321ece8d24a8fc6b769d428d7a177eb31474 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 10 Dec 2018 03:27:30 -0800 Subject: [PATCH 261/508] release 11.5.1-1 From cfcdfb450f1b414ed5f38d1d8ea7797bf61d4b3c Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 10 Dec 2018 03:31:01 -0800 Subject: [PATCH 262/508] Upgrade GitLab CE to 11.5.2 Signed-off-by: solidnerd --- 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 75fc0cec..db567313 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. +**11.5.2** +- gitlab: upgrade CE to v11.5.2 + **11.5.1-1** - Fixed GitLab Dependencies diff --git a/Dockerfile b/Dockerfile index c6d5b075..dd2521d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181113 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.5.1 +ARG VERSION=11.5.2 LABEL \ maintainer="sameer@damagehead.com" \ diff --git a/README.md b/README.md index 629a6ebe..9f39daa1 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:11.5.1-1 +# sameersbn/gitlab:11.5.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -127,7 +127,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:11.5.1-1 +docker pull sameersbn/gitlab:11.5.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -196,7 +196,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:11.5.1-1 + sameersbn/gitlab:11.5.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -231,7 +231,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:11.5.1-1 + sameersbn/gitlab:11.5.2 ``` ## 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:11.5.1-1 + sameersbn/gitlab:11.5.2 ``` #### 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:11.5.1-1 + sameersbn/gitlab:11.5.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: @@ -362,7 +362,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:11.5.1-1 + sameersbn/gitlab:11.5.2 ``` #### Linking to MySQL Container @@ -405,7 +405,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:11.5.1-1 + sameersbn/gitlab:11.5.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: @@ -432,7 +432,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:11.5.1-1 + sameersbn/gitlab:11.5.2 ``` ### Linking to Redis Container @@ -459,7 +459,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.5.1-1 + sameersbn/gitlab:11.5.2 ``` ### Mail @@ -472,7 +472,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:11.5.1-1 + sameersbn/gitlab:11.5.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -492,7 +492,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:11.5.1-1 + sameersbn/gitlab:11.5.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -569,7 +569,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:11.5.1-1 + sameersbn/gitlab:11.5.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. @@ -585,7 +585,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:11.5.1-1 + sameersbn/gitlab:11.5.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -608,7 +608,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:11.5.1-1 + sameersbn/gitlab:11.5.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -656,7 +656,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:11.5.1-1 + sameersbn/gitlab:11.5.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -784,14 +784,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:11.5.1-1 + sameersbn/gitlab:11.5.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:11.5.1-1 app:sanitize + sameersbn/gitlab:11.5.2 app:sanitize ``` ### Piwik @@ -1111,7 +1111,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.1-1 app:rake gitlab:backup:create + sameersbn/gitlab:11.5.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. @@ -1139,14 +1139,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.1-1 app:rake db:setup + sameersbn/gitlab:11.5.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:11.5.1-1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.5.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. @@ -1155,7 +1155,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.1-1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.5.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1204,7 +1204,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:11.5.1-1 app:rake gitlab:env:info + sameersbn/gitlab:11.5.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1217,7 +1217,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.1-1 app:rake gitlab:import:repos + sameersbn/gitlab:11.5.2 app:rake gitlab:import:repos ``` Or @@ -1248,7 +1248,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.1-1 app:rake gitlab:import:repos + sameersbn/gitlab:11.5.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1270,12 +1270,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.5.1-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:11.5.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:11.5.1-1 +docker pull sameersbn/gitlab:11.5.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1301,7 +1301,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:11.5.1-1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index 4d3032cb..16ae142e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.5.1-1 +11.5.2 diff --git a/docker-compose.yml b/docker-compose.yml index 94506109..13cd8365 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.5.1-1 + image: sameersbn/gitlab:11.5.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index f8061cf7..01341ec6 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:11.5.1-1 app:rake gitlab:backup:create + sameersbn/gitlab:11.5.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:11.5.1-1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.5.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:11.5.1-1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.5.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:11.5.1-1 +docker pull sameersbn/gitlab:11.5.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:11.5.1-1 +sameersbn/gitlab:11.5.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 221bc5ea..c6c9b0ce 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.5.1-1 + image: sameersbn/gitlab:11.5.2 env: - name: TZ value: Asia/Kolkata From 4063bdefc24a938932b0f0d4bd13e00031d9775a Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 10 Dec 2018 03:37:06 -0800 Subject: [PATCH 263/508] Fix formatting of components versions Signed-off-by: solidnerd --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index dd2521d6..1ec22a34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,10 +18,10 @@ LABEL \ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.10.5 \ - GITLAB_SHELL_VERSION="8.4.1" \ - GITLAB_WORKHORSE_VERSION="7.1.3" \ - GITLAB_PAGES_VERSION="1.3.1" \ - GITALY_SERVER_VERSION="0.129.0" \ + GITLAB_SHELL_VERSION=8.4.1 \ + GITLAB_WORKHORSE_VERSION=7.1.3 \ + GITLAB_PAGES_VERSION=1.3.1 \ + GITALY_SERVER_VERSION=0.129.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 70b6e711ebde8fff151a3e0c911ca747311f7723 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 10 Dec 2018 04:11:55 -0800 Subject: [PATCH 264/508] release 11.5.2 From 3e5eced2adb6397c690d7eeb6a018629baa8bba8 Mon Sep 17 00:00:00 2001 From: Niclas Mietz Date: Mon, 10 Dec 2018 04:45:50 -0800 Subject: [PATCH 265/508] Move labels to lower a layer --- Dockerfile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1ec22a34..4777e580 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,17 +4,6 @@ ARG BUILD_DATE ARG VCS_REF ARG VERSION=11.5.2 -LABEL \ - maintainer="sameer@damagehead.com" \ - org.label-schema.schema-version="1.0" \ - org.label-schema.build-date=${BUILD_DATE} \ - org.label-schema.name=gitlab \ - org.label-schema.vendor=damagehead \ - org.label-schema.url="https://github.com/sameersbn/docker-gitlab" \ - org.label-schema.vcs-url="https://github.com/sameersbn/docker-gitlab.git" \ - org.label-schema.vcs-ref=${VCS_REF} \ - com.damagehead.gitlab.license=MIT - ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.10.5 \ @@ -72,6 +61,17 @@ COPY assets/runtime/ ${GITLAB_RUNTIME_DIR}/ COPY entrypoint.sh /sbin/entrypoint.sh RUN chmod 755 /sbin/entrypoint.sh +LABEL \ + maintainer="sameer@damagehead.com" \ + org.label-schema.schema-version="1.0" \ + org.label-schema.build-date=${BUILD_DATE} \ + org.label-schema.name=gitlab \ + org.label-schema.vendor=damagehead \ + org.label-schema.url="https://github.com/sameersbn/docker-gitlab" \ + org.label-schema.vcs-url="https://github.com/sameersbn/docker-gitlab.git" \ + org.label-schema.vcs-ref=${VCS_REF} \ + com.damagehead.gitlab.license=MIT + EXPOSE 22/tcp 80/tcp 443/tcp VOLUME ["${GITLAB_DATA_DIR}", "${GITLAB_LOG_DIR}"] From 8793e50cddf5eb200508a33bc2b77a763f826211 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 10 Dec 2018 04:22:57 -0800 Subject: [PATCH 266/508] Upgrade GitLab CE to 11.5.3 --- 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 db567313..255dbe5c 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. +**11.5.3** +- gitlab: upgrade CE to v11.5.3 + **11.5.2** - gitlab: upgrade CE to v11.5.2 diff --git a/Dockerfile b/Dockerfile index 4777e580..45742c1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181113 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.5.2 +ARG VERSION=11.5.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 9f39daa1..eae9e992 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:11.5.2 +# sameersbn/gitlab:11.5.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -127,7 +127,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:11.5.2 +docker pull sameersbn/gitlab:11.5.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -196,7 +196,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:11.5.2 + sameersbn/gitlab:11.5.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -231,7 +231,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:11.5.2 + sameersbn/gitlab:11.5.3 ``` ## 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:11.5.2 + sameersbn/gitlab:11.5.3 ``` #### 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:11.5.2 + sameersbn/gitlab:11.5.3 ``` 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: @@ -362,7 +362,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:11.5.2 + sameersbn/gitlab:11.5.3 ``` #### Linking to MySQL Container @@ -405,7 +405,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:11.5.2 + sameersbn/gitlab:11.5.3 ``` 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: @@ -432,7 +432,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:11.5.2 + sameersbn/gitlab:11.5.3 ``` ### Linking to Redis Container @@ -459,7 +459,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.5.2 + sameersbn/gitlab:11.5.3 ``` ### Mail @@ -472,7 +472,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:11.5.2 + sameersbn/gitlab:11.5.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -492,7 +492,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:11.5.2 + sameersbn/gitlab:11.5.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -569,7 +569,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:11.5.2 + sameersbn/gitlab:11.5.3 ``` 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. @@ -585,7 +585,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:11.5.2 + sameersbn/gitlab:11.5.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -608,7 +608,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:11.5.2 + sameersbn/gitlab:11.5.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -656,7 +656,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:11.5.2 + sameersbn/gitlab:11.5.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -784,14 +784,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:11.5.2 + sameersbn/gitlab:11.5.3 ``` 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:11.5.2 app:sanitize + sameersbn/gitlab:11.5.3 app:sanitize ``` ### Piwik @@ -1111,7 +1111,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.5.3 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. @@ -1139,14 +1139,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.2 app:rake db:setup + sameersbn/gitlab:11.5.3 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:11.5.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.5.3 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. @@ -1155,7 +1155,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.5.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1204,7 +1204,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:11.5.2 app:rake gitlab:env:info + sameersbn/gitlab:11.5.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1217,7 +1217,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.5.3 app:rake gitlab:import:repos ``` Or @@ -1248,7 +1248,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.5.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1270,12 +1270,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.5.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. +> Upgrading to `sameersbn/gitlab:11.5.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.5.2 +docker pull sameersbn/gitlab:11.5.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1301,7 +1301,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:11.5.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index 16ae142e..39eb3b4f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.5.2 +11.5.3 diff --git a/docker-compose.yml b/docker-compose.yml index 13cd8365..dec7637b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.5.2 + image: sameersbn/gitlab:11.5.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 01341ec6..2668779d 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:11.5.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.5.3 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:11.5.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.5.3 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:11.5.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.5.3 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:11.5.2 +docker pull sameersbn/gitlab:11.5.3 ``` - **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:11.5.2 +sameersbn/gitlab:11.5.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index c6c9b0ce..2ec580d7 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.5.2 + image: sameersbn/gitlab:11.5.3 env: - name: TZ value: Asia/Kolkata From 184bda66075425be0fc7402a7a3bccee61cde5de Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 10 Dec 2018 04:55:12 -0800 Subject: [PATCH 267/508] release 11.5.3 From 6d0613e59b4e1fb8aecadc85c1b19b1be2e11048 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 26 Dec 2018 10:20:36 +0100 Subject: [PATCH 268/508] Upgrade GitLab CE to 11.5.4 --- 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 255dbe5c..1b2b9827 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. +**11.5.4** +- gitlab: upgrade CE to v11.5.4 + **11.5.3** - gitlab: upgrade CE to v11.5.3 diff --git a/Dockerfile b/Dockerfile index 45742c1a..99104740 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181113 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.5.3 +ARG VERSION=11.5.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index eae9e992..0845a4c2 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:11.5.3 +# sameersbn/gitlab:11.5.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -127,7 +127,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:11.5.3 +docker pull sameersbn/gitlab:11.5.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -196,7 +196,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:11.5.3 + sameersbn/gitlab:11.5.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -231,7 +231,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:11.5.3 + sameersbn/gitlab:11.5.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:11.5.3 + sameersbn/gitlab:11.5.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:11.5.3 + sameersbn/gitlab:11.5.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: @@ -362,7 +362,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:11.5.3 + sameersbn/gitlab:11.5.4 ``` #### Linking to MySQL Container @@ -405,7 +405,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:11.5.3 + sameersbn/gitlab:11.5.4 ``` 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: @@ -432,7 +432,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:11.5.3 + sameersbn/gitlab:11.5.4 ``` ### Linking to Redis Container @@ -459,7 +459,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.5.3 + sameersbn/gitlab:11.5.4 ``` ### Mail @@ -472,7 +472,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:11.5.3 + sameersbn/gitlab:11.5.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -492,7 +492,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:11.5.3 + sameersbn/gitlab:11.5.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -569,7 +569,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:11.5.3 + sameersbn/gitlab:11.5.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. @@ -585,7 +585,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:11.5.3 + sameersbn/gitlab:11.5.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -608,7 +608,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:11.5.3 + sameersbn/gitlab:11.5.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -656,7 +656,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:11.5.3 + sameersbn/gitlab:11.5.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -784,14 +784,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:11.5.3 + sameersbn/gitlab:11.5.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:11.5.3 app:sanitize + sameersbn/gitlab:11.5.4 app:sanitize ``` ### Piwik @@ -1111,7 +1111,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.5.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. @@ -1139,14 +1139,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.3 app:rake db:setup + sameersbn/gitlab:11.5.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:11.5.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.5.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. @@ -1155,7 +1155,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.5.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1204,7 +1204,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:11.5.3 app:rake gitlab:env:info + sameersbn/gitlab:11.5.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1217,7 +1217,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.5.4 app:rake gitlab:import:repos ``` Or @@ -1248,7 +1248,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.5.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1270,12 +1270,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.5.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:11.5.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:11.5.3 +docker pull sameersbn/gitlab:11.5.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1301,7 +1301,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:11.5.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index 39eb3b4f..0cca32ca 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.5.3 +11.5.4 diff --git a/docker-compose.yml b/docker-compose.yml index dec7637b..7d066f7f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.5.3 + image: sameersbn/gitlab:11.5.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 2668779d..7d1808b5 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:11.5.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.5.4 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:11.5.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.5.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. @@ -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:11.5.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.5.4 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:11.5.3 +docker pull sameersbn/gitlab:11.5.4 ``` - **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:11.5.3 +sameersbn/gitlab:11.5.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 2ec580d7..d120911c 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.5.3 + image: sameersbn/gitlab:11.5.4 env: - name: TZ value: Asia/Kolkata From 9447dfb1ffd5cbf7e09692c1fc217048e6484d6e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 26 Dec 2018 11:22:17 +0100 Subject: [PATCH 269/508] release 11.5.4 From 6131c5e0b64d59e9ab5ecb9de1819f4667b84562 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 26 Dec 2018 11:26:00 +0100 Subject: [PATCH 270/508] Upgrade GitLab CE to 11.5.5 --- 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 1b2b9827..2608a257 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. +**11.5.5** +- gitlab: upgrade CE to v11.5.5 + **11.5.4** - gitlab: upgrade CE to v11.5.4 diff --git a/Dockerfile b/Dockerfile index 99104740..30f49a03 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181113 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.5.4 +ARG VERSION=11.5.5 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 0845a4c2..e629a5d6 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:11.5.4 +# sameersbn/gitlab:11.5.5 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -127,7 +127,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:11.5.4 +docker pull sameersbn/gitlab:11.5.5 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -196,7 +196,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:11.5.4 + sameersbn/gitlab:11.5.5 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -231,7 +231,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:11.5.4 + sameersbn/gitlab:11.5.5 ``` ## 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:11.5.4 + sameersbn/gitlab:11.5.5 ``` #### 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:11.5.4 + sameersbn/gitlab:11.5.5 ``` 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: @@ -362,7 +362,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:11.5.4 + sameersbn/gitlab:11.5.5 ``` #### Linking to MySQL Container @@ -405,7 +405,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:11.5.4 + sameersbn/gitlab:11.5.5 ``` 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: @@ -432,7 +432,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:11.5.4 + sameersbn/gitlab:11.5.5 ``` ### Linking to Redis Container @@ -459,7 +459,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.5.4 + sameersbn/gitlab:11.5.5 ``` ### Mail @@ -472,7 +472,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:11.5.4 + sameersbn/gitlab:11.5.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -492,7 +492,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:11.5.4 + sameersbn/gitlab:11.5.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -569,7 +569,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:11.5.4 + sameersbn/gitlab:11.5.5 ``` 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. @@ -585,7 +585,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:11.5.4 + sameersbn/gitlab:11.5.5 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -608,7 +608,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:11.5.4 + sameersbn/gitlab:11.5.5 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -656,7 +656,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:11.5.4 + sameersbn/gitlab:11.5.5 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -784,14 +784,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:11.5.4 + sameersbn/gitlab:11.5.5 ``` 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:11.5.4 app:sanitize + sameersbn/gitlab:11.5.5 app:sanitize ``` ### Piwik @@ -1111,7 +1111,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.5.5 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. @@ -1139,14 +1139,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.4 app:rake db:setup + sameersbn/gitlab:11.5.5 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:11.5.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.5.5 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. @@ -1155,7 +1155,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.5.5 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1204,7 +1204,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:11.5.4 app:rake gitlab:env:info + sameersbn/gitlab:11.5.5 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1217,7 +1217,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.5.5 app:rake gitlab:import:repos ``` Or @@ -1248,7 +1248,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.5.5 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1270,12 +1270,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.5.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. +> Upgrading to `sameersbn/gitlab:11.5.5` 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:11.5.4 +docker pull sameersbn/gitlab:11.5.5 ``` - **Step 2**: Stop and remove the currently running image @@ -1301,7 +1301,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:11.5.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.5.5 ``` ## Shell Access diff --git a/VERSION b/VERSION index 0cca32ca..b0525db0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.5.4 +11.5.5 diff --git a/docker-compose.yml b/docker-compose.yml index 7d066f7f..edfeb7bb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.5.4 + image: sameersbn/gitlab:11.5.5 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 7d1808b5..ca0fdb29 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:11.5.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.5.5 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:11.5.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.5.5 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:11.5.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.5.5 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:11.5.4 +docker pull sameersbn/gitlab:11.5.5 ``` - **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:11.5.4 +sameersbn/gitlab:11.5.5 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index d120911c..30f53136 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.5.4 + image: sameersbn/gitlab:11.5.5 env: - name: TZ value: Asia/Kolkata From fd3651e9f953602baa2fe963c48b3a5929798a7b Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 26 Dec 2018 12:06:03 +0100 Subject: [PATCH 271/508] release 11.5.5 From 0b72e43d7fcf40b3ce16af9ae5eaa9b010be50d4 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 26 Dec 2018 12:35:38 +0100 Subject: [PATCH 272/508] Upgrade GitLab CE to 11.6.0 --- 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 2608a257..3c5c5ef2 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. +**11.6.0** +- gitlab: upgrade CE to v11.6.0 + **11.5.5** - gitlab: upgrade CE to v11.5.5 diff --git a/Dockerfile b/Dockerfile index 30f49a03..19b2ccac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181113 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.5.5 +ARG VERSION=11.6.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index e629a5d6..6014ff8e 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:11.5.5 +# sameersbn/gitlab:11.6.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -127,7 +127,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:11.5.5 +docker pull sameersbn/gitlab:11.6.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -196,7 +196,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:11.5.5 + sameersbn/gitlab:11.6.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -231,7 +231,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:11.5.5 + sameersbn/gitlab:11.6.0 ``` ## 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:11.5.5 + sameersbn/gitlab:11.6.0 ``` #### 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:11.5.5 + sameersbn/gitlab:11.6.0 ``` 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: @@ -362,7 +362,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:11.5.5 + sameersbn/gitlab:11.6.0 ``` #### Linking to MySQL Container @@ -405,7 +405,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:11.5.5 + sameersbn/gitlab:11.6.0 ``` 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: @@ -432,7 +432,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:11.5.5 + sameersbn/gitlab:11.6.0 ``` ### Linking to Redis Container @@ -459,7 +459,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:11.5.5 + sameersbn/gitlab:11.6.0 ``` ### Mail @@ -472,7 +472,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:11.5.5 + sameersbn/gitlab:11.6.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -492,7 +492,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:11.5.5 + sameersbn/gitlab:11.6.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -569,7 +569,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:11.5.5 + sameersbn/gitlab:11.6.0 ``` 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. @@ -585,7 +585,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:11.5.5 + sameersbn/gitlab:11.6.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -608,7 +608,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:11.5.5 + sameersbn/gitlab:11.6.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -656,7 +656,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:11.5.5 + sameersbn/gitlab:11.6.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -784,14 +784,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:11.5.5 + sameersbn/gitlab:11.6.0 ``` 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:11.5.5 app:sanitize + sameersbn/gitlab:11.6.0 app:sanitize ``` ### Piwik @@ -1111,7 +1111,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.5 app:rake gitlab:backup:create + sameersbn/gitlab:11.6.0 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. @@ -1139,14 +1139,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.5 app:rake db:setup + sameersbn/gitlab:11.6.0 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:11.5.5 app:rake gitlab:backup:restore + sameersbn/gitlab:11.6.0 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. @@ -1155,7 +1155,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.6.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1204,7 +1204,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:11.5.5 app:rake gitlab:env:info + sameersbn/gitlab:11.6.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1217,7 +1217,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.5 app:rake gitlab:import:repos + sameersbn/gitlab:11.6.0 app:rake gitlab:import:repos ``` Or @@ -1248,7 +1248,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.5.5 app:rake gitlab:import:repos + sameersbn/gitlab:11.6.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1270,12 +1270,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.5.5` 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:11.6.0` 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:11.5.5 +docker pull sameersbn/gitlab:11.6.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1301,7 +1301,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:11.5.5 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.6.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index b0525db0..146d5de7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.5.5 +11.6.0 diff --git a/docker-compose.yml b/docker-compose.yml index edfeb7bb..06f6d5c6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.5.5 + image: sameersbn/gitlab:11.6.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ca0fdb29..3af8824d 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:11.5.5 app:rake gitlab:backup:create + sameersbn/gitlab:11.6.0 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:11.5.5 app:rake gitlab:backup:restore + sameersbn/gitlab:11.6.0 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:11.5.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.6.0 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:11.5.5 +docker pull sameersbn/gitlab:11.6.0 ``` - **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:11.5.5 +sameersbn/gitlab:11.6.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 30f53136..03890948 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.5.5 + image: sameersbn/gitlab:11.6.0 env: - name: TZ value: Asia/Kolkata From c93d2353aa1a626f4f19a1cfe67c2a23c784d9a9 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 26 Dec 2018 12:35:45 +0100 Subject: [PATCH 273/508] Update gitlab-shell to 8.4.3 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 19b2ccac..4674924d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG VERSION=11.6.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.10.5 \ - GITLAB_SHELL_VERSION=8.4.1 \ + GITLAB_SHELL_VERSION=8.4.3 \ GITLAB_WORKHORSE_VERSION=7.1.3 \ GITLAB_PAGES_VERSION=1.3.1 \ GITALY_SERVER_VERSION=0.129.0 \ From a4c49bcd58bd54c51e65f62851b0f1fea01dbe14 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 26 Dec 2018 12:35:45 +0100 Subject: [PATCH 274/508] Update gitlab-workhorse to 7.6.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4674924d..460edee3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.10.5 \ GITLAB_SHELL_VERSION=8.4.3 \ - GITLAB_WORKHORSE_VERSION=7.1.3 \ + GITLAB_WORKHORSE_VERSION=7.6.0 \ GITLAB_PAGES_VERSION=1.3.1 \ GITALY_SERVER_VERSION=0.129.0 \ GITLAB_USER="git" \ From b75862f4708fd29081f08458c94e5a0949cb5581 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 26 Dec 2018 12:35:45 +0100 Subject: [PATCH 275/508] Update gitaly to 1.7.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 460edee3..0ce861dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=8.4.3 \ GITLAB_WORKHORSE_VERSION=7.6.0 \ GITLAB_PAGES_VERSION=1.3.1 \ - GITALY_SERVER_VERSION=0.129.0 \ + GITALY_SERVER_VERSION=1.7.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 7f349a35bbeda59d79bbdefb3dec481831f62831 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 26 Dec 2018 12:50:17 +0100 Subject: [PATCH 276/508] Update golang to 1.11.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0ce861dc..9526615b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG VERSION=11.6.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ - GOLANG_VERSION=1.10.5 \ + GOLANG_VERSION=1.11.4 \ GITLAB_SHELL_VERSION=8.4.3 \ GITLAB_WORKHORSE_VERSION=7.6.0 \ GITLAB_PAGES_VERSION=1.3.1 \ From 5ed969bf1a4fdbd3afc594ef4fe4348c5cfd3f80 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 26 Dec 2018 13:17:31 +0100 Subject: [PATCH 277/508] Update to 11.6.0 --- Changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Changelog.md b/Changelog.md index 3c5c5ef2..823e6f17 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,10 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **11.6.0** - gitlab: upgrade CE to v11.6.0 +- Update gitaly to 1.7.1 +- Update gitlab-shell to 8.4.3 +- Update gitlab-workhorse to 7.6.0 +- Update golang to 1.11.4 **11.5.5** - gitlab: upgrade CE to v11.5.5 From 5c59e16edb53976330dbcacfd5e22b265b780b2c Mon Sep 17 00:00:00 2001 From: Gert-Jan Timmer Date: Sat, 10 Nov 2018 23:37:48 +0100 Subject: [PATCH 278/508] Fix: Gitlab Pages Custom Domain Setup --- README.md | 1 + assets/runtime/env-defaults | 1 + assets/runtime/functions | 87 ++++++++++++++++++++++--------------- 3 files changed, 54 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 6014ff8e..d95a9dc7 100644 --- a/README.md +++ b/README.md @@ -917,6 +917,7 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_PAGES_EXTERNAL_HTTP` | Sets GitLab Pages external http to receive request on an independen port. Disabled by default | | `GITLAB_PAGES_EXTERNAL_HTTPS` | Sets GitLab Pages external https to receive request on an independen port. Disabled by default | | `GITLAB_PAGES_ACCESS_CONTROL` | Set to `true` to enable access control for pages. Allows access to a Pages site to be controlled based on a user’s membership to that project. Disabled by default. | +| `GITLAB_PAGES_NGINX_PROXY` | Disable the nginx proxy for gitlab pages, defaults to `true`. When set to `false` this will turn off the nginx proxy to the gitlab pages daemon, used when the user provides their own http load balancer in combination with a gitlab pages custom domain setup. | | `GITLAB_HTTPS` | Set to `true` to enable https support, disabled by default. | | `GITALY_CLIENT_PATH` | Set default path for gitaly. defaults to `/home/git/gitaly` | | `GITALY_TOKEN` | Set a gitaly token, blank by default. | diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 96a537f9..f593d053 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -414,6 +414,7 @@ GITLAB_PAGES_HTTPS=${GITLAB_PAGES_HTTPS:-false} GITLAB_PAGES_EXTERNAL_HTTP=${GITLAB_PAGES_EXTERNAL_HTTP:-} GITLAB_PAGES_EXTERNAL_HTTPS=${GITLAB_PAGES_EXTERNAL_HTTPS:-} GITLAB_PAGES_ACCESS_CONTROL=${GITLAB_PAGES_ACCESS_CONTROL:-false} +GITLAB_PAGES_NGINX_PROXY=${GITLAB_PAGES_NGINX_PROXY:-true} ## Gitaly GITALY_CLIENT_PATH=${GITALY_CLIENT_PATH:-$GITLAB_GITALY_INSTALL_DIR} diff --git a/assets/runtime/functions b/assets/runtime/functions index ce851b98..0ebe8152 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1121,22 +1121,24 @@ nginx_configure_gitlab_hsts() { fi } - nginx_configure_gitlab_ipv6() { - if [[ ! -f /proc/net/if_inet6 ]]; then - # disable ipv6 support in nginx for gitlab - sed -i \ - -e "/listen \[::\]:80/d" \ - -e "/listen \[::\]:443/d" \ - ${GITLAB_NGINX_CONFIG} - # disable ipv6 support in nginx for pages - if [[ ${GITLAB_PAGES_ENABLED} == true ]]; then - sed -i \ - -e "/listen \[::\]:80/d" \ - -e "/listen \[::\]:443/d" \ - ${GITLAB_PAGES_NGINX_CONFIG} - fi - fi - } +nginx_configure_gitlab_ipv6() { + if [[ ! -f /proc/net/if_inet6 ]]; then + # disable ipv6 support in nginx for gitlab + sed -i \ + -e "/listen \[::\]:80/d" \ + -e "/listen \[::\]:443/d" \ + ${GITLAB_NGINX_CONFIG} + # disable ipv6 support in nginx for pages + if [[ ${GITLAB_PAGES_ENABLED} == true ]]; then + if [[ ${GITLAB_PAGES_NGINX_PROXY} == true ]]; then + sed -i \ + -e "/listen \[::\]:80/d" \ + -e "/listen \[::\]:443/d" \ + ${GITLAB_PAGES_NGINX_CONFIG} + fi + fi + fi +} nginx_configure_gitlab_real_ip() { if [[ ${NGINX_REAL_IP_RECURSIVE} == on && \ @@ -1199,21 +1201,26 @@ nginx_configure_pages(){ local GITLAB_PAGES_DOMAIN=$(echo $GITLAB_PAGES_DOMAIN | sed 's/\./\\\\./g') if [[ ${GITLAB_PAGES_ENABLED} == true ]]; then echo "Configuring nginx::gitlab-pages..." - if [[ ${GITLAB_PAGES_HTTPS} == true ]]; then - update_template ${GITLAB_PAGES_NGINX_CONFIG} \ - GITLAB_PORT \ - GITLAB_PAGES_DOMAIN \ - GITLAB_PAGES_PORT \ - GITLAB_LOG_DIR \ - GITLAB_PAGES_DOMAIN \ - SSL_PAGES_CERT_PATH \ - SSL_PAGES_KEY_PATH \ - SSL_DHPARAM_PATH \ - GITLAB_LOG_DIR - else - update_template ${GITLAB_PAGES_NGINX_CONFIG} \ - GITLAB_PAGES_DOMAIN \ - GITLAB_LOG_DIR + if [[ ${GITLAB_PAGES_NGINX_PROXY} == true ]]; then + if [[ ${GITLAB_PAGES_HTTPS} == true ]]; then + update_template ${GITLAB_PAGES_NGINX_CONFIG} \ + GITLAB_PORT \ + GITLAB_PAGES_DOMAIN \ + GITLAB_PAGES_PORT \ + GITLAB_LOG_DIR \ + GITLAB_PAGES_DOMAIN \ + SSL_PAGES_CERT_PATH \ + SSL_PAGES_KEY_PATH \ + SSL_DHPARAM_PATH \ + GITLAB_LOG_DIR + else + update_template ${GITLAB_PAGES_NGINX_CONFIG} \ + GITLAB_PAGES_DOMAIN \ + GITLAB_LOG_DIR + fi + else + echo "Gitlab pages nginx proxy disabled" + echo "Assuming custom domain setup with own HTTP(S) load balancer'" fi fi } @@ -1479,11 +1486,21 @@ install_configuration_templates() { ## ${GITLAB_PAGES_NGINX_CONFIG} if [[ ${GITLAB_PAGES_ENABLED} == true ]]; then if [[ ${GITLAB_PAGES_HTTPS} == true && -f ${SSL_PAGES_CERT_PATH} && -f ${SSL_PAGES_KEY_PATH} ]]; then - install_template root: nginx/gitlab-pages-ssl ${GITLAB_PAGES_NGINX_CONFIG} + if [[ ${GITLAB_PAGES_NGINX_PROXY} == true ]]; then + install_template root: nginx/gitlab-pages-ssl ${GITLAB_PAGES_NGINX_CONFIG} + else + echo "Gitlab pages nginx proxy disabled" + echo "Assuming custom domain setup with own HTTP(S) load balancer'" + fi else - echo "SSL Key, SSL Certificate were not found." - echo "Assuming that the container is running behind a HTTPS enabled load balancer." - install_template root: nginx/gitlab-pages ${GITLAB_PAGES_NGINX_CONFIG} + if [[ ${GITLAB_PAGES_NGINX_PROXY} == true ]]; then + echo "SSL Key, SSL Certificate were not found." + echo "Assuming that the container is running behind a HTTPS enabled load balancer." + install_template root: nginx/gitlab-pages ${GITLAB_PAGES_NGINX_CONFIG} + else + echo "Gitlab pages nginx proxy disabled" + echo "Assuming custom domain setup with own HTTP(S) load balancer'" + fi fi fi From e5feefa189a87b27c89f31c2c42f9330688a0b89 Mon Sep 17 00:00:00 2001 From: Gert-Jan Timmer Date: Tue, 27 Nov 2018 15:15:13 +0100 Subject: [PATCH 279/508] fix-backup-subdirectory --- README.md | 3 ++- assets/runtime/env-defaults | 1 + assets/runtime/functions | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d95a9dc7..16702ba8 100644 --- a/README.md +++ b/README.md @@ -844,7 +844,8 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_NOTIFY_PUSHER` | Add pusher to recipients list of broken build notification emails. Defaults to `false` | | `GITLAB_REPOS_DIR` | The git repositories folder in the container. Defaults to `/home/git/data/repositories` | | `GITLAB_BACKUP_DIR` | The backup folder in the container. Defaults to `/home/git/data/backups` | -| `GITLAB_BACKUP_DIR_CHOWN` | Optionally change ownership of backup files on start-up | Defaults to `true` | +| `GITLAB_BACKUP_DIR_CHOWN` | Optionally change ownership of backup files on start-up. Defaults to `true` | +| `GITLAB_BACKUP_DIR_GROUP` | Optionally group backups into a subfolder. Can also be used to place backups in to a subfolder on remote storage. Not used by default. | | `GITLAB_BUILDS_DIR` | The build traces directory. Defaults to `/home/git/data/builds` | | `GITLAB_DOWNLOADS_DIR` | The repository downloads directory. A temporary zip is created in this directory when users click **Download Zip** on a project. Defaults to `/home/git/data/tmp/downloads`. | | `GITLAB_SHARED_DIR` | The directory to store the build artifacts. Defaults to `/home/git/data/shared` | diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index f593d053..47690310 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -6,6 +6,7 @@ DEBUG=${DEBUG:-$DEBUG_ENTRYPOINT} GITLAB_TEMP_DIR="${GITLAB_DATA_DIR}/tmp" GITLAB_BACKUP_DIR="${GITLAB_BACKUP_DIR:-$GITLAB_DATA_DIR/backups}" GITLAB_BACKUP_DIR_CHOWN=${GITLAB_BACKUP_DIR_CHOWN:-true} +GITLAB_BACKUP_DIR_GROUP=${GITLAB_BACKUP_DIR_GROUP:-} GITLAB_REPOS_DIR="${GITLAB_REPOS_DIR:-$GITLAB_DATA_DIR/repositories}" GITLAB_BUILDS_DIR="${GITLAB_BUILDS_DIR:-$GITLAB_DATA_DIR/builds}" GITLAB_DOWNLOADS_DIR="${GITLAB_DOWNLOADS_DIR:-$GITLAB_TEMP_DIR/downloads}" diff --git a/assets/runtime/functions b/assets/runtime/functions index 0ebe8152..5ab2e09f 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -784,7 +784,11 @@ gitlab_configure_backups_schedule() { weekly) day_of_week=0 ;; monthly) day_of_month=01 ;; esac - echo "$min $hour $day_of_month $month $day_of_week /bin/bash -l -c 'cd ${GITLAB_INSTALL_DIR} && bundle exec rake gitlab:backup:create SKIP=${GITLAB_BACKUP_SKIP} RAILS_ENV=${RAILS_ENV}'" >> /tmp/cron.${GITLAB_USER} + if [[ -n ${GITLAB_BACKUP_DIR_GROUP} ]]; then + echo "$min $hour $day_of_month $month $day_of_week /bin/bash -l -c 'cd ${GITLAB_INSTALL_DIR} && bundle exec rake gitlab:backup:create SKIP=${GITLAB_BACKUP_SKIP} DIRECTORY=${GITLAB_BACKUP_DIR_GROUP} RAILS_ENV=${RAILS_ENV}'" >> /tmp/cron.${GITLAB_USER} + else + echo "$min $hour $day_of_month $month $day_of_week /bin/bash -l -c 'cd ${GITLAB_INSTALL_DIR} && bundle exec rake gitlab:backup:create SKIP=${GITLAB_BACKUP_SKIP} RAILS_ENV=${RAILS_ENV}'" >> /tmp/cron.${GITLAB_USER} + fi crontab -u ${GITLAB_USER} /tmp/cron.${GITLAB_USER} fi rm -rf /tmp/cron.${GITLAB_USER} From 33ef7ffde80988852b89313a1f9683f1d843ca80 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 28 Dec 2018 23:04:15 +0100 Subject: [PATCH 280/508] Add LDAP_USER_ATTRIBUTE_* This will add misssing options to configure LDAP_USER_ATTRIBUTES These will fix several Issues and merge multiple merge requests. Fixes sameersbn#699 Fixes sameersbn#1746 Fixes sameersbn#1814 Signed-off-by: solidnerd --- README.md | 5 +++++ assets/runtime/config/gitlabhq/gitlab.yml | 10 +++++----- assets/runtime/env-defaults | 5 +++++ assets/runtime/functions | 5 +++++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 16702ba8..ed326b9a 100644 --- a/README.md +++ b/README.md @@ -1003,6 +1003,11 @@ Below is the complete list of available options that can be used to customize yo | `LDAP_BLOCK_AUTO_CREATED_USERS` | Locks down those users until they have been cleared by the admin. Defaults to `false`. | | `LDAP_BASE` | Base where we can search for users. No default. | | `LDAP_USER_FILTER` | Filter LDAP users. No default. | +| `LDAP_USER_ATTRIBUTE_USERNAME` | Attribute fields for the identification of a user. Default to `['uid', 'userid', 'sAMAccountName']` | +| `LDAP_USER_ATTRIBUTE_MAIL` | Attribute fields for the shown mail address. Default to `['mail', 'email', 'userPrincipalName']` | +| `LDAP_USER_ATTRIBUTE_NAME` | Attribute field for the used username of a user. Default to `cn`. | +| `LDAP_USER_ATTRIBUTE_FIRSTNAME` | Attribute field for the forename of a user. Default to `givenName` | +| `LDAP_USER_ATTRIBUTE_LASTNAME` | Attribute field for the surname of a user. Default to `sn` | | `LDAP_LOWERCASE_USERNAMES` | GitLab will lower case the username for the LDAP Server. Defaults to `false` | | `OAUTH_ENABLED` | Enable OAuth support. Defaults to `true` if any of the support OAuth providers is configured, else defaults to `false`. | | `OAUTH_AUTO_SIGN_IN_WITH_PROVIDER` | Automatically sign in with a specific OAuth provider without showing GitLab sign-in page. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default. | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 1c09c2c1..863105cb 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -395,15 +395,15 @@ production: &base # them in issues, merge request and comments (like `@username`). # If the attribute specified for `username` contains an email address, # the GitLab username will be the part of the email address before the '@'. - username: ['uid', 'userid', 'sAMAccountName'] - email: ['mail', 'email', 'userPrincipalName'] + username: {{LDAP_USER_ATTRIBUTE_USERNAME}} + email: {{LDAP_USER_ATTRIBUTE_MAIL}} # If no full name could be found at the attribute specified for `name`, # the full name is determined using the attributes specified for # `first_name` and `last_name`. - name: 'cn' - first_name: 'givenName' - last_name: 'sn' + name: '{{LDAP_USER_ATTRIBUTE_NAME}}' + first_name: '{{LDAP_USER_ATTRIBUTE_FIRSTNAME}}' + last_name: '{{LDAP_USER_ATTRIBUTE_LASTNAME}}' # If lowercase_usernames is enabled, GitLab will lower case the username. lowercase_usernames: {{LDAP_LOWERCASE_USERNAMES}} diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 47690310..17a0fbc8 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -285,6 +285,11 @@ LDAP_ACTIVE_DIRECTORY=${LDAP_ACTIVE_DIRECTORY:-true} LDAP_BLOCK_AUTO_CREATED_USERS=${LDAP_BLOCK_AUTO_CREATED_USERS:-false} LDAP_BASE=${LDAP_BASE:-} LDAP_USER_FILTER=${LDAP_USER_FILTER:-} +LDAP_USER_ATTRIBUTE_USERNAME=${LDAP_USER_ATTRIBUTE_USERNAME:-['uid', 'userid', 'sAMAccountName']} +LDAP_USER_ATTRIBUTE_MAIL=${LDAP_USER_ATTRIBUTE_MAIL:-['mail', 'email', 'userPrincipalName']} +LDAP_USER_ATTRIBUTE_NAME=${LDAP_USER_ATTRIBUTE_NAME:-cn} +LDAP_USER_ATTRIBUTE_FIRSTNAME=${LDAP_USER_ATTRIBUTE_FIRSTNAME:-givenName} +LDAP_USER_ATTRIBUTE_LASTNAME=${LDAP_USER_ATTRIBUTE_LASTNAME:-sn} LDAP_LOWERCASE_USERNAMES="${LDAP_LOWERCASE_USERNAMES:-false}" LDAP_LABEL=${LDAP_LABEL:-LDAP} LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN=${LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN:-} diff --git a/assets/runtime/functions b/assets/runtime/functions index 5ab2e09f..316c3e63 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -463,6 +463,11 @@ gitlab_configure_ldap() { LDAP_BASE \ LDAP_USER_FILTER \ LDAP_LOWERCASE_USERNAMES \ + LDAP_USER_ATTRIBUTE_USERNAME \ + LDAP_USER_ATTRIBUTE_MAIL \ + LDAP_USER_ATTRIBUTE_NAME \ + LDAP_USER_ATTRIBUTE_FIRSTNAME \ + LDAP_USER_ATTRIBUTE_LASTNAME \ LDAP_LABEL } From cef00972a28f0696eafcbe6ad6db5ae21b110134 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 29 Dec 2018 00:10:27 +0100 Subject: [PATCH 281/508] Update Changelog for 11.6.0 --- Changelog.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Changelog.md b/Changelog.md index 823e6f17..5b3a23e3 100644 --- a/Changelog.md +++ b/Changelog.md @@ -9,6 +9,14 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o - Update gitlab-shell to 8.4.3 - Update gitlab-workhorse to 7.6.0 - Update golang to 1.11.4 +- Added `LDAP_USER_ATTRIBUTE_USERNAME` +- Added `LDAP_USER_ATTRIBUTE_MAIL` +- Added `LDAP_USER_ATTRIBUTE_NAME` +- Added `LDAP_USER_ATTRIBUTE_FIRSTNAME` +- Added `LDAP_USER_ATTRIBUTE_LASTNAME` +- Added `GITLAB_BACKUP_DIR_CHOWN` +- Added `GITLAB_BACKUP_DIR_GROUP` +- Added `GITLAB_PAGES_NGINX_PROXY` **11.5.5** - gitlab: upgrade CE to v11.5.5 From a623f39fb15d8be91c13a0b2393dbd8369272754 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 29 Dec 2018 00:11:43 +0100 Subject: [PATCH 282/508] release 11.6.0 From ec4df3a82fb056fbf0bc8dd4bd13fffea5b3e5b0 Mon Sep 17 00:00:00 2001 From: Alexander Trost Date: Wed, 2 Jan 2019 12:32:39 +0100 Subject: [PATCH 283/508] Added OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME Signed-off-by: Alexander Trost --- README.md | 1 + assets/runtime/config/gitlabhq/gitlab.yml | 3 ++- assets/runtime/env-defaults | 1 + assets/runtime/functions | 17 ++++++++++------- contrib/docker-swarm/docker-compose.yml | 1 + docker-compose.yml | 1 + docs/s3_compatible_storage.md | 2 +- 7 files changed, 17 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index ed326b9a..aafae2fa 100644 --- a/README.md +++ b/README.md @@ -1050,6 +1050,7 @@ Below is the complete list of available options that can be used to customize yo | `OAUTH_SAML_GROUPS_ATTRIBUTE` | Map groups attribute in a SAMLResponse to external groups. No defaults. | | `OAUTH_SAML_EXTERNAL_GROUPS` | List of external groups in a SAMLResponse. Value is comma separated list of single quoted groups. Example: `'group1','group2'`. No defaults. | | `OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL` | Map 'email' attribute name in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details. | +| `OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME` | Map 'username' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details. | | `OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME` | Map 'name' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details. | | `OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME` | Map 'first_name' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details. | | `OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME` | Map 'last_name' attribute in a SAMLResponse to entries in the OmniAuth info hash, No defaults. See [GitLab documentation](http://doc.gitlab.com/ce/integration/saml.html#attribute_statements) for more details. | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 863105cb..5fd56812 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -158,7 +158,7 @@ production: &base object_store: enabled: {{GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED}} remote_directory: {{GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name - direct_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD}} # Set to true to enable direct upload of Artifacts without the need of local shared storage. + direct_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD}} # Set to true to enable direct upload of Artifacts without the need of local shared storage. background_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true) proxy_download: {{GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage connection: @@ -516,6 +516,7 @@ production: &base attribute_statements: { first_name: ['{{OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME}}'], last_name: ['{{OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME}}'], + username: ['{{OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME}}'], name: ['{{OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME}}'], email: ['{{OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL}}'] }, name_identifier_format: '{{OAUTH_SAML_NAME_IDENTIFIER_FORMAT}}' } } diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 17a0fbc8..cf574b17 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -382,6 +382,7 @@ OAUTH_SAML_GROUPS_ATTRIBUTE=${OAUTH_SAML_GROUPS_ATTRIBUTE:-} OAUTH_SAML_EXTERNAL_GROUPS=${OAUTH_SAML_EXTERNAL_GROUPS:-} OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL:-} OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME:-} +OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME:-} OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME:-} OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME=${OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME:-} diff --git a/assets/runtime/functions b/assets/runtime/functions index 316c3e63..6ce2312d 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -598,6 +598,9 @@ gitlab_configure_oauth_saml_attribute_statements() { OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME \ OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME # Remove undefined optional attributes + exec_as_git sed -i "/email: \\[''\\],/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/name: \\[''\\],/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/username: \\[''\\],/d" ${GITLAB_CONFIG} exec_as_git sed -i "/first_name: \\[''\\],/d" ${GITLAB_CONFIG} exec_as_git sed -i "/last_name: \\[''\\],/d" ${GITLAB_CONFIG} else @@ -791,7 +794,7 @@ gitlab_configure_backups_schedule() { esac if [[ -n ${GITLAB_BACKUP_DIR_GROUP} ]]; then echo "$min $hour $day_of_month $month $day_of_week /bin/bash -l -c 'cd ${GITLAB_INSTALL_DIR} && bundle exec rake gitlab:backup:create SKIP=${GITLAB_BACKUP_SKIP} DIRECTORY=${GITLAB_BACKUP_DIR_GROUP} RAILS_ENV=${RAILS_ENV}'" >> /tmp/cron.${GITLAB_USER} - else + else echo "$min $hour $day_of_month $month $day_of_week /bin/bash -l -c 'cd ${GITLAB_INSTALL_DIR} && bundle exec rake gitlab:backup:create SKIP=${GITLAB_BACKUP_SKIP} RAILS_ENV=${RAILS_ENV}'" >> /tmp/cron.${GITLAB_USER} fi crontab -u ${GITLAB_USER} /tmp/cron.${GITLAB_USER} @@ -972,7 +975,7 @@ gitlab_configure_artifacts() { GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST \ GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE - else + else exec_as_git sed -i -e "/path: {{GITLAB_ARTIFACTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG} fi @@ -998,7 +1001,7 @@ gitlab_configure_lfs() { GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST \ GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE - else + else exec_as_git sed -i -e "/path: {{GITLAB_LFS_OBJECTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG} fi @@ -1024,14 +1027,14 @@ gitlab_configure_uploads() { GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST \ GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE - else + else exec_as_git sed -i -e "/base_dir: {{GITLAB_UPLOADS_BASE_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG} fi echo "Configuring gitlab::uploads..." update_template ${GITLAB_CONFIG} \ GITLAB_UPLOADS_STORAGE_PATH \ - GITLAB_UPLOADS_BASE_DIR + GITLAB_UPLOADS_BASE_DIR } gitlab_configure_mattermost() { @@ -1227,7 +1230,7 @@ nginx_configure_pages(){ GITLAB_PAGES_DOMAIN \ GITLAB_LOG_DIR fi - else + else echo "Gitlab pages nginx proxy disabled" echo "Assuming custom domain setup with own HTTP(S) load balancer'" fi @@ -1550,7 +1553,7 @@ configure_gitlab() { GITLAB_PROJECTS_LIMIT \ GITLAB_USERNAME_CHANGE \ GITLAB_DEFAULT_THEME \ - GITLAB_CREATE_GROUP + GITLAB_CREATE_GROUP gitlab_configure_database gitlab_configure_redis diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 0d20c4cb..5779985d 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -138,6 +138,7 @@ services: - OAUTH_SAML_EXTERNAL_GROUPS= - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL= - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME= + - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME= - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME= - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME= diff --git a/docker-compose.yml b/docker-compose.yml index 06f6d5c6..fe2e3321 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -134,6 +134,7 @@ services: - OAUTH_SAML_EXTERNAL_GROUPS= - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL= - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME= + - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME= - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME= - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME= diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md index adb4126f..d876cc7a 100644 --- a/docs/s3_compatible_storage.md +++ b/docs/s3_compatible_storage.md @@ -184,6 +184,7 @@ services: - OAUTH_SAML_EXTERNAL_GROUPS= - OAUTH_SAML_ATTRIBUTE_STATEMENTS_EMAIL= - OAUTH_SAML_ATTRIBUTE_STATEMENTS_NAME= + - OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME= - OAUTH_SAML_ATTRIBUTE_STATEMENTS_FIRST_NAME= - OAUTH_SAML_ATTRIBUTE_STATEMENTS_LAST_NAME= - OAUTH_CROWD_SERVER_URL= @@ -236,4 +237,3 @@ To avoid user interaction in the restore operation, specify the timestamp of the docker run --name gitlab -it --rm [OPTIONS] \ sameersbn/gitlab:8.16.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` - From 3c910cdb8f0760cba3e7d74b3eb11961c2ad21b4 Mon Sep 17 00:00:00 2001 From: Gert-Jan Timmer Date: Wed, 28 Nov 2018 11:12:25 +0100 Subject: [PATCH 284/508] Fix Gitlab Pages Access Control Signed-off-by: solidnerd # Conflicts: # README.md # assets/runtime/env-defaults --- README.md | 51 +++++++++++++++++++++++++++++++++++++ assets/runtime/env-defaults | 5 ++++ assets/runtime/functions | 14 ++++++++++ 3 files changed, 70 insertions(+) diff --git a/README.md b/README.md index aafae2fa..b4100672 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,7 @@ - [SAML](#saml) - [Crowd](#crowd) - [Microsoft Azure](#microsoft-azure) + - [Gitlab Pages](#gitlab-pages) - [External Issue Trackers](#external-issue-trackers) - [Host UID / GID Mapping](#host-uid--gid-mapping) - [Piwik](#piwik) @@ -767,6 +768,51 @@ Once you have the Client ID, Client secret and Tenant ID generated, configure th For example, if your Client ID is `xxx`, the Client secret is `yyy` and the Tenant ID is `zzz`, then adding `--env 'OAUTH_AZURE_API_KEY=xxx' --env 'OAUTH_AZURE_API_SECRET=yyy' --env 'OAUTH_AZURE_TENANT_ID=zzz'` to the docker run command enables support for Microsoft Azure OAuth. +### Gitlab Pages + +Gitlab Pages allows a user to host static websites from a project. Gitlab pages can be enabled with setting the envrionment variable `GITLAB_PAGES_ENABLED` to `true`. + +### Gitlab Pages Access Control + +Since version `11.5.0` Gitlab pages supports access control. This allows only access to a published website if you are a project member, or have access to a certain project. + +Gitlab pages access control requires additional configuration before activating it through the variable `GITLAB_PAGES_ACCESS_CONTROL`. + +Gitab pages access control makes use of the Gitlab OAuth Module. + + - Goto the Gitlab Admin area + - Select `Applications` in the menu + - Create `New Application` + - Name: `Gitlab Pages` + - Scopes: + - api + - Trusted: NO (Do not select) + - Redirect URI: https://projects./auth + +Note about the `Redirect URI`; this can be tricky to configure or figure out, What needs to be achieved is to following, the redirect URI needs to end up at the `gitlab-pages` daemon with the `/auth` endpoint. + +This means that if you run your gitlab pages at domain `pages.example.io` this will be a wilcard domain where your projects are created based on their namespace. The best trick is to enter a NON-Existing gitlab project pages URI as the redirect URI. + +In the example above; the pages domain `projects` has been chosen. This will cause the nginx, either the built in or your own loadbalancer to redirect `*.` to the `gitlab-pages` daemon. Which will trigger the pages endpoint. + +Make sure to choose own which does not exist and make sure that the request is routed to the `gitlab-pages` daemon if you are using your own HTTP load balancer in front of Gitlab. + +After creating the OAuth application endpoint for the Gitlab Pages Daemon. Gitlab pages access control can now be enabled. + +Add to following environment variables to your Gitlab Container. + +| Variable | R/O | Description | +|----------|-----|-------------| +| GITLAB_PAGES_ACCESS_CONTROL | Required | Set to `true` to enable access control. | +| GITLAB_PAGES_ACCESS_SECRET | Optional | Secret Hash, minimal 32 characters, if omitted, it will be auto generated. | +| GITLAB_PAGES_ACCESS_CONTROL_SERVER | Required | Gitlab instance URI, example: `https://gitlab.example.io` | +| GITLAB_PAGES_ACCESS_CLIENT_ID | Required | Client ID from earlier generated OAuth application | +| GITLAB_PAGES_ACCESS_CLIENT_SECRET | Required | Client Secret from earlier genereated OAuth application | +| GITLAB_PAGES_ACCESS_REDIRECT_URI | Required | Redirect URI, non existing pages domain to redirect to pages daemon, `https://projects.example.io` | + +After you have enabled the gitlab pages access control. When you go to a project `General Settings` -> `Permissions` you can choose the pages persmission level for the project. + + ### External Issue Trackers Since version `7.10.0` support for external issue trackers can be enabled in the "Service Templates" section of the settings panel. @@ -919,6 +965,11 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_PAGES_EXTERNAL_HTTPS` | Sets GitLab Pages external https to receive request on an independen port. Disabled by default | | `GITLAB_PAGES_ACCESS_CONTROL` | Set to `true` to enable access control for pages. Allows access to a Pages site to be controlled based on a user’s membership to that project. Disabled by default. | | `GITLAB_PAGES_NGINX_PROXY` | Disable the nginx proxy for gitlab pages, defaults to `true`. When set to `false` this will turn off the nginx proxy to the gitlab pages daemon, used when the user provides their own http load balancer in combination with a gitlab pages custom domain setup. | +| `GITLAB_PAGES_ACCESS_SECRET` | Secret Hash, minimal 32 characters, if omitted, it will be auto generated. | +| `GITLAB_PAGES_ACCESS_CONTROL_SERVER` | Gitlab instance URI, example: `https://gitlab.example.io` | +| `GITLAB_PAGES_ACCESS_CLIENT_ID` | Client ID from earlier generated OAuth application | +| `GITLAB_PAGES_ACCESS_CLIENT_SECRET` | Client Secret from earlier genereated OAuth application | +| `GITLAB_PAGES_ACCESS_REDIRECT_URI` | Redirect URI, non existing pages domain to redirect to pages daemon, `https://projects.example.io` | | `GITLAB_HTTPS` | Set to `true` to enable https support, disabled by default. | | `GITALY_CLIENT_PATH` | Set default path for gitaly. defaults to `/home/git/gitaly` | | `GITALY_TOKEN` | Set a gitaly token, blank by default. | diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index cf574b17..f44751a1 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -421,6 +421,11 @@ GITLAB_PAGES_HTTPS=${GITLAB_PAGES_HTTPS:-false} GITLAB_PAGES_EXTERNAL_HTTP=${GITLAB_PAGES_EXTERNAL_HTTP:-} GITLAB_PAGES_EXTERNAL_HTTPS=${GITLAB_PAGES_EXTERNAL_HTTPS:-} GITLAB_PAGES_ACCESS_CONTROL=${GITLAB_PAGES_ACCESS_CONTROL:-false} +GITLAB_PAGES_ACCESS_CONTROL_SERVER=${GITLAB_PAGES_ACCESS_CONTROL_SERVER:-} +GITLAB_PAGES_ACCESS_SECRET=${GITLAB_PAGES_ACCESS_SECRET:-} +GITLAB_PAGES_ACCESS_CLIENT_ID=${GITLAB_PAGES_ACCESS_CLIENT_ID:-} +GITLAB_PAGES_ACCESS_CLIENT_SECRET=${GITLAB_PAGES_ACCESS_CLIENT_SECRET:-} +GITLAB_PAGES_ACCESS_REDIRECT_URI=${GITLAB_PAGES_ACCESS_REDIRECT_URI:-} GITLAB_PAGES_NGINX_PROXY=${GITLAB_PAGES_NGINX_PROXY:-true} ## Gitaly diff --git a/assets/runtime/functions b/assets/runtime/functions index 6ce2312d..929ee8f0 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1631,6 +1631,20 @@ cat >> /etc/supervisor/conf.d/gitlab-pages.conf <> /etc/supervisor/conf.d/gitlab-pages.conf <> /etc/supervisor/conf.d/gitlab-pages.conf < Date: Mon, 31 Dec 2018 15:40:40 +0100 Subject: [PATCH 285/508] ADD GITLAB_IMPERSONATION_ENABLED Signed-off-by: Pierre Belloy --- README.md | 1 + assets/runtime/config/gitlabhq/gitlab.yml | 3 +++ assets/runtime/env-defaults | 1 + assets/runtime/functions | 1 + 4 files changed, 6 insertions(+) diff --git a/README.md b/README.md index b4100672..890e09a6 100644 --- a/README.md +++ b/README.md @@ -876,6 +876,7 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_INCOMING_EMAIL_ADDRESS` | The incoming email address for reply by email. Defaults to the value of `IMAP_USER`, else defaults to `reply@example.com`. Please read the [reply by email](http://doc.gitlab.com/ce/incoming_email/README.html) documentation to currently set this parameter. | | `GITLAB_INCOMING_EMAIL_ENABLED` | Enable or disable gitlab reply by email feature. Defaults to the value of `IMAP_ENABLED`. | | `GITLAB_SIGNUP_ENABLED` | Enable or disable user signups (first run only). Default is `true`. | +| `GITLAB_IMPERSONATION_ENABLED` | Enable or disable impersonation. Defaults to `true`. | | `GITLAB_PROJECTS_LIMIT` | Set default projects limit. Defaults to `100`. | | `GITLAB_USERNAME_CHANGE` | Enable or disable ability for users to change their username. Defaults to `true`. | | `GITLAB_CREATE_GROUP` | Enable or disable ability for users to create groups. Defaults to `true`. | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 5fd56812..5f203dc0 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -118,6 +118,9 @@ production: &base # The default is 'shared/cache/archive/' relative to the root of the Rails app. repository_downloads_path: {{GITLAB_DOWNLOADS_DIR}} + ## Impersonation settings + impersonation_enabled: {{GITLAB_IMPERSONATION_ENABLED}} + ## Reply by email # Allow users to comment on issues and merge requests by replying to notification emails. # For documentation on how to set this up, see http://doc.gitlab.com/ce/administration/reply_by_email.html diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index f44751a1..3b1f5bc3 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -16,6 +16,7 @@ GITLAB_HTTPS=${GITLAB_HTTPS:-false} GITLAB_HOST=${GITLAB_HOST:-localhost} GITLAB_CI_HOST=${GITLAB_CI_HOST:-} GITLAB_PORT=${GITLAB_PORT:-} +GITLAB_IMPERSONATION_ENABLED=${GITLAB_IMPERSONATION_ENABLED:-true} if [[ $GITLAB_HTTPS == true ]]; then GITLAB_PORT=${GITLAB_PORT:-443} else diff --git a/assets/runtime/functions b/assets/runtime/functions index 929ee8f0..53e063c1 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1550,6 +1550,7 @@ configure_gitlab() { GITLAB_SSH_HOST \ GITLAB_SSH_PORT \ GITLAB_SIGNUP_ENABLED \ + GITLAB_IMPERSONATION_ENABLED \ GITLAB_PROJECTS_LIMIT \ GITLAB_USERNAME_CHANGE \ GITLAB_DEFAULT_THEME \ From 4284283859cdba070b03fb4e7a06be778e13b3af Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 1 Jan 2019 22:58:27 +0100 Subject: [PATCH 286/508] Upgrade GitLab CE to 11.6.1 --- 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 5b3a23e3..aee4ec9b 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. +**11.6.1** +- gitlab: upgrade CE to v11.6.1 + **11.6.0** - gitlab: upgrade CE to v11.6.0 - Update gitaly to 1.7.1 diff --git a/Dockerfile b/Dockerfile index 9526615b..0e06ceb1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181113 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.6.0 +ARG VERSION=11.6.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 890e09a6..0de7d9df 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:11.6.0 +# sameersbn/gitlab:11.6.1 - [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:11.6.0 +docker pull sameersbn/gitlab:11.6.1 ``` 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:11.6.0 + sameersbn/gitlab:11.6.1 ``` *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:11.6.0 + sameersbn/gitlab:11.6.1 ``` ## 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:11.6.0 + sameersbn/gitlab:11.6.1 ``` #### 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:11.6.0 + sameersbn/gitlab:11.6.1 ``` 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:11.6.0 + sameersbn/gitlab:11.6.1 ``` #### 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:11.6.0 + sameersbn/gitlab:11.6.1 ``` 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:11.6.0 + sameersbn/gitlab:11.6.1 ``` ### 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:11.6.0 + sameersbn/gitlab:11.6.1 ``` ### 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:11.6.0 + sameersbn/gitlab:11.6.1 ``` 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:11.6.0 + sameersbn/gitlab:11.6.1 ``` 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:11.6.0 + sameersbn/gitlab:11.6.1 ``` 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:11.6.0 + sameersbn/gitlab:11.6.1 ``` 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:11.6.0 + sameersbn/gitlab:11.6.1 ``` 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:11.6.0 + sameersbn/gitlab:11.6.1 ``` 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:11.6.0 + sameersbn/gitlab:11.6.1 ``` 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:11.6.0 app:sanitize + sameersbn/gitlab:11.6.1 app:sanitize ``` ### Piwik @@ -1171,7 +1171,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.6.1 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. @@ -1199,14 +1199,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.0 app:rake db:setup + sameersbn/gitlab:11.6.1 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:11.6.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.6.1 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. @@ -1215,7 +1215,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.6.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1264,7 +1264,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:11.6.0 app:rake gitlab:env:info + sameersbn/gitlab:11.6.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1277,7 +1277,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.6.1 app:rake gitlab:import:repos ``` Or @@ -1308,7 +1308,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.6.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1330,12 +1330,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.6.0` 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:11.6.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.6.0 +docker pull sameersbn/gitlab:11.6.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1361,7 +1361,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:11.6.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.6.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 146d5de7..1a31377d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.6.0 +11.6.1 diff --git a/docker-compose.yml b/docker-compose.yml index fe2e3321..c84f8ef8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.6.0 + image: sameersbn/gitlab:11.6.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 3af8824d..90d98a80 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:11.6.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.6.1 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:11.6.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.6.1 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:11.6.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.6.1 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:11.6.0 +docker pull sameersbn/gitlab:11.6.1 ``` - **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:11.6.0 +sameersbn/gitlab:11.6.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 03890948..f3dffba3 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.6.0 + image: sameersbn/gitlab:11.6.1 env: - name: TZ value: Asia/Kolkata From fffe87747a6ca411d79d2a6f8b04b5ebe5966804 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 1 Jan 2019 23:02:10 +0100 Subject: [PATCH 287/508] Update base-image to 2018-12-18 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0e06ceb1..d9f9718a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:xenial-20181113 +FROM ubuntu:xenial-20181218 ARG BUILD_DATE ARG VCS_REF From a15ba879db37149c8bcbe52d6a5ce94121f1f473 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 2 Jan 2019 13:51:28 +0100 Subject: [PATCH 288/508] Update Changelog for 11.6.1 --- Changelog.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Changelog.md b/Changelog.md index aee4ec9b..b6c119d2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,13 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **11.6.1** - gitlab: upgrade CE to v11.6.1 +- Added `GITLAB_IMPERSONATION_ENABLED` +- Added `OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME` +- Added `GITLAB_PAGES_ACCESS_CONTROL_SERVER` +- Added `GITLAB_PAGES_ACCESS_CLIENT_ID` +- Added `GITLAB_PAGES_ACCESS_CLIENT_SECRET` +- Added `GITLAB_PAGES_ACCESS_SECRET` +- Added `GITLAB_PAGES_ACCESS_REDIRECT_URI` **11.6.0** - gitlab: upgrade CE to v11.6.0 From 011b0af72f2cbed5c2fd8046d8f371658b59675e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 2 Jan 2019 13:52:24 +0100 Subject: [PATCH 289/508] release 11.6.1 From 2ca3c61261b6c2055109cb9f04fa8793aa4ef5bc Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 3 Jan 2019 19:16:57 +0530 Subject: [PATCH 290/508] fix image builds on docker hub --- Dockerfile | 2 +- assets/build/install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d9f9718a..d1b26065 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,7 +51,7 @@ RUN apt-get update \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \ - && gem install --no-document bundler \ + && gem install --no-document bundler -v 1.17.3 \ && rm -rf /var/lib/apt/lists/* COPY assets/build/ ${GITLAB_BUILD_DIR}/ diff --git a/assets/build/install.sh b/assets/build/install.sh index bd0e1124..8eb9ecad 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -166,7 +166,7 @@ exec_as_git yarn install --production --pure-lockfile exec_as_git yarn add ajv@^4.0.0 echo "Compiling assets. Please be patient, this could take a while..." -exec_as_git bundle exec rake gitlab:assets:compile USE_DB=false SKIP_STORAGE_VALIDATION=true +exec_as_git bundle exec rake gitlab:assets:compile USE_DB=false SKIP_STORAGE_VALIDATION=true NODE_OPTIONS="--max-old-space-size=4096" # remove auto generated ${GITLAB_DATA_DIR}/config/secrets.yml rm -rf ${GITLAB_DATA_DIR}/config/secrets.yml From b7df78ca004f21a1a68fac5c53bd80fdece0ea7b Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 3 Jan 2019 10:07:33 +0100 Subject: [PATCH 291/508] Upgrade GitLab CE to 11.6.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 b6c119d2..c3331b14 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. +**11.6.2** +- gitlab: upgrade CE to v11.6.2 + **11.6.1** - gitlab: upgrade CE to v11.6.1 - Added `GITLAB_IMPERSONATION_ENABLED` diff --git a/Dockerfile b/Dockerfile index d1b26065..ad63fe52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.6.1 +ARG VERSION=11.6.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 0de7d9df..585cde78 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:11.6.1 +# sameersbn/gitlab:11.6.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:11.6.1 +docker pull sameersbn/gitlab:11.6.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:11.6.1 + sameersbn/gitlab:11.6.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:11.6.1 + sameersbn/gitlab:11.6.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:11.6.1 + sameersbn/gitlab:11.6.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:11.6.1 + sameersbn/gitlab:11.6.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:11.6.1 + sameersbn/gitlab:11.6.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:11.6.1 + sameersbn/gitlab:11.6.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:11.6.1 + sameersbn/gitlab:11.6.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:11.6.1 + sameersbn/gitlab:11.6.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:11.6.1 + sameersbn/gitlab:11.6.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:11.6.1 + sameersbn/gitlab:11.6.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:11.6.1 + sameersbn/gitlab:11.6.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:11.6.1 + sameersbn/gitlab:11.6.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:11.6.1 + sameersbn/gitlab:11.6.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:11.6.1 + sameersbn/gitlab:11.6.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:11.6.1 + sameersbn/gitlab:11.6.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:11.6.1 app:sanitize + sameersbn/gitlab:11.6.2 app:sanitize ``` ### Piwik @@ -1171,7 +1171,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.6.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. @@ -1199,14 +1199,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.1 app:rake db:setup + sameersbn/gitlab:11.6.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:11.6.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.6.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. @@ -1215,7 +1215,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.6.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1264,7 +1264,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:11.6.1 app:rake gitlab:env:info + sameersbn/gitlab:11.6.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1277,7 +1277,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.6.2 app:rake gitlab:import:repos ``` Or @@ -1308,7 +1308,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.6.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1330,12 +1330,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.6.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:11.6.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:11.6.1 +docker pull sameersbn/gitlab:11.6.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1361,7 +1361,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:11.6.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.6.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index 1a31377d..48f8d64e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.6.1 +11.6.2 diff --git a/docker-compose.yml b/docker-compose.yml index c84f8ef8..d0a21e22 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.6.1 + image: sameersbn/gitlab:11.6.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 90d98a80..edd4ee58 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:11.6.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.6.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:11.6.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.6.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:11.6.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.6.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:11.6.1 +docker pull sameersbn/gitlab:11.6.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:11.6.1 +sameersbn/gitlab:11.6.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index f3dffba3..a42b7db0 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.6.1 + image: sameersbn/gitlab:11.6.2 env: - name: TZ value: Asia/Kolkata From 0b3e863457d7eabc499ca81a03d936239eac3c02 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 5 Jan 2019 22:56:42 +0100 Subject: [PATCH 292/508] release 11.6.2 From 6e8e04c2959c31f8d15b3323b4cadd21e3d409df Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 5 Jan 2019 22:54:31 +0100 Subject: [PATCH 293/508] Upgrade GitLab CE to 11.6.3 --- 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 c3331b14..7f7139f4 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. +**11.6.3** +- gitlab: upgrade CE to v11.6.3 + **11.6.2** - gitlab: upgrade CE to v11.6.2 diff --git a/Dockerfile b/Dockerfile index ad63fe52..bc309acf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.6.2 +ARG VERSION=11.6.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 585cde78..4cb78002 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:11.6.2 +# sameersbn/gitlab:11.6.3 - [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:11.6.2 +docker pull sameersbn/gitlab:11.6.3 ``` 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:11.6.2 + sameersbn/gitlab:11.6.3 ``` *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:11.6.2 + sameersbn/gitlab:11.6.3 ``` ## 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:11.6.2 + sameersbn/gitlab:11.6.3 ``` #### 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:11.6.2 + sameersbn/gitlab:11.6.3 ``` 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:11.6.2 + sameersbn/gitlab:11.6.3 ``` #### 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:11.6.2 + sameersbn/gitlab:11.6.3 ``` 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:11.6.2 + sameersbn/gitlab:11.6.3 ``` ### 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:11.6.2 + sameersbn/gitlab:11.6.3 ``` ### 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:11.6.2 + sameersbn/gitlab:11.6.3 ``` 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:11.6.2 + sameersbn/gitlab:11.6.3 ``` 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:11.6.2 + sameersbn/gitlab:11.6.3 ``` 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:11.6.2 + sameersbn/gitlab:11.6.3 ``` 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:11.6.2 + sameersbn/gitlab:11.6.3 ``` 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:11.6.2 + sameersbn/gitlab:11.6.3 ``` 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:11.6.2 + sameersbn/gitlab:11.6.3 ``` 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:11.6.2 app:sanitize + sameersbn/gitlab:11.6.3 app:sanitize ``` ### Piwik @@ -1171,7 +1171,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.6.3 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. @@ -1199,14 +1199,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.2 app:rake db:setup + sameersbn/gitlab:11.6.3 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:11.6.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.6.3 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. @@ -1215,7 +1215,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.6.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1264,7 +1264,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:11.6.2 app:rake gitlab:env:info + sameersbn/gitlab:11.6.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1277,7 +1277,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.6.3 app:rake gitlab:import:repos ``` Or @@ -1308,7 +1308,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.6.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1330,12 +1330,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.6.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. +> Upgrading to `sameersbn/gitlab:11.6.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.6.2 +docker pull sameersbn/gitlab:11.6.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1361,7 +1361,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:11.6.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.6.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index 48f8d64e..546fe235 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.6.2 +11.6.3 diff --git a/docker-compose.yml b/docker-compose.yml index d0a21e22..812b70ed 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.6.2 + image: sameersbn/gitlab:11.6.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index edd4ee58..fa824a22 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:11.6.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.6.3 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:11.6.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.6.3 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:11.6.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.6.3 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:11.6.2 +docker pull sameersbn/gitlab:11.6.3 ``` - **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:11.6.2 +sameersbn/gitlab:11.6.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index a42b7db0..abc7eaf7 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.6.2 + image: sameersbn/gitlab:11.6.3 env: - name: TZ value: Asia/Kolkata From df2c38d9da9c625bf54c5b051a6e7a7cdf8f0a85 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 7 Jan 2019 21:19:12 +0100 Subject: [PATCH 294/508] release 11.6.3 From c29086dcd970f1a0867aa22ea526bac4a1c336de Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 16 Jan 2019 20:58:17 +0100 Subject: [PATCH 295/508] Upgrade GitLab CE to 11.6.4 --- 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 7f7139f4..87b359f3 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. +**11.6.4** +- gitlab: upgrade CE to v11.6.4 + **11.6.3** - gitlab: upgrade CE to v11.6.3 diff --git a/Dockerfile b/Dockerfile index bc309acf..1edf03f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.6.3 +ARG VERSION=11.6.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 4cb78002..eee89526 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:11.6.3 +# sameersbn/gitlab:11.6.4 - [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:11.6.3 +docker pull sameersbn/gitlab:11.6.4 ``` 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:11.6.3 + sameersbn/gitlab:11.6.4 ``` *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:11.6.3 + sameersbn/gitlab:11.6.4 ``` ## 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:11.6.3 + sameersbn/gitlab:11.6.4 ``` #### 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:11.6.3 + sameersbn/gitlab:11.6.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: @@ -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:11.6.3 + sameersbn/gitlab:11.6.4 ``` #### 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:11.6.3 + sameersbn/gitlab:11.6.4 ``` 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:11.6.3 + sameersbn/gitlab:11.6.4 ``` ### 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:11.6.3 + sameersbn/gitlab:11.6.4 ``` ### 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:11.6.3 + sameersbn/gitlab:11.6.4 ``` 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:11.6.3 + sameersbn/gitlab:11.6.4 ``` 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:11.6.3 + sameersbn/gitlab:11.6.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. @@ -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:11.6.3 + sameersbn/gitlab:11.6.4 ``` 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:11.6.3 + sameersbn/gitlab:11.6.4 ``` 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:11.6.3 + sameersbn/gitlab:11.6.4 ``` 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:11.6.3 + sameersbn/gitlab:11.6.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:11.6.3 app:sanitize + sameersbn/gitlab:11.6.4 app:sanitize ``` ### Piwik @@ -1171,7 +1171,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.6.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. @@ -1199,14 +1199,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.3 app:rake db:setup + sameersbn/gitlab:11.6.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:11.6.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.6.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. @@ -1215,7 +1215,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.6.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1264,7 +1264,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:11.6.3 app:rake gitlab:env:info + sameersbn/gitlab:11.6.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1277,7 +1277,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.6.4 app:rake gitlab:import:repos ``` Or @@ -1308,7 +1308,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.6.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1330,12 +1330,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.6.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:11.6.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:11.6.3 +docker pull sameersbn/gitlab:11.6.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1361,7 +1361,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:11.6.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.6.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index 546fe235..1baf6d5a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.6.3 +11.6.4 diff --git a/docker-compose.yml b/docker-compose.yml index 812b70ed..6f4df672 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.6.3 + image: sameersbn/gitlab:11.6.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index fa824a22..ec3fa6b8 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:11.6.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.6.4 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:11.6.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.6.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. @@ -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:11.6.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.6.4 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:11.6.3 +docker pull sameersbn/gitlab:11.6.4 ``` - **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:11.6.3 +sameersbn/gitlab:11.6.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index abc7eaf7..9fa30c2c 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.6.3 + image: sameersbn/gitlab:11.6.4 env: - name: TZ value: Asia/Kolkata From 172588746a7bfc08d65e5c33e5afb61c749cef7e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 19 Jan 2019 09:25:44 +0100 Subject: [PATCH 296/508] release 11.6.4 From 9f821fd4bf685b5bed87e3f3615b93120b24528e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 19 Jan 2019 09:27:13 +0100 Subject: [PATCH 297/508] Upgrade GitLab CE to 11.6.5 --- 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 87b359f3..edf14756 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. +**11.6.5** +- gitlab: upgrade CE to v11.6.5 + **11.6.4** - gitlab: upgrade CE to v11.6.4 diff --git a/Dockerfile b/Dockerfile index 1edf03f3..d404a96e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.6.4 +ARG VERSION=11.6.5 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index eee89526..1fcfb2b6 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:11.6.4 +# sameersbn/gitlab:11.6.5 - [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:11.6.4 +docker pull sameersbn/gitlab:11.6.5 ``` 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:11.6.4 + sameersbn/gitlab:11.6.5 ``` *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:11.6.4 + sameersbn/gitlab:11.6.5 ``` ## 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:11.6.4 + sameersbn/gitlab:11.6.5 ``` #### 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:11.6.4 + sameersbn/gitlab:11.6.5 ``` 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:11.6.4 + sameersbn/gitlab:11.6.5 ``` #### 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:11.6.4 + sameersbn/gitlab:11.6.5 ``` 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:11.6.4 + sameersbn/gitlab:11.6.5 ``` ### 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:11.6.4 + sameersbn/gitlab:11.6.5 ``` ### 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:11.6.4 + sameersbn/gitlab:11.6.5 ``` 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:11.6.4 + sameersbn/gitlab:11.6.5 ``` 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:11.6.4 + sameersbn/gitlab:11.6.5 ``` 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:11.6.4 + sameersbn/gitlab:11.6.5 ``` 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:11.6.4 + sameersbn/gitlab:11.6.5 ``` 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:11.6.4 + sameersbn/gitlab:11.6.5 ``` 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:11.6.4 + sameersbn/gitlab:11.6.5 ``` 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:11.6.4 app:sanitize + sameersbn/gitlab:11.6.5 app:sanitize ``` ### Piwik @@ -1171,7 +1171,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.6.5 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. @@ -1199,14 +1199,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.4 app:rake db:setup + sameersbn/gitlab:11.6.5 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:11.6.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.6.5 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. @@ -1215,7 +1215,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.6.5 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1264,7 +1264,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:11.6.4 app:rake gitlab:env:info + sameersbn/gitlab:11.6.5 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1277,7 +1277,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.6.5 app:rake gitlab:import:repos ``` Or @@ -1308,7 +1308,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.6.5 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1330,12 +1330,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.6.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. +> Upgrading to `sameersbn/gitlab:11.6.5` 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:11.6.4 +docker pull sameersbn/gitlab:11.6.5 ``` - **Step 2**: Stop and remove the currently running image @@ -1361,7 +1361,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:11.6.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.6.5 ``` ## Shell Access diff --git a/VERSION b/VERSION index 1baf6d5a..ee5d7542 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.6.4 +11.6.5 diff --git a/docker-compose.yml b/docker-compose.yml index 6f4df672..d6b352dd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.6.4 + image: sameersbn/gitlab:11.6.5 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ec3fa6b8..c186bc33 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:11.6.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.6.5 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:11.6.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.6.5 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:11.6.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.6.5 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:11.6.4 +docker pull sameersbn/gitlab:11.6.5 ``` - **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:11.6.4 +sameersbn/gitlab:11.6.5 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 9fa30c2c..e5b87506 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.6.4 + image: sameersbn/gitlab:11.6.5 env: - name: TZ value: Asia/Kolkata From 2144b7f5b3414d09d8b81f69bab9993268330ae2 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 20 Jan 2019 08:39:42 +0100 Subject: [PATCH 298/508] release 11.6.5 From 5eb7c43ce4640913183d04fe6e4878811886bdf6 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 22 Jan 2019 08:10:10 +0100 Subject: [PATCH 299/508] Upgrade GitLab CE to 11.7.0 --- 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 edf14756..82bba70a 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. +**11.7.0** +- gitlab: upgrade CE to v11.7.0 + **11.6.5** - gitlab: upgrade CE to v11.6.5 diff --git a/Dockerfile b/Dockerfile index d404a96e..a0be2326 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.6.5 +ARG VERSION=11.7.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 1fcfb2b6..72165429 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:11.6.5 +# sameersbn/gitlab:11.7.0 - [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:11.6.5 +docker pull sameersbn/gitlab:11.7.0 ``` 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:11.6.5 + sameersbn/gitlab:11.7.0 ``` *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:11.6.5 + sameersbn/gitlab:11.7.0 ``` ## 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:11.6.5 + sameersbn/gitlab:11.7.0 ``` #### 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:11.6.5 + sameersbn/gitlab:11.7.0 ``` 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:11.6.5 + sameersbn/gitlab:11.7.0 ``` #### 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:11.6.5 + sameersbn/gitlab:11.7.0 ``` 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:11.6.5 + sameersbn/gitlab:11.7.0 ``` ### 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:11.6.5 + sameersbn/gitlab:11.7.0 ``` ### 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:11.6.5 + sameersbn/gitlab:11.7.0 ``` 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:11.6.5 + sameersbn/gitlab:11.7.0 ``` 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:11.6.5 + sameersbn/gitlab:11.7.0 ``` 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:11.6.5 + sameersbn/gitlab:11.7.0 ``` 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:11.6.5 + sameersbn/gitlab:11.7.0 ``` 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:11.6.5 + sameersbn/gitlab:11.7.0 ``` 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:11.6.5 + sameersbn/gitlab:11.7.0 ``` 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:11.6.5 app:sanitize + sameersbn/gitlab:11.7.0 app:sanitize ``` ### Piwik @@ -1171,7 +1171,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.5 app:rake gitlab:backup:create + sameersbn/gitlab:11.7.0 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. @@ -1199,14 +1199,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.5 app:rake db:setup + sameersbn/gitlab:11.7.0 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:11.6.5 app:rake gitlab:backup:restore + sameersbn/gitlab:11.7.0 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. @@ -1215,7 +1215,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.7.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1264,7 +1264,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:11.6.5 app:rake gitlab:env:info + sameersbn/gitlab:11.7.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1277,7 +1277,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.5 app:rake gitlab:import:repos + sameersbn/gitlab:11.7.0 app:rake gitlab:import:repos ``` Or @@ -1308,7 +1308,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.6.5 app:rake gitlab:import:repos + sameersbn/gitlab:11.7.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1330,12 +1330,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.6.5` 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:11.7.0` 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:11.6.5 +docker pull sameersbn/gitlab:11.7.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1361,7 +1361,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:11.6.5 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.7.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index ee5d7542..308bbae7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.6.5 +11.7.0 diff --git a/docker-compose.yml b/docker-compose.yml index d6b352dd..dd437e93 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.6.5 + image: sameersbn/gitlab:11.7.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index c186bc33..bd214b0b 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:11.6.5 app:rake gitlab:backup:create + sameersbn/gitlab:11.7.0 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:11.6.5 app:rake gitlab:backup:restore + sameersbn/gitlab:11.7.0 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:11.6.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.7.0 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:11.6.5 +docker pull sameersbn/gitlab:11.7.0 ``` - **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:11.6.5 +sameersbn/gitlab:11.7.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index e5b87506..6280066d 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.6.5 + image: sameersbn/gitlab:11.7.0 env: - name: TZ value: Asia/Kolkata From 4849e7fa55a45e3456bf2bc51c3993408ca6bae4 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 22 Jan 2019 08:10:19 +0100 Subject: [PATCH 300/508] Update gitlab-shell to 8.4.4 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a0be2326..f7acb00d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG VERSION=11.7.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.11.4 \ - GITLAB_SHELL_VERSION=8.4.3 \ + GITLAB_SHELL_VERSION=8.4.4 \ GITLAB_WORKHORSE_VERSION=7.6.0 \ GITLAB_PAGES_VERSION=1.3.1 \ GITALY_SERVER_VERSION=1.7.1 \ From b893869aed175939cc1d87f88e865096d7118f24 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 22 Jan 2019 08:10:20 +0100 Subject: [PATCH 301/508] Update gitlab-workhorse to 8.0.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f7acb00d..2ac3fdfc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.11.4 \ GITLAB_SHELL_VERSION=8.4.4 \ - GITLAB_WORKHORSE_VERSION=7.6.0 \ + GITLAB_WORKHORSE_VERSION=8.0.0 \ GITLAB_PAGES_VERSION=1.3.1 \ GITALY_SERVER_VERSION=1.7.1 \ GITLAB_USER="git" \ From f841122e767dc30175f2de8b043696f2238ff38d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 22 Jan 2019 08:10:20 +0100 Subject: [PATCH 302/508] Update gitaly to 1.12.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2ac3fdfc..b13a116d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=8.4.4 \ GITLAB_WORKHORSE_VERSION=8.0.0 \ GITLAB_PAGES_VERSION=1.3.1 \ - GITALY_SERVER_VERSION=1.7.1 \ + GITALY_SERVER_VERSION=1.12.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From fa2701679469c215a9f07860bfa20a3c45ec0728 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 23 Jan 2019 07:44:20 +0100 Subject: [PATCH 303/508] release 11.7.0 From 8fc04134d11780e3e2bef830d25ac5fa7bac0976 Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Fri, 1 Feb 2019 11:32:06 +0300 Subject: [PATCH 304/508] Upgrade GitLab CE to 11.7.3 --- Changelog.md | 5 +++- Dockerfile | 2 +- README.md | 56 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 41 insertions(+), 38 deletions(-) diff --git a/Changelog.md b/Changelog.md index 82bba70a..997fb7a8 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. +**11.7.3** +- gitlab: upgrade CE to v11.7.3 + **11.7.0** - gitlab: upgrade CE to v11.7.0 @@ -113,7 +116,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o - gitlab: upgrade CE to v11.3.0 - Fix backup config stripping for when AWS & GCS backups are disabled [#1725](https://github.com/sameersbn/docker-gitlab/pull/1725) - Correct Backup Date format for selective backups [#1699](https://github.com/sameersbn/docker-gitlab/pull/1699) -- Fix gitlay-ssh symlink to enable rebase/squash in forks +- Fix gitlay-ssh symlink to enable rebase/squash in forks **11.2.3** - gitlab: upgrade CE to v11.2.3 diff --git a/Dockerfile b/Dockerfile index b13a116d..dc8c4dc4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.7.0 +ARG VERSION=11.7.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 72165429..0fd85e87 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:11.7.0 +# sameersbn/gitlab:11.7.3 - [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:11.7.0 +docker pull sameersbn/gitlab:11.7.3 ``` 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:11.7.0 + sameersbn/gitlab:11.7.3 ``` *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:11.7.0 + sameersbn/gitlab:11.7.3 ``` ## 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:11.7.0 + sameersbn/gitlab:11.7.3 ``` #### 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:11.7.0 + sameersbn/gitlab:11.7.3 ``` 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:11.7.0 + sameersbn/gitlab:11.7.3 ``` #### 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:11.7.0 + sameersbn/gitlab:11.7.3 ``` 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:11.7.0 + sameersbn/gitlab:11.7.3 ``` ### 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:11.7.0 + sameersbn/gitlab:11.7.3 ``` ### 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:11.7.0 + sameersbn/gitlab:11.7.3 ``` 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:11.7.0 + sameersbn/gitlab:11.7.3 ``` 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:11.7.0 + sameersbn/gitlab:11.7.3 ``` 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:11.7.0 + sameersbn/gitlab:11.7.3 ``` 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:11.7.0 + sameersbn/gitlab:11.7.3 ``` 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:11.7.0 + sameersbn/gitlab:11.7.3 ``` 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:11.7.0 + sameersbn/gitlab:11.7.3 ``` 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:11.7.0 app:sanitize + sameersbn/gitlab:11.7.3 app:sanitize ``` ### Piwik @@ -1171,7 +1171,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.7.3 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. @@ -1199,14 +1199,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.0 app:rake db:setup + sameersbn/gitlab:11.7.3 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:11.7.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.7.3 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. @@ -1215,7 +1215,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.7.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1264,7 +1264,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:11.7.0 app:rake gitlab:env:info + sameersbn/gitlab:11.7.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1277,7 +1277,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.7.3 app:rake gitlab:import:repos ``` Or @@ -1308,7 +1308,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.7.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1330,12 +1330,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.7.0` 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:11.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.7.0 +docker pull sameersbn/gitlab:11.7.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1361,7 +1361,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:11.7.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.7.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index 308bbae7..7687edc1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.7.0 +11.7.3 diff --git a/docker-compose.yml b/docker-compose.yml index dd437e93..34b59a57 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.7.0 + image: sameersbn/gitlab:11.7.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index bd214b0b..1b1f7fc8 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:11.7.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.7.3 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:11.7.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.7.3 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:11.7.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.7.3 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:11.7.0 +docker pull sameersbn/gitlab:11.7.3 ``` - **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:11.7.0 +sameersbn/gitlab:11.7.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 6280066d..5b18fdbe 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.7.0 + image: sameersbn/gitlab:11.7.3 env: - name: TZ value: Asia/Kolkata From 1a59542e93260a314618af102e0231b20958dacf Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Fri, 1 Feb 2019 11:39:42 +0300 Subject: [PATCH 305/508] Update gitlab-workhorse to 8.1.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dc8c4dc4..4d57d718 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.11.4 \ GITLAB_SHELL_VERSION=8.4.4 \ - GITLAB_WORKHORSE_VERSION=8.0.0 \ + GITLAB_WORKHORSE_VERSION=8.1.1 \ GITLAB_PAGES_VERSION=1.3.1 \ GITALY_SERVER_VERSION=1.12.1 \ GITLAB_USER="git" \ From bd0efed161ebf5519e4bbc439abcfe892fc8c24e Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Fri, 1 Feb 2019 11:46:58 +0300 Subject: [PATCH 306/508] Update gitaly to 1.13.0 --- Changelog.md | 2 ++ Dockerfile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 997fb7a8..1e8a37c2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,8 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **11.7.3** - gitlab: upgrade CE to v11.7.3 +- Update gitlab-workhorse to 8.1.1 +- Update gitaly to 1.13.0 **11.7.0** - gitlab: upgrade CE to v11.7.0 diff --git a/Dockerfile b/Dockerfile index 4d57d718..f691913a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=8.4.4 \ GITLAB_WORKHORSE_VERSION=8.1.1 \ GITLAB_PAGES_VERSION=1.3.1 \ - GITALY_SERVER_VERSION=1.12.1 \ + GITALY_SERVER_VERSION=1.13.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From c19a365227e0feadfa60849f1665f495e0604e6a Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Fri, 1 Feb 2019 11:48:21 +0300 Subject: [PATCH 307/508] Update gitlab-pages to 1.4.0 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 1e8a37c2..aee8be32 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o - gitlab: upgrade CE to v11.7.3 - Update gitlab-workhorse to 8.1.1 - Update gitaly to 1.13.0 +- Update gitlab-pages to 1.4.0 **11.7.0** - gitlab: upgrade CE to v11.7.0 diff --git a/Dockerfile b/Dockerfile index f691913a..f5cb677b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.11.4 \ GITLAB_SHELL_VERSION=8.4.4 \ GITLAB_WORKHORSE_VERSION=8.1.1 \ - GITLAB_PAGES_VERSION=1.3.1 \ + GITLAB_PAGES_VERSION=1.4.0 \ GITALY_SERVER_VERSION=1.13.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ From 3dae4bd07c25d17c40724e3778535cc51d15abe2 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 5 Feb 2019 07:14:29 +0100 Subject: [PATCH 308/508] release 11.7.3 From 622f55c54fd928b2b4051af0821314f84eb8700f Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 8 Feb 2019 07:14:02 +0100 Subject: [PATCH 309/508] Upgrade GitLab CE to 11.7.4 --- 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 aee8be32..366a888b 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. +**11.7.4** +- gitlab: upgrade CE to v11.7.4 + **11.7.3** - gitlab: upgrade CE to v11.7.3 - Update gitlab-workhorse to 8.1.1 diff --git a/Dockerfile b/Dockerfile index f5cb677b..42b0ec02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.7.3 +ARG VERSION=11.7.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 0fd85e87..d1ab5aaa 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:11.7.3 +# sameersbn/gitlab:11.7.4 - [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:11.7.3 +docker pull sameersbn/gitlab:11.7.4 ``` 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:11.7.3 + sameersbn/gitlab:11.7.4 ``` *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:11.7.3 + sameersbn/gitlab:11.7.4 ``` ## 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:11.7.3 + sameersbn/gitlab:11.7.4 ``` #### 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:11.7.3 + sameersbn/gitlab:11.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: @@ -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:11.7.3 + sameersbn/gitlab:11.7.4 ``` #### 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:11.7.3 + sameersbn/gitlab:11.7.4 ``` 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:11.7.3 + sameersbn/gitlab:11.7.4 ``` ### 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:11.7.3 + sameersbn/gitlab:11.7.4 ``` ### 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:11.7.3 + sameersbn/gitlab:11.7.4 ``` 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:11.7.3 + sameersbn/gitlab:11.7.4 ``` 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:11.7.3 + sameersbn/gitlab:11.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. @@ -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:11.7.3 + sameersbn/gitlab:11.7.4 ``` 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:11.7.3 + sameersbn/gitlab:11.7.4 ``` 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:11.7.3 + sameersbn/gitlab:11.7.4 ``` 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:11.7.3 + sameersbn/gitlab:11.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:11.7.3 app:sanitize + sameersbn/gitlab:11.7.4 app:sanitize ``` ### Piwik @@ -1171,7 +1171,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.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. @@ -1199,14 +1199,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.3 app:rake db:setup + sameersbn/gitlab:11.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:11.7.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.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. @@ -1215,7 +1215,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.7.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1264,7 +1264,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:11.7.3 app:rake gitlab:env:info + sameersbn/gitlab:11.7.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1277,7 +1277,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.7.4 app:rake gitlab:import:repos ``` Or @@ -1308,7 +1308,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.7.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1330,12 +1330,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.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:11.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:11.7.3 +docker pull sameersbn/gitlab:11.7.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1361,7 +1361,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:11.7.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.7.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index 7687edc1..6e009551 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.7.3 +11.7.4 diff --git a/docker-compose.yml b/docker-compose.yml index 34b59a57..19230fb6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.7.3 + image: sameersbn/gitlab:11.7.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 1b1f7fc8..544023c4 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:11.7.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.7.4 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:11.7.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.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. @@ -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:11.7.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.7.4 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:11.7.3 +docker pull sameersbn/gitlab:11.7.4 ``` - **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:11.7.3 +sameersbn/gitlab:11.7.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 5b18fdbe..25ce31df 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.7.3 + image: sameersbn/gitlab:11.7.4 env: - name: TZ value: Asia/Kolkata From 155266db59195470033ba9c7f90c5b4523c0c8cf Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 8 Feb 2019 07:14:12 +0100 Subject: [PATCH 310/508] Update gitlab-workhorse to 8.0.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 42b0ec02..62edbbf7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.11.4 \ GITLAB_SHELL_VERSION=8.4.4 \ - GITLAB_WORKHORSE_VERSION=8.1.1 \ + GITLAB_WORKHORSE_VERSION=8.0.1 \ GITLAB_PAGES_VERSION=1.4.0 \ GITALY_SERVER_VERSION=1.13.0 \ GITLAB_USER="git" \ From 9a4b59e0675fbdff0bc43a40c9660fb02fa8ea27 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 8 Feb 2019 07:14:12 +0100 Subject: [PATCH 311/508] Update gitlab-pages to 1.3.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 62edbbf7..3a12bb4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.11.4 \ GITLAB_SHELL_VERSION=8.4.4 \ GITLAB_WORKHORSE_VERSION=8.0.1 \ - GITLAB_PAGES_VERSION=1.4.0 \ + GITLAB_PAGES_VERSION=1.3.1 \ GITALY_SERVER_VERSION=1.13.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ From cc21c60cd3ffb34f2d4fcd11ca23f2b259f17fa4 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 8 Feb 2019 07:14:12 +0100 Subject: [PATCH 312/508] Update gitaly to 1.12.2 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3a12bb4a..947c7fc6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=8.4.4 \ GITLAB_WORKHORSE_VERSION=8.0.1 \ GITLAB_PAGES_VERSION=1.3.1 \ - GITALY_SERVER_VERSION=1.13.0 \ + GITALY_SERVER_VERSION=1.12.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From ec07b0eddb4ca8429f735162535d24df49a46258 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 8 Feb 2019 22:08:36 +0100 Subject: [PATCH 313/508] release 11.7.4 From 09acdb68312b10ff1bcd695d850d80ef39621c7d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 8 Feb 2019 22:12:56 +0100 Subject: [PATCH 314/508] Upgrade GitLab CE to 11.7.5 --- 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 366a888b..353e495a 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. +**11.7.5** +- gitlab: upgrade CE to v11.7.5 + **11.7.4** - gitlab: upgrade CE to v11.7.4 diff --git a/Dockerfile b/Dockerfile index 947c7fc6..fb8fe998 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.7.4 +ARG VERSION=11.7.5 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index d1ab5aaa..ed1f5221 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:11.7.4 +# sameersbn/gitlab:11.7.5 - [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:11.7.4 +docker pull sameersbn/gitlab:11.7.5 ``` 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:11.7.4 + sameersbn/gitlab:11.7.5 ``` *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:11.7.4 + sameersbn/gitlab:11.7.5 ``` ## 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:11.7.4 + sameersbn/gitlab:11.7.5 ``` #### 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:11.7.4 + sameersbn/gitlab:11.7.5 ``` 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:11.7.4 + sameersbn/gitlab:11.7.5 ``` #### 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:11.7.4 + sameersbn/gitlab:11.7.5 ``` 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:11.7.4 + sameersbn/gitlab:11.7.5 ``` ### 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:11.7.4 + sameersbn/gitlab:11.7.5 ``` ### 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:11.7.4 + sameersbn/gitlab:11.7.5 ``` 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:11.7.4 + sameersbn/gitlab:11.7.5 ``` 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:11.7.4 + sameersbn/gitlab:11.7.5 ``` 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:11.7.4 + sameersbn/gitlab:11.7.5 ``` 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:11.7.4 + sameersbn/gitlab:11.7.5 ``` 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:11.7.4 + sameersbn/gitlab:11.7.5 ``` 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:11.7.4 + sameersbn/gitlab:11.7.5 ``` 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:11.7.4 app:sanitize + sameersbn/gitlab:11.7.5 app:sanitize ``` ### Piwik @@ -1171,7 +1171,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.7.5 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. @@ -1199,14 +1199,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.4 app:rake db:setup + sameersbn/gitlab:11.7.5 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:11.7.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.7.5 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. @@ -1215,7 +1215,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.7.5 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1264,7 +1264,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:11.7.4 app:rake gitlab:env:info + sameersbn/gitlab:11.7.5 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1277,7 +1277,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.7.5 app:rake gitlab:import:repos ``` Or @@ -1308,7 +1308,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.7.5 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1330,12 +1330,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.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. +> Upgrading to `sameersbn/gitlab:11.7.5` 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:11.7.4 +docker pull sameersbn/gitlab:11.7.5 ``` - **Step 2**: Stop and remove the currently running image @@ -1361,7 +1361,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:11.7.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.7.5 ``` ## Shell Access diff --git a/VERSION b/VERSION index 6e009551..64e4bdff 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.7.4 +11.7.5 diff --git a/docker-compose.yml b/docker-compose.yml index 19230fb6..47ab5938 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.7.4 + image: sameersbn/gitlab:11.7.5 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 544023c4..b7be5fcb 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:11.7.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.7.5 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:11.7.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.7.5 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:11.7.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.7.5 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:11.7.4 +docker pull sameersbn/gitlab:11.7.5 ``` - **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:11.7.4 +sameersbn/gitlab:11.7.5 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 25ce31df..ede479a8 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.7.4 + image: sameersbn/gitlab:11.7.5 env: - name: TZ value: Asia/Kolkata From 0566350e96cb685394005ebb14ede74c52ed9587 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 8 Feb 2019 22:13:02 +0100 Subject: [PATCH 315/508] Update gitlab-workhorse to 8.0.2 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fb8fe998..21e2a931 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.11.4 \ GITLAB_SHELL_VERSION=8.4.4 \ - GITLAB_WORKHORSE_VERSION=8.0.1 \ + GITLAB_WORKHORSE_VERSION=8.0.2 \ GITLAB_PAGES_VERSION=1.3.1 \ GITALY_SERVER_VERSION=1.12.2 \ GITLAB_USER="git" \ From ff97c1dc47f9f7239d50e83009106ab29ab6584d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 8 Feb 2019 22:13:41 +0100 Subject: [PATCH 316/508] release 11.7.5 From f307379e594b5b8d00a7159cc8dbe7fb385ccde9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20Felix=20=C5=A0ulc?= Date: Fri, 11 Jan 2019 18:18:17 +0100 Subject: [PATCH 317/508] Readme: document missing GITLAB_DEFAULT_THEME --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index ed1f5221..4039cd74 100644 --- a/README.md +++ b/README.md @@ -873,6 +873,7 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_EMAIL_REPLY_TO` | The reply-to address of emails sent out by GitLab. Defaults to value of `GITLAB_EMAIL`, else defaults to `noreply@example.com`. | | `GITLAB_EMAIL_SUBJECT_SUFFIX` | The e-mail subject suffix used in e-mails sent by GitLab. No defaults. | | `GITLAB_EMAIL_ENABLED` | Enable or disable gitlab mailer. Defaults to the `SMTP_ENABLED` configuration. | +| `GITLAB_DEFAULT_THEME` | Default theme ID, by default 2. (1 - Indigo, 2 - Dark, 3 - Light, 4 - Blue, 5 - Green, 6 - Light Indigo, 7 - Light Blue, 8 - Light Green, 9 - Red, 10 - Light Red) | | `GITLAB_INCOMING_EMAIL_ADDRESS` | The incoming email address for reply by email. Defaults to the value of `IMAP_USER`, else defaults to `reply@example.com`. Please read the [reply by email](http://doc.gitlab.com/ce/incoming_email/README.html) documentation to currently set this parameter. | | `GITLAB_INCOMING_EMAIL_ENABLED` | Enable or disable gitlab reply by email feature. Defaults to the value of `IMAP_ENABLED`. | | `GITLAB_SIGNUP_ENABLED` | Enable or disable user signups (first run only). Default is `true`. | From d902ec2ff8f633f664016e7efa05c71cb886877a Mon Sep 17 00:00:00 2001 From: Don Bowman Date: Wed, 6 Feb 2019 20:16:43 -0500 Subject: [PATCH 318/508] Add support for `receive.advertisePushOptions` See [install](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md) which suggests doing: ``` sudo -u git -H git config --global receive.advertisePushOptions true ``` Signed-off-by: Don Bowman --- assets/build/install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/build/install.sh b/assets/build/install.sh index 8eb9ecad..bcca8cdd 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -62,6 +62,8 @@ EOF exec_as_git git config --global core.autocrlf input exec_as_git git config --global gc.auto 0 exec_as_git git config --global repack.writeBitmaps true +exec_as_git git config --global receive.advertisePushOptions true + # shallow clone gitlab-ce echo "Cloning gitlab-ce v.${GITLAB_VERSION}..." From b088f4b26813dede58fa8aee614680db0fa8f119 Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Fri, 22 Feb 2019 09:57:03 +0300 Subject: [PATCH 319/508] Upgrade GitLab CE to 11.8.0 --- 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 353e495a..551f0530 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. +**11.8.0** +- gitlab: upgrade CE to v11.8.0 + **11.7.5** - gitlab: upgrade CE to v11.7.5 diff --git a/Dockerfile b/Dockerfile index 21e2a931..1d125666 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.7.5 +ARG VERSION=11.8.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 4039cd74..c917d84d 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:11.7.5 +# sameersbn/gitlab:11.8.0 - [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:11.7.5 +docker pull sameersbn/gitlab:11.8.0 ``` 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:11.7.5 + sameersbn/gitlab:11.8.0 ``` *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:11.7.5 + sameersbn/gitlab:11.8.0 ``` ## 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:11.7.5 + sameersbn/gitlab:11.8.0 ``` #### 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:11.7.5 + sameersbn/gitlab:11.8.0 ``` 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:11.7.5 + sameersbn/gitlab:11.8.0 ``` #### 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:11.7.5 + sameersbn/gitlab:11.8.0 ``` 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:11.7.5 + sameersbn/gitlab:11.8.0 ``` ### 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:11.7.5 + sameersbn/gitlab:11.8.0 ``` ### 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:11.7.5 + sameersbn/gitlab:11.8.0 ``` 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:11.7.5 + sameersbn/gitlab:11.8.0 ``` 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:11.7.5 + sameersbn/gitlab:11.8.0 ``` 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:11.7.5 + sameersbn/gitlab:11.8.0 ``` 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:11.7.5 + sameersbn/gitlab:11.8.0 ``` 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:11.7.5 + sameersbn/gitlab:11.8.0 ``` 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:11.7.5 + sameersbn/gitlab:11.8.0 ``` 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:11.7.5 app:sanitize + sameersbn/gitlab:11.8.0 app:sanitize ``` ### Piwik @@ -1172,7 +1172,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.5 app:rake gitlab:backup:create + sameersbn/gitlab:11.8.0 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. @@ -1200,14 +1200,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.5 app:rake db:setup + sameersbn/gitlab:11.8.0 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:11.7.5 app:rake gitlab:backup:restore + sameersbn/gitlab:11.8.0 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. @@ -1216,7 +1216,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.8.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1265,7 +1265,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:11.7.5 app:rake gitlab:env:info + sameersbn/gitlab:11.8.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1278,7 +1278,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.5 app:rake gitlab:import:repos + sameersbn/gitlab:11.8.0 app:rake gitlab:import:repos ``` Or @@ -1309,7 +1309,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.7.5 app:rake gitlab:import:repos + sameersbn/gitlab:11.8.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1331,12 +1331,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.7.5` 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:11.8.0` 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:11.7.5 +docker pull sameersbn/gitlab:11.8.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1362,7 +1362,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:11.7.5 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.8.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index 64e4bdff..897063bb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.7.5 +11.8.0 diff --git a/docker-compose.yml b/docker-compose.yml index 47ab5938..dae4b9b6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.7.5 + image: sameersbn/gitlab:11.8.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index b7be5fcb..ce8e07e2 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:11.7.5 app:rake gitlab:backup:create + sameersbn/gitlab:11.8.0 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:11.7.5 app:rake gitlab:backup:restore + sameersbn/gitlab:11.8.0 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:11.7.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.8.0 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:11.7.5 +docker pull sameersbn/gitlab:11.8.0 ``` - **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:11.7.5 +sameersbn/gitlab:11.8.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index ede479a8..22d5fe0b 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.7.5 + image: sameersbn/gitlab:11.8.0 env: - name: TZ value: Asia/Kolkata From 8434ab1351abe45f9d32a94d6477bdd02df9052a Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Fri, 22 Feb 2019 10:00:52 +0300 Subject: [PATCH 320/508] Update gitlab-workhorse to 8.3.1 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 551f0530..399b47a7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **11.8.0** - gitlab: upgrade CE to v11.8.0 +- Update gitlab-workhorse to 8.3.1 **11.7.5** - gitlab: upgrade CE to v11.7.5 diff --git a/Dockerfile b/Dockerfile index 1d125666..478e6750 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.11.4 \ GITLAB_SHELL_VERSION=8.4.4 \ - GITLAB_WORKHORSE_VERSION=8.0.2 \ + GITLAB_WORKHORSE_VERSION=8.3.1 \ GITLAB_PAGES_VERSION=1.3.1 \ GITALY_SERVER_VERSION=1.12.2 \ GITLAB_USER="git" \ From f41ddd869ff2d7ed3cfac2fc74b4697380b06df7 Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Sat, 23 Feb 2019 20:42:44 +0300 Subject: [PATCH 321/508] Update gitaly to 1.20.0 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 399b47a7..c365c3ef 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **11.8.0** - gitlab: upgrade CE to v11.8.0 - Update gitlab-workhorse to 8.3.1 +- Update gitaly to 1.20.0 **11.7.5** - gitlab: upgrade CE to v11.7.5 diff --git a/Dockerfile b/Dockerfile index 478e6750..279a781f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=8.4.4 \ GITLAB_WORKHORSE_VERSION=8.3.1 \ GITLAB_PAGES_VERSION=1.3.1 \ - GITALY_SERVER_VERSION=1.12.2 \ + GITALY_SERVER_VERSION=1.20.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From bdf51b75f8384a762d290027a7f80eab5f671630 Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Sat, 23 Feb 2019 20:44:22 +0300 Subject: [PATCH 322/508] Update gitlab-pages to 1.5.0 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index c365c3ef..659f5e28 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o - gitlab: upgrade CE to v11.8.0 - Update gitlab-workhorse to 8.3.1 - Update gitaly to 1.20.0 +- Update gitlab-pages to 1.5.0 **11.7.5** - gitlab: upgrade CE to v11.7.5 diff --git a/Dockerfile b/Dockerfile index 279a781f..132aa5e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.11.4 \ GITLAB_SHELL_VERSION=8.4.4 \ GITLAB_WORKHORSE_VERSION=8.3.1 \ - GITLAB_PAGES_VERSION=1.3.1 \ + GITLAB_PAGES_VERSION=1.5.0 \ GITALY_SERVER_VERSION=1.20.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ From a16f1f88ee43e0c600d7e14edab5614409058c6d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 28 Feb 2019 10:23:25 +0100 Subject: [PATCH 323/508] release 11.8.0 From 76bfb2f1e09848217591d2e35177f6e7843496bd Mon Sep 17 00:00:00 2001 From: David Rubin Date: Sat, 23 Feb 2019 14:56:51 +0100 Subject: [PATCH 324/508] Support Google Cloud Object Store --- README.md | 26 +++++++-- assets/runtime/config/gitlabhq/gitlab.yml | 31 ++++++++--- assets/runtime/env-defaults | 49 +++++++++++++---- assets/runtime/functions | 64 ++++++++++++++++++++--- 4 files changed, 144 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index c917d84d..465f01f0 100644 --- a/README.md +++ b/README.md @@ -899,18 +899,28 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_SHARED_DIR` | The directory to store the build artifacts. Defaults to `/home/git/data/shared` | | `GITLAB_ARTIFACTS_ENABLED` | Enable/Disable GitLab artifacts support. Defaults to `true`. | | `GITLAB_ARTIFACTS_DIR` | Directory to store the artifacts. Defaults to `$GITLAB_SHARED_DIR/artifacts` | +| `AWS_ACCESS_KEY_ID`| Default AWS access key to be used for object store. Defaults to `AWS_ACCESS_KEY_ID`| +| `AWS_SECRET_ACCESS_KEY`| Default AWS access key to be used for object store. Defaults to `AWS_SECRET_ACCESS_KEY`| +| `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Default Google project to use for Object Store.| +| `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Default Google service account email to use for Object Store.| +| `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file Defaults to `/gcs/key.json`| +| `GITLAB_OBJECT_STORE_CONNECTION_PROVIDER`| Default object store connection provider. Defaults to `AWS`| | `GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED` | Enables Object Store for Artifacts that will be remote stored. Defaults to `false` | | `GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the artifacts. Defaults to `artifacts` | | `GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD` | Set to true to enable direct upload of Artifacts without the need of local shared storage. Defaults to `false` | | `GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD` | Temporary option to limit automatic upload. Defaults to `false` | | `GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD` | Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` | -| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. Currently only AWS is supported. Defaults to `AWS` | -| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `AWS_ACCESS_KEY_ID` | -| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `AWS_SECRET_ACCESS_KEY` | +| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) | +| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `$AWS_ACCESS_KEY_ID` | +| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `$AWS_SECRET_ACCESS_KEY` | | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `us-east-1` | | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `s3.amazonaws.com` | | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil` | | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` | +| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| +| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| +| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)| + | `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON` | Cron notation for the GitLab pipeline schedule worker. Defaults to `'0 */12 * * *'` | | `GITLAB_LFS_ENABLED` | Enable/Disable Git LFS support. Defaults to `true`. | | `GITLAB_LFS_OBJECTS_DIR` | Directory to store the lfs-objects. Defaults to `$GITLAB_SHARED_DIR/lfs-objects` | @@ -918,26 +928,32 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the LFS. Defaults to `lfs-object` | | `GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD` | Temporary option to limit automatic upload. Defaults to `false` | | `GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD` | Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` | -| `GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. Currently only AWS is supported. Defaults to `AWS` | +| `GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) | | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `AWS_ACCESS_KEY_ID` | | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `AWS_SECRET_ACCESS_KEY` | | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `us-east-1` | | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `s3.amazonaws.com` | | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil` | | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` | +| `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| +| `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| +| `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)| | `GITLAB_UPLOADS_STORAGE_PATH` | The location where uploads objects are stored. Defaults to `$GITLAB_SHARED_DIR/public`. | | `GITLAB_UPLOADS_BASE_DIR` | Mapping for the `GITLAB_UPLOADS_STORAGE_PATH`. Defaults to `uploads/-/system` | | `GITLAB_UPLOADS_OBJECT_STORE_ENABLED` | Enables Object Store for UPLOADS that will be remote stored. Defaults to `false` | | `GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the UPLOADS. Defaults to `uploads` | | `GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD` | Temporary option to limit automatic upload. Defaults to `false` | | `GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD` | Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` | -| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. Currently only AWS is supported. Defaults to `AWS` | +| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) | | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `AWS_ACCESS_KEY_ID` | | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `AWS_SECRET_ACCESS_KEY` | | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `us-east-1` | | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `s3.amazonaws.com` | | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil` | | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` | +| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| +| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| +| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)| | `GITLAB_MATTERMOST_ENABLED` | Enable/Disable GitLab Mattermost for *Add Mattermost button*. Defaults to `false`. | | `GITLAB_MATTERMOST_URL` | Sets Mattermost URL. Defaults to `https://mattermost.example.com`. | | `GITLAB_BACKUP_SCHEDULE` | Setup cron job to automatic backups. Possible values `disable`, `daily`, `weekly` or `monthly`. Disabled by default | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 5f203dc0..3d36a878 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -165,14 +165,20 @@ production: &base background_upload: {{GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true) proxy_download: {{GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage connection: - provider: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER}} # Only AWS supported at the moment + provider: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER}} + #start-artifacts-aws aws_access_key_id: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID}} aws_secret_access_key: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}} region: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION}} host: '{{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com endpoint: '{{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil path_style: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' - + #end-artifacts-aws + #start-artifacts-gcs + google_project: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}} + google_client_email: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}} + google_json_key_location: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}} + #end-artifacts-gcs ## Git LFS lfs: @@ -186,15 +192,22 @@ production: &base background_upload: {{GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true) proxy_download: {{GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage connection: - provider: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER}} # Only AWS supported at the moment + provider: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER}} + #start-lfs-aws aws_access_key_id: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID}} aws_secret_access_key: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}} region: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION}} host: '{{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com endpoint: '{{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil path_style: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' + #end-lfs-aws + #start-lfs-gcs + google_project: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}} + google_client_email: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}} + google_json_key_location: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}} + #end-lfs-gcs - + ## Uploads (attachments, avatars, etc...) uploads: # The location where uploads objects are stored (default: public/). @@ -207,14 +220,20 @@ production: &base background_upload: {{GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true) proxy_download: {{GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage connection: - provider: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER}} # Only AWS supported at the moment + provider: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER}} + #start-uploads-aws aws_access_key_id: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID}} aws_secret_access_key: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}} region: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION}} host: '{{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com endpoint: '{{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil path_style: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' - + #end-uploads-aws + #start-uploads-gcs + google_project: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}} + google_client_email: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}} + google_json_key_location: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}} + #end-uploads-gcs ## GitLab Pages diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 3b1f5bc3..4c4318b8 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -90,23 +90,39 @@ GITLAB_WEBHOOK_TIMEOUT=${GITLAB_WEBHOOK_TIMEOUT:-10} GITLAB_WORKHORSE_TIMEOUT=${GITLAB_WORKHORSE_TIMEOUT:-5m0s} +# OBJECTSTORE +GITLAB_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_OBJECT_STORE_CONNECTION_PROVIDER:-AWS} +AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-AWS_ACCESS_KEY_ID} +AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY:-AWS_SECRET_ACCESS_KEY} +GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT} +GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL=${GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL} +GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION:-"/gcs/key.json"} + ## ARTIFACTS GITLAB_ARTIFACTS_ENABLED=${GITLAB_ARTIFACTS_ENABLED:-true} GITLAB_ARTIFACTS_DIR="${GITLAB_ARTIFACTS_DIR:-$GITLAB_SHARED_DIR/artifacts}" + GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED=${GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED:-false} GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY:-artifacts} GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD=${GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD:-false} GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD=${GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD:-false} GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD=${GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD:-false} -GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER:-AWS} -GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-AWS_ACCESS_KEY_ID} -GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-AWS_SECRET_ACCESS_KEY} +GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER:-$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER} + +# ARTIFACTS:AWS +GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-$AWS_ACCESS_KEY_ID} +GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-$AWS_SECRET_ACCESS_KEY} GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION:-us-east-1} GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST:-s3.amazonaws.com} GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-nil} GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-true} +# ARTIFACTS:Google +GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT} +GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL} +GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION} + ## Cron Jobs GITLAB_PIPELINE_SCHEDULE_WORKER_CRON=${GITLAB_PIPELINE_SCHEDULE_WORKER_CRON:-"19 * * * *"} @@ -120,14 +136,21 @@ GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECT GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD=${GITLAB_LFS_OBJECT_STORE_DIRECT_UPLOAD:-false} GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD=${GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD:-false} GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD=${GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD:-false} -GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER:-AWS} -GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-AWS_ACCESS_KEY_ID} -GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-AWS_SECRET_ACCESS_KEY} +GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER:-$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER} + +# LFS:AWS +GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-$AWS_ACCESS_KEY_ID} +GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-$AWS_SECRET_ACCESS_KEY} GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION:-us-east-1} GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST:-s3.amazonaws.com} GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-nil} GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-true} +# LFS:Google +GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT} +GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL=${GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL} +GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION} + ## Uploads GITLAB_UPLOADS_STORAGE_PATH="${GITLAB_UPLOADS_STORAGE_PATH:-$GITLAB_INSTALL_DIR/public}" GITLAB_UPLOADS_BASE_DIR="${GITLAB_UPLOADS_BASE_DIR:-uploads/-/system}" @@ -137,14 +160,22 @@ GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_UPLOADS_OBJECT_STORE_REMOT GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD=${GITLAB_UPLOADS_OBJECT_STORE_DIRECT_UPLOAD:-false} GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD=${GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD:-false} GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD=${GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD:-false} -GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER:-AWS} -GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-AWS_ACCESS_KEY_ID} -GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-AWS_SECRET_ACCESS_KEY} +GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER:-$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER} + +# Uploads:AWS +GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-$AWS_ACCESS_KEY_ID} +GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-$AWS_SECRET_ACCESS_KEY} GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION:-us-east-1} GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST:-s3.amazonaws.com} GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-nil} GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-true} +# Uploads:Google +GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT} +GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL} +GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION} + + ## Mattermost GITLAB_MATTERMOST_ENABLED=${GITLAB_MATTERMOST_ENABLED:-false} GITLAB_MATTERMOST_URL=${GITLAB_MATTERMOST_URL:-https://mattermost.example.com} diff --git a/assets/runtime/functions b/assets/runtime/functions index 53e063c1..08d3a509 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -962,6 +962,20 @@ gitlab_configure_ci() { gitlab_configure_artifacts() { if [[ ${GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED} == true ]]; then echo "Configuring gitlab::artifacts:object_store" + + if [[ "${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER}" == "Google" ]]; then + echo " -> Google ARTIFACTS provider selected removing aws config" + exec_as_git sed -i "/#start-artifacts-aws/,/#end-artifacts-aws/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#start-artifacts-gcs/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#end-artifacts-gcs/d" ${GITLAB_CONFIG} + fi + if [[ "${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER}" == "AWS" ]]; then + echo " -> AWS ARTIFACTS provider selected removing Google config" + exec_as_git sed -i "/#start-artifacts-gcs/,/#end-artifacts-gcs/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#start-artifacts-aws/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#end-artifacts-aws/d" ${GITLAB_CONFIG} + fi + update_template ${GITLAB_CONFIG} \ GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED \ GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY \ @@ -974,9 +988,12 @@ gitlab_configure_artifacts() { GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION \ GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST \ GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ - GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE \ + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \ + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \ + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION else - exec_as_git sed -i -e "/path: {{GITLAB_ARTIFACTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG} + exec_as_git sed -i -e "/path: {{GITLAB_ARTIFACTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG} fi echo "Configuring gitlab::artifacts..." @@ -988,6 +1005,20 @@ gitlab_configure_artifacts() { gitlab_configure_lfs() { if [[ ${GITLAB_LFS_OBJECT_STORE_ENABLED} == true ]]; then echo "Configuring gitlab::lfs:object_store" + + if [[ "${GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER}" == "Google" ]]; then + echo " -> Google LFS provider selected removing aws config" + exec_as_git sed -i "/#start-lfs-aws/,/#end-lfs-aws/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#start-lfs-gcs/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#end-lfs-gcs/d" ${GITLAB_CONFIG} + fi + if [[ "${GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER}" == "AWS" ]]; then + echo " -> AWS LFS provider selected removing Google config" + exec_as_git sed -i "/#start-lfs-gcs/,/#end-lfs-gcs/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#start-lfs-aws/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#end-lfs-aws/d" ${GITLAB_CONFIG} + fi + update_template ${GITLAB_CONFIG} \ GITLAB_LFS_OBJECT_STORE_ENABLED \ GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY \ @@ -1000,9 +1031,12 @@ gitlab_configure_lfs() { GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION \ GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST \ GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ - GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE + GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE \ + GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \ + GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \ + GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION else - exec_as_git sed -i -e "/path: {{GITLAB_LFS_OBJECTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG} + exec_as_git sed -i -e "/path: {{GITLAB_LFS_OBJECTS_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG} fi echo "Configuring gitlab::lfs..." @@ -1014,6 +1048,20 @@ gitlab_configure_lfs() { gitlab_configure_uploads() { if [[ ${GITLAB_UPLOADS_OBJECT_STORE_ENABLED} == true ]]; then echo "Configuring gitlab::uploads:object_store" + + if [[ "${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER}" == "Google" ]]; then + echo " -> Google UPLOADS provider selected removing aws config" + exec_as_git sed -i "/#start-uploads-aws/,/#end-uploads-aws/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#start-uploads-gcs/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#end-uploads-gcs/d" ${GITLAB_CONFIG} + fi + if [[ "${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER}" == "AWS" ]]; then + echo " -> AWS UPLOADS provider selected removing Google config" + exec_as_git sed -i "/#start-uploads-gcs/,/#end-uploads-gcs/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#start-uploads-aws/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#end-uploads-aws/d" ${GITLAB_CONFIG} + fi + update_template ${GITLAB_CONFIG} \ GITLAB_UPLOADS_OBJECT_STORE_ENABLED \ GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY \ @@ -1026,9 +1074,13 @@ gitlab_configure_uploads() { GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION \ GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST \ GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ - GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE \ + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \ + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \ + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION + else - exec_as_git sed -i -e "/base_dir: {{GITLAB_UPLOADS_BASE_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG} + exec_as_git sed -i -e "/base_dir: {{GITLAB_UPLOADS_BASE_DIR}}/{n;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;N;d;}" ${GITLAB_CONFIG} fi echo "Configuring gitlab::uploads..." From 99feb6f083925df55b38c8c993ffc17238acc7b9 Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Tue, 5 Mar 2019 09:43:45 +0300 Subject: [PATCH 325/508] Upgrade GitLab CE to 11.8.1 --- 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 659f5e28..5dac885b 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. +**11.8.1** +- gitlab: upgrade CE to v11.8.1 + **11.8.0** - gitlab: upgrade CE to v11.8.0 - Update gitlab-workhorse to 8.3.1 diff --git a/Dockerfile b/Dockerfile index 132aa5e9..59028c07 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20181218 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.8.0 +ARG VERSION=11.8.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 465f01f0..7f1d6287 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:11.8.0 +# sameersbn/gitlab:11.8.1 - [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:11.8.0 +docker pull sameersbn/gitlab:11.8.1 ``` 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:11.8.0 + sameersbn/gitlab:11.8.1 ``` *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:11.8.0 + sameersbn/gitlab:11.8.1 ``` ## 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:11.8.0 + sameersbn/gitlab:11.8.1 ``` #### 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:11.8.0 + sameersbn/gitlab:11.8.1 ``` 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:11.8.0 + sameersbn/gitlab:11.8.1 ``` #### 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:11.8.0 + sameersbn/gitlab:11.8.1 ``` 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:11.8.0 + sameersbn/gitlab:11.8.1 ``` ### 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:11.8.0 + sameersbn/gitlab:11.8.1 ``` ### 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:11.8.0 + sameersbn/gitlab:11.8.1 ``` 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:11.8.0 + sameersbn/gitlab:11.8.1 ``` 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:11.8.0 + sameersbn/gitlab:11.8.1 ``` 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:11.8.0 + sameersbn/gitlab:11.8.1 ``` 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:11.8.0 + sameersbn/gitlab:11.8.1 ``` 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:11.8.0 + sameersbn/gitlab:11.8.1 ``` 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:11.8.0 + sameersbn/gitlab:11.8.1 ``` 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:11.8.0 app:sanitize + sameersbn/gitlab:11.8.1 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:11.8.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.8.1 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. @@ -1216,14 +1216,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.0 app:rake db:setup + sameersbn/gitlab:11.8.1 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:11.8.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.8.1 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. @@ -1232,7 +1232,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.8.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1281,7 +1281,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:11.8.0 app:rake gitlab:env:info + sameersbn/gitlab:11.8.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1294,7 +1294,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.8.1 app:rake gitlab:import:repos ``` Or @@ -1325,7 +1325,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.8.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1347,12 +1347,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.8.0` 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:11.8.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.8.0 +docker pull sameersbn/gitlab:11.8.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1378,7 +1378,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:11.8.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.8.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 897063bb..4775ed63 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.8.0 +11.8.1 diff --git a/docker-compose.yml b/docker-compose.yml index dae4b9b6..539bd116 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.8.0 + image: sameersbn/gitlab:11.8.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ce8e07e2..4c1626fd 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:11.8.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.8.1 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:11.8.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.8.1 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:11.8.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.8.1 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:11.8.0 +docker pull sameersbn/gitlab:11.8.1 ``` - **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:11.8.0 +sameersbn/gitlab:11.8.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 22d5fe0b..0b668451 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.8.0 + image: sameersbn/gitlab:11.8.1 env: - name: TZ value: Asia/Kolkata From dfadf9a8127744fe0db1108958033276b3834e4b Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 6 Mar 2019 07:22:32 +0100 Subject: [PATCH 326/508] Update base-image to ubuntu:20190122 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 59028c07..01eae170 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:xenial-20181218 +FROM ubuntu:xenial-20190122 ARG BUILD_DATE ARG VCS_REF From b84f7f2ef7bd068d394839c7f0dd63d4e28c2086 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 6 Mar 2019 07:28:25 +0100 Subject: [PATCH 327/508] release 11.8.1 From 7b58c08b78ece2ba84d96de4d57b44da72024532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Jeli=C4=87?= Date: Wed, 6 Mar 2019 13:01:56 +0100 Subject: [PATCH 328/508] Fix configuration parameter list in README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 7f1d6287..13269f3b 100644 --- a/README.md +++ b/README.md @@ -920,7 +920,6 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)| - | `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON` | Cron notation for the GitLab pipeline schedule worker. Defaults to `'0 */12 * * *'` | | `GITLAB_LFS_ENABLED` | Enable/Disable Git LFS support. Defaults to `true`. | | `GITLAB_LFS_OBJECTS_DIR` | Directory to store the lfs-objects. Defaults to `$GITLAB_SHARED_DIR/lfs-objects` | From fb64920e6bc8477068380272c59609820042fe62 Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Fri, 15 Mar 2019 15:18:03 +0300 Subject: [PATCH 329/508] Upgrade GitLab CE to 11.8.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 5dac885b..862f86e2 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. +**11.8.2** +- gitlab: upgrade CE to v11.8.2 + **11.8.1** - gitlab: upgrade CE to v11.8.1 diff --git a/Dockerfile b/Dockerfile index 01eae170..50cd36f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190122 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.8.1 +ARG VERSION=11.8.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 13269f3b..c15c6ad3 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:11.8.1 +# sameersbn/gitlab:11.8.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:11.8.1 +docker pull sameersbn/gitlab:11.8.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:11.8.1 + sameersbn/gitlab:11.8.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:11.8.1 + sameersbn/gitlab:11.8.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:11.8.1 + sameersbn/gitlab:11.8.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:11.8.1 + sameersbn/gitlab:11.8.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:11.8.1 + sameersbn/gitlab:11.8.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:11.8.1 + sameersbn/gitlab:11.8.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:11.8.1 + sameersbn/gitlab:11.8.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:11.8.1 + sameersbn/gitlab:11.8.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:11.8.1 + sameersbn/gitlab:11.8.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:11.8.1 + sameersbn/gitlab:11.8.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:11.8.1 + sameersbn/gitlab:11.8.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:11.8.1 + sameersbn/gitlab:11.8.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:11.8.1 + sameersbn/gitlab:11.8.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:11.8.1 + sameersbn/gitlab:11.8.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:11.8.1 + sameersbn/gitlab:11.8.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:11.8.1 app:sanitize + sameersbn/gitlab:11.8.2 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.8.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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.1 app:rake db:setup + sameersbn/gitlab:11.8.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:11.8.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.8.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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.8.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.8.1 app:rake gitlab:env:info + sameersbn/gitlab:11.8.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.8.2 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.8.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.8.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:11.8.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:11.8.1 +docker pull sameersbn/gitlab:11.8.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.8.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.8.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index 4775ed63..95da6166 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.8.1 +11.8.2 diff --git a/docker-compose.yml b/docker-compose.yml index 539bd116..62eed928 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.8.1 + image: sameersbn/gitlab:11.8.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 4c1626fd..061a6aa4 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:11.8.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.8.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:11.8.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.8.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:11.8.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.8.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:11.8.1 +docker pull sameersbn/gitlab:11.8.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:11.8.1 +sameersbn/gitlab:11.8.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 0b668451..a0dc3cd8 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.8.1 + image: sameersbn/gitlab:11.8.2 env: - name: TZ value: Asia/Kolkata From 6a3cb6ae44fd183cc29080fb9180d22a266a9cea Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 16 Mar 2019 10:58:22 +0100 Subject: [PATCH 330/508] release 11.8.2 From 1f80e9f429b22fd1f1b471d44aaaf4355336d1ae Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Thu, 21 Mar 2019 10:47:07 +0300 Subject: [PATCH 331/508] Upgrade GitLab CE to 11.8.3 --- 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 862f86e2..ffc2d126 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. +**11.8.3** +- gitlab: upgrade CE to v11.8.3 + **11.8.2** - gitlab: upgrade CE to v11.8.2 diff --git a/Dockerfile b/Dockerfile index 50cd36f6..ced8d117 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190122 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.8.2 +ARG VERSION=11.8.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index c15c6ad3..52846573 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:11.8.2 +# sameersbn/gitlab:11.8.3 - [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:11.8.2 +docker pull sameersbn/gitlab:11.8.3 ``` 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:11.8.2 + sameersbn/gitlab:11.8.3 ``` *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:11.8.2 + sameersbn/gitlab:11.8.3 ``` ## 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:11.8.2 + sameersbn/gitlab:11.8.3 ``` #### 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:11.8.2 + sameersbn/gitlab:11.8.3 ``` 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:11.8.2 + sameersbn/gitlab:11.8.3 ``` #### 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:11.8.2 + sameersbn/gitlab:11.8.3 ``` 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:11.8.2 + sameersbn/gitlab:11.8.3 ``` ### 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:11.8.2 + sameersbn/gitlab:11.8.3 ``` ### 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:11.8.2 + sameersbn/gitlab:11.8.3 ``` 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:11.8.2 + sameersbn/gitlab:11.8.3 ``` 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:11.8.2 + sameersbn/gitlab:11.8.3 ``` 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:11.8.2 + sameersbn/gitlab:11.8.3 ``` 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:11.8.2 + sameersbn/gitlab:11.8.3 ``` 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:11.8.2 + sameersbn/gitlab:11.8.3 ``` 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:11.8.2 + sameersbn/gitlab:11.8.3 ``` 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:11.8.2 app:sanitize + sameersbn/gitlab:11.8.3 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.8.3 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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.2 app:rake db:setup + sameersbn/gitlab:11.8.3 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:11.8.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.8.3 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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.8.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.8.2 app:rake gitlab:env:info + sameersbn/gitlab:11.8.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.8.3 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.8.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.8.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. +> Upgrading to `sameersbn/gitlab:11.8.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.8.2 +docker pull sameersbn/gitlab:11.8.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.8.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.8.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index 95da6166..6cf2801b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.8.2 +11.8.3 diff --git a/docker-compose.yml b/docker-compose.yml index 62eed928..581a5516 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.8.2 + image: sameersbn/gitlab:11.8.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 061a6aa4..442ee42f 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:11.8.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.8.3 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:11.8.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.8.3 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:11.8.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.8.3 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:11.8.2 +docker pull sameersbn/gitlab:11.8.3 ``` - **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:11.8.2 +sameersbn/gitlab:11.8.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index a0dc3cd8..811386f9 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.8.2 + image: sameersbn/gitlab:11.8.3 env: - name: TZ value: Asia/Kolkata From 8b488579c1d71dab6d7c15e30d0f6912d81e8189 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 23 Mar 2019 08:21:24 +0100 Subject: [PATCH 332/508] Update base-image to 20190222 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ced8d117..f54f0976 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:xenial-20190122 +FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF From a223855f53c9db86a4e201b41669b3fda92f354a Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 23 Mar 2019 08:21:34 +0100 Subject: [PATCH 333/508] update golang to 1.11.6 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f54f0976..560cce59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG VERSION=11.8.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ - GOLANG_VERSION=1.11.4 \ + GOLANG_VERSION=1.11.6 \ GITLAB_SHELL_VERSION=8.4.4 \ GITLAB_WORKHORSE_VERSION=8.3.1 \ GITLAB_PAGES_VERSION=1.5.0 \ From 22a910171a5c36c73bac1e28354d14782de24da6 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 23 Mar 2019 09:02:32 +0100 Subject: [PATCH 334/508] release 11.8.3 From 6cd2a114ddffaeffb06524ef0ebe3cbf702aabc9 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 23 Mar 2019 09:11:16 +0100 Subject: [PATCH 335/508] Upgrade GitLab CE to 11.9.0 --- 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 ffc2d126..1d089630 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. +**11.9.0** +- gitlab: upgrade CE to v11.9.0 + **11.8.3** - gitlab: upgrade CE to v11.8.3 diff --git a/Dockerfile b/Dockerfile index 560cce59..4c862426 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.8.3 +ARG VERSION=11.9.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 52846573..91b25a96 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:11.8.3 +# sameersbn/gitlab:11.9.0 - [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:11.8.3 +docker pull sameersbn/gitlab:11.9.0 ``` 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:11.8.3 + sameersbn/gitlab:11.9.0 ``` *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:11.8.3 + sameersbn/gitlab:11.9.0 ``` ## 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:11.8.3 + sameersbn/gitlab:11.9.0 ``` #### 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:11.8.3 + sameersbn/gitlab:11.9.0 ``` 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:11.8.3 + sameersbn/gitlab:11.9.0 ``` #### 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:11.8.3 + sameersbn/gitlab:11.9.0 ``` 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:11.8.3 + sameersbn/gitlab:11.9.0 ``` ### 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:11.8.3 + sameersbn/gitlab:11.9.0 ``` ### 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:11.8.3 + sameersbn/gitlab:11.9.0 ``` 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:11.8.3 + sameersbn/gitlab:11.9.0 ``` 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:11.8.3 + sameersbn/gitlab:11.9.0 ``` 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:11.8.3 + sameersbn/gitlab:11.9.0 ``` 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:11.8.3 + sameersbn/gitlab:11.9.0 ``` 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:11.8.3 + sameersbn/gitlab:11.9.0 ``` 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:11.8.3 + sameersbn/gitlab:11.9.0 ``` 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:11.8.3 app:sanitize + sameersbn/gitlab:11.9.0 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.9.0 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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.3 app:rake db:setup + sameersbn/gitlab:11.9.0 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:11.8.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.9.0 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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.9.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.8.3 app:rake gitlab:env:info + sameersbn/gitlab:11.9.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.9.0 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.8.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.9.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.8.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:11.9.0` 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:11.8.3 +docker pull sameersbn/gitlab:11.9.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.8.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index 6cf2801b..ba9aff72 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.8.3 +11.9.0 diff --git a/docker-compose.yml b/docker-compose.yml index 581a5516..40c6ced2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.8.3 + image: sameersbn/gitlab:11.9.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 442ee42f..3734c0fe 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:11.8.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.9.0 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:11.8.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.9.0 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:11.8.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.9.0 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:11.8.3 +docker pull sameersbn/gitlab:11.9.0 ``` - **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:11.8.3 +sameersbn/gitlab:11.9.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 811386f9..856b953e 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.8.3 + image: sameersbn/gitlab:11.9.0 env: - name: TZ value: Asia/Kolkata From 0f970c8efa332c3c7d59f5a2c3f6aa73d1214c50 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 23 Mar 2019 09:11:25 +0100 Subject: [PATCH 336/508] Update gitlab-shell to 8.7.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4c862426..1134c086 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG VERSION=11.9.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.11.6 \ - GITLAB_SHELL_VERSION=8.4.4 \ + GITLAB_SHELL_VERSION=8.7.1 \ GITLAB_WORKHORSE_VERSION=8.3.1 \ GITLAB_PAGES_VERSION=1.5.0 \ GITALY_SERVER_VERSION=1.20.0 \ From c20acf2e4e7454fbb064b6feab7cbb7d5127d4af Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 23 Mar 2019 09:11:26 +0100 Subject: [PATCH 337/508] Update gitaly to 1.27.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1134c086..25e353fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=8.7.1 \ GITLAB_WORKHORSE_VERSION=8.3.1 \ GITLAB_PAGES_VERSION=1.5.0 \ - GITALY_SERVER_VERSION=1.20.0 \ + GITALY_SERVER_VERSION=1.27.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 72b6d5ac7d3dc98b4b0bf1dda47ebec01c3b0b66 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 2 Apr 2019 21:06:33 +0200 Subject: [PATCH 338/508] release 11.9.0 From 4c785877f65da063b0384968f9e15b5605e32f72 Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Tue, 26 Mar 2019 10:54:29 +0300 Subject: [PATCH 339/508] Upgrade GitLab CE to 11.9.1 --- 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 1d089630..4fac0d98 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. +**11.9.1** +- gitlab: upgrade CE to v11.9.1 + **11.9.0** - gitlab: upgrade CE to v11.9.0 diff --git a/Dockerfile b/Dockerfile index 25e353fa..ce30dfb2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.9.0 +ARG VERSION=11.9.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 91b25a96..2af6e920 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:11.9.0 +# sameersbn/gitlab:11.9.1 - [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:11.9.0 +docker pull sameersbn/gitlab:11.9.1 ``` 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:11.9.0 + sameersbn/gitlab:11.9.1 ``` *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:11.9.0 + sameersbn/gitlab:11.9.1 ``` ## 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:11.9.0 + sameersbn/gitlab:11.9.1 ``` #### 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:11.9.0 + sameersbn/gitlab:11.9.1 ``` 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:11.9.0 + sameersbn/gitlab:11.9.1 ``` #### 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:11.9.0 + sameersbn/gitlab:11.9.1 ``` 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:11.9.0 + sameersbn/gitlab:11.9.1 ``` ### 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:11.9.0 + sameersbn/gitlab:11.9.1 ``` ### 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:11.9.0 + sameersbn/gitlab:11.9.1 ``` 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:11.9.0 + sameersbn/gitlab:11.9.1 ``` 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:11.9.0 + sameersbn/gitlab:11.9.1 ``` 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:11.9.0 + sameersbn/gitlab:11.9.1 ``` 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:11.9.0 + sameersbn/gitlab:11.9.1 ``` 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:11.9.0 + sameersbn/gitlab:11.9.1 ``` 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:11.9.0 + sameersbn/gitlab:11.9.1 ``` 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:11.9.0 app:sanitize + sameersbn/gitlab:11.9.1 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.9.1 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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.0 app:rake db:setup + sameersbn/gitlab:11.9.1 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:11.9.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.9.1 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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.9.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.9.0 app:rake gitlab:env:info + sameersbn/gitlab:11.9.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.9.1 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.9.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.9.0` 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:11.9.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.9.0 +docker pull sameersbn/gitlab:11.9.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.9.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index ba9aff72..03a7c8d3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.9.0 +11.9.1 diff --git a/docker-compose.yml b/docker-compose.yml index 40c6ced2..283d7785 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.9.0 + image: sameersbn/gitlab:11.9.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 3734c0fe..b9c864a5 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:11.9.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.9.1 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:11.9.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.9.1 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:11.9.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.9.1 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:11.9.0 +docker pull sameersbn/gitlab:11.9.1 ``` - **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:11.9.0 +sameersbn/gitlab:11.9.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 856b953e..959e9c3f 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.9.0 + image: sameersbn/gitlab:11.9.1 env: - name: TZ value: Asia/Kolkata From 861cb5d842baecb18709d6cf9aebfe0ce61eaacc Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Mon, 1 Apr 2019 23:41:50 +0300 Subject: [PATCH 340/508] Update gitaly to 1.27.1 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 4fac0d98..32b48583 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **11.9.1** - gitlab: upgrade CE to v11.9.1 +- Update gitaly to 1.27.1 **11.9.0** - gitlab: upgrade CE to v11.9.0 diff --git a/Dockerfile b/Dockerfile index ce30dfb2..16b8785b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=8.7.1 \ GITLAB_WORKHORSE_VERSION=8.3.1 \ GITLAB_PAGES_VERSION=1.5.0 \ - GITALY_SERVER_VERSION=1.27.0 \ + GITALY_SERVER_VERSION=1.27.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From b66197fefe6a43596d73fa9778ba3017ef234191 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 2 Apr 2019 21:53:53 +0200 Subject: [PATCH 341/508] release 11.9.1 From dcb91a659d4d2af0c455ac554a830a8644056530 Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Mon, 1 Apr 2019 23:43:33 +0300 Subject: [PATCH 342/508] Upgrade GitLab CE to 11.9.4 --- 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 32b48583..c8209d95 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. +**11.9.4** +- gitlab: upgrade CE to v11.9.4 + **11.9.1** - gitlab: upgrade CE to v11.9.1 - Update gitaly to 1.27.1 diff --git a/Dockerfile b/Dockerfile index 16b8785b..f31938cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.9.1 +ARG VERSION=11.9.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 2af6e920..8edaf144 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:11.9.1 +# sameersbn/gitlab:11.9.4 - [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:11.9.1 +docker pull sameersbn/gitlab:11.9.4 ``` 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:11.9.1 + sameersbn/gitlab:11.9.4 ``` *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:11.9.1 + sameersbn/gitlab:11.9.4 ``` ## 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:11.9.1 + sameersbn/gitlab:11.9.4 ``` #### 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:11.9.1 + sameersbn/gitlab:11.9.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: @@ -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:11.9.1 + sameersbn/gitlab:11.9.4 ``` #### 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:11.9.1 + sameersbn/gitlab:11.9.4 ``` 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:11.9.1 + sameersbn/gitlab:11.9.4 ``` ### 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:11.9.1 + sameersbn/gitlab:11.9.4 ``` ### 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:11.9.1 + sameersbn/gitlab:11.9.4 ``` 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:11.9.1 + sameersbn/gitlab:11.9.4 ``` 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:11.9.1 + sameersbn/gitlab:11.9.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. @@ -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:11.9.1 + sameersbn/gitlab:11.9.4 ``` 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:11.9.1 + sameersbn/gitlab:11.9.4 ``` 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:11.9.1 + sameersbn/gitlab:11.9.4 ``` 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:11.9.1 + sameersbn/gitlab:11.9.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:11.9.1 app:sanitize + sameersbn/gitlab:11.9.4 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.9.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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.1 app:rake db:setup + sameersbn/gitlab:11.9.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:11.9.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.9.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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.9.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.9.1 app:rake gitlab:env:info + sameersbn/gitlab:11.9.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.9.4 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.9.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.9.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:11.9.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:11.9.1 +docker pull sameersbn/gitlab:11.9.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.9.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index 03a7c8d3..ead8ba09 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.9.1 +11.9.4 diff --git a/docker-compose.yml b/docker-compose.yml index 283d7785..3c89ca55 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.9.1 + image: sameersbn/gitlab:11.9.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index b9c864a5..5a47a72f 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:11.9.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.9.4 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:11.9.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.9.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. @@ -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:11.9.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.9.4 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:11.9.1 +docker pull sameersbn/gitlab:11.9.4 ``` - **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:11.9.1 +sameersbn/gitlab:11.9.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 959e9c3f..c9e0095e 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.9.1 + image: sameersbn/gitlab:11.9.4 env: - name: TZ value: Asia/Kolkata From 100a9f8adbb6105a79d342777b3cfce587c0e8a5 Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Mon, 1 Apr 2019 23:44:04 +0300 Subject: [PATCH 343/508] Update gitlab-workhorse to 8.3.3 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index c8209d95..2455595f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **11.9.4** - gitlab: upgrade CE to v11.9.4 +- Update gitlab-workhorse to 8.3.3 **11.9.1** - gitlab: upgrade CE to v11.9.1 diff --git a/Dockerfile b/Dockerfile index f31938cb..23f1ea85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.11.6 \ GITLAB_SHELL_VERSION=8.7.1 \ - GITLAB_WORKHORSE_VERSION=8.3.1 \ + GITLAB_WORKHORSE_VERSION=8.3.3 \ GITLAB_PAGES_VERSION=1.5.0 \ GITALY_SERVER_VERSION=1.27.1 \ GITLAB_USER="git" \ From 48dceec1c5a7a9bbb6c090b0d5fdc9816d073c6b Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 4 Apr 2019 08:19:07 +0200 Subject: [PATCH 344/508] release 11.9.4 From d2e5d0a7ed2ef4c119bebf4fd71887c7cbabba9e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 4 Apr 2019 08:25:01 +0200 Subject: [PATCH 345/508] Upgrade GitLab CE to 11.9.5 --- 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 2455595f..f8fb3701 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. +**11.9.5** +- gitlab: upgrade CE to v11.9.5 + **11.9.4** - gitlab: upgrade CE to v11.9.4 - Update gitlab-workhorse to 8.3.3 diff --git a/Dockerfile b/Dockerfile index 23f1ea85..09c53219 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.9.4 +ARG VERSION=11.9.5 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 8edaf144..2e900e68 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:11.9.4 +# sameersbn/gitlab:11.9.5 - [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:11.9.4 +docker pull sameersbn/gitlab:11.9.5 ``` 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:11.9.4 + sameersbn/gitlab:11.9.5 ``` *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:11.9.4 + sameersbn/gitlab:11.9.5 ``` ## 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:11.9.4 + sameersbn/gitlab:11.9.5 ``` #### 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:11.9.4 + sameersbn/gitlab:11.9.5 ``` 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:11.9.4 + sameersbn/gitlab:11.9.5 ``` #### 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:11.9.4 + sameersbn/gitlab:11.9.5 ``` 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:11.9.4 + sameersbn/gitlab:11.9.5 ``` ### 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:11.9.4 + sameersbn/gitlab:11.9.5 ``` ### 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:11.9.4 + sameersbn/gitlab:11.9.5 ``` 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:11.9.4 + sameersbn/gitlab:11.9.5 ``` 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:11.9.4 + sameersbn/gitlab:11.9.5 ``` 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:11.9.4 + sameersbn/gitlab:11.9.5 ``` 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:11.9.4 + sameersbn/gitlab:11.9.5 ``` 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:11.9.4 + sameersbn/gitlab:11.9.5 ``` 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:11.9.4 + sameersbn/gitlab:11.9.5 ``` 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:11.9.4 app:sanitize + sameersbn/gitlab:11.9.5 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.9.5 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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.4 app:rake db:setup + sameersbn/gitlab:11.9.5 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:11.9.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.9.5 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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.9.5 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.9.4 app:rake gitlab:env:info + sameersbn/gitlab:11.9.5 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.9.5 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.9.5 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.9.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. +> Upgrading to `sameersbn/gitlab:11.9.5` 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:11.9.4 +docker pull sameersbn/gitlab:11.9.5 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.9.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.5 ``` ## Shell Access diff --git a/VERSION b/VERSION index ead8ba09..739d9387 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.9.4 +11.9.5 diff --git a/docker-compose.yml b/docker-compose.yml index 3c89ca55..bf94a2b9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.9.4 + image: sameersbn/gitlab:11.9.5 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 5a47a72f..f55a1646 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:11.9.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.9.5 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:11.9.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.9.5 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:11.9.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.9.5 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:11.9.4 +docker pull sameersbn/gitlab:11.9.5 ``` - **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:11.9.4 +sameersbn/gitlab:11.9.5 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index c9e0095e..9667f2cd 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.9.4 + image: sameersbn/gitlab:11.9.5 env: - name: TZ value: Asia/Kolkata From 6bd475ce294ab45c8cb522b362237840327cbb32 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 4 Apr 2019 10:35:34 +0200 Subject: [PATCH 346/508] release 11.9.5 From dbefa57ba26c991f7db3598b565162c60c09bd4a Mon Sep 17 00:00:00 2001 From: David Rubin Date: Sat, 6 Apr 2019 17:39:06 +0200 Subject: [PATCH 347/508] Upgrade gitlab to 11.9.6 --- 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 f8fb3701..3b30e3be 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. +**11.9.6** +- gitlab: upgrade CE to v11.9.6 + **11.9.5** - gitlab: upgrade CE to v11.9.5 diff --git a/Dockerfile b/Dockerfile index 09c53219..6368bfe0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.9.5 +ARG VERSION=11.9.6 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 2e900e68..0938b4ac 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:11.9.5 +# sameersbn/gitlab:11.9.6 - [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:11.9.5 +docker pull sameersbn/gitlab:11.9.6 ``` 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:11.9.5 + sameersbn/gitlab:11.9.6 ``` *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:11.9.5 + sameersbn/gitlab:11.9.6 ``` ## 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:11.9.5 + sameersbn/gitlab:11.9.6 ``` #### 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:11.9.5 + sameersbn/gitlab:11.9.6 ``` 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:11.9.5 + sameersbn/gitlab:11.9.6 ``` #### 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:11.9.5 + sameersbn/gitlab:11.9.6 ``` 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:11.9.5 + sameersbn/gitlab:11.9.6 ``` ### 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:11.9.5 + sameersbn/gitlab:11.9.6 ``` ### 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:11.9.5 + sameersbn/gitlab:11.9.6 ``` 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:11.9.5 + sameersbn/gitlab:11.9.6 ``` 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:11.9.5 + sameersbn/gitlab:11.9.6 ``` 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:11.9.5 + sameersbn/gitlab:11.9.6 ``` 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:11.9.5 + sameersbn/gitlab:11.9.6 ``` 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:11.9.5 + sameersbn/gitlab:11.9.6 ``` 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:11.9.5 + sameersbn/gitlab:11.9.6 ``` 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:11.9.5 app:sanitize + sameersbn/gitlab:11.9.6 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.5 app:rake gitlab:backup:create + sameersbn/gitlab:11.9.6 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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.5 app:rake db:setup + sameersbn/gitlab:11.9.6 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:11.9.5 app:rake gitlab:backup:restore + sameersbn/gitlab:11.9.6 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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.9.6 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.9.5 app:rake gitlab:env:info + sameersbn/gitlab:11.9.6 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.5 app:rake gitlab:import:repos + sameersbn/gitlab:11.9.6 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.5 app:rake gitlab:import:repos + sameersbn/gitlab:11.9.6 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.9.5` 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:11.9.6` 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:11.9.5 +docker pull sameersbn/gitlab:11.9.6 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.9.5 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.6 ``` ## Shell Access diff --git a/VERSION b/VERSION index 739d9387..e5416e49 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.9.5 +11.9.6 diff --git a/docker-compose.yml b/docker-compose.yml index bf94a2b9..1fa65e11 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.9.5 + image: sameersbn/gitlab:11.9.6 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index f55a1646..8076c11a 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:11.9.5 app:rake gitlab:backup:create + sameersbn/gitlab:11.9.6 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:11.9.5 app:rake gitlab:backup:restore + sameersbn/gitlab:11.9.6 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:11.9.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.9.6 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:11.9.5 +docker pull sameersbn/gitlab:11.9.6 ``` - **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:11.9.5 +sameersbn/gitlab:11.9.6 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 9667f2cd..feec8d79 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.9.5 + image: sameersbn/gitlab:11.9.6 env: - name: TZ value: Asia/Kolkata From 508e1e0ed38e7ca5ab3f3e0f80b01524a813f209 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 17 Apr 2019 19:47:55 +0200 Subject: [PATCH 348/508] release 11.9.6 From 180a1e81f089b8da35ca51809840568231518832 Mon Sep 17 00:00:00 2001 From: David Rubin Date: Wed, 10 Apr 2019 23:02:22 +0200 Subject: [PATCH 349/508] Upgrade to gitlab 11.9.7 --- 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 3b30e3be..a14dd921 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. +**11.9.7** +- gitlab: upgrade CE to v11.9.7 + **11.9.6** - gitlab: upgrade CE to v11.9.6 diff --git a/Dockerfile b/Dockerfile index 6368bfe0..f980fc91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.9.6 +ARG VERSION=11.9.7 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 0938b4ac..3657eadb 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:11.9.6 +# sameersbn/gitlab:11.9.7 - [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:11.9.6 +docker pull sameersbn/gitlab:11.9.7 ``` 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:11.9.6 + sameersbn/gitlab:11.9.7 ``` *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:11.9.6 + sameersbn/gitlab:11.9.7 ``` ## 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:11.9.6 + sameersbn/gitlab:11.9.7 ``` #### 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:11.9.6 + sameersbn/gitlab:11.9.7 ``` 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:11.9.6 + sameersbn/gitlab:11.9.7 ``` #### 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:11.9.6 + sameersbn/gitlab:11.9.7 ``` 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:11.9.6 + sameersbn/gitlab:11.9.7 ``` ### 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:11.9.6 + sameersbn/gitlab:11.9.7 ``` ### 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:11.9.6 + sameersbn/gitlab:11.9.7 ``` 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:11.9.6 + sameersbn/gitlab:11.9.7 ``` 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:11.9.6 + sameersbn/gitlab:11.9.7 ``` 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:11.9.6 + sameersbn/gitlab:11.9.7 ``` 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:11.9.6 + sameersbn/gitlab:11.9.7 ``` 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:11.9.6 + sameersbn/gitlab:11.9.7 ``` 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:11.9.6 + sameersbn/gitlab:11.9.7 ``` 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:11.9.6 app:sanitize + sameersbn/gitlab:11.9.7 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.6 app:rake gitlab:backup:create + sameersbn/gitlab:11.9.7 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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.6 app:rake db:setup + sameersbn/gitlab:11.9.7 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:11.9.6 app:rake gitlab:backup:restore + sameersbn/gitlab:11.9.7 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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.6 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.9.7 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.9.6 app:rake gitlab:env:info + sameersbn/gitlab:11.9.7 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.6 app:rake gitlab:import:repos + sameersbn/gitlab:11.9.7 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.6 app:rake gitlab:import:repos + sameersbn/gitlab:11.9.7 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.9.6` 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:11.9.7` 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:11.9.6 +docker pull sameersbn/gitlab:11.9.7 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.9.6 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.7 ``` ## Shell Access diff --git a/VERSION b/VERSION index e5416e49..2f9c5843 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.9.6 +11.9.7 diff --git a/docker-compose.yml b/docker-compose.yml index 1fa65e11..a4e3b78b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.9.6 + image: sameersbn/gitlab:11.9.7 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 8076c11a..338fa640 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:11.9.6 app:rake gitlab:backup:create + sameersbn/gitlab:11.9.7 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:11.9.6 app:rake gitlab:backup:restore + sameersbn/gitlab:11.9.7 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:11.9.6 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.9.7 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:11.9.6 +docker pull sameersbn/gitlab:11.9.7 ``` - **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:11.9.6 +sameersbn/gitlab:11.9.7 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index feec8d79..eaa0fa7b 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.9.6 + image: sameersbn/gitlab:11.9.7 env: - name: TZ value: Asia/Kolkata From 676f7ffd494ee8f18ea27c34fd0826a5b168000a Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 17 Apr 2019 19:50:52 +0200 Subject: [PATCH 350/508] release 11.9.7 From 79f84308f6d740a6cf1b4918a262cdbee6aef8a7 Mon Sep 17 00:00:00 2001 From: Olaf Meeuwissen Date: Sun, 14 Apr 2019 11:52:36 +0900 Subject: [PATCH 351/508] Fix `gitlab:assets:compile` task for relative URL root setups This makes container startup/upgrades use the same `NODE_OPTIONS` as the Docker image build process. Fixes #1896 --- assets/runtime/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index 08d3a509..ab3e02d8 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1786,7 +1786,7 @@ migrate_database() { # assets need to be recompiled when GITLAB_RELATIVE_URL_ROOT is used if [[ -n ${GITLAB_RELATIVE_URL_ROOT} ]]; then echo "Recompiling assets (relative_url in use), this could take a while..." - exec_as_git bundle exec rake gitlab:assets:compile >/dev/null 2>&1 + exec_as_git bundle exec rake gitlab:assets:compile NODE_OPTIONS="--max-old-space-size=4096" >/dev/null 2>&1 fi echo "Clearing cache..." From a96ecdfa05b115cf36034d49cd369dee90d78686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9g=C3=A9?= Date: Mon, 15 Apr 2019 15:59:33 +0200 Subject: [PATCH 352/508] add libimage-exiftool-perl (needed to upload group avatar & sanitize tasks) https://docs.gitlab.com/ee/administration/raketasks/uploads/sanitize.html --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f980fc91..9044c9fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,7 @@ RUN apt-get update \ git-core gnupg2 ruby${RUBY_VERSION} python2.7 python-docutils nodejs yarn gettext-base \ libmysqlclient20 libpq5 zlib1g libyaml-0-2 libssl1.0.0 \ libgdbm3 libreadline6 libncurses5 libffi6 \ - libxml2 libxslt1.1 libcurl3 libicu55 libre2-dev tzdata unzip \ + libxml2 libxslt1.1 libcurl3 libicu55 libre2-dev tzdata unzip libimage-exiftool-perl \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \ From f65f64006eeb875518d046a8e3b40ac755df5034 Mon Sep 17 00:00:00 2001 From: David Rubin Date: Sat, 13 Apr 2019 15:14:56 +0200 Subject: [PATCH 353/508] Upgrade to gitlab 11.9.8 --- 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 a14dd921..1a8f2d49 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. +**11.9.8** +- gitlab: upgrade CE to v11.9.8 + **11.9.7** - gitlab: upgrade CE to v11.9.7 diff --git a/Dockerfile b/Dockerfile index 9044c9fa..542d6e03 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.9.7 +ARG VERSION=11.9.8 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 3657eadb..5302bfd8 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:11.9.7 +# sameersbn/gitlab:11.9.8 - [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:11.9.7 +docker pull sameersbn/gitlab:11.9.8 ``` 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:11.9.7 + sameersbn/gitlab:11.9.8 ``` *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:11.9.7 + sameersbn/gitlab:11.9.8 ``` ## 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:11.9.7 + sameersbn/gitlab:11.9.8 ``` #### 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:11.9.7 + sameersbn/gitlab:11.9.8 ``` 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:11.9.7 + sameersbn/gitlab:11.9.8 ``` #### 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:11.9.7 + sameersbn/gitlab:11.9.8 ``` 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:11.9.7 + sameersbn/gitlab:11.9.8 ``` ### 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:11.9.7 + sameersbn/gitlab:11.9.8 ``` ### 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:11.9.7 + sameersbn/gitlab:11.9.8 ``` 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:11.9.7 + sameersbn/gitlab:11.9.8 ``` 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:11.9.7 + sameersbn/gitlab:11.9.8 ``` 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:11.9.7 + sameersbn/gitlab:11.9.8 ``` 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:11.9.7 + sameersbn/gitlab:11.9.8 ``` 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:11.9.7 + sameersbn/gitlab:11.9.8 ``` 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:11.9.7 + sameersbn/gitlab:11.9.8 ``` 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:11.9.7 app:sanitize + sameersbn/gitlab:11.9.8 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.7 app:rake gitlab:backup:create + sameersbn/gitlab:11.9.8 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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.7 app:rake db:setup + sameersbn/gitlab:11.9.8 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:11.9.7 app:rake gitlab:backup:restore + sameersbn/gitlab:11.9.8 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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.7 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.9.8 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.9.7 app:rake gitlab:env:info + sameersbn/gitlab:11.9.8 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.7 app:rake gitlab:import:repos + sameersbn/gitlab:11.9.8 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.7 app:rake gitlab:import:repos + sameersbn/gitlab:11.9.8 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.9.7` 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:11.9.8` 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:11.9.7 +docker pull sameersbn/gitlab:11.9.8 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.9.7 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.9.8 ``` ## Shell Access diff --git a/VERSION b/VERSION index 2f9c5843..76d3a6cf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.9.7 +11.9.8 diff --git a/docker-compose.yml b/docker-compose.yml index a4e3b78b..9e642a52 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.9.7 + image: sameersbn/gitlab:11.9.8 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 338fa640..bc95b856 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:11.9.7 app:rake gitlab:backup:create + sameersbn/gitlab:11.9.8 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:11.9.7 app:rake gitlab:backup:restore + sameersbn/gitlab:11.9.8 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:11.9.7 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.9.8 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:11.9.7 +docker pull sameersbn/gitlab:11.9.8 ``` - **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:11.9.7 +sameersbn/gitlab:11.9.8 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index eaa0fa7b..f054de11 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.9.7 + image: sameersbn/gitlab:11.9.8 env: - name: TZ value: Asia/Kolkata From 1f048d144e0b2fbd218203d86ad460b573a9df20 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 17 Apr 2019 20:19:55 +0200 Subject: [PATCH 354/508] release 11.9.8 From ad8b54bdb9616df3a3918b42438419ebaaafddf3 Mon Sep 17 00:00:00 2001 From: Peter Leitzen Date: Sun, 21 Apr 2019 20:08:39 +0200 Subject: [PATCH 355/508] Prefer CI_REGISTRY_PASSWORD over CI_REGISTRY_PASS --- .gitlab-ci.yml | 4 ++-- CONTRIBUTING.md | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 675b0495..b3e190bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ before_script: - export VERSION=$(cat VERSION) - export CI_REGISTRY=${CI_REGISTRY:-hub.docker.com} - export CI_REGISTRY_USER=${CI_REGISTRY_USER:-gitlab-ci-token} - - export CI_REGISTRY_PASS=${CI_REGISTRY_PASS:-${CI_JOB_TOKEN}} + - export CI_REGISTRY_PASSWORD=${CI_REGISTRY_PASS:-${CI_REGISTRY_PASSWORD:-${CI_JOB_TOKEN}}} - export DOCKER_IMAGE=${DOCKER_IMAGE:-${CI_REGISTRY}/${CI_PROJECT_PATH}} - | if [ "${DOCKER_IMAGE}" = "/" ]; then @@ -19,7 +19,7 @@ docker:build: only: - master script: - - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY} + - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY} - docker build --pull --cache-from=${DOCKER_IMAGE} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f6f3fc40..d180caab 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,9 +4,10 @@ When using your own gitlab instance, the provided .gitlab-ci.yml will be automat Overrides for these values can be set within the project, under `Settings` -> `CI/CD` -> `Variables`. -| Variable | Default Value | Description | -| ------------------ | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| `CI_REGISTRY` | `hub.docker.com` | If available this will be automatically overriden by registry address which is configured within the GitLab instance | -| `CI_REGISTRY_USER` | `gitlab-ci-token` | Username for the registry | -| `CI_REGISTRY_PASS` | `${CI_JOB_TOKEN}` | Password for the registry | -| `DOCKER_IMAGE` | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running GitLab instance with the `${CI_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within GitLab. | +| Variable | Default Value | Description | +| ---------------------- | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| `CI_REGISTRY` | `hub.docker.com` | If available this will be automatically overriden by registry address which is configured within the GitLab instance | +| `CI_REGISTRY_USER` | `gitlab-ci-token` | Username for the registry | +| `CI_REGISTRY_PASSWORD` | `${CI_JOB_TOKEN}` | Password for the registry | +| `CI_REGISTRY_PASS` | `${CI_JOB_TOKEN}` | DEPRECATED: Use `CI_REGISTRY_PASSWORD` | +| `DOCKER_IMAGE` | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running GitLab instance with the `${CI_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within GitLab. | From 97719e1de503296fc9f3ca3bb607478c1e9e2697 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 20 Apr 2019 09:38:59 +0200 Subject: [PATCH 356/508] Upgrade GitLab CE to 11.10.0 --- 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 1a8f2d49..156d1932 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. +**11.10.0** +- gitlab: upgrade CE to v11.10.0 + **11.9.8** - gitlab: upgrade CE to v11.9.8 diff --git a/Dockerfile b/Dockerfile index 542d6e03..7838169a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.9.8 +ARG VERSION=11.10.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 5302bfd8..42da88f2 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:11.9.8 +# sameersbn/gitlab:11.10.0 - [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:11.9.8 +docker pull sameersbn/gitlab:11.10.0 ``` 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:11.9.8 + sameersbn/gitlab:11.10.0 ``` *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:11.9.8 + sameersbn/gitlab:11.10.0 ``` ## 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:11.9.8 + sameersbn/gitlab:11.10.0 ``` #### 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:11.9.8 + sameersbn/gitlab:11.10.0 ``` 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:11.9.8 + sameersbn/gitlab:11.10.0 ``` #### 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:11.9.8 + sameersbn/gitlab:11.10.0 ``` 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:11.9.8 + sameersbn/gitlab:11.10.0 ``` ### 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:11.9.8 + sameersbn/gitlab:11.10.0 ``` ### 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:11.9.8 + sameersbn/gitlab:11.10.0 ``` 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:11.9.8 + sameersbn/gitlab:11.10.0 ``` 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:11.9.8 + sameersbn/gitlab:11.10.0 ``` 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:11.9.8 + sameersbn/gitlab:11.10.0 ``` 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:11.9.8 + sameersbn/gitlab:11.10.0 ``` 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:11.9.8 + sameersbn/gitlab:11.10.0 ``` 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:11.9.8 + sameersbn/gitlab:11.10.0 ``` 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:11.9.8 app:sanitize + sameersbn/gitlab:11.10.0 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.8 app:rake gitlab:backup:create + sameersbn/gitlab:11.10.0 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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.8 app:rake db:setup + sameersbn/gitlab:11.10.0 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:11.9.8 app:rake gitlab:backup:restore + sameersbn/gitlab:11.10.0 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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.8 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.10.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.9.8 app:rake gitlab:env:info + sameersbn/gitlab:11.10.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.8 app:rake gitlab:import:repos + sameersbn/gitlab:11.10.0 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.9.8 app:rake gitlab:import:repos + sameersbn/gitlab:11.10.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.9.8` 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:11.10.0` 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:11.9.8 +docker pull sameersbn/gitlab:11.10.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.9.8 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.10.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index 76d3a6cf..933dbb1d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.9.8 +11.10.0 diff --git a/docker-compose.yml b/docker-compose.yml index 9e642a52..52a233c2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.9.8 + image: sameersbn/gitlab:11.10.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index bc95b856..22df3d24 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:11.9.8 app:rake gitlab:backup:create + sameersbn/gitlab:11.10.0 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:11.9.8 app:rake gitlab:backup:restore + sameersbn/gitlab:11.10.0 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:11.9.8 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.10.0 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:11.9.8 +docker pull sameersbn/gitlab:11.10.0 ``` - **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:11.9.8 +sameersbn/gitlab:11.10.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index f054de11..ec7d62e6 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.9.8 + image: sameersbn/gitlab:11.10.0 env: - name: TZ value: Asia/Kolkata From baaaf59d020b939acd2f15e085744f8ef980b529 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 20 Apr 2019 09:39:22 +0200 Subject: [PATCH 357/508] Update gitlab-shell to 9.0.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7838169a..6682def1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG VERSION=11.10.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.11.6 \ - GITLAB_SHELL_VERSION=8.7.1 \ + GITLAB_SHELL_VERSION=9.0.0 \ GITLAB_WORKHORSE_VERSION=8.3.3 \ GITLAB_PAGES_VERSION=1.5.0 \ GITALY_SERVER_VERSION=1.27.1 \ From a15350ffdd2d424b3a28e39b4b55f762006d6181 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 20 Apr 2019 09:39:22 +0200 Subject: [PATCH 358/508] Update gitlab-workhorse to 8.5.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6682def1..d9dc5bc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.11.6 \ GITLAB_SHELL_VERSION=9.0.0 \ - GITLAB_WORKHORSE_VERSION=8.3.3 \ + GITLAB_WORKHORSE_VERSION=8.5.1 \ GITLAB_PAGES_VERSION=1.5.0 \ GITALY_SERVER_VERSION=1.27.1 \ GITLAB_USER="git" \ From 257a71f1f923c89f745c78cf76341ade8f98d84f Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 20 Apr 2019 09:39:22 +0200 Subject: [PATCH 359/508] Update gitaly to 1.33.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d9dc5bc9..13b03780 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=9.0.0 \ GITLAB_WORKHORSE_VERSION=8.5.1 \ GITLAB_PAGES_VERSION=1.5.0 \ - GITALY_SERVER_VERSION=1.27.1 \ + GITALY_SERVER_VERSION=1.33.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 5ff5765a87786c47d309d011f9adcce45081b575 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 22 Apr 2019 19:18:48 +0200 Subject: [PATCH 360/508] release 11.10.0 From c66b785fcc070cc49516e5ff279061a161ae9c59 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 23 Apr 2019 20:44:35 +0200 Subject: [PATCH 361/508] Upgrade GitLab CE to 11.10.1 --- 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 156d1932..f1f70845 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. +**11.10.1** +- gitlab: upgrade CE to v11.10.1 + **11.10.0** - gitlab: upgrade CE to v11.10.0 diff --git a/Dockerfile b/Dockerfile index 13b03780..8360b218 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.10.0 +ARG VERSION=11.10.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 42da88f2..e63644b4 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:11.10.0 +# sameersbn/gitlab:11.10.1 - [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:11.10.0 +docker pull sameersbn/gitlab:11.10.1 ``` 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:11.10.0 + sameersbn/gitlab:11.10.1 ``` *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:11.10.0 + sameersbn/gitlab:11.10.1 ``` ## 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:11.10.0 + sameersbn/gitlab:11.10.1 ``` #### 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:11.10.0 + sameersbn/gitlab:11.10.1 ``` 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:11.10.0 + sameersbn/gitlab:11.10.1 ``` #### 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:11.10.0 + sameersbn/gitlab:11.10.1 ``` 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:11.10.0 + sameersbn/gitlab:11.10.1 ``` ### 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:11.10.0 + sameersbn/gitlab:11.10.1 ``` ### 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:11.10.0 + sameersbn/gitlab:11.10.1 ``` 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:11.10.0 + sameersbn/gitlab:11.10.1 ``` 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:11.10.0 + sameersbn/gitlab:11.10.1 ``` 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:11.10.0 + sameersbn/gitlab:11.10.1 ``` 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:11.10.0 + sameersbn/gitlab:11.10.1 ``` 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:11.10.0 + sameersbn/gitlab:11.10.1 ``` 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:11.10.0 + sameersbn/gitlab:11.10.1 ``` 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:11.10.0 app:sanitize + sameersbn/gitlab:11.10.1 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.10.1 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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.0 app:rake db:setup + sameersbn/gitlab:11.10.1 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:11.10.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.10.1 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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.10.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.10.0 app:rake gitlab:env:info + sameersbn/gitlab:11.10.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.10.1 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.10.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.10.0` 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:11.10.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.10.0 +docker pull sameersbn/gitlab:11.10.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.10.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.10.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 933dbb1d..46577f54 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.10.0 +11.10.1 diff --git a/docker-compose.yml b/docker-compose.yml index 52a233c2..c845b3a3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.10.0 + image: sameersbn/gitlab:11.10.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 22df3d24..ab529bce 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:11.10.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.10.1 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:11.10.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.10.1 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:11.10.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.10.1 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:11.10.0 +docker pull sameersbn/gitlab:11.10.1 ``` - **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:11.10.0 +sameersbn/gitlab:11.10.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index ec7d62e6..fd3716c4 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.10.0 + image: sameersbn/gitlab:11.10.1 env: - name: TZ value: Asia/Kolkata From 915df34f0ec1b5b3ff598293b4d16a4af15b27f8 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 23 Apr 2019 20:44:48 +0200 Subject: [PATCH 362/508] Update gitaly to 1.34.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8360b218..0ee0feee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=9.0.0 \ GITLAB_WORKHORSE_VERSION=8.5.1 \ GITLAB_PAGES_VERSION=1.5.0 \ - GITALY_SERVER_VERSION=1.33.0 \ + GITALY_SERVER_VERSION=1.34.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 052ae0a2dff6e48cb21edddb34cee25a8e7c73af Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 23 Apr 2019 21:12:16 +0200 Subject: [PATCH 363/508] release 11.10.1 From 4b2dd9368ba7f62f1f5449e4f86bc3d0dc32e4d0 Mon Sep 17 00:00:00 2001 From: Dominic Dey-Marckmann Date: Mon, 29 Apr 2019 21:13:03 +0200 Subject: [PATCH 364/508] Upgrade GitLab CE to 11.10.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 f1f70845..4ccbbf30 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. +**11.10.2** +- gitlab: upgrade CE to v11.10.2 + **11.10.1** - gitlab: upgrade CE to v11.10.1 diff --git a/Dockerfile b/Dockerfile index 0ee0feee..a6b3b6d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.10.1 +ARG VERSION=11.10.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index e63644b4..4f40fc3e 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:11.10.1 +# sameersbn/gitlab:11.10.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:11.10.1 +docker pull sameersbn/gitlab:11.10.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:11.10.1 + sameersbn/gitlab:11.10.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:11.10.1 + sameersbn/gitlab:11.10.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:11.10.1 + sameersbn/gitlab:11.10.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:11.10.1 + sameersbn/gitlab:11.10.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:11.10.1 + sameersbn/gitlab:11.10.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:11.10.1 + sameersbn/gitlab:11.10.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:11.10.1 + sameersbn/gitlab:11.10.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:11.10.1 + sameersbn/gitlab:11.10.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:11.10.1 + sameersbn/gitlab:11.10.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:11.10.1 + sameersbn/gitlab:11.10.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:11.10.1 + sameersbn/gitlab:11.10.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:11.10.1 + sameersbn/gitlab:11.10.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:11.10.1 + sameersbn/gitlab:11.10.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:11.10.1 + sameersbn/gitlab:11.10.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:11.10.1 + sameersbn/gitlab:11.10.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:11.10.1 app:sanitize + sameersbn/gitlab:11.10.2 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.10.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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.1 app:rake db:setup + sameersbn/gitlab:11.10.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:11.10.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.10.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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.10.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.10.1 app:rake gitlab:env:info + sameersbn/gitlab:11.10.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.10.2 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.10.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.10.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:11.10.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:11.10.1 +docker pull sameersbn/gitlab:11.10.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.10.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.10.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index 46577f54..bd0f144b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.10.1 +11.10.2 diff --git a/docker-compose.yml b/docker-compose.yml index c845b3a3..49803ad6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.10.1 + image: sameersbn/gitlab:11.10.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ab529bce..ca6375d1 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:11.10.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.10.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:11.10.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.10.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:11.10.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.10.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:11.10.1 +docker pull sameersbn/gitlab:11.10.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:11.10.1 +sameersbn/gitlab:11.10.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index fd3716c4..4337974f 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.10.1 + image: sameersbn/gitlab:11.10.2 env: - name: TZ value: Asia/Kolkata From d92260eb20e8f777a85ea2e1eebc5aa4395053aa Mon Sep 17 00:00:00 2001 From: Dominic Dey-Marckmann Date: Mon, 29 Apr 2019 21:13:15 +0200 Subject: [PATCH 365/508] Update gitaly to 1.34.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a6b3b6d7..4b734de4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=9.0.0 \ GITLAB_WORKHORSE_VERSION=8.5.1 \ GITLAB_PAGES_VERSION=1.5.0 \ - GITALY_SERVER_VERSION=1.34.0 \ + GITALY_SERVER_VERSION=1.34.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 6d174c42333768c855c2db786d9c29c0d59e55bc Mon Sep 17 00:00:00 2001 From: Kiina Date: Tue, 30 Apr 2019 16:06:32 +0200 Subject: [PATCH 366/508] Update go to 1.11.9 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4b734de4..2204f5c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG VERSION=11.10.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ - GOLANG_VERSION=1.11.6 \ + GOLANG_VERSION=1.11.9 \ GITLAB_SHELL_VERSION=9.0.0 \ GITLAB_WORKHORSE_VERSION=8.5.1 \ GITLAB_PAGES_VERSION=1.5.0 \ From 1d42a1dae9b99848b94ae2458a520b0cc5223448 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 4 May 2019 21:04:00 +0200 Subject: [PATCH 367/508] release 11.10.2 From 1006c32fe20aa56c5b459279d4dd57eebf3168be Mon Sep 17 00:00:00 2001 From: Dominic Dey-Marckmann Date: Wed, 1 May 2019 18:23:19 +0200 Subject: [PATCH 368/508] Upgrade GitLab CE to 11.10.3 --- 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 4ccbbf30..69180f2c 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. +**11.10.3** +- gitlab: upgrade CE to v11.10.3 + **11.10.2** - gitlab: upgrade CE to v11.10.2 diff --git a/Dockerfile b/Dockerfile index 2204f5c9..246e5964 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.10.2 +ARG VERSION=11.10.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 4f40fc3e..7920c879 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:11.10.2 +# sameersbn/gitlab:11.10.3 - [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:11.10.2 +docker pull sameersbn/gitlab:11.10.3 ``` 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:11.10.2 + sameersbn/gitlab:11.10.3 ``` *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:11.10.2 + sameersbn/gitlab:11.10.3 ``` ## 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:11.10.2 + sameersbn/gitlab:11.10.3 ``` #### 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:11.10.2 + sameersbn/gitlab:11.10.3 ``` 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:11.10.2 + sameersbn/gitlab:11.10.3 ``` #### 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:11.10.2 + sameersbn/gitlab:11.10.3 ``` 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:11.10.2 + sameersbn/gitlab:11.10.3 ``` ### 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:11.10.2 + sameersbn/gitlab:11.10.3 ``` ### 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:11.10.2 + sameersbn/gitlab:11.10.3 ``` 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:11.10.2 + sameersbn/gitlab:11.10.3 ``` 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:11.10.2 + sameersbn/gitlab:11.10.3 ``` 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:11.10.2 + sameersbn/gitlab:11.10.3 ``` 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:11.10.2 + sameersbn/gitlab:11.10.3 ``` 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:11.10.2 + sameersbn/gitlab:11.10.3 ``` 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:11.10.2 + sameersbn/gitlab:11.10.3 ``` 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:11.10.2 app:sanitize + sameersbn/gitlab:11.10.3 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.10.3 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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.2 app:rake db:setup + sameersbn/gitlab:11.10.3 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:11.10.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.10.3 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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.10.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.10.2 app:rake gitlab:env:info + sameersbn/gitlab:11.10.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.10.3 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.10.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.10.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. +> Upgrading to `sameersbn/gitlab:11.10.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.10.2 +docker pull sameersbn/gitlab:11.10.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.10.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.10.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index bd0f144b..d5b7da55 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.10.2 +11.10.3 diff --git a/docker-compose.yml b/docker-compose.yml index 49803ad6..48b3408e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.10.2 + image: sameersbn/gitlab:11.10.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ca6375d1..e7d940a0 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:11.10.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.10.3 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:11.10.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.10.3 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:11.10.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.10.3 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:11.10.2 +docker pull sameersbn/gitlab:11.10.3 ``` - **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:11.10.2 +sameersbn/gitlab:11.10.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 4337974f..aa9422b4 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.10.2 + image: sameersbn/gitlab:11.10.3 env: - name: TZ value: Asia/Kolkata From b8eddcb7e69bb4179842a02c81072714b4e26be6 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 4 May 2019 21:22:30 +0200 Subject: [PATCH 369/508] release 11.10.3 From 0976f6e32ba55f143ea7ba933ff58305a1da119a Mon Sep 17 00:00:00 2001 From: Dominic Dey-Marckmann Date: Wed, 1 May 2019 18:25:02 +0200 Subject: [PATCH 370/508] Update gitlab workhorse to 8.5.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 246e5964..e43ad848 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.11.9 \ GITLAB_SHELL_VERSION=9.0.0 \ - GITLAB_WORKHORSE_VERSION=8.5.1 \ + GITLAB_WORKHORSE_VERSION=8.5.2 \ GITLAB_PAGES_VERSION=1.5.0 \ GITALY_SERVER_VERSION=1.34.1 \ GITLAB_USER="git" \ From 03eee129b25d3306f69311135079908b0237c21f Mon Sep 17 00:00:00 2001 From: Dominic Dey-Marckmann Date: Wed, 1 May 2019 18:26:12 +0200 Subject: [PATCH 371/508] Upgrade GitLab CE to 11.10.4 --- 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 69180f2c..e4eddc23 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. +**11.10.4** +- gitlab: upgrade CE to v11.10.4 + **11.10.3** - gitlab: upgrade CE to v11.10.3 diff --git a/Dockerfile b/Dockerfile index e43ad848..3bb03b37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.10.3 +ARG VERSION=11.10.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index 7920c879..ad9191cc 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:11.10.3 +# sameersbn/gitlab:11.10.4 - [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:11.10.3 +docker pull sameersbn/gitlab:11.10.4 ``` 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:11.10.3 + sameersbn/gitlab:11.10.4 ``` *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:11.10.3 + sameersbn/gitlab:11.10.4 ``` ## 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:11.10.3 + sameersbn/gitlab:11.10.4 ``` #### 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:11.10.3 + sameersbn/gitlab:11.10.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: @@ -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:11.10.3 + sameersbn/gitlab:11.10.4 ``` #### 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:11.10.3 + sameersbn/gitlab:11.10.4 ``` 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:11.10.3 + sameersbn/gitlab:11.10.4 ``` ### 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:11.10.3 + sameersbn/gitlab:11.10.4 ``` ### 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:11.10.3 + sameersbn/gitlab:11.10.4 ``` 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:11.10.3 + sameersbn/gitlab:11.10.4 ``` 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:11.10.3 + sameersbn/gitlab:11.10.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. @@ -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:11.10.3 + sameersbn/gitlab:11.10.4 ``` 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:11.10.3 + sameersbn/gitlab:11.10.4 ``` 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:11.10.3 + sameersbn/gitlab:11.10.4 ``` 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:11.10.3 + sameersbn/gitlab:11.10.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:11.10.3 app:sanitize + sameersbn/gitlab:11.10.4 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.10.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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.3 app:rake db:setup + sameersbn/gitlab:11.10.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:11.10.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.10.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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.10.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.10.3 app:rake gitlab:env:info + sameersbn/gitlab:11.10.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.10.4 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.3 app:rake gitlab:import:repos + sameersbn/gitlab:11.10.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.10.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:11.10.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:11.10.3 +docker pull sameersbn/gitlab:11.10.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.10.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.10.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index d5b7da55..d9db763c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.10.3 +11.10.4 diff --git a/docker-compose.yml b/docker-compose.yml index 48b3408e..1351a553 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.10.3 + image: sameersbn/gitlab:11.10.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index e7d940a0..c072a6df 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:11.10.3 app:rake gitlab:backup:create + sameersbn/gitlab:11.10.4 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:11.10.3 app:rake gitlab:backup:restore + sameersbn/gitlab:11.10.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. @@ -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:11.10.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.10.4 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:11.10.3 +docker pull sameersbn/gitlab:11.10.4 ``` - **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:11.10.3 +sameersbn/gitlab:11.10.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index aa9422b4..e5c80b9d 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.10.3 + image: sameersbn/gitlab:11.10.4 env: - name: TZ value: Asia/Kolkata From c5b1a28045eef4e68810c877cebc9d73128ca064 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 4 May 2019 21:24:03 +0200 Subject: [PATCH 372/508] release 11.10.4 From 56aa82d412662a7fe42464f92d14466f5bcae68d Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Mon, 27 May 2019 17:09:35 +0300 Subject: [PATCH 373/508] Upgrade GitLab CE to 11.11.0 --- 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 e4eddc23..c54615fc 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. +**11.11.0** +- gitlab: upgrade CE to v11.11.0 + **11.10.4** - gitlab: upgrade CE to v11.10.4 diff --git a/Dockerfile b/Dockerfile index 3bb03b37..11fb9f38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.10.4 +ARG VERSION=11.11.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index ad9191cc..632aaba5 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:11.10.4 +# sameersbn/gitlab:11.11.0 - [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:11.10.4 +docker pull sameersbn/gitlab:11.11.0 ``` 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:11.10.4 + sameersbn/gitlab:11.11.0 ``` *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:11.10.4 + sameersbn/gitlab:11.11.0 ``` ## 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:11.10.4 + sameersbn/gitlab:11.11.0 ``` #### 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:11.10.4 + sameersbn/gitlab:11.11.0 ``` 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:11.10.4 + sameersbn/gitlab:11.11.0 ``` #### 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:11.10.4 + sameersbn/gitlab:11.11.0 ``` 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:11.10.4 + sameersbn/gitlab:11.11.0 ``` ### 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:11.10.4 + sameersbn/gitlab:11.11.0 ``` ### 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:11.10.4 + sameersbn/gitlab:11.11.0 ``` 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:11.10.4 + sameersbn/gitlab:11.11.0 ``` 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:11.10.4 + sameersbn/gitlab:11.11.0 ``` 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:11.10.4 + sameersbn/gitlab:11.11.0 ``` 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:11.10.4 + sameersbn/gitlab:11.11.0 ``` 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:11.10.4 + sameersbn/gitlab:11.11.0 ``` 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:11.10.4 + sameersbn/gitlab:11.11.0 ``` 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:11.10.4 app:sanitize + sameersbn/gitlab:11.11.0 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.11.0 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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.4 app:rake db:setup + sameersbn/gitlab:11.11.0 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:11.10.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.11.0 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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.11.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.10.4 app:rake gitlab:env:info + sameersbn/gitlab:11.11.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.11.0 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.10.4 app:rake gitlab:import:repos + sameersbn/gitlab:11.11.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.10.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. +> Upgrading to `sameersbn/gitlab:11.11.0` 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:11.10.4 +docker pull sameersbn/gitlab:11.11.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.10.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.11.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index d9db763c..4b8f5876 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.10.4 +11.11.0 diff --git a/docker-compose.yml b/docker-compose.yml index 1351a553..6c16aefc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.10.4 + image: sameersbn/gitlab:11.11.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index c072a6df..ba26d8c9 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:11.10.4 app:rake gitlab:backup:create + sameersbn/gitlab:11.11.0 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:11.10.4 app:rake gitlab:backup:restore + sameersbn/gitlab:11.11.0 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:11.10.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.11.0 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:11.10.4 +docker pull sameersbn/gitlab:11.11.0 ``` - **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:11.10.4 +sameersbn/gitlab:11.11.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index e5c80b9d..30e9c0f7 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.10.4 + image: sameersbn/gitlab:11.11.0 env: - name: TZ value: Asia/Kolkata From ebf19ef30cb153a7481e311c6728cf197e8e174f Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Mon, 27 May 2019 17:10:41 +0300 Subject: [PATCH 374/508] Update gitaly to 1.42.0 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index c54615fc..2005c93d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **11.11.0** - gitlab: upgrade CE to v11.11.0 +- Update gitaly to 1.42.0 **11.10.4** - gitlab: upgrade CE to v11.10.4 diff --git a/Dockerfile b/Dockerfile index 11fb9f38..360f6168 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=9.0.0 \ GITLAB_WORKHORSE_VERSION=8.5.2 \ GITLAB_PAGES_VERSION=1.5.0 \ - GITALY_SERVER_VERSION=1.34.1 \ + GITALY_SERVER_VERSION=1.42.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 95ca4492419740a71439ba7ddf035fa6c67f083d Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Mon, 27 May 2019 17:11:51 +0300 Subject: [PATCH 375/508] Update gitlab-shell to 9.1.0 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 2005c93d..1511320c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **11.11.0** - gitlab: upgrade CE to v11.11.0 - Update gitaly to 1.42.0 +- Update gitlab-shell to 9.1.0 **11.10.4** - gitlab: upgrade CE to v11.10.4 diff --git a/Dockerfile b/Dockerfile index 360f6168..d5691db9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG VERSION=11.11.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.11.9 \ - GITLAB_SHELL_VERSION=9.0.0 \ + GITLAB_SHELL_VERSION=9.1.0 \ GITLAB_WORKHORSE_VERSION=8.5.2 \ GITLAB_PAGES_VERSION=1.5.0 \ GITALY_SERVER_VERSION=1.42.0 \ From e8ccebcc699af1e8f08638b47046c9670df2a9e1 Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Mon, 27 May 2019 17:24:39 +0300 Subject: [PATCH 376/508] Update gitlab-workhorse to 8.7.0 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 1511320c..d81afff9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o - gitlab: upgrade CE to v11.11.0 - Update gitaly to 1.42.0 - Update gitlab-shell to 9.1.0 +- Update gitlab-workhorse to 8.7.0 **11.10.4** - gitlab: upgrade CE to v11.10.4 diff --git a/Dockerfile b/Dockerfile index d5691db9..9801e9fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.11.9 \ GITLAB_SHELL_VERSION=9.1.0 \ - GITLAB_WORKHORSE_VERSION=8.5.2 \ + GITLAB_WORKHORSE_VERSION=8.7.0 \ GITLAB_PAGES_VERSION=1.5.0 \ GITALY_SERVER_VERSION=1.42.0 \ GITLAB_USER="git" \ From 921f26d8ff888c66426fe25c9111f0f9f898a9b2 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 27 May 2019 21:24:27 +0200 Subject: [PATCH 377/508] release 11.11.0 From 1e3feaa967fc8103469895ad624cf17d3486d2fa Mon Sep 17 00:00:00 2001 From: David Rubin Date: Tue, 4 Jun 2019 17:29:29 +0200 Subject: [PATCH 378/508] Upgrade to 11.11.1 --- Changelog.md | 4 +++ Dockerfile | 4 +-- README.md | 56 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 42 insertions(+), 38 deletions(-) diff --git a/Changelog.md b/Changelog.md index d81afff9..0c063ab9 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-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**11.11.1** +- gitlab: upgrade CE to v11.11.1 +- Update gitaly to 1.42.2 + **11.11.0** - gitlab: upgrade CE to v11.11.0 - Update gitaly to 1.42.0 diff --git a/Dockerfile b/Dockerfile index 9801e9fe..20e9b5d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.11.0 +ARG VERSION=11.11.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=9.1.0 \ GITLAB_WORKHORSE_VERSION=8.7.0 \ GITLAB_PAGES_VERSION=1.5.0 \ - GITALY_SERVER_VERSION=1.42.0 \ + GITALY_SERVER_VERSION=1.42.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 632aaba5..983797f8 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:11.11.0 +# sameersbn/gitlab:11.11.1 - [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:11.11.0 +docker pull sameersbn/gitlab:11.11.1 ``` 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:11.11.0 + sameersbn/gitlab:11.11.1 ``` *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:11.11.0 + sameersbn/gitlab:11.11.1 ``` ## 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:11.11.0 + sameersbn/gitlab:11.11.1 ``` #### 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:11.11.0 + sameersbn/gitlab:11.11.1 ``` 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:11.11.0 + sameersbn/gitlab:11.11.1 ``` #### 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:11.11.0 + sameersbn/gitlab:11.11.1 ``` 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:11.11.0 + sameersbn/gitlab:11.11.1 ``` ### 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:11.11.0 + sameersbn/gitlab:11.11.1 ``` ### 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:11.11.0 + sameersbn/gitlab:11.11.1 ``` 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:11.11.0 + sameersbn/gitlab:11.11.1 ``` 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:11.11.0 + sameersbn/gitlab:11.11.1 ``` 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:11.11.0 + sameersbn/gitlab:11.11.1 ``` 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:11.11.0 + sameersbn/gitlab:11.11.1 ``` 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:11.11.0 + sameersbn/gitlab:11.11.1 ``` 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:11.11.0 + sameersbn/gitlab:11.11.1 ``` 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:11.11.0 app:sanitize + sameersbn/gitlab:11.11.1 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.11.1 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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.0 app:rake db:setup + sameersbn/gitlab:11.11.1 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:11.11.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.11.1 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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.11.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.11.0 app:rake gitlab:env:info + sameersbn/gitlab:11.11.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.11.1 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.0 app:rake gitlab:import:repos + sameersbn/gitlab:11.11.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.11.0` 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:11.11.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.11.0 +docker pull sameersbn/gitlab:11.11.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.11.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.11.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 4b8f5876..ef772f7a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.11.0 +11.11.1 diff --git a/docker-compose.yml b/docker-compose.yml index 6c16aefc..14049340 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.11.0 + image: sameersbn/gitlab:11.11.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ba26d8c9..06d14345 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:11.11.0 app:rake gitlab:backup:create + sameersbn/gitlab:11.11.1 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:11.11.0 app:rake gitlab:backup:restore + sameersbn/gitlab:11.11.1 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:11.11.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.11.1 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:11.11.0 +docker pull sameersbn/gitlab:11.11.1 ``` - **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:11.11.0 +sameersbn/gitlab:11.11.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 30e9c0f7..0e3620fd 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.11.0 + image: sameersbn/gitlab:11.11.1 env: - name: TZ value: Asia/Kolkata From 283d6a907ce32359405ba0052f9e088f0ac4b893 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 7 Jun 2019 22:22:54 +0200 Subject: [PATCH 379/508] release 11.11.1 From 3da4f83fbc223c980ade05129aac458000b416a3 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 7 Jun 2019 23:32:00 +0200 Subject: [PATCH 380/508] release 11.11.1 From 63883ab0a0bb0b1f4aba6477cf2db4eb1eb6ac01 Mon Sep 17 00:00:00 2001 From: David Rubin Date: Fri, 7 Jun 2019 19:09:20 +0200 Subject: [PATCH 381/508] Upgrade to 11.11.2 --- Changelog.md | 4 +++ Dockerfile | 4 +-- README.md | 56 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 42 insertions(+), 38 deletions(-) diff --git a/Changelog.md b/Changelog.md index 0c063ab9..21dd36ef 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-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**11.11.2** +- gitlab: upgrade CE to v11.11.2 +- Update gitaly to 1.42.3 + **11.11.1** - gitlab: upgrade CE to v11.11.1 - Update gitaly to 1.42.2 diff --git a/Dockerfile b/Dockerfile index 20e9b5d6..7b0bf887 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.11.1 +ARG VERSION=11.11.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=9.1.0 \ GITLAB_WORKHORSE_VERSION=8.7.0 \ GITLAB_PAGES_VERSION=1.5.0 \ - GITALY_SERVER_VERSION=1.42.2 \ + GITALY_SERVER_VERSION=1.42.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 983797f8..3a393dd7 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:11.11.1 +# sameersbn/gitlab:11.11.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:11.11.1 +docker pull sameersbn/gitlab:11.11.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:11.11.1 + sameersbn/gitlab:11.11.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:11.11.1 + sameersbn/gitlab:11.11.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:11.11.1 + sameersbn/gitlab:11.11.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:11.11.1 + sameersbn/gitlab:11.11.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:11.11.1 + sameersbn/gitlab:11.11.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:11.11.1 + sameersbn/gitlab:11.11.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:11.11.1 + sameersbn/gitlab:11.11.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:11.11.1 + sameersbn/gitlab:11.11.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:11.11.1 + sameersbn/gitlab:11.11.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:11.11.1 + sameersbn/gitlab:11.11.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:11.11.1 + sameersbn/gitlab:11.11.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:11.11.1 + sameersbn/gitlab:11.11.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:11.11.1 + sameersbn/gitlab:11.11.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:11.11.1 + sameersbn/gitlab:11.11.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:11.11.1 + sameersbn/gitlab:11.11.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:11.11.1 app:sanitize + sameersbn/gitlab:11.11.2 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.11.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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.1 app:rake db:setup + sameersbn/gitlab:11.11.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:11.11.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.11.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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.11.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.11.1 app:rake gitlab:env:info + sameersbn/gitlab:11.11.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.11.2 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.1 app:rake gitlab:import:repos + sameersbn/gitlab:11.11.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.11.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:11.11.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:11.11.1 +docker pull sameersbn/gitlab:11.11.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.11.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.11.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index ef772f7a..5866bfb2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.11.1 +11.11.2 diff --git a/docker-compose.yml b/docker-compose.yml index 14049340..27c0afbc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.11.1 + image: sameersbn/gitlab:11.11.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 06d14345..e5945a3a 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:11.11.1 app:rake gitlab:backup:create + sameersbn/gitlab:11.11.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:11.11.1 app:rake gitlab:backup:restore + sameersbn/gitlab:11.11.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:11.11.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.11.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:11.11.1 +docker pull sameersbn/gitlab:11.11.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:11.11.1 +sameersbn/gitlab:11.11.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 0e3620fd..760e55d3 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.11.1 + image: sameersbn/gitlab:11.11.2 env: - name: TZ value: Asia/Kolkata From ccd59a8a3206f42d1c085aa9ffb2b7dd796a2d37 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 7 Jun 2019 23:38:52 +0200 Subject: [PATCH 382/508] release 11.11.2 From 6e6add4210c16a6065fc5de9069760dbeacef12c Mon Sep 17 00:00:00 2001 From: "Klos, Jan" Date: Mon, 10 Jun 2019 19:25:04 +0200 Subject: [PATCH 383/508] upgrade gitlab-ce to 11.11.3 and gitaly to 1.42.4 --- Changelog.md | 4 +++ Dockerfile | 4 +-- README.md | 56 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 42 insertions(+), 38 deletions(-) diff --git a/Changelog.md b/Changelog.md index 21dd36ef..cd9f172f 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-ce/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**11.11.3** +- gitlab: upgrade CE to v11.11.3 +- Update gitaly to 1.42.4 + **11.11.2** - gitlab: upgrade CE to v11.11.2 - Update gitaly to 1.42.3 diff --git a/Dockerfile b/Dockerfile index 7b0bf887..ac3eac86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.11.2 +ARG VERSION=11.11.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=9.1.0 \ GITLAB_WORKHORSE_VERSION=8.7.0 \ GITLAB_PAGES_VERSION=1.5.0 \ - GITALY_SERVER_VERSION=1.42.3 \ + GITALY_SERVER_VERSION=1.42.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 3a393dd7..ee22ca13 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:11.11.2 +# sameersbn/gitlab:11.11.3 - [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:11.11.2 +docker pull sameersbn/gitlab:11.11.3 ``` 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:11.11.2 + sameersbn/gitlab:11.11.3 ``` *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:11.11.2 + sameersbn/gitlab:11.11.3 ``` ## 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:11.11.2 + sameersbn/gitlab:11.11.3 ``` #### 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:11.11.2 + sameersbn/gitlab:11.11.3 ``` 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:11.11.2 + sameersbn/gitlab:11.11.3 ``` #### 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:11.11.2 + sameersbn/gitlab:11.11.3 ``` 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:11.11.2 + sameersbn/gitlab:11.11.3 ``` ### 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:11.11.2 + sameersbn/gitlab:11.11.3 ``` ### 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:11.11.2 + sameersbn/gitlab:11.11.3 ``` 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:11.11.2 + sameersbn/gitlab:11.11.3 ``` 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:11.11.2 + sameersbn/gitlab:11.11.3 ``` 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:11.11.2 + sameersbn/gitlab:11.11.3 ``` 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:11.11.2 + sameersbn/gitlab:11.11.3 ``` 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:11.11.2 + sameersbn/gitlab:11.11.3 ``` 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:11.11.2 + sameersbn/gitlab:11.11.3 ``` 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:11.11.2 app:sanitize + sameersbn/gitlab:11.11.3 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.11.3 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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.2 app:rake db:setup + sameersbn/gitlab:11.11.3 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:11.11.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.11.3 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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.11.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.11.2 app:rake gitlab:env:info + sameersbn/gitlab:11.11.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.11.3 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.2 app:rake gitlab:import:repos + sameersbn/gitlab:11.11.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.11.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. +> Upgrading to `sameersbn/gitlab:11.11.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:11.11.2 +docker pull sameersbn/gitlab:11.11.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.11.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:11.11.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index 5866bfb2..caf202a9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.11.2 +11.11.3 diff --git a/docker-compose.yml b/docker-compose.yml index 27c0afbc..97f30d8d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.11.2 + image: sameersbn/gitlab:11.11.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index e5945a3a..36b54ff6 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:11.11.2 app:rake gitlab:backup:create + sameersbn/gitlab:11.11.3 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:11.11.2 app:rake gitlab:backup:restore + sameersbn/gitlab:11.11.3 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:11.11.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:11.11.3 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:11.11.2 +docker pull sameersbn/gitlab:11.11.3 ``` - **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:11.11.2 +sameersbn/gitlab:11.11.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 760e55d3..1b3182e7 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.11.2 + image: sameersbn/gitlab:11.11.3 env: - name: TZ value: Asia/Kolkata From 3446236fea85b02af0f49205128d7298cf96fd7f Mon Sep 17 00:00:00 2001 From: "Klos, Jan" Date: Mon, 10 Jun 2019 19:27:20 +0200 Subject: [PATCH 384/508] Update golang to 1.12.5 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index cd9f172f..b56d4493 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **11.11.3** - gitlab: upgrade CE to v11.11.3 - Update gitaly to 1.42.4 +- Update golang to 1.12.5 **11.11.2** - gitlab: upgrade CE to v11.11.2 diff --git a/Dockerfile b/Dockerfile index ac3eac86..a03e3742 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG VERSION=11.11.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ - GOLANG_VERSION=1.11.9 \ + GOLANG_VERSION=1.12.5 \ GITLAB_SHELL_VERSION=9.1.0 \ GITLAB_WORKHORSE_VERSION=8.7.0 \ GITLAB_PAGES_VERSION=1.5.0 \ From 8fdb620349ef577b19801127d4404616a5c823af Mon Sep 17 00:00:00 2001 From: "Klos, Jan" Date: Mon, 17 Jun 2019 16:06:04 +0200 Subject: [PATCH 385/508] update golang to 1.12.6 --- Changelog.md | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index b56d4493..37b89d0e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,7 +6,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **11.11.3** - gitlab: upgrade CE to v11.11.3 - Update gitaly to 1.42.4 -- Update golang to 1.12.5 +- Update golang to 1.12.6 **11.11.2** - gitlab: upgrade CE to v11.11.2 diff --git a/Dockerfile b/Dockerfile index a03e3742..5a44628f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG VERSION=11.11.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ - GOLANG_VERSION=1.12.5 \ + GOLANG_VERSION=1.12.6 \ GITLAB_SHELL_VERSION=9.1.0 \ GITLAB_WORKHORSE_VERSION=8.7.0 \ GITLAB_PAGES_VERSION=1.5.0 \ From d1e15afe02b1c875a892a970a1cbd4a97d0ce1d4 Mon Sep 17 00:00:00 2001 From: Sergey Rusakov Date: Fri, 31 May 2019 10:05:48 +0300 Subject: [PATCH 386/508] Removed ipv6only option from gitlab-pages-ssl nginx config template --- assets/runtime/config/nginx/gitlab-pages-ssl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/config/nginx/gitlab-pages-ssl b/assets/runtime/config/nginx/gitlab-pages-ssl index 9eaa3244..17ab05e9 100644 --- a/assets/runtime/config/nginx/gitlab-pages-ssl +++ b/assets/runtime/config/nginx/gitlab-pages-ssl @@ -23,7 +23,7 @@ server { ## Pages serving host server { listen 0.0.0.0:443 ssl; - listen [::]:443 ipv6only=on ssl http2; + listen [::]:443 ssl http2; ## Replace this with something like pages.gitlab.com server_name ~^.*{{GITLAB_PAGES_DOMAIN}}; From 70d36b466922dca815fbff8f3dff87e95296e14e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 17 Jun 2019 21:58:11 +0200 Subject: [PATCH 387/508] release 11.11.3 From 3e54c3a92acd0a0d8a449c036d1953d71a348f6d Mon Sep 17 00:00:00 2001 From: Patrick Oberdorf Date: Sun, 7 Jul 2019 17:27:56 +0200 Subject: [PATCH 388/508] Upgrade GitLab CE to 12.0.0 --- 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 37b89d0e..1289fbf4 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.0** +- gitlab: upgrade CE to v12.0.0 + **11.11.3** - gitlab: upgrade CE to v11.11.3 - Update gitaly to 1.42.4 diff --git a/Dockerfile b/Dockerfile index 5a44628f..55a276ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=11.11.3 +ARG VERSION=12.0.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ diff --git a/README.md b/README.md index ee22ca13..8d53bc3c 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:11.11.3 +# sameersbn/gitlab:12.0.0 - [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:11.11.3 +docker pull sameersbn/gitlab:12.0.0 ``` 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:11.11.3 + sameersbn/gitlab:12.0.0 ``` *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:11.11.3 + sameersbn/gitlab:12.0.0 ``` ## 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:11.11.3 + sameersbn/gitlab:12.0.0 ``` #### 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:11.11.3 + sameersbn/gitlab:12.0.0 ``` 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:11.11.3 + sameersbn/gitlab:12.0.0 ``` #### 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:11.11.3 + sameersbn/gitlab:12.0.0 ``` 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:11.11.3 + sameersbn/gitlab:12.0.0 ``` ### 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:11.11.3 + sameersbn/gitlab:12.0.0 ``` ### 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:11.11.3 + sameersbn/gitlab:12.0.0 ``` 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:11.11.3 + sameersbn/gitlab:12.0.0 ``` 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:11.11.3 + sameersbn/gitlab:12.0.0 ``` 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:11.11.3 + sameersbn/gitlab:12.0.0 ``` 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:11.11.3 + sameersbn/gitlab:12.0.0 ``` 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:11.11.3 + sameersbn/gitlab:12.0.0 ``` 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:11.11.3 + sameersbn/gitlab:12.0.0 ``` 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:11.11.3 app:sanitize + sameersbn/gitlab:12.0.0 app:sanitize ``` ### Piwik @@ -1187,7 +1187,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.3 app:rake gitlab:backup:create + sameersbn/gitlab:12.0.0 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. @@ -1215,14 +1215,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.3 app:rake db:setup + sameersbn/gitlab:12.0.0 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:11.11.3 app:rake gitlab:backup:restore + sameersbn/gitlab:12.0.0 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. @@ -1231,7 +1231,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.0.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1280,7 +1280,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:11.11.3 app:rake gitlab:env:info + sameersbn/gitlab:12.0.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1293,7 +1293,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.3 app:rake gitlab:import:repos + sameersbn/gitlab:12.0.0 app:rake gitlab:import:repos ``` Or @@ -1324,7 +1324,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:11.11.3 app:rake gitlab:import:repos + sameersbn/gitlab:12.0.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1346,12 +1346,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:11.11.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:12.0.0` 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:11.11.3 +docker pull sameersbn/gitlab:12.0.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1377,7 +1377,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:11.11.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.0.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index caf202a9..4044f908 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -11.11.3 +12.0.0 diff --git a/docker-compose.yml b/docker-compose.yml index 97f30d8d..b59bd284 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:11.11.3 + image: sameersbn/gitlab:12.0.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 36b54ff6..ff4a4b2f 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:11.11.3 app:rake gitlab:backup:create + sameersbn/gitlab:12.0.0 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:11.11.3 app:rake gitlab:backup:restore + sameersbn/gitlab:12.0.0 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:11.11.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.0.0 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:11.11.3 +docker pull sameersbn/gitlab:12.0.0 ``` - **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:11.11.3 +sameersbn/gitlab:12.0.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 1b3182e7..da7e7015 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:11.11.3 + image: sameersbn/gitlab:12.0.0 env: - name: TZ value: Asia/Kolkata From 63203877c4b9319d7ba2ffc2a983f76e70cdff89 Mon Sep 17 00:00:00 2001 From: Patrick Oberdorf Date: Sun, 7 Jul 2019 17:29:55 +0200 Subject: [PATCH 389/508] Update gitaly to 1.47.0 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 1289fbf4..00bd0ff2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **12.0.0** - gitlab: upgrade CE to v12.0.0 +- Update gitaly to 1.47.0 **11.11.3** - gitlab: upgrade CE to v11.11.3 diff --git a/Dockerfile b/Dockerfile index 55a276ce..497844d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=9.1.0 \ GITLAB_WORKHORSE_VERSION=8.7.0 \ GITLAB_PAGES_VERSION=1.5.0 \ - GITALY_SERVER_VERSION=1.42.4 \ + GITALY_SERVER_VERSION=1.47.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From e358c02e49d0d4fc24e77d669dedaf8af29732e9 Mon Sep 17 00:00:00 2001 From: Patrick Oberdorf Date: Sun, 7 Jul 2019 17:31:35 +0200 Subject: [PATCH 390/508] Update gitlab-shell to 9.3.0 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 00bd0ff2..ad1c1a68 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **12.0.0** - gitlab: upgrade CE to v12.0.0 - Update gitaly to 1.47.0 +- Update gitlab-shell to 9.3.0 **11.11.3** - gitlab: upgrade CE to v11.11.3 diff --git a/Dockerfile b/Dockerfile index 497844d1..23c2b7e6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG VERSION=12.0.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.5 \ GOLANG_VERSION=1.12.6 \ - GITLAB_SHELL_VERSION=9.1.0 \ + GITLAB_SHELL_VERSION=9.3.0 \ GITLAB_WORKHORSE_VERSION=8.7.0 \ GITLAB_PAGES_VERSION=1.5.0 \ GITALY_SERVER_VERSION=1.47.0 \ From d2672dec824460b38333bf13146acefd7f168adf Mon Sep 17 00:00:00 2001 From: Patrick Oberdorf Date: Sun, 7 Jul 2019 17:33:11 +0200 Subject: [PATCH 391/508] Update gitlab-pages to 1.6.1 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index ad1c1a68..3b93d113 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o - gitlab: upgrade CE to v12.0.0 - Update gitaly to 1.47.0 - Update gitlab-shell to 9.3.0 +- Update gitlab-pages to 1.6.1 **11.11.3** - gitlab: upgrade CE to v11.11.3 diff --git a/Dockerfile b/Dockerfile index 23c2b7e6..22cac6d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.12.6 \ GITLAB_SHELL_VERSION=9.3.0 \ GITLAB_WORKHORSE_VERSION=8.7.0 \ - GITLAB_PAGES_VERSION=1.5.0 \ + GITLAB_PAGES_VERSION=1.6.1 \ GITALY_SERVER_VERSION=1.47.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ From d9276e8cd7a43bed6dcd28e7d3ce6007de6d68fa Mon Sep 17 00:00:00 2001 From: Patrick Oberdorf Date: Sun, 7 Jul 2019 17:34:39 +0200 Subject: [PATCH 392/508] Update ruby to 2.6 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 3b93d113..d59a842f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -8,6 +8,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o - Update gitaly to 1.47.0 - Update gitlab-shell to 9.3.0 - Update gitlab-pages to 1.6.1 +- ruby: update to 2.6 **11.11.3** - gitlab: upgrade CE to v11.11.3 diff --git a/Dockerfile b/Dockerfile index 22cac6d3..c22b5427 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG VCS_REF ARG VERSION=12.0.0 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=2.5 \ + RUBY_VERSION=2.6 \ GOLANG_VERSION=1.12.6 \ GITLAB_SHELL_VERSION=9.3.0 \ GITLAB_WORKHORSE_VERSION=8.7.0 \ From f582876f8301e1740c753dfc5641f5c4808749a3 Mon Sep 17 00:00:00 2001 From: Patrick Oberdorf Date: Sun, 7 Jul 2019 17:36:44 +0200 Subject: [PATCH 393/508] Update python to 3 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index d59a842f..53af18eb 100644 --- a/Changelog.md +++ b/Changelog.md @@ -9,6 +9,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o - Update gitlab-shell to 9.3.0 - Update gitlab-pages to 1.6.1 - ruby: update to 2.6 +- python: update to 3 **11.11.3** - gitlab: upgrade CE to v11.11.3 diff --git a/Dockerfile b/Dockerfile index c22b5427..e3e73526 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,7 +44,7 @@ RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ sudo supervisor logrotate locales curl \ nginx openssh-server mysql-client postgresql-client redis-tools \ - git-core gnupg2 ruby${RUBY_VERSION} python2.7 python-docutils nodejs yarn gettext-base \ + git-core gnupg2 ruby${RUBY_VERSION} python3 python3-docutils nodejs yarn gettext-base \ libmysqlclient20 libpq5 zlib1g libyaml-0-2 libssl1.0.0 \ libgdbm3 libreadline6 libncurses5 libffi6 \ libxml2 libxslt1.1 libcurl3 libicu55 libre2-dev tzdata unzip libimage-exiftool-perl \ From be45df494daddfb7a9991d56aa7d06a2d51c96ba Mon Sep 17 00:00:00 2001 From: Bartosz Cisek Date: Wed, 3 Jul 2019 21:43:59 +0200 Subject: [PATCH 394/508] Add support for AWS S3 signature version Some 3rd party storage solutions allow upload via S3 protocol but still use v2 of signature schema. [Fog library used by gitlab](https://docs.gitlab.com/ee/administration/uploads.html#s3-compatible-connection-settings) allows to override default version 4. --- README.md | 1 + assets/runtime/config/gitlabhq/gitlab.yml | 1 + assets/runtime/env-defaults | 1 + assets/runtime/functions | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d53bc3c..909054ec 100644 --- a/README.md +++ b/README.md @@ -1148,6 +1148,7 @@ Below is the complete list of available options that can be used to customize yo | `AWS_BACKUP_MULTIPART_CHUNK_SIZE` | Enables mulitpart uploads when file size reaches a defined size. See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html) | | `AWS_BACKUP_ENCRYPTION` | Turns on AWS Server-Side Encryption. Defaults to `false`. See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html) | | `AWS_BACKUP_STORAGE_CLASS` | Configure the storage class for the item. Defaults to `STANDARD` See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/storage-class-intro.html) | +| `AWS_BACKUP_SIGNATURE_VERSION` | Configure the storage signature version. Defaults to `4` See at [AWS S3 Docs](https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingAWSSDK.html#specify-signature-version) | | `GCS_BACKUPS` | Enables automatic uploads to an Google Cloud Storage (GCS) instance. Defaults to `false`. | | `GCS_BACKUP_ACCESS_KEY_ID` | GCS access key id. No defaults | | `GCS_BACKUP_SECRET_ACCESS_KEY` | GCS secret access key. No defaults | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 3d36a878..775b4f15 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -606,6 +606,7 @@ production: &base path_style: {{AWS_BACKUP_PATH_STYLE}} aws_access_key_id: {{AWS_BACKUP_ACCESS_KEY_ID}} aws_secret_access_key: '{{AWS_BACKUP_SECRET_ACCESS_KEY}}' + aws_signature_version: {{AWS_BACKUP_SIGNATURE_VERSION}} # The remote 'directory' to store your backups. For S3, this would be the bucket name. remote_directory: '{{AWS_BACKUP_BUCKET}}' #start-multipart-aws diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 4c4318b8..0834090d 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -239,6 +239,7 @@ AWS_BACKUP_BUCKET=${AWS_BACKUP_BUCKET} AWS_BACKUP_MULTIPART_CHUNK_SIZE=${AWS_BACKUP_MULTIPART_CHUNK_SIZE} AWS_BACKUP_ENCRYPTION=${AWS_BACKUP_ENCRYPTION} AWS_BACKUP_STORAGE_CLASS=${AWS_BACKUP_STORAGE_CLASS:-STANDARD} +AWS_BACKUP_SIGNATURE_VERSION=${AWS_BACKUP_SIGNATURE_VERSION:-4} ### GCS BACKUPS GCS_BACKUPS=${GCS_BACKUPS:-false} diff --git a/assets/runtime/functions b/assets/runtime/functions index ab3e02d8..12a49eed 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -844,7 +844,8 @@ gitlab_configure_backups_aws() { AWS_BACKUP_SECRET_ACCESS_KEY \ AWS_BACKUP_BUCKET \ AWS_BACKUP_MULTIPART_CHUNK_SIZE \ - AWS_BACKUP_STORAGE_CLASS + AWS_BACKUP_STORAGE_CLASS \ + AWS_BACKUP_SIGNATURE_VERSION } gitlab_configure_backup_gcs() { From fe04334b61f7f2b4c27804e0aedcca034efd4677 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 7 Jul 2019 18:39:58 +0200 Subject: [PATCH 395/508] Fix behaviour of gitlab:backup:restore/backup Since 10.8 GitLab requires Gitaly as core process. Gitaly needs to be run to make backups successfuly. For this case we will start all proccess to let handle the backup and restore correctly like before. Signed-off-by: solidnerd --- README.md | 8 ++++++++ assets/build/install.sh | 13 +++++++++++++ assets/runtime/functions | 9 +++++++++ 3 files changed, 30 insertions(+) diff --git a/README.md b/README.md index 909054ec..4dabad84 100644 --- a/README.md +++ b/README.md @@ -1198,9 +1198,16 @@ A backup will be created in the backups folder of the [Data Store](#data-store). When using `docker-compose` you may use the following command to execute the backup. ```bash +docker-compose rm -sf gitlab docker-compose run --rm gitlab app:rake gitlab:backup:create ``` +Afterwards you can bring your Instance back with the following command: + +```bash +docker-compose up -d +``` + ## Restoring Backups GitLab also defines a rake task to restore a backup. @@ -1242,6 +1249,7 @@ docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available b docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1417624827 # Choose to restore from 1417624827 ``` + ## Host Key Backups (ssh) SSH keys are not backed up in the normal gitlab backup process. You diff --git a/assets/build/install.sh b/assets/build/install.sh index bcca8cdd..ab96d6ee 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -402,6 +402,19 @@ stdout_logfile=${GITLAB_LOG_DIR}/supervisor/%(program_name)s.log stderr_logfile=${GITLAB_LOG_DIR}/supervisor/%(program_name)s.log EOF + +cat > /etc/supervisor/conf.d/groups.conf < Date: Sat, 6 Jul 2019 19:38:42 +0530 Subject: [PATCH 396/508] updated to sameersbn/postgresql:10-2 image --- README.md | 6 +++--- docker-compose.yml | 2 +- docs/s3_compatible_storage.md | 2 +- kubernetes/postgresql-rc.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 4dabad84..1dd3841a 100644 --- a/README.md +++ b/README.md @@ -175,7 +175,7 @@ docker run --name gitlab-postgresql -d \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --env 'DB_EXTENSION=pg_trgm' \ --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \ - sameersbn/postgresql:10 + sameersbn/postgresql:10-2 ``` Step 2. Launch a redis container @@ -279,7 +279,7 @@ To illustrate linking with a postgresql container, we will use the [sameersbn/po First, lets pull the postgresql image from the docker index. ```bash -docker pull sameersbn/postgresql:10 +docker pull sameersbn/postgresql:10-2 ``` For data persistence lets create a store for the postgresql and start the container. @@ -299,7 +299,7 @@ docker run --name gitlab-postgresql -d \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --env 'DB_EXTENSION=pg_trgm' \ --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \ - sameersbn/postgresql:10 + sameersbn/postgresql:10-2 ``` The above command will create a database named `gitlabhq_production` and also create a user named `gitlab` with the password `password` with access to the `gitlabhq_production` database. diff --git a/docker-compose.yml b/docker-compose.yml index b59bd284..537ee70a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: postgresql: restart: always - image: sameersbn/postgresql:10 + image: sameersbn/postgresql:10-2 volumes: - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z environment: diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md index d876cc7a..046c6917 100644 --- a/docs/s3_compatible_storage.md +++ b/docs/s3_compatible_storage.md @@ -80,7 +80,7 @@ services: postgresql: restart: always - image: sameersbn/postgresql:10 + image: sameersbn/postgresql:10-2 volumes: - /tmp/docker/gitlab/postgresql:/var/lib/postgresql:Z environment: diff --git a/kubernetes/postgresql-rc.yml b/kubernetes/postgresql-rc.yml index d5ce45aa..42df975a 100644 --- a/kubernetes/postgresql-rc.yml +++ b/kubernetes/postgresql-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: postgresql - image: sameersbn/postgresql:10 + image: sameersbn/postgresql:10-2 env: - name: DB_USER value: gitlab From 9aab3ea2f9423ab63b86fe45499030bc04462300 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Sat, 6 Jul 2019 19:39:46 +0530 Subject: [PATCH 397/508] updated to sameersbn/mysql:5.7.26-0 image --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1dd3841a..d1d64119 100644 --- a/README.md +++ b/README.md @@ -332,7 +332,7 @@ Assuming that your mysql data is available at `/srv/docker/gitlab/mysql` ```bash docker run --name gitlab-mysql -d \ --volume /srv/docker/gitlab/mysql:/var/lib/mysql \ - sameersbn/mysql:5.7.22-1 + sameersbn/mysql:5.7.26-0 ``` This will start a mysql container with your existing mysql data. Now login to the mysql container and create a user for the existing `gitlabhq_production` database. @@ -377,7 +377,7 @@ To illustrate linking with a mysql container, we will use the [sameersbn/mysql]( First, lets pull the mysql image from the docker index. ```bash -docker pull sameersbn/mysql:5.7.22-1 +docker pull sameersbn/mysql:5.7.26-0 ``` For data persistence lets create a store for the mysql and start the container. @@ -396,7 +396,7 @@ docker run --name gitlab-mysql -d \ --env 'DB_NAME=gitlabhq_production' \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --volume /srv/docker/gitlab/mysql:/var/lib/mysql \ - sameersbn/mysql:5.7.22-1 + sameersbn/mysql:5.7.26-0 ``` The above command will create a database named `gitlabhq_production` and also create a user named `gitlab` with the password `password` with full/remote access to the `gitlabhq_production` database. From 9d88a0d94e7461426624180f1a43cd9431ecd8aa Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Sat, 6 Jul 2019 19:40:02 +0530 Subject: [PATCH 398/508] updated to sameersbn/redis:4.0.9-2 image --- README.md | 6 +++--- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.yml | 2 +- docs/docker-compose-registry.yml | 2 +- docs/s3_compatible_storage.md | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d1d64119..cb6bf6f3 100644 --- a/README.md +++ b/README.md @@ -183,7 +183,7 @@ Step 2. Launch a redis container ```bash docker run --name gitlab-redis -d \ --volume /srv/docker/gitlab/redis:/var/lib/redis \ - sameersbn/redis:4.0.9-1 + sameersbn/redis:4.0.9-2 ``` Step 3. Launch the gitlab container @@ -445,7 +445,7 @@ To illustrate linking with a redis container, we will use the [sameersbn/redis]( First, lets pull the redis image from the docker index. ```bash -docker pull sameersbn/redis:4.0.9-1 +docker pull sameersbn/redis:4.0.9-2 ``` Lets start the redis container @@ -453,7 +453,7 @@ Lets start the redis container ```bash docker run --name gitlab-redis -d \ --volume /srv/docker/gitlab/redis:/var/lib/redis \ - sameersbn/redis:4.0.9-1 + sameersbn/redis:4.0.9-2 ``` We are now ready to start the GitLab application. diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 5779985d..567e5035 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.4' services: redis: restart: always - image: sameersbn/redis:4.0.9-1 + image: sameersbn/redis:4.0.9-2 command: - --loglevel warning volumes: diff --git a/docker-compose.yml b/docker-compose.yml index 537ee70a..ddabe537 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2' services: redis: restart: always - image: sameersbn/redis:4.0.9-1 + image: sameersbn/redis:4.0.9-2 command: - --loglevel warning volumes: diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 1a8ba4b6..f9fd537c 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -3,7 +3,7 @@ version: '2' services: redis: restart: always - image: sameersbn/redis:4.0.9-1 + image: sameersbn/redis:4.0.9-2 command: - --loglevel warning volumes: diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md index 046c6917..d640d63c 100644 --- a/docs/s3_compatible_storage.md +++ b/docs/s3_compatible_storage.md @@ -72,7 +72,7 @@ version: '2' services: redis: restart: always - image: sameersbn/redis:4.0.9-1 + image: sameersbn/redis:4.0.9-2 command: - --loglevel warning volumes: From 5eadf56ba75841a0915d4256bc2ea26551fd9591 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 13 Jul 2019 14:06:28 +0200 Subject: [PATCH 399/508] release 12.0.0 From d15024e1f9f05396f5bd8aa330d969fad46d6e53 Mon Sep 17 00:00:00 2001 From: Patrick Oberdorf Date: Sun, 7 Jul 2019 17:59:06 +0200 Subject: [PATCH 400/508] Upgrade GitLab CE to 12.0.1 --- 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 53af18eb..4d42e61e 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.1** +- gitlab: upgrade CE to v12.0.1 + **12.0.0** - gitlab: upgrade CE to v12.0.0 - Update gitaly to 1.47.0 diff --git a/Dockerfile b/Dockerfile index e3e73526..7f487562 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.0.0 +ARG VERSION=12.0.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index cb6bf6f3..64892512 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.0 +# sameersbn/gitlab:12.0.1 - [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.0 +docker pull sameersbn/gitlab:12.0.1 ``` 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.0 + sameersbn/gitlab:12.0.1 ``` *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.0 + sameersbn/gitlab:12.0.1 ``` ## 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.0 + sameersbn/gitlab:12.0.1 ``` #### 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.0 + sameersbn/gitlab:12.0.1 ``` 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.0 + sameersbn/gitlab:12.0.1 ``` #### 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.0 + sameersbn/gitlab:12.0.1 ``` 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.0 + sameersbn/gitlab:12.0.1 ``` ### 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.0 + sameersbn/gitlab:12.0.1 ``` ### 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.0 + sameersbn/gitlab:12.0.1 ``` 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.0 + sameersbn/gitlab:12.0.1 ``` 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.0 + sameersbn/gitlab:12.0.1 ``` 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.0 + sameersbn/gitlab:12.0.1 ``` 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.0 + sameersbn/gitlab:12.0.1 ``` 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.0 + sameersbn/gitlab:12.0.1 ``` 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.0 + sameersbn/gitlab:12.0.1 ``` 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.0 app:sanitize + sameersbn/gitlab:12.0.1 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.0 app:rake gitlab:backup:create + sameersbn/gitlab:12.0.1 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.0 app:rake db:setup + sameersbn/gitlab:12.0.1 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.0 app:rake gitlab:backup:restore + sameersbn/gitlab:12.0.1 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.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.0.1 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.0 app:rake gitlab:env:info + sameersbn/gitlab:12.0.1 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.0 app:rake gitlab:import:repos + sameersbn/gitlab:12.0.1 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.0 app:rake gitlab:import:repos + sameersbn/gitlab:12.0.1 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.0` 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.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:12.0.0 +docker pull sameersbn/gitlab:12.0.1 ``` - **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.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.0.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 4044f908..b700dc1d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.0.0 +12.0.1 diff --git a/docker-compose.yml b/docker-compose.yml index ddabe537..81944e0a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.0.0 + image: sameersbn/gitlab:12.0.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ff4a4b2f..8f3a4f6e 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.0 app:rake gitlab:backup:create + sameersbn/gitlab:12.0.1 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.0 app:rake gitlab:backup:restore + sameersbn/gitlab:12.0.1 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.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.0.1 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.0 +docker pull sameersbn/gitlab:12.0.1 ``` - **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.0 +sameersbn/gitlab:12.0.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index da7e7015..757a46d4 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.0 + image: sameersbn/gitlab:12.0.1 env: - name: TZ value: Asia/Kolkata From 970e0d60dff56fecae5acbdd8e3db0148c1c6a60 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 23 Jul 2019 12:02:37 +0200 Subject: [PATCH 401/508] release 12.0.1 From cdf4d8dd7a475a24f6fa460cf303327d5deb51b6 Mon Sep 17 00:00:00 2001 From: Patrick Oberdorf Date: Sun, 7 Jul 2019 18:03:20 +0200 Subject: [PATCH 402/508] 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 From 4bc69212fadda96cf8dce263b89cdcb9650403ed Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 24 Jul 2019 12:50:44 +0200 Subject: [PATCH 403/508] release 12.0.2 From 33bf60d6679db824ab9975e31b3d4373887540f6 Mon Sep 17 00:00:00 2001 From: Patrick Oberdorf Date: Sun, 7 Jul 2019 18:05:38 +0200 Subject: [PATCH 404/508] Upgrade GitLab CE to 12.0.3 --- 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 2dc66c5b..6672abfb 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.3** +- gitlab: upgrade CE to v12.0.3 + **12.0.2** - gitlab: upgrade CE to v12.0.2 diff --git a/Dockerfile b/Dockerfile index 068b263e..313c275b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.0.2 +ARG VERSION=12.0.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index acb23b21..210b8de6 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.2 +# sameersbn/gitlab:12.0.3 - [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.2 +docker pull sameersbn/gitlab:12.0.3 ``` 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.2 + sameersbn/gitlab:12.0.3 ``` *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.2 + sameersbn/gitlab:12.0.3 ``` ## 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.2 + sameersbn/gitlab:12.0.3 ``` #### 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.2 + sameersbn/gitlab:12.0.3 ``` 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.2 + sameersbn/gitlab:12.0.3 ``` #### 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.2 + sameersbn/gitlab:12.0.3 ``` 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.2 + sameersbn/gitlab:12.0.3 ``` ### 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.2 + sameersbn/gitlab:12.0.3 ``` ### 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.2 + sameersbn/gitlab:12.0.3 ``` 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.2 + sameersbn/gitlab:12.0.3 ``` 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.2 + sameersbn/gitlab:12.0.3 ``` 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.2 + sameersbn/gitlab:12.0.3 ``` 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.2 + sameersbn/gitlab:12.0.3 ``` 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.2 + sameersbn/gitlab:12.0.3 ``` 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.2 + sameersbn/gitlab:12.0.3 ``` 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.2 app:sanitize + sameersbn/gitlab:12.0.3 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.2 app:rake gitlab:backup:create + sameersbn/gitlab:12.0.3 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.2 app:rake db:setup + sameersbn/gitlab:12.0.3 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.2 app:rake gitlab:backup:restore + sameersbn/gitlab:12.0.3 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.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.0.3 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.2 app:rake gitlab:env:info + sameersbn/gitlab:12.0.3 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.2 app:rake gitlab:import:repos + sameersbn/gitlab:12.0.3 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.2 app:rake gitlab:import:repos + sameersbn/gitlab:12.0.3 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.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. +> Upgrading to `sameersbn/gitlab:12.0.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:12.0.2 +docker pull sameersbn/gitlab:12.0.3 ``` - **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.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.0.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index f36e00ab..470ce40f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.0.2 +12.0.3 diff --git a/docker-compose.yml b/docker-compose.yml index 2da0a9b8..ef332da9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.0.2 + image: sameersbn/gitlab:12.0.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ccd13859..60090f65 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.2 app:rake gitlab:backup:create + sameersbn/gitlab:12.0.3 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.2 app:rake gitlab:backup:restore + sameersbn/gitlab:12.0.3 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.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.0.3 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.2 +docker pull sameersbn/gitlab:12.0.3 ``` - **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.2 +sameersbn/gitlab:12.0.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index c6864038..ef5afe7e 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.2 + image: sameersbn/gitlab:12.0.3 env: - name: TZ value: Asia/Kolkata From c705567a80d5b184c3a995a395497905bb436246 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 24 Jul 2019 13:29:48 +0200 Subject: [PATCH 405/508] release 12.0.3 From c9a85fe385f5fc5d8cd53d30b2374276f046e932 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 30 Jul 2019 07:52:12 +0200 Subject: [PATCH 406/508] Upgrade GitLab CE to 12.0.4 --- 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 6672abfb..81de3900 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.4** +- gitlab: upgrade CE to v12.0.4 + **12.0.3** - gitlab: upgrade CE to v12.0.3 diff --git a/Dockerfile b/Dockerfile index 313c275b..c46ce982 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.0.3 +ARG VERSION=12.0.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index 210b8de6..121d38ee 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.3 +# sameersbn/gitlab:12.0.4 - [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.3 +docker pull sameersbn/gitlab:12.0.4 ``` 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.3 + sameersbn/gitlab:12.0.4 ``` *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.3 + sameersbn/gitlab:12.0.4 ``` ## 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.3 + sameersbn/gitlab:12.0.4 ``` #### 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.3 + sameersbn/gitlab:12.0.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: @@ -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.3 + sameersbn/gitlab:12.0.4 ``` #### 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.3 + sameersbn/gitlab:12.0.4 ``` 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.3 + sameersbn/gitlab:12.0.4 ``` ### 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.3 + sameersbn/gitlab:12.0.4 ``` ### 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.3 + sameersbn/gitlab:12.0.4 ``` 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.3 + sameersbn/gitlab:12.0.4 ``` 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.3 + sameersbn/gitlab:12.0.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. @@ -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.3 + sameersbn/gitlab:12.0.4 ``` 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.3 + sameersbn/gitlab:12.0.4 ``` 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.3 + sameersbn/gitlab:12.0.4 ``` 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.3 + sameersbn/gitlab:12.0.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:12.0.3 app:sanitize + sameersbn/gitlab:12.0.4 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.3 app:rake gitlab:backup:create + sameersbn/gitlab:12.0.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. @@ -1223,14 +1223,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.0.3 app:rake db:setup + sameersbn/gitlab:12.0.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:12.0.3 app:rake gitlab:backup:restore + sameersbn/gitlab:12.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. @@ -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.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.0.4 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.3 app:rake gitlab:env:info + sameersbn/gitlab:12.0.4 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.3 app:rake gitlab:import:repos + sameersbn/gitlab:12.0.4 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.3 app:rake gitlab:import:repos + sameersbn/gitlab:12.0.4 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.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:12.0.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:12.0.3 +docker pull sameersbn/gitlab:12.0.4 ``` - **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.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.0.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index 470ce40f..f0ad7925 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.0.3 +12.0.4 diff --git a/docker-compose.yml b/docker-compose.yml index ef332da9..9c2a28f4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.0.3 + image: sameersbn/gitlab:12.0.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 60090f65..d6032998 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.3 app:rake gitlab:backup:create + sameersbn/gitlab:12.0.4 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.3 app:rake gitlab:backup:restore + sameersbn/gitlab:12.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. @@ -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.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.0.4 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.3 +docker pull sameersbn/gitlab:12.0.4 ``` - **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.3 +sameersbn/gitlab:12.0.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index ef5afe7e..bf828890 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.3 + image: sameersbn/gitlab:12.0.4 env: - name: TZ value: Asia/Kolkata From 9ffc775ab9a77356e84e5c09eb2ee9ad3fb5443a Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 11 Aug 2019 11:19:23 +0200 Subject: [PATCH 407/508] release 12.0.4 From 75e025ed2af723d00f11f855c89e2ee03d2ae038 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 24 Jul 2019 13:00:25 +0200 Subject: [PATCH 408/508] Upgrade GitLab CE to 12.1.0 --- 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 81de3900..227ad1ca 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.1.0** +- gitlab: upgrade CE to v12.1.0 + **12.0.4** - gitlab: upgrade CE to v12.0.4 diff --git a/Dockerfile b/Dockerfile index c46ce982..7f51740f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190222 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.0.4 +ARG VERSION=12.1.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index 121d38ee..0be7a5ce 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.4 +# sameersbn/gitlab:12.1.0 - [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.4 +docker pull sameersbn/gitlab:12.1.0 ``` 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.4 + sameersbn/gitlab:12.1.0 ``` *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.4 + sameersbn/gitlab:12.1.0 ``` ## 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.4 + sameersbn/gitlab:12.1.0 ``` #### 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.4 + sameersbn/gitlab:12.1.0 ``` 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.4 + sameersbn/gitlab:12.1.0 ``` #### 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.4 + sameersbn/gitlab:12.1.0 ``` 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.4 + sameersbn/gitlab:12.1.0 ``` ### 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.4 + sameersbn/gitlab:12.1.0 ``` ### 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.4 + sameersbn/gitlab:12.1.0 ``` 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.4 + sameersbn/gitlab:12.1.0 ``` 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.4 + sameersbn/gitlab:12.1.0 ``` 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.4 + sameersbn/gitlab:12.1.0 ``` 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.4 + sameersbn/gitlab:12.1.0 ``` 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.4 + sameersbn/gitlab:12.1.0 ``` 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.4 + sameersbn/gitlab:12.1.0 ``` 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.4 app:sanitize + sameersbn/gitlab:12.1.0 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.4 app:rake gitlab:backup:create + sameersbn/gitlab:12.1.0 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.4 app:rake db:setup + sameersbn/gitlab:12.1.0 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.4 app:rake gitlab:backup:restore + sameersbn/gitlab:12.1.0 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.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.1.0 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.4 app:rake gitlab:env:info + sameersbn/gitlab:12.1.0 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.4 app:rake gitlab:import:repos + sameersbn/gitlab:12.1.0 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.4 app:rake gitlab:import:repos + sameersbn/gitlab:12.1.0 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.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. +> Upgrading to `sameersbn/gitlab:12.1.0` 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.4 +docker pull sameersbn/gitlab:12.1.0 ``` - **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.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.1.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index f0ad7925..77903b35 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.0.4 +12.1.0 diff --git a/docker-compose.yml b/docker-compose.yml index 9c2a28f4..7222e10f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.0.4 + image: sameersbn/gitlab:12.1.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index d6032998..46088db1 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.4 app:rake gitlab:backup:create + sameersbn/gitlab:12.1.0 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.4 app:rake gitlab:backup:restore + sameersbn/gitlab:12.1.0 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.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.1.0 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.4 +docker pull sameersbn/gitlab:12.1.0 ``` - **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.4 +sameersbn/gitlab:12.1.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index bf828890..780fc591 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.4 + image: sameersbn/gitlab:12.1.0 env: - name: TZ value: Asia/Kolkata From 7a82fd25ce311b0855921c035cee37cfa4e74a3c Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 24 Jul 2019 13:01:06 +0200 Subject: [PATCH 409/508] Update gitlab-pages to 1.7.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7f51740f..114246df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.12.6 \ GITLAB_SHELL_VERSION=9.3.0 \ GITLAB_WORKHORSE_VERSION=8.7.0 \ - GITLAB_PAGES_VERSION=1.6.1 \ + GITLAB_PAGES_VERSION=1.7.0 \ GITALY_SERVER_VERSION=1.47.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ From 7d2116f5569872f9ccfd96e2a51d3f830abfaa25 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 24 Jul 2019 13:01:06 +0200 Subject: [PATCH 410/508] Update gitaly to 1.53.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 114246df..ed42b9a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=9.3.0 \ GITLAB_WORKHORSE_VERSION=8.7.0 \ GITLAB_PAGES_VERSION=1.7.0 \ - GITALY_SERVER_VERSION=1.47.0 \ + GITALY_SERVER_VERSION=1.53.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 1a22748ea22f3070d8b446610e4110935400d203 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 11 Aug 2019 11:06:26 +0200 Subject: [PATCH 411/508] Remove MySQL Support for Versions > 12.1 --- Changelog.md | 1 + Dockerfile | 6 +- README.md | 114 +----------------- assets/build/install.sh | 6 +- assets/runtime/config/gitlabhq/database.yml | 4 +- assets/runtime/env-defaults | 3 +- assets/runtime/functions | 122 +++++--------------- 7 files changed, 47 insertions(+), 209 deletions(-) diff --git a/Changelog.md b/Changelog.md index 227ad1ca..601fe96c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **12.1.0** - gitlab: upgrade CE to v12.1.0 +- Removed MySQL related information and packages. GitLab v12.1.X or greater requires only PostgreSQL. Do an Migration before upgrading to v12.1.X. For more Information have a look at the [Migration Guide](https://docs.gitlab.com/ce/update/mysql_to_postgresql.html) **12.0.4** - gitlab: upgrade CE to v12.0.4 diff --git a/Dockerfile b/Dockerfile index ed42b9a3..dd74bc37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:xenial-20190222 +FROM ubuntu:xenial-20190720 ARG BUILD_DATE ARG VCS_REF @@ -43,9 +43,9 @@ RUN apt-get update \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ sudo supervisor logrotate locales curl \ - nginx openssh-server mysql-client postgresql-client redis-tools \ + nginx openssh-server postgresql-client-10 redis-tools \ git-core gnupg2 ruby${RUBY_VERSION} python3 python3-docutils nodejs yarn gettext-base \ - libmysqlclient20 libpq5 zlib1g libyaml-0-2 libssl1.0.0 \ + libpq5 zlib1g libyaml-0-2 libssl1.0.0 \ libgdbm3 libreadline6 libncurses5 libffi6 \ libxml2 libxslt1.1 libcurl3 libicu55 libre2-dev tzdata unzip libimage-exiftool-perl \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ diff --git a/README.md b/README.md index 0be7a5ce..f900f08b 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,6 @@ - [PostgreSQL (Recommended)](#postgresql) - [External PostgreSQL Server](#external-postgresql-server) - [Linking to PostgreSQL Container](#linking-to-postgresql-container) - - [MySQL](#mysql) - - [Internal MySQL Server](#internal-mysql-server) - - [External MySQL Server](#external-mysql-server) - - [Linking to MySQL Container](#linking-to-mysql-container) - [Redis](#redis) - [Internal Redis Server](#internal-redis-server) - [External Redis Server](#external-redis-server) @@ -237,9 +233,9 @@ docker run --name gitlab -d \ ## Database -GitLab uses a database backend to store its data. You can configure this image to use either MySQL or PostgreSQL. +GitLab uses a database backend to store its data. You can configure this image to use PostgreSQL. -*Note: GitLab HQ recommends using PostgreSQL over MySQL* +*Note: GitLab requieres PostgreSQL now. So use an older image < 12.1 or migrate to PostgresSQL* ### PostgreSQL @@ -261,7 +257,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d \ - --env 'DB_ADAPTER=postgresql' --env 'DB_HOST=192.168.1.100' \ + --env 'DB_HOST=192.168.1.100' \ --env 'DB_NAME=gitlabhq_production' \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ @@ -272,7 +268,7 @@ docker run --name gitlab -d \ You can link this image with a postgresql container for the database requirements. The alias of the postgresql server container should be set to **postgresql** while linking with the gitlab image. -If a postgresql container is linked, only the `DB_ADAPTER`, `DB_HOST` and `DB_PORT` settings are automatically retrieved using the linkage. You may still need to set other database connection parameters such as the `DB_NAME`, `DB_USER`, `DB_PASS` and so on. +If a postgresql container is linked, only the `DB_HOST` and `DB_PORT` settings are automatically retrieved using the linkage. You may still need to set other database connection parameters such as the `DB_NAME`, `DB_USER`, `DB_PASS` and so on. To illustrate linking with a postgresql container, we will use the [sameersbn/postgresql](https://github.com/sameersbn/docker-postgresql) image. When using postgresql image in production you should mount a volume for the postgresql data store. Please refer the [README](https://github.com/sameersbn/docker-postgresql/blob/master/README.md) of docker-postgresql for details. @@ -319,103 +315,6 @@ Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PA - [orchardup/postgresql](https://hub.docker.com/r/orchardup/postgresql/) - [paintedfox/postgresql](https://hub.docker.com/r/paintedfox/postgresql/) -### MySQL - -#### Internal MySQL Server - -The internal mysql server has been removed from the image. Please use a [linked mysql](#linking-to-mysql-container) container or specify a connection to a [external mysql](#external-mysql-server) server. - -If you have been using the internal mysql server follow these instructions to migrate to a linked mysql container: - -Assuming that your mysql data is available at `/srv/docker/gitlab/mysql` - -```bash -docker run --name gitlab-mysql -d \ - --volume /srv/docker/gitlab/mysql:/var/lib/mysql \ - sameersbn/mysql:5.7.26-0 -``` - -This will start a mysql container with your existing mysql data. Now login to the mysql container and create a user for the existing `gitlabhq_production` database. - -All you need to do now is link this mysql container to the gitlab ci container using the `--link gitlab-mysql:mysql` option and provide the `DB_NAME`, `DB_USER` and `DB_PASS` parameters. - -Refer to [Linking to MySQL Container](#linking-to-mysql-container) for more information. - -#### External MySQL Server - -The image can be configured to use an external MySQL database. The database configuration should be specified using environment variables while starting the GitLab image. - -Before you start the GitLab image create user and database for gitlab. - -```sql -CREATE USER 'gitlab'@'%.%.%.%' IDENTIFIED BY 'password'; -CREATE DATABASE IF NOT EXISTS `gitlabhq_production` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`; -GRANT ALL PRIVILEGES ON `gitlabhq_production`.* TO 'gitlab'@'%.%.%.%'; -``` - -We are now ready to start the GitLab application. - -*Assuming that the mysql server host is 192.168.1.100* - -```bash -docker run --name gitlab -d \ - --env 'DB_ADAPTER=mysql2' --env 'DB_HOST=192.168.1.100' \ - --env 'DB_NAME=gitlabhq_production' \ - --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ - --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:12.1.0 -``` - -#### Linking to MySQL Container - -You can link this image with a mysql container for the database requirements. The alias of the mysql server container should be set to **mysql** while linking with the gitlab image. - -If a mysql container is linked, only the `DB_ADAPTER`, `DB_HOST` and `DB_PORT` settings are automatically retrieved using the linkage. You may still need to set other database connection parameters such as the `DB_NAME`, `DB_USER`, `DB_PASS` and so on. - -To illustrate linking with a mysql container, we will use the [sameersbn/mysql](https://github.com/sameersbn/docker-mysql) image. When using docker-mysql in production you should mount a volume for the mysql data store. Please refer the [README](https://github.com/sameersbn/docker-mysql/blob/master/README.md) of docker-mysql for details. - -First, lets pull the mysql image from the docker index. - -```bash -docker pull sameersbn/mysql:5.7.26-0 -``` - -For data persistence lets create a store for the mysql and start the container. - -SELinux users are also required to change the security context of the mount point so that it plays nicely with selinux. - -```bash -mkdir -p /srv/docker/gitlab/mysql -sudo chcon -Rt svirt_sandbox_file_t /srv/docker/gitlab/mysql -``` - -The run command looks like this. - -```bash -docker run --name gitlab-mysql -d \ - --env 'DB_NAME=gitlabhq_production' \ - --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ - --volume /srv/docker/gitlab/mysql:/var/lib/mysql \ - sameersbn/mysql:5.7.26-0 -``` - -The above command will create a database named `gitlabhq_production` and also create a user named `gitlab` with the password `password` with full/remote access to the `gitlabhq_production` database. - -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.1.0 -``` - -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: - - - [mysql](https://hub.docker.com/_/mysql/) - - [sameersbn/mysql](https://quay.io/repository/sameersbn/mysql/) - - [centurylink/mysql](https://hub.docker.com/r/centurylink/mysql/) - - [orchardup/mysql](https://hub.docker.com/r/orchardup/mysql/) - ## Redis GitLab uses the redis server for its key-value data store. The redis server connection details can be specified using environment variables. @@ -1024,9 +923,8 @@ Below is the complete list of available options that can be used to customize yo | `SIDEKIQ_SHUTDOWN_TIMEOUT` | Timeout for sidekiq shutdown. Defaults to `4` | | `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | Non-zero value enables the SidekiqMemoryKiller. Defaults to `1000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html) | | `GITLAB_SIDEKIQ_LOG_FORMAT` | Sidekiq log format that will be used. Defaults to `default` | -| `DB_ADAPTER` | The database type. Possible values: `mysql2`, `postgresql`. Defaults to `postgresql`. | -| `DB_ENCODING` | The database encoding. For `DB_ADAPTER` values `postresql` and `mysql2`, this parameter defaults to `unicode` and `utf8` respectively. | -| `DB_COLLATION` | The database collation. Defaults to `utf8_general_ci` for `DB_ADAPTER` `mysql2`. This parameter is not supported for `DB_ADAPTER` `postresql` and will be removed. | +| `DB_ADAPTER` | The database type. Currently only postgresql is supported. Over 12.1 postgres force. Possible values: `postgresql`. Defaults to `postgresql`. | +| `DB_ENCODING` | The database encoding. For `DB_ADAPTER` values `postresql` this parameter defaults and `utf8` respectively. | | `DB_HOST` | The database server hostname. Defaults to `localhost`. | | `DB_PORT` | The database server port. Defaults to `3306` for mysql and `5432` for postgresql. | | `DB_NAME` | The database database name. Defaults to `gitlabhq_production` | diff --git a/assets/build/install.sh b/assets/build/install.sh index ab96d6ee..a6ca7941 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -20,7 +20,7 @@ export GOROOT PATH BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \ libc6-dev ruby${RUBY_VERSION}-dev \ - libmysqlclient-dev libpq-dev zlib1g-dev libyaml-dev libssl-dev \ + libpq-dev zlib1g-dev libyaml-dev libssl-dev \ libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \ libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev \ gettext libkrb5-dev" @@ -153,7 +153,7 @@ if [[ -d ${GEM_CACHE_DIR} ]]; then chown -R ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/vendor/cache fi -exec_as_git bundle install -j"$(nproc)" --deployment --without development test aws +exec_as_git bundle install -j"$(nproc)" --deployment --without development test mysql aws # make sure everything in ${GITLAB_HOME} is owned by ${GITLAB_USER} user chown -R ${GITLAB_USER}: ${GITLAB_HOME} @@ -161,7 +161,7 @@ chown -R ${GITLAB_USER}: ${GITLAB_HOME} # gitlab.yml and database.yml are required for `assets:precompile` exec_as_git cp ${GITLAB_INSTALL_DIR}/config/resque.yml.example ${GITLAB_INSTALL_DIR}/config/resque.yml exec_as_git cp ${GITLAB_INSTALL_DIR}/config/gitlab.yml.example ${GITLAB_INSTALL_DIR}/config/gitlab.yml -exec_as_git cp ${GITLAB_INSTALL_DIR}/config/database.yml.mysql ${GITLAB_INSTALL_DIR}/config/database.yml +exec_as_git cp ${GITLAB_INSTALL_DIR}/config/database.yml.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml # Installs nodejs packages required to compile webpack exec_as_git yarn install --production --pure-lockfile diff --git a/assets/runtime/config/gitlabhq/database.yml b/assets/runtime/config/gitlabhq/database.yml index 9cfd8037..f7845428 100644 --- a/assets/runtime/config/gitlabhq/database.yml +++ b/assets/runtime/config/gitlabhq/database.yml @@ -2,10 +2,8 @@ # PRODUCTION # production: - adapter: {{DB_ADAPTER}} + adapter: postgresql encoding: {{DB_ENCODING}} - collation: {{DB_COLLATION}} - reconnect: false database: {{DB_NAME}} host: {{DB_HOST}} port: {{DB_PORT}} diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 0834090d..929e7779 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -35,7 +35,7 @@ NGINX_HSTS_MAXAGE=${NGINX_HSTS_MAXAGE:-$GITLAB_HTTPS_HSTS_MAXAGE} # backward com NGINX_HSTS_MAXAGE=${NGINX_HSTS_MAXAGE:-31536000} ## DATABASE -DB_ADAPTER=${DB_ADAPTER:-} +DB_ADAPTER=${DB_ADAPTER:-postgresql} DB_ENCODING=${DB_ENCODING:-} DB_COLLATION=${DB_COLLATION:-} DB_HOST=${DB_HOST:-} @@ -47,7 +47,6 @@ DB_POOL=${DB_POOL:-10} # backward compatibility case ${DB_TYPE} in - mysql) DB_ADAPTER=${DB_ADAPTER:-mysql2} ;; postgres) DB_ADAPTER=${DB_ADAPTER:-postgresql} ;; esac diff --git a/assets/runtime/functions b/assets/runtime/functions index 6c3b4283..c8338947 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -102,47 +102,30 @@ gitlab_finalize_database_parameters() { # is a mysql or postgresql database linked? # requires that the mysql or postgresql containers have exposed # port 3306 and 5432 respectively. - if [[ -n ${MYSQL_PORT_3306_TCP_ADDR} ]]; then - DB_ADAPTER=${DB_ADAPTER:-mysql2} - DB_HOST=${DB_HOST:-${MYSQL_PORT_3306_TCP_ADDR}} - DB_PORT=${DB_PORT:-${MYSQL_PORT_3306_TCP_PORT}} + DB_HOST=${DB_HOST:-${POSTGRESQL_PORT_5432_TCP_ADDR}} + DB_PORT=${DB_PORT:-${POSTGRESQL_PORT_5432_TCP_PORT}} - # support for linked sameersbn/mysql image - DB_USER=${DB_USER:-${MYSQL_ENV_DB_USER}} - DB_PASS=${DB_PASS:-${MYSQL_ENV_DB_PASS}} - DB_NAME=${DB_NAME:-${MYSQL_ENV_DB_NAME}} + # support for linked official postgres image + DB_USER=${DB_USER:-${POSTGRESQL_ENV_POSTGRES_USER}} + DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_POSTGRES_PASSWORD}} + DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_POSTGRES_DB}} + DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_POSTGRES_USER}} - # support for linked orchardup/mysql and enturylink/mysql image - # also supports official mysql image - DB_USER=${DB_USER:-${MYSQL_ENV_MYSQL_USER}} - DB_PASS=${DB_PASS:-${MYSQL_ENV_MYSQL_PASSWORD}} - DB_NAME=${DB_NAME:-${MYSQL_ENV_MYSQL_DATABASE}} - elif [[ -n ${POSTGRESQL_PORT_5432_TCP_ADDR} ]]; then - DB_ADAPTER=${DB_ADAPTER:-postgresql} - DB_HOST=${DB_HOST:-${POSTGRESQL_PORT_5432_TCP_ADDR}} - DB_PORT=${DB_PORT:-${POSTGRESQL_PORT_5432_TCP_PORT}} + # support for linked sameersbn/postgresql image + DB_USER=${DB_USER:-${POSTGRESQL_ENV_DB_USER}} + DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_DB_PASS}} + DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_DB_NAME}} - # support for linked official postgres image - DB_USER=${DB_USER:-${POSTGRESQL_ENV_POSTGRES_USER}} - DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_POSTGRES_PASSWORD}} - DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_POSTGRES_DB}} - DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_POSTGRES_USER}} + # support for linked orchardup/postgresql image + DB_USER=${DB_USER:-${POSTGRESQL_ENV_POSTGRESQL_USER}} + DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_POSTGRESQL_PASS}} + DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_POSTGRESQL_DB}} - # support for linked sameersbn/postgresql image - DB_USER=${DB_USER:-${POSTGRESQL_ENV_DB_USER}} - DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_DB_PASS}} - DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_DB_NAME}} - - # support for linked orchardup/postgresql image - DB_USER=${DB_USER:-${POSTGRESQL_ENV_POSTGRESQL_USER}} - DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_POSTGRESQL_PASS}} - DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_POSTGRESQL_DB}} - - # support for linked paintedfox/postgresql image - DB_USER=${DB_USER:-${POSTGRESQL_ENV_USER}} - DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_PASS}} - DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_DB}} - fi + # support for linked paintedfox/postgresql image + DB_USER=${DB_USER:-${POSTGRESQL_ENV_USER}} + DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_PASS}} + DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_DB}} + if [[ -z ${DB_HOST} ]]; then echo @@ -155,27 +138,11 @@ gitlab_finalize_database_parameters() { fi # set default port number if not specified - DB_ADAPTER=${DB_ADAPTER:-postgresql} - case ${DB_ADAPTER} in - mysql2) - DB_ENCODING=${DB_ENCODING:-utf8} - DB_COLLATION=${DB_COLLATION:-utf8_general_ci} - DB_PORT=${DB_PORT:-3306} - ;; - postgresql) - DB_ENCODING=${DB_ENCODING:-unicode} - # DB_COLLATION: Not supported for postgresql and will be removed below. - DB_PORT=${DB_PORT:-5432} - ;; - *) - echo - echo "ERROR: " - echo " Please specify the database type in use via the DB_ADAPTER configuration option." - echo " Accepted values are \"postgresql\" or \"mysql2\". Aborting..." - echo - return 1 - ;; - esac + + DB_ENCODING=${DB_ENCODING:-unicode} + # DB_COLLATION: Not supported for postgresql and will be removed below. + DB_PORT=${DB_PORT:-5432} + # set default user and database DB_USER=${DB_USER:-root} @@ -183,15 +150,10 @@ gitlab_finalize_database_parameters() { } gitlab_check_database_connection() { - case ${DB_ADAPTER} in - mysql2) - prog="mysqladmin -h ${DB_HOST} -P ${DB_PORT} -u ${DB_USER} ${DB_PASS:+-p$DB_PASS} status" - ;; - postgresql) - prog=$(find /usr/lib/postgresql/ -name pg_isready) - prog="${prog} -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER} -d ${DB_NAME} -t 1" - ;; - esac + + prog=$(find /usr/lib/postgresql/ -name pg_isready) + prog="${prog} -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER} -d ${DB_NAME} -t 1" + timeout=60 while ! ${prog} >/dev/null 2>&1 do @@ -214,22 +176,13 @@ gitlab_configure_database() { gitlab_check_database_connection update_template ${GITLAB_DATABASE_CONFIG} \ - DB_ADAPTER \ DB_ENCODING \ - DB_COLLATION \ DB_HOST \ DB_PORT \ DB_NAME \ DB_USER \ DB_PASS \ DB_POOL - - if [[ ${DB_ADAPTER} == postgresql ]]; then - exec_as_git sed -i \ - -e "/reconnect: /d" \ - -e "/collation: /d" \ - ${GITLAB_DATABASE_CONFIG} - fi } gitlab_finalize_redis_parameters() { @@ -1724,16 +1677,9 @@ configure_nginx() { migrate_database() { # run the `gitlab:setup` rake task if required - case ${DB_ADAPTER} in - mysql2) - QUERY="SELECT count(*) FROM information_schema.tables WHERE table_schema = '${DB_NAME}';" - COUNT=$(mysql -h ${DB_HOST} -P ${DB_PORT} -u ${DB_USER} ${DB_PASS:+-p$DB_PASS} -ss -e "${QUERY}") - ;; - postgresql) - QUERY="SELECT count(*) FROM information_schema.tables WHERE table_schema = 'public';" - COUNT=$(PGPASSWORD="${DB_PASS}" psql -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER} -d ${DB_NAME} -Atw -c "${QUERY}") - ;; - esac + QUERY="SELECT count(*) FROM information_schema.tables WHERE table_schema = 'public';" + COUNT=$(PGPASSWORD="${DB_PASS}" psql -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER} -d ${DB_NAME} -Atw -c "${QUERY}") + if [[ -z ${COUNT} || ${COUNT} -eq 0 ]]; then echo "Setting up GitLab for firstrun. Please be patient, this could take a while..." @@ -1773,10 +1719,6 @@ migrate_database() { echo "Migrating database..." exec_as_git bundle exec rake db:migrate >/dev/null - if [[ ${DB_ADAPTER} == mysql2 ]]; then - exec_as_git bundle exec rake add_limits_mysql >/dev/null - fi - echo "${GITLAB_VERSION}" > ${GITLAB_TEMP_DIR}/VERSION rm -rf ${GITLAB_TEMP_DIR}/GITLAB_RELATIVE_URL_ROOT # force cache cleanup fi From e209ba3bf4763fb4cf3498c1b713c6f608e7b644 Mon Sep 17 00:00:00 2001 From: Nontawat Numor Date: Thu, 8 Aug 2019 17:47:26 +0700 Subject: [PATCH 412/508] Update wrong config README.md Ref to file ./assets/runtime/env-defaults ## Cron Jobs GITLAB_PIPELINE_SCHEDULE_WORKER_CRON=${GITLAB_PIPELINE_SCHEDULE_WORKER_CRON:-"19 * * * *"} --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f900f08b..6366b3f6 100644 --- a/README.md +++ b/README.md @@ -819,7 +819,7 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION`| Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`)| -| `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON` | Cron notation for the GitLab pipeline schedule worker. Defaults to `'0 */12 * * *'` | +| `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON` | Cron notation for the GitLab pipeline schedule worker. Defaults to `'19 * * * *'` | | `GITLAB_LFS_ENABLED` | Enable/Disable Git LFS support. Defaults to `true`. | | `GITLAB_LFS_OBJECTS_DIR` | Directory to store the lfs-objects. Defaults to `$GITLAB_SHARED_DIR/lfs-objects` | | `GITLAB_LFS_OBJECT_STORE_ENABLED` | Enables Object Store for LFS that will be remote stored. Defaults to `false` | From 7c96eeea583eda9421fc2273909a9c6d0c571046 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 11 Aug 2019 19:54:23 +0200 Subject: [PATCH 413/508] release 12.1.0 From 946bfd3d101bf3a457d8cf6f6e126b8615660460 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 12 Aug 2019 08:35:52 +0200 Subject: [PATCH 414/508] Upgrade GitLab CE to 12.1.1 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index 601fe96c..2bea2116 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.1.1** +- gitlab: upgrade CE to v12.1.1 + **12.1.0** - gitlab: upgrade CE to v12.1.0 - Removed MySQL related information and packages. GitLab v12.1.X or greater requires only PostgreSQL. Do an Migration before upgrading to v12.1.X. For more Information have a look at the [Migration Guide](https://docs.gitlab.com/ce/update/mysql_to_postgresql.html) diff --git a/Dockerfile b/Dockerfile index dd74bc37..ae10f692 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190720 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.1.0 +ARG VERSION=12.1.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index 6366b3f6..7230a231 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.1.0 +# sameersbn/gitlab:12.1.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.1.0 +docker pull sameersbn/gitlab:12.1.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.1.0 + sameersbn/gitlab:12.1.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.1.0 + sameersbn/gitlab:12.1.1 ``` ## Database @@ -261,7 +261,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.1.0 + sameersbn/gitlab:12.1.1 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.1.0 + sameersbn/gitlab:12.1.1 ``` 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: @@ -332,7 +332,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.1.0 + sameersbn/gitlab:12.1.1 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.1.0 + sameersbn/gitlab:12.1.1 ``` ### Mail @@ -372,7 +372,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.1.0 + sameersbn/gitlab:12.1.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.1.0 + sameersbn/gitlab:12.1.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.1.0 + sameersbn/gitlab:12.1.1 ``` 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. @@ -485,7 +485,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.1.0 + sameersbn/gitlab:12.1.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.1.0 + sameersbn/gitlab:12.1.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.1.0 + sameersbn/gitlab:12.1.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.1.0 + sameersbn/gitlab:12.1.1 ``` 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.1.0 app:sanitize + sameersbn/gitlab:12.1.1 app:sanitize ``` ### Piwik @@ -1086,7 +1086,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.0 app:rake gitlab:backup:create + sameersbn/gitlab:12.1.1 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. @@ -1121,14 +1121,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.0 app:rake db:setup + sameersbn/gitlab:12.1.1 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.1.0 app:rake gitlab:backup:restore + sameersbn/gitlab:12.1.1 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. @@ -1137,7 +1137,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.1.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.1.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1187,7 +1187,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.1.0 app:rake gitlab:env:info + sameersbn/gitlab:12.1.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.0 app:rake gitlab:import:repos + sameersbn/gitlab:12.1.1 app:rake gitlab:import:repos ``` Or @@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.0 app:rake gitlab:import:repos + sameersbn/gitlab:12.1.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.1.0` 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.1.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:12.1.0 +docker pull sameersbn/gitlab:12.1.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1284,7 +1284,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.1.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.1.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 77903b35..a5545292 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.1.0 +12.1.1 diff --git a/docker-compose.yml b/docker-compose.yml index 7222e10f..3baa7529 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.1.0 + image: sameersbn/gitlab:12.1.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 46088db1..0709aba5 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.1.0 app:rake gitlab:backup:create + sameersbn/gitlab:12.1.1 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.1.0 app:rake gitlab:backup:restore + sameersbn/gitlab:12.1.1 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.1.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.1.1 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.1.0 +docker pull sameersbn/gitlab:12.1.1 ``` - **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.1.0 +sameersbn/gitlab:12.1.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 780fc591..fc2035a7 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.1.0 + image: sameersbn/gitlab:12.1.1 env: - name: TZ value: Asia/Kolkata From 0a65c2a66f90cbba3ee71ff4e688d2813aebf79a Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 12 Aug 2019 21:08:37 +0200 Subject: [PATCH 415/508] release 12.1.1 From 9397ffba070b20ce9ad302ec6204e82fbf5c1383 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 12 Aug 2019 08:38:39 +0200 Subject: [PATCH 416/508] Upgrade GitLab CE to 12.1.2 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index 2bea2116..f13194dc 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.1.2** +- gitlab: upgrade CE to v12.1.2 + **12.1.1** - gitlab: upgrade CE to v12.1.1 diff --git a/Dockerfile b/Dockerfile index ae10f692..30f85144 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190720 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.1.1 +ARG VERSION=12.1.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index 7230a231..bb072ec6 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.1.1 +# sameersbn/gitlab:12.1.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.1.1 +docker pull sameersbn/gitlab:12.1.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.1.1 + sameersbn/gitlab:12.1.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.1.1 + sameersbn/gitlab:12.1.2 ``` ## Database @@ -261,7 +261,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.1.1 + sameersbn/gitlab:12.1.2 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.1.1 + sameersbn/gitlab:12.1.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: @@ -332,7 +332,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.1.1 + sameersbn/gitlab:12.1.2 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.1.1 + sameersbn/gitlab:12.1.2 ``` ### Mail @@ -372,7 +372,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.1.1 + sameersbn/gitlab:12.1.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.1.1 + sameersbn/gitlab:12.1.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.1.1 + sameersbn/gitlab:12.1.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. @@ -485,7 +485,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.1.1 + sameersbn/gitlab:12.1.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.1.1 + sameersbn/gitlab:12.1.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.1.1 + sameersbn/gitlab:12.1.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.1.1 + sameersbn/gitlab:12.1.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.1.1 app:sanitize + sameersbn/gitlab:12.1.2 app:sanitize ``` ### Piwik @@ -1086,7 +1086,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.1 app:rake gitlab:backup:create + sameersbn/gitlab:12.1.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. @@ -1121,14 +1121,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.1 app:rake db:setup + sameersbn/gitlab:12.1.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.1.1 app:rake gitlab:backup:restore + sameersbn/gitlab:12.1.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. @@ -1137,7 +1137,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.1.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.1.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1187,7 +1187,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.1.1 app:rake gitlab:env:info + sameersbn/gitlab:12.1.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.1 app:rake gitlab:import:repos + sameersbn/gitlab:12.1.2 app:rake gitlab:import:repos ``` Or @@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.1 app:rake gitlab:import:repos + sameersbn/gitlab:12.1.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.1.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.1.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.1.1 +docker pull sameersbn/gitlab:12.1.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1284,7 +1284,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.1.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.1.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index a5545292..a54d1cee 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.1.1 +12.1.2 diff --git a/docker-compose.yml b/docker-compose.yml index 3baa7529..7570e11f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.1.1 + image: sameersbn/gitlab:12.1.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 0709aba5..4c48553b 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.1.1 app:rake gitlab:backup:create + sameersbn/gitlab:12.1.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.1.1 app:rake gitlab:backup:restore + sameersbn/gitlab:12.1.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.1.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.1.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.1.1 +docker pull sameersbn/gitlab:12.1.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.1.1 +sameersbn/gitlab:12.1.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index fc2035a7..3c9a8356 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.1.1 + image: sameersbn/gitlab:12.1.2 env: - name: TZ value: Asia/Kolkata From 19bad7b0f245534bc72aac3eed58f0301865e53f Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 12 Aug 2019 21:24:11 +0200 Subject: [PATCH 417/508] release 12.1.2 From d9e787616a18e8aa951f54f3f2c379a7d3ae6551 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 12 Aug 2019 08:39:43 +0200 Subject: [PATCH 418/508] Upgrade GitLab CE to 12.1.3 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index f13194dc..bd486110 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.1.3** +- gitlab: upgrade CE to v12.1.3 + **12.1.2** - gitlab: upgrade CE to v12.1.2 diff --git a/Dockerfile b/Dockerfile index 30f85144..b0f9d87c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190720 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.1.2 +ARG VERSION=12.1.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index bb072ec6..f99831a3 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.1.2 +# sameersbn/gitlab:12.1.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.1.2 +docker pull sameersbn/gitlab:12.1.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.1.2 + sameersbn/gitlab:12.1.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.1.2 + sameersbn/gitlab:12.1.3 ``` ## Database @@ -261,7 +261,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.1.2 + sameersbn/gitlab:12.1.3 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.1.2 + sameersbn/gitlab:12.1.3 ``` 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: @@ -332,7 +332,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.1.2 + sameersbn/gitlab:12.1.3 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.1.2 + sameersbn/gitlab:12.1.3 ``` ### Mail @@ -372,7 +372,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.1.2 + sameersbn/gitlab:12.1.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.1.2 + sameersbn/gitlab:12.1.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.1.2 + sameersbn/gitlab:12.1.3 ``` 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. @@ -485,7 +485,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.1.2 + sameersbn/gitlab:12.1.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.1.2 + sameersbn/gitlab:12.1.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.1.2 + sameersbn/gitlab:12.1.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.1.2 + sameersbn/gitlab:12.1.3 ``` 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.1.2 app:sanitize + sameersbn/gitlab:12.1.3 app:sanitize ``` ### Piwik @@ -1086,7 +1086,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.2 app:rake gitlab:backup:create + sameersbn/gitlab:12.1.3 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. @@ -1121,14 +1121,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.2 app:rake db:setup + sameersbn/gitlab:12.1.3 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.1.2 app:rake gitlab:backup:restore + sameersbn/gitlab:12.1.3 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. @@ -1137,7 +1137,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.1.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.1.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1187,7 +1187,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.1.2 app:rake gitlab:env:info + sameersbn/gitlab:12.1.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.2 app:rake gitlab:import:repos + sameersbn/gitlab:12.1.3 app:rake gitlab:import:repos ``` Or @@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.2 app:rake gitlab:import:repos + sameersbn/gitlab:12.1.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.1.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. +> Upgrading to `sameersbn/gitlab:12.1.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:12.1.2 +docker pull sameersbn/gitlab:12.1.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1284,7 +1284,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.1.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.1.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index a54d1cee..c7c14531 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.1.2 +12.1.3 diff --git a/docker-compose.yml b/docker-compose.yml index 7570e11f..26dd8251 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.1.2 + image: sameersbn/gitlab:12.1.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 4c48553b..39cda2b0 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.1.2 app:rake gitlab:backup:create + sameersbn/gitlab:12.1.3 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.1.2 app:rake gitlab:backup:restore + sameersbn/gitlab:12.1.3 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.1.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.1.3 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.1.2 +docker pull sameersbn/gitlab:12.1.3 ``` - **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.1.2 +sameersbn/gitlab:12.1.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 3c9a8356..f1f35d3f 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.1.2 + image: sameersbn/gitlab:12.1.3 env: - name: TZ value: Asia/Kolkata From 0cb31a93f91e1abda77993b113e3146bfc32ba6a Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 13 Aug 2019 07:05:18 +0200 Subject: [PATCH 419/508] release 12.1.3 From e11cec487bfce549e01b77a6a902a101e6b324c8 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 12 Aug 2019 08:40:53 +0200 Subject: [PATCH 420/508] Upgrade GitLab CE to 12.1.4 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index bd486110..4f5daff2 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.1.4** +- gitlab: upgrade CE to v12.1.4 + **12.1.3** - gitlab: upgrade CE to v12.1.3 diff --git a/Dockerfile b/Dockerfile index b0f9d87c..6ecf9c7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190720 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.1.3 +ARG VERSION=12.1.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index f99831a3..4a7a750c 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.1.3 +# sameersbn/gitlab:12.1.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.1.3 +docker pull sameersbn/gitlab:12.1.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.1.3 + sameersbn/gitlab:12.1.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.1.3 + sameersbn/gitlab:12.1.4 ``` ## Database @@ -261,7 +261,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.1.3 + sameersbn/gitlab:12.1.4 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.1.3 + sameersbn/gitlab:12.1.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: @@ -332,7 +332,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.1.3 + sameersbn/gitlab:12.1.4 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.1.3 + sameersbn/gitlab:12.1.4 ``` ### Mail @@ -372,7 +372,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.1.3 + sameersbn/gitlab:12.1.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.1.3 + sameersbn/gitlab:12.1.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.1.3 + sameersbn/gitlab:12.1.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. @@ -485,7 +485,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.1.3 + sameersbn/gitlab:12.1.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.1.3 + sameersbn/gitlab:12.1.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.1.3 + sameersbn/gitlab:12.1.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.1.3 + sameersbn/gitlab:12.1.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:12.1.3 app:sanitize + sameersbn/gitlab:12.1.4 app:sanitize ``` ### Piwik @@ -1086,7 +1086,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.3 app:rake gitlab:backup:create + sameersbn/gitlab:12.1.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. @@ -1121,14 +1121,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.3 app:rake db:setup + sameersbn/gitlab:12.1.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:12.1.3 app:rake gitlab:backup:restore + sameersbn/gitlab:12.1.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. @@ -1137,7 +1137,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.1.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.1.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1187,7 +1187,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.1.3 app:rake gitlab:env:info + sameersbn/gitlab:12.1.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.3 app:rake gitlab:import:repos + sameersbn/gitlab:12.1.4 app:rake gitlab:import:repos ``` Or @@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.3 app:rake gitlab:import:repos + sameersbn/gitlab:12.1.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.1.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:12.1.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:12.1.3 +docker pull sameersbn/gitlab:12.1.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1284,7 +1284,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.1.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.1.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index c7c14531..33b637b4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.1.3 +12.1.4 diff --git a/docker-compose.yml b/docker-compose.yml index 26dd8251..7cca826a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.1.3 + image: sameersbn/gitlab:12.1.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 39cda2b0..461eb334 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.1.3 app:rake gitlab:backup:create + sameersbn/gitlab:12.1.4 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.1.3 app:rake gitlab:backup:restore + sameersbn/gitlab:12.1.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. @@ -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.1.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.1.4 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.1.3 +docker pull sameersbn/gitlab:12.1.4 ``` - **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.1.3 +sameersbn/gitlab:12.1.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index f1f35d3f..d2b3701a 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.1.3 + image: sameersbn/gitlab:12.1.4 env: - name: TZ value: Asia/Kolkata From 04215cc44a1a163aea0c34195b8682a8721f12dd Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 13 Aug 2019 07:17:34 +0200 Subject: [PATCH 421/508] release 12.1.4 From 0eef0816878821098ad85818ca0518d93cced060 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 13 Aug 2019 07:21:47 +0200 Subject: [PATCH 422/508] Upgrade GitLab CE to 12.1.6 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index 4f5daff2..26499c7b 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.1.6** +- gitlab: upgrade CE to v12.1.6 + **12.1.4** - gitlab: upgrade CE to v12.1.4 diff --git a/Dockerfile b/Dockerfile index 6ecf9c7d..21cd99b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190720 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.1.4 +ARG VERSION=12.1.6 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index 4a7a750c..3a162004 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.1.4 +# sameersbn/gitlab:12.1.6 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.1.4 +docker pull sameersbn/gitlab:12.1.6 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.1.4 + sameersbn/gitlab:12.1.6 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.1.4 + sameersbn/gitlab:12.1.6 ``` ## Database @@ -261,7 +261,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.1.4 + sameersbn/gitlab:12.1.6 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.1.4 + sameersbn/gitlab:12.1.6 ``` 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: @@ -332,7 +332,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.1.4 + sameersbn/gitlab:12.1.6 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.1.4 + sameersbn/gitlab:12.1.6 ``` ### Mail @@ -372,7 +372,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.1.4 + sameersbn/gitlab:12.1.6 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.1.4 + sameersbn/gitlab:12.1.6 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.1.4 + sameersbn/gitlab:12.1.6 ``` 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. @@ -485,7 +485,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.1.4 + sameersbn/gitlab:12.1.6 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.1.4 + sameersbn/gitlab:12.1.6 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.1.4 + sameersbn/gitlab:12.1.6 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.1.4 + sameersbn/gitlab:12.1.6 ``` 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.1.4 app:sanitize + sameersbn/gitlab:12.1.6 app:sanitize ``` ### Piwik @@ -1086,7 +1086,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.4 app:rake gitlab:backup:create + sameersbn/gitlab:12.1.6 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. @@ -1121,14 +1121,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.4 app:rake db:setup + sameersbn/gitlab:12.1.6 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.1.4 app:rake gitlab:backup:restore + sameersbn/gitlab:12.1.6 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. @@ -1137,7 +1137,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.1.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.1.6 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1187,7 +1187,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.1.4 app:rake gitlab:env:info + sameersbn/gitlab:12.1.6 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.4 app:rake gitlab:import:repos + sameersbn/gitlab:12.1.6 app:rake gitlab:import:repos ``` Or @@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.4 app:rake gitlab:import:repos + sameersbn/gitlab:12.1.6 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.1.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. +> Upgrading to `sameersbn/gitlab:12.1.6` 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.1.4 +docker pull sameersbn/gitlab:12.1.6 ``` - **Step 2**: Stop and remove the currently running image @@ -1284,7 +1284,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.1.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.1.6 ``` ## Shell Access diff --git a/VERSION b/VERSION index 33b637b4..9152894c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.1.4 +12.1.6 diff --git a/docker-compose.yml b/docker-compose.yml index 7cca826a..268728b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.1.4 + image: sameersbn/gitlab:12.1.6 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 461eb334..18e75911 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.1.4 app:rake gitlab:backup:create + sameersbn/gitlab:12.1.6 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.1.4 app:rake gitlab:backup:restore + sameersbn/gitlab:12.1.6 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.1.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.1.6 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.1.4 +docker pull sameersbn/gitlab:12.1.6 ``` - **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.1.4 +sameersbn/gitlab:12.1.6 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index d2b3701a..9455aaf5 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.1.4 + image: sameersbn/gitlab:12.1.6 env: - name: TZ value: Asia/Kolkata From 2adc96656938cdf9c14aa6418907f0c0dbfe38c0 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 13 Aug 2019 07:21:59 +0200 Subject: [PATCH 423/508] Update gitlab-pages to 1.7.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 21cd99b2..3f4ea2e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.12.6 \ GITLAB_SHELL_VERSION=9.3.0 \ GITLAB_WORKHORSE_VERSION=8.7.0 \ - GITLAB_PAGES_VERSION=1.7.0 \ + GITLAB_PAGES_VERSION=1.7.1 \ GITALY_SERVER_VERSION=1.53.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ From 791adf9c96fbfea6ee64d3960121e52fe067994c Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 13 Aug 2019 07:21:59 +0200 Subject: [PATCH 424/508] Update gitaly to 1.53.2 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3f4ea2e2..c875bcde 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=9.3.0 \ GITLAB_WORKHORSE_VERSION=8.7.0 \ GITLAB_PAGES_VERSION=1.7.1 \ - GITALY_SERVER_VERSION=1.53.0 \ + GITALY_SERVER_VERSION=1.53.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From c57f92dffc039ba28d59ee4799ca6b49d23ebc36 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 13 Aug 2019 07:27:11 +0200 Subject: [PATCH 425/508] release 12.1.6 From 8f5f7f0f9d8233a7b45b7f43b764846726d0c979 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 22 Aug 2019 07:02:41 +0200 Subject: [PATCH 426/508] Upgrade GitLab CE to 12.2.0 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index 26499c7b..ce6968b5 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.2.0** +- gitlab: upgrade CE to v12.2.0 + **12.1.6** - gitlab: upgrade CE to v12.1.6 diff --git a/Dockerfile b/Dockerfile index c875bcde..c0a62f02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:xenial-20190720 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.1.6 +ARG VERSION=12.2.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index 3a162004..aaf92f33 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.1.6 +# sameersbn/gitlab:12.2.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.1.6 +docker pull sameersbn/gitlab:12.2.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.1.6 + sameersbn/gitlab:12.2.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.1.6 + sameersbn/gitlab:12.2.0 ``` ## Database @@ -261,7 +261,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.1.6 + sameersbn/gitlab:12.2.0 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.1.6 + sameersbn/gitlab:12.2.0 ``` 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: @@ -332,7 +332,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.1.6 + sameersbn/gitlab:12.2.0 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.1.6 + sameersbn/gitlab:12.2.0 ``` ### Mail @@ -372,7 +372,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.1.6 + sameersbn/gitlab:12.2.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.1.6 + sameersbn/gitlab:12.2.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.1.6 + sameersbn/gitlab:12.2.0 ``` 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. @@ -485,7 +485,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.1.6 + sameersbn/gitlab:12.2.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.1.6 + sameersbn/gitlab:12.2.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.1.6 + sameersbn/gitlab:12.2.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.1.6 + sameersbn/gitlab:12.2.0 ``` 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.1.6 app:sanitize + sameersbn/gitlab:12.2.0 app:sanitize ``` ### Piwik @@ -1086,7 +1086,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.6 app:rake gitlab:backup:create + sameersbn/gitlab:12.2.0 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. @@ -1121,14 +1121,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.6 app:rake db:setup + sameersbn/gitlab:12.2.0 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.1.6 app:rake gitlab:backup:restore + sameersbn/gitlab:12.2.0 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. @@ -1137,7 +1137,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.1.6 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.2.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1187,7 +1187,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.1.6 app:rake gitlab:env:info + sameersbn/gitlab:12.2.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.6 app:rake gitlab:import:repos + sameersbn/gitlab:12.2.0 app:rake gitlab:import:repos ``` Or @@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.1.6 app:rake gitlab:import:repos + sameersbn/gitlab:12.2.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.1.6` 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.2.0` 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.1.6 +docker pull sameersbn/gitlab:12.2.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1284,7 +1284,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.1.6 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.2.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index 9152894c..68533262 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.1.6 +12.2.0 diff --git a/docker-compose.yml b/docker-compose.yml index 268728b3..9b2b3c68 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.1.6 + image: sameersbn/gitlab:12.2.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 18e75911..a29b4ab0 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.1.6 app:rake gitlab:backup:create + sameersbn/gitlab:12.2.0 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.1.6 app:rake gitlab:backup:restore + sameersbn/gitlab:12.2.0 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.1.6 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.2.0 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.1.6 +docker pull sameersbn/gitlab:12.2.0 ``` - **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.1.6 +sameersbn/gitlab:12.2.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 9455aaf5..e67d61fb 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.1.6 + image: sameersbn/gitlab:12.2.0 env: - name: TZ value: Asia/Kolkata From e4a2f8703b362aebc0db52087a4d2e9a00625bff Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 22 Aug 2019 07:02:54 +0200 Subject: [PATCH 427/508] Update gitlab-workhorse to 8.8.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c0a62f02..d0b05bb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ GOLANG_VERSION=1.12.6 \ GITLAB_SHELL_VERSION=9.3.0 \ - GITLAB_WORKHORSE_VERSION=8.7.0 \ + GITLAB_WORKHORSE_VERSION=8.8.0 \ GITLAB_PAGES_VERSION=1.7.1 \ GITALY_SERVER_VERSION=1.53.2 \ GITLAB_USER="git" \ From 888bf5e4f21131a2827d827c9279cdb576da938d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 22 Aug 2019 07:02:55 +0200 Subject: [PATCH 428/508] Update gitaly to 1.59.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d0b05bb7..4734210a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=9.3.0 \ GITLAB_WORKHORSE_VERSION=8.8.0 \ GITLAB_PAGES_VERSION=1.7.1 \ - GITALY_SERVER_VERSION=1.53.2 \ + GITALY_SERVER_VERSION=1.59.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 33d97605d670dbbd55b43da077c1f090ec26be97 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 22 Aug 2019 07:48:38 +0200 Subject: [PATCH 429/508] Upgrade base-image to ubuntu:bionic --- Dockerfile | 28 +++++++++++++++------------- assets/build/install.sh | 4 ++-- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4734210a..f01e8625 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:xenial-20190720 +FROM ubuntu:bionic-20190807 ARG BUILD_DATE ARG VCS_REF @@ -6,7 +6,7 @@ ARG VERSION=12.2.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ - GOLANG_VERSION=1.12.6 \ + GOLANG_VERSION=1.12.9 \ GITLAB_SHELL_VERSION=9.3.0 \ GITLAB_WORKHORSE_VERSION=8.8.0 \ GITLAB_PAGES_VERSION=1.7.1 \ @@ -27,27 +27,29 @@ ENV GITLAB_INSTALL_DIR="${GITLAB_HOME}/gitlab" \ RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ - wget ca-certificates apt-transport-https \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \ - && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu xenial main" >> /etc/apt/sources.list \ + wget ca-certificates apt-transport-https gnupg2 +RUN set -ex && \ + apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \ + && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu bionic main" >> /etc/apt/sources.list \ && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 80F70E11F0F0D5F10CB20E62F5DA5F09C3173AA6 \ - && echo "deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu xenial main" >> /etc/apt/sources.list \ + && echo "deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu bionic main" >> /etc/apt/sources.list \ && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 8B3981E7A6852F782CC4951600A6F0A3C300EE8C \ - && echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu xenial main" >> /etc/apt/sources.list \ + && echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu bionic main" >> /etc/apt/sources.list \ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ - && echo 'deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ + && echo 'deb http://apt.postgresql.org/pub/repos/apt/ bionic-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo 'deb https://deb.nodesource.com/node_8.x xenial main' > /etc/apt/sources.list.d/nodesource.list \ + && echo 'deb https://deb.nodesource.com/node_12.x bionic main' > /etc/apt/sources.list.d/nodesource.list \ && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo 'deb https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \ + && set -ex \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ sudo supervisor logrotate locales curl \ - nginx openssh-server postgresql-client-10 redis-tools \ - git-core gnupg2 ruby${RUBY_VERSION} python3 python3-docutils nodejs yarn gettext-base \ + nginx openssh-server postgresql-client-10 postgresql-contrib-10 redis-tools \ + git-core ruby${RUBY_VERSION} python3 python3-docutils nodejs yarn gettext-base graphicsmagick \ libpq5 zlib1g libyaml-0-2 libssl1.0.0 \ - libgdbm3 libreadline6 libncurses5 libffi6 \ - libxml2 libxslt1.1 libcurl3 libicu55 libre2-dev tzdata unzip libimage-exiftool-perl \ + libgdbm5 libreadline7 libncurses5 libffi6 \ + libxml2 libxslt1.1 libcurl4 libicu60 libre2-dev tzdata unzip libimage-exiftool-perl \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \ diff --git a/assets/build/install.sh b/assets/build/install.sh index a6ca7941..734432f0 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -42,9 +42,9 @@ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y ${BUIL # Applying the mark late here does make the build usable on PaX kernels, but # still the build itself must be executed on a non-PaX kernel. It's done here # only for simplicity. -paxctl -Cm "$(command -v ruby${RUBY_VERSION})" +paxctl -cvm "$(command -v ruby${RUBY_VERSION})" # https://en.wikibooks.org/wiki/Grsecurity/Application-specific_Settings#Node.js -paxctl -Cm "$(command -v nodejs)" +paxctl -cvm "$(command -v nodejs)" # remove the host keys generated during openssh-server installation rm -rf /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub From d2e8063deefe3667ea38ca3c7d2e397513205b23 Mon Sep 17 00:00:00 2001 From: Niclas Mietz Date: Mon, 26 Aug 2019 21:11:49 +0200 Subject: [PATCH 430/508] Add note for base image --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index ce6968b5..71ced4da 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **12.2.0** - gitlab: upgrade CE to v12.2.0 +- upgrade base image to ubuntu:bionic **12.1.6** - gitlab: upgrade CE to v12.1.6 From 97eebba179d7ffef89a7d6cc26583e13400c5628 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 26 Aug 2019 21:12:05 +0200 Subject: [PATCH 431/508] release 12.2.0 From d587abc6997e33e673d78e5695f2c612520d3c8d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 26 Aug 2019 21:14:26 +0200 Subject: [PATCH 432/508] Upgrade GitLab CE to 12.2.1 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index 71ced4da..b6b2998e 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.2.1** +- gitlab: upgrade CE to v12.2.1 + **12.2.0** - gitlab: upgrade CE to v12.2.0 - upgrade base image to ubuntu:bionic diff --git a/Dockerfile b/Dockerfile index f01e8625..dd509591 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20190807 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.2.0 +ARG VERSION=12.2.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index aaf92f33..ae1b67a3 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.2.0 +# sameersbn/gitlab:12.2.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.2.0 +docker pull sameersbn/gitlab:12.2.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.2.0 + sameersbn/gitlab:12.2.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.2.0 + sameersbn/gitlab:12.2.1 ``` ## Database @@ -261,7 +261,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.2.0 + sameersbn/gitlab:12.2.1 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.2.0 + sameersbn/gitlab:12.2.1 ``` 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: @@ -332,7 +332,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.2.0 + sameersbn/gitlab:12.2.1 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.2.0 + sameersbn/gitlab:12.2.1 ``` ### Mail @@ -372,7 +372,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.2.0 + sameersbn/gitlab:12.2.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.2.0 + sameersbn/gitlab:12.2.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.2.0 + sameersbn/gitlab:12.2.1 ``` 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. @@ -485,7 +485,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.2.0 + sameersbn/gitlab:12.2.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.2.0 + sameersbn/gitlab:12.2.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.2.0 + sameersbn/gitlab:12.2.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.2.0 + sameersbn/gitlab:12.2.1 ``` 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.2.0 app:sanitize + sameersbn/gitlab:12.2.1 app:sanitize ``` ### Piwik @@ -1086,7 +1086,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.0 app:rake gitlab:backup:create + sameersbn/gitlab:12.2.1 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. @@ -1121,14 +1121,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.0 app:rake db:setup + sameersbn/gitlab:12.2.1 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.2.0 app:rake gitlab:backup:restore + sameersbn/gitlab:12.2.1 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. @@ -1137,7 +1137,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.2.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.2.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1187,7 +1187,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.2.0 app:rake gitlab:env:info + sameersbn/gitlab:12.2.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.0 app:rake gitlab:import:repos + sameersbn/gitlab:12.2.1 app:rake gitlab:import:repos ``` Or @@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.0 app:rake gitlab:import:repos + sameersbn/gitlab:12.2.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.2.0` 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.2.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:12.2.0 +docker pull sameersbn/gitlab:12.2.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1284,7 +1284,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.2.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.2.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 68533262..9e3b2058 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.2.0 +12.2.1 diff --git a/docker-compose.yml b/docker-compose.yml index 9b2b3c68..007524ca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.2.0 + image: sameersbn/gitlab:12.2.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index a29b4ab0..60f9cb7b 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.2.0 app:rake gitlab:backup:create + sameersbn/gitlab:12.2.1 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.2.0 app:rake gitlab:backup:restore + sameersbn/gitlab:12.2.1 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.2.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.2.1 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.2.0 +docker pull sameersbn/gitlab:12.2.1 ``` - **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.2.0 +sameersbn/gitlab:12.2.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index e67d61fb..645ad05a 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.2.0 + image: sameersbn/gitlab:12.2.1 env: - name: TZ value: Asia/Kolkata From cc474269d5eee9d788ca388a156a98a25ab12fcf Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 27 Aug 2019 22:10:14 +0200 Subject: [PATCH 433/508] Fix HostKey function for ubuntu:bionic --- assets/runtime/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index c8338947..be51298d 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1439,7 +1439,7 @@ generate_ssh_key() { } generate_ssh_host_keys() { - sed -i "s|HostKey /etc/ssh/|HostKey ${GITLAB_DATA_DIR}/ssh/|g" /etc/ssh/sshd_config + sed -i "s|#HostKey /etc/ssh/|HostKey ${GITLAB_DATA_DIR}/ssh/|g" /etc/ssh/sshd_config if [[ ! -e ${GITLAB_DATA_DIR}/ssh/ssh_host_rsa_key ]]; then echo -n "Generating OpenSSH host keys... " generate_ssh_key rsa ${GITLAB_DATA_DIR}/ssh/ssh_host_rsa_key From 61d3859bd05c12df6bd38b6aa49de33409ed7272 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 28 Aug 2019 07:22:53 +0200 Subject: [PATCH 434/508] Upgrade GitLab Image to 12.2.1-1 --- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index ae1b67a3..4f2092ea 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.2.1 +# sameersbn/gitlab:12.2.1-1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.2.1 +docker pull sameersbn/gitlab:12.2.1-1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.2.1 + sameersbn/gitlab:12.2.1-1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.2.1 + sameersbn/gitlab:12.2.1-1 ``` ## Database @@ -261,7 +261,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.2.1 + sameersbn/gitlab:12.2.1-1 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.2.1 + sameersbn/gitlab:12.2.1-1 ``` 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: @@ -332,7 +332,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.2.1 + sameersbn/gitlab:12.2.1-1 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.2.1 + sameersbn/gitlab:12.2.1-1 ``` ### Mail @@ -372,7 +372,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.2.1 + sameersbn/gitlab:12.2.1-1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.2.1 + sameersbn/gitlab:12.2.1-1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.2.1 + sameersbn/gitlab:12.2.1-1 ``` 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. @@ -485,7 +485,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.2.1 + sameersbn/gitlab:12.2.1-1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.2.1 + sameersbn/gitlab:12.2.1-1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.2.1 + sameersbn/gitlab:12.2.1-1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.2.1 + sameersbn/gitlab:12.2.1-1 ``` 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.2.1 app:sanitize + sameersbn/gitlab:12.2.1-1 app:sanitize ``` ### Piwik @@ -1086,7 +1086,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.1 app:rake gitlab:backup:create + sameersbn/gitlab:12.2.1-1 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. @@ -1121,14 +1121,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.1 app:rake db:setup + sameersbn/gitlab:12.2.1-1 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.2.1 app:rake gitlab:backup:restore + sameersbn/gitlab:12.2.1-1 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. @@ -1137,7 +1137,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.2.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.2.1-1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1187,7 +1187,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.2.1 app:rake gitlab:env:info + sameersbn/gitlab:12.2.1-1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.1 app:rake gitlab:import:repos + sameersbn/gitlab:12.2.1-1 app:rake gitlab:import:repos ``` Or @@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.1 app:rake gitlab:import:repos + sameersbn/gitlab:12.2.1-1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.2.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.2.1-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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:12.2.1 +docker pull sameersbn/gitlab:12.2.1-1 ``` - **Step 2**: Stop and remove the currently running image @@ -1284,7 +1284,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.2.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.2.1-1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 9e3b2058..8371e3dd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.2.1 +12.2.1-1 diff --git a/docker-compose.yml b/docker-compose.yml index 007524ca..0cfe6b5c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.2.1 + image: sameersbn/gitlab:12.2.1-1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 60f9cb7b..89450ab2 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.2.1 app:rake gitlab:backup:create + sameersbn/gitlab:12.2.1-1 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.2.1 app:rake gitlab:backup:restore + sameersbn/gitlab:12.2.1-1 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.2.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.2.1-1 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.2.1 +docker pull sameersbn/gitlab:12.2.1-1 ``` - **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.2.1 +sameersbn/gitlab:12.2.1-1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 645ad05a..9bad40dc 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.2.1 + image: sameersbn/gitlab:12.2.1-1 env: - name: TZ value: Asia/Kolkata From 315b52dee30de84b16c107c121fe3db0f62ca9d6 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 28 Aug 2019 07:24:31 +0200 Subject: [PATCH 435/508] release 12.2.1-1 From 788597063eb80b46ade153398f2277dfa8a1718e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 1 Sep 2019 19:16:53 +0200 Subject: [PATCH 436/508] Upgrade GitLab CE to 12.2.3 --- Changelog.md | 3 +++ README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 6 files changed, 37 insertions(+), 34 deletions(-) diff --git a/Changelog.md b/Changelog.md index b6b2998e..fd83dbde 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.2.3** +- gitlab: upgrade CE to v12.2.3 + **12.2.1** - gitlab: upgrade CE to v12.2.1 diff --git a/README.md b/README.md index 4f2092ea..ce35961c 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.2.1-1 +# sameersbn/gitlab:12.2.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.2.1-1 +docker pull sameersbn/gitlab:12.2.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.2.1-1 + sameersbn/gitlab:12.2.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.2.1-1 + sameersbn/gitlab:12.2.3 ``` ## Database @@ -261,7 +261,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.2.1-1 + sameersbn/gitlab:12.2.3 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.2.1-1 + sameersbn/gitlab:12.2.3 ``` 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: @@ -332,7 +332,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.2.1-1 + sameersbn/gitlab:12.2.3 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.2.1-1 + sameersbn/gitlab:12.2.3 ``` ### Mail @@ -372,7 +372,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.2.1-1 + sameersbn/gitlab:12.2.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.2.1-1 + sameersbn/gitlab:12.2.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.2.1-1 + sameersbn/gitlab:12.2.3 ``` 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. @@ -485,7 +485,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.2.1-1 + sameersbn/gitlab:12.2.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.2.1-1 + sameersbn/gitlab:12.2.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.2.1-1 + sameersbn/gitlab:12.2.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.2.1-1 + sameersbn/gitlab:12.2.3 ``` 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.2.1-1 app:sanitize + sameersbn/gitlab:12.2.3 app:sanitize ``` ### Piwik @@ -1086,7 +1086,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.1-1 app:rake gitlab:backup:create + sameersbn/gitlab:12.2.3 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. @@ -1121,14 +1121,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.1-1 app:rake db:setup + sameersbn/gitlab:12.2.3 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.2.1-1 app:rake gitlab:backup:restore + sameersbn/gitlab:12.2.3 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. @@ -1137,7 +1137,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.2.1-1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.2.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1187,7 +1187,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.2.1-1 app:rake gitlab:env:info + sameersbn/gitlab:12.2.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.1-1 app:rake gitlab:import:repos + sameersbn/gitlab:12.2.3 app:rake gitlab:import:repos ``` Or @@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.1-1 app:rake gitlab:import:repos + sameersbn/gitlab:12.2.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.2.1-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.2.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:12.2.1-1 +docker pull sameersbn/gitlab:12.2.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1284,7 +1284,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.2.1-1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.2.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index 8371e3dd..9446bf2b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.2.1-1 +12.2.3 diff --git a/docker-compose.yml b/docker-compose.yml index 0cfe6b5c..5ba55c2d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.2.1-1 + image: sameersbn/gitlab:12.2.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 89450ab2..43979ebe 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.2.1-1 app:rake gitlab:backup:create + sameersbn/gitlab:12.2.3 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.2.1-1 app:rake gitlab:backup:restore + sameersbn/gitlab:12.2.3 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.2.1-1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.2.3 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.2.1-1 +docker pull sameersbn/gitlab:12.2.3 ``` - **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.2.1-1 +sameersbn/gitlab:12.2.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 9bad40dc..902e6ee5 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.2.1-1 + image: sameersbn/gitlab:12.2.3 env: - name: TZ value: Asia/Kolkata From 76897ccada787e6724b1d8984f40766fc76a2fc3 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 1 Sep 2019 19:17:08 +0200 Subject: [PATCH 437/508] Update gitlab-workhorse to 8.8.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dd509591..c6e43082 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ GOLANG_VERSION=1.12.9 \ GITLAB_SHELL_VERSION=9.3.0 \ - GITLAB_WORKHORSE_VERSION=8.8.0 \ + GITLAB_WORKHORSE_VERSION=8.8.1 \ GITLAB_PAGES_VERSION=1.7.1 \ GITALY_SERVER_VERSION=1.59.0 \ GITLAB_USER="git" \ From 31a439b26d5008868cb84aa307ed4894d370be76 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 1 Sep 2019 19:17:08 +0200 Subject: [PATCH 438/508] Update gitaly to 1.59.2 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c6e43082..8ba2e5dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=9.3.0 \ GITLAB_WORKHORSE_VERSION=8.8.1 \ GITLAB_PAGES_VERSION=1.7.1 \ - GITALY_SERVER_VERSION=1.59.0 \ + GITALY_SERVER_VERSION=1.59.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From a8790e8531014e6360c68a8778ef393f922df30d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 11 Sep 2019 21:56:23 +0200 Subject: [PATCH 439/508] Upgrade GitLab CE to 12.2.4 --- Changelog.md | 3 +++ README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 6 files changed, 37 insertions(+), 34 deletions(-) diff --git a/Changelog.md b/Changelog.md index fd83dbde..379fab7d 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.2.4** +- gitlab: upgrade CE to v12.2.4 + **12.2.3** - gitlab: upgrade CE to v12.2.3 diff --git a/README.md b/README.md index ce35961c..eb1984fc 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.2.3 +# sameersbn/gitlab:12.2.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.2.3 +docker pull sameersbn/gitlab:12.2.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.2.3 + sameersbn/gitlab:12.2.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.2.3 + sameersbn/gitlab:12.2.4 ``` ## Database @@ -261,7 +261,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.2.3 + sameersbn/gitlab:12.2.4 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.2.3 + sameersbn/gitlab:12.2.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: @@ -332,7 +332,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.2.3 + sameersbn/gitlab:12.2.4 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.2.3 + sameersbn/gitlab:12.2.4 ``` ### Mail @@ -372,7 +372,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.2.3 + sameersbn/gitlab:12.2.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.2.3 + sameersbn/gitlab:12.2.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.2.3 + sameersbn/gitlab:12.2.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. @@ -485,7 +485,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.2.3 + sameersbn/gitlab:12.2.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.2.3 + sameersbn/gitlab:12.2.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.2.3 + sameersbn/gitlab:12.2.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.2.3 + sameersbn/gitlab:12.2.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:12.2.3 app:sanitize + sameersbn/gitlab:12.2.4 app:sanitize ``` ### Piwik @@ -1086,7 +1086,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.3 app:rake gitlab:backup:create + sameersbn/gitlab:12.2.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. @@ -1121,14 +1121,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.3 app:rake db:setup + sameersbn/gitlab:12.2.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:12.2.3 app:rake gitlab:backup:restore + sameersbn/gitlab:12.2.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. @@ -1137,7 +1137,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.2.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.2.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1187,7 +1187,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.2.3 app:rake gitlab:env:info + sameersbn/gitlab:12.2.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.3 app:rake gitlab:import:repos + sameersbn/gitlab:12.2.4 app:rake gitlab:import:repos ``` Or @@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.3 app:rake gitlab:import:repos + sameersbn/gitlab:12.2.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.2.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:12.2.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:12.2.3 +docker pull sameersbn/gitlab:12.2.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1284,7 +1284,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.2.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.2.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index 9446bf2b..8571ff0f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.2.3 +12.2.4 diff --git a/docker-compose.yml b/docker-compose.yml index 5ba55c2d..42201dad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.2.3 + image: sameersbn/gitlab:12.2.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 43979ebe..f73236a1 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.2.3 app:rake gitlab:backup:create + sameersbn/gitlab:12.2.4 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.2.3 app:rake gitlab:backup:restore + sameersbn/gitlab:12.2.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. @@ -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.2.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.2.4 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.2.3 +docker pull sameersbn/gitlab:12.2.4 ``` - **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.2.3 +sameersbn/gitlab:12.2.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 902e6ee5..d3d45f74 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.2.3 + image: sameersbn/gitlab:12.2.4 env: - name: TZ value: Asia/Kolkata From 4791fd3fc03bd16ad8785ccc4edac1f5e3ffe8ef Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 11 Sep 2019 22:14:06 +0200 Subject: [PATCH 440/508] release 12.2.4 From a878a3ee7350a61d82ed5e8fd4f8254e20501121 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 11 Sep 2019 22:16:30 +0200 Subject: [PATCH 441/508] Upgrade GitLab CE to 12.2.5 --- Changelog.md | 3 +++ README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 6 files changed, 37 insertions(+), 34 deletions(-) diff --git a/Changelog.md b/Changelog.md index 379fab7d..983c7f11 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.2.5** +- gitlab: upgrade CE to v12.2.5 + **12.2.4** - gitlab: upgrade CE to v12.2.4 diff --git a/README.md b/README.md index eb1984fc..c23fc020 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.2.4 +# sameersbn/gitlab:12.2.5 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.2.4 +docker pull sameersbn/gitlab:12.2.5 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.2.4 + sameersbn/gitlab:12.2.5 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.2.4 + sameersbn/gitlab:12.2.5 ``` ## Database @@ -261,7 +261,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.2.4 + sameersbn/gitlab:12.2.5 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.2.4 + sameersbn/gitlab:12.2.5 ``` 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: @@ -332,7 +332,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.2.4 + sameersbn/gitlab:12.2.5 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.2.4 + sameersbn/gitlab:12.2.5 ``` ### Mail @@ -372,7 +372,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.2.4 + sameersbn/gitlab:12.2.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.2.4 + sameersbn/gitlab:12.2.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.2.4 + sameersbn/gitlab:12.2.5 ``` 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. @@ -485,7 +485,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.2.4 + sameersbn/gitlab:12.2.5 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.2.4 + sameersbn/gitlab:12.2.5 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.2.4 + sameersbn/gitlab:12.2.5 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.2.4 + sameersbn/gitlab:12.2.5 ``` 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.2.4 app:sanitize + sameersbn/gitlab:12.2.5 app:sanitize ``` ### Piwik @@ -1086,7 +1086,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.4 app:rake gitlab:backup:create + sameersbn/gitlab:12.2.5 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. @@ -1121,14 +1121,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.4 app:rake db:setup + sameersbn/gitlab:12.2.5 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.2.4 app:rake gitlab:backup:restore + sameersbn/gitlab:12.2.5 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. @@ -1137,7 +1137,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.2.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.2.5 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1187,7 +1187,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.2.4 app:rake gitlab:env:info + sameersbn/gitlab:12.2.5 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1200,7 +1200,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.4 app:rake gitlab:import:repos + sameersbn/gitlab:12.2.5 app:rake gitlab:import:repos ``` Or @@ -1231,7 +1231,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.4 app:rake gitlab:import:repos + sameersbn/gitlab:12.2.5 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1253,12 +1253,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.2.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. +> Upgrading to `sameersbn/gitlab:12.2.5` 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.2.4 +docker pull sameersbn/gitlab:12.2.5 ``` - **Step 2**: Stop and remove the currently running image @@ -1284,7 +1284,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.2.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.2.5 ``` ## Shell Access diff --git a/VERSION b/VERSION index 8571ff0f..c3cbe7de 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.2.4 +12.2.5 diff --git a/docker-compose.yml b/docker-compose.yml index 42201dad..20d16bf4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.2.4 + image: sameersbn/gitlab:12.2.5 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index f73236a1..6101ddab 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.2.4 app:rake gitlab:backup:create + sameersbn/gitlab:12.2.5 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.2.4 app:rake gitlab:backup:restore + sameersbn/gitlab:12.2.5 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.2.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.2.5 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.2.4 +docker pull sameersbn/gitlab:12.2.5 ``` - **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.2.4 +sameersbn/gitlab:12.2.5 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index d3d45f74..fb82c239 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.2.4 + image: sameersbn/gitlab:12.2.5 env: - name: TZ value: Asia/Kolkata From 0d6fca2cd9f1fe40c37ea42a0a0d54779c66c054 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 11 Sep 2019 22:16:39 +0200 Subject: [PATCH 442/508] Update gitlab-pages to 1.7.2 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8ba2e5dd..474c84fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.12.9 \ GITLAB_SHELL_VERSION=9.3.0 \ GITLAB_WORKHORSE_VERSION=8.8.1 \ - GITLAB_PAGES_VERSION=1.7.1 \ + GITLAB_PAGES_VERSION=1.7.2 \ GITALY_SERVER_VERSION=1.59.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ From fc2b7a4bb58422b99ecbb588eee97b36a272868a Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 11 Sep 2019 22:17:55 +0200 Subject: [PATCH 443/508] release 12.2.5 From 1d2fc24c80939c950f6545cdcdf947f1b913afaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomek=20=C5=9Awi=C4=99cicki?= Date: Tue, 17 Sep 2019 16:15:43 +0200 Subject: [PATCH 444/508] Change VERSION to 12.2.5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 474c84fc..a3f1f600 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20190807 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.2.1 +ARG VERSION=12.2.5 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ From 9d8903a523174330035781e31799fb41950955b7 Mon Sep 17 00:00:00 2001 From: Julien Grenier Date: Tue, 24 Sep 2019 07:04:13 +0200 Subject: [PATCH 445/508] Fix Auth0 config (#1964) Fix Auth0 configuration and Add OAUTH_AUTH0_SCOPE --- README.md | 1 + assets/runtime/config/gitlabhq/gitlab.yml | 3 ++- assets/runtime/env-defaults | 3 +++ assets/runtime/functions | 4 +++- contrib/docker-swarm/docker-compose.yml | 1 + docker-compose.yml | 1 + docs/s3_compatible_storage.md | 1 + 7 files changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c23fc020..4a76ec4a 100644 --- a/README.md +++ b/README.md @@ -1026,6 +1026,7 @@ Below is the complete list of available options that can be used to customize yo | `OAUTH_AUTH0_CLIENT_ID` | Auth0 Client ID. No defaults. | | `OAUTH_AUTH0_CLIENT_SECRET` | Auth0 Client secret. No defaults. | | `OAUTH_AUTH0_DOMAIN` | Auth0 Domain. No defaults. | +| `OAUTH_AUTH0_SCOPE` | Auth0 Scope. Defaults to `openid profile email`. | | `OAUTH_AZURE_API_KEY` | Azure Client ID. No defaults. | | `OAUTH_AZURE_API_SECRET` | Azure Client secret. No defaults. | | `OAUTH_AZURE_TENANT_ID` | Azure Tenant ID. No defaults. | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 775b4f15..5aeeb457 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -551,7 +551,8 @@ production: &base args: { client_id: '{{OAUTH_AUTH0_CLIENT_ID}}', client_secret: '{{OAUTH_AUTH0_CLIENT_SECRET}}', - namespace: '{{OAUTH_AUTH0_DOMAIN}}' } } + domain: '{{OAUTH_AUTH0_DOMAIN}}', + scope: '{{OAUTH_AUTH0_SCOPE}}' } } - { name: 'azure_oauth2', args: { client_id: '{{OAUTH_AZURE_API_KEY}}', diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 929e7779..630a6b87 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -426,6 +426,9 @@ OAUTH_CAS3_LOGIN_URL=${OAUTH_CAS3_LOGIN_URL:-/cas/login} OAUTH_CAS3_VALIDATE_URL=${OAUTH_CAS3_VALIDATE_URL:-/cas/p3/serviceValidate} OAUTH_CAS3_LOGOUT_URL=${OAUTH_CAS3_LOGOUT_URL:-/cas/logout} +### AUTH0 +OAUTH_AUTH0_SCOPE=${OAUTH_AUTH0_SCOPE:-openid profile email} + ## ANALYTICS ### GOOGLE diff --git a/assets/runtime/functions b/assets/runtime/functions index be51298d..fa313bd5 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -604,13 +604,15 @@ gitlab_configure_oauth_crowd() { gitlab_configure_oauth_auth0() { if [[ -n ${OAUTH_AUTH0_CLIENT_ID} && \ -n ${OAUTH_AUTH0_CLIENT_SECRET} && \ + -n ${OAUTH_AUTH0_SCOPE} && \ -n ${OAUTH_AUTH0_DOMAIN} ]]; then echo "Configuring gitlab::oauth::auth0..." OAUTH_ENABLED=${OAUTH_ENABLED:-true} update_template ${GITLAB_CONFIG} \ OAUTH_AUTH0_CLIENT_ID \ OAUTH_AUTH0_CLIENT_SECRET \ - OAUTH_AUTH0_DOMAIN + OAUTH_AUTH0_DOMAIN \ + OAUTH_AUTH0_SCOPE else exec_as_git sed -i "/name: 'auth0'/,/{{OAUTH_AUTH0_DOMAIN}}/d" ${GITLAB_CONFIG} fi diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 567e5035..78fc4327 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -149,6 +149,7 @@ services: - OAUTH_AUTH0_CLIENT_ID= - OAUTH_AUTH0_CLIENT_SECRET= - OAUTH_AUTH0_DOMAIN= + - OAUTH_AUTH0_SCOPE= - OAUTH_AZURE_API_KEY= - OAUTH_AZURE_API_SECRET= diff --git a/docker-compose.yml b/docker-compose.yml index 20d16bf4..6cbc9580 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -145,6 +145,7 @@ services: - OAUTH_AUTH0_CLIENT_ID= - OAUTH_AUTH0_CLIENT_SECRET= - OAUTH_AUTH0_DOMAIN= + - OAUTH_AUTH0_SCOPE= - OAUTH_AZURE_API_KEY= - OAUTH_AZURE_API_SECRET= diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md index d640d63c..7471206b 100644 --- a/docs/s3_compatible_storage.md +++ b/docs/s3_compatible_storage.md @@ -193,6 +193,7 @@ services: - OAUTH_AUTH0_CLIENT_ID= - OAUTH_AUTH0_CLIENT_SECRET= - OAUTH_AUTH0_DOMAIN= + - OAUTH_AUTH0_SCOPE= - OAUTH_AZURE_API_KEY= - OAUTH_AZURE_API_SECRET= - OAUTH_AZURE_TENANT_ID= From edfe1492e288bc7343aaa5d9cfce010f44c7f068 Mon Sep 17 00:00:00 2001 From: sue445 Date: Sat, 31 Aug 2019 16:21:28 +0900 Subject: [PATCH 446/508] Add Sentry configuration to gitlab.yml --- README.md | 4 ++++ assets/runtime/config/gitlabhq/gitlab.yml | 7 +++++++ assets/runtime/env-defaults | 6 ++++++ assets/runtime/functions | 9 +++++++++ 4 files changed, 26 insertions(+) diff --git a/README.md b/README.md index 4a76ec4a..eaca90bd 100644 --- a/README.md +++ b/README.md @@ -1059,6 +1059,10 @@ Below is the complete list of available options that can be used to customize yo | `RACK_ATTACK_FINDTIME` | Number of seconds before resetting the per IP auth attempt counter. Defaults to `60`. | | `RACK_ATTACK_BANTIME` | Number of seconds an IP should be banned after too many auth attempts. Defaults to `3600`. | | `GITLAB_WORKHORSE_TIMEOUT` | Timeout for gitlab workhorse http proxy. Defaults to `5m0s`. | +| `SENTRY_ENABLED` | Enables Error Reporting and Logging with Sentry. Defaults to `false`. | +| `SENTRY_DSN` | Sentry DSN. No defaults. | +| `SENTRY_CLIENTSIDE_DSN` | Sentry clientside DSN. No defaults. | +| `SENTRY_ENVIRONMENT` | Sentry environment. Defaults to `production`. | ### Docker secrets and configs diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 5aeeb457..7a6d9e7d 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -310,6 +310,13 @@ production: &base path: {{GITLAB_REGISTRY_DIR}} issuer: {{GITLAB_REGISTRY_ISSUER}} + ## Error Reporting and Logging with Sentry + sentry: + enabled: {{SENTRY_ENABLED}} + dsn: {{SENTRY_DSN}} + clientside_dsn: {{SENTRY_CLIENTSIDE_DSN}} + environment: '{{SENTRY_ENVIRONMENT}}' # e.g. development, staging, production + # # 2. GitLab CI settings # ========================== diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 630a6b87..12be5083 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -475,3 +475,9 @@ GITLAB_MONITORING_IP_WHITELIST=${GITLAB_MONITORING_IP_WHITELIST:-"0.0.0.0/8"} GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED=${GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED:-true} GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS=${GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS:-"0.0.0.0"} GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT=${GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT:-3807} + +## Sentry +SENTRY_ENABLED=${SENTRY_ENABLED:-false} +SENTRY_DSN=${SENTRY_DSN:-} +SENTRY_CLIENTSIDE_DSN=${SENTRY_CLIENTSIDE_DSN:-} +SENTRY_ENVIRONMENT=${SENTRY_ENVIRONMENT:-production} diff --git a/assets/runtime/functions b/assets/runtime/functions index fa313bd5..dd282d2d 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1111,6 +1111,14 @@ gitlab_configure_pages(){ fi } +gitlab_configure_sentry(){ + echo "Configuring gitlab::sentry..." + update_template ${GITLAB_CONFIG} \ + SENTRY_ENABLED \ + SENTRY_DSN \ + SENTRY_CLIENTSIDE_DSN \ + SENTRY_ENVIRONMENT +} nginx_configure_gitlab_ssl() { if [[ ${GITLAB_HTTPS} == true && -f ${SSL_CERTIFICATE_PATH} && -f ${SSL_KEY_PATH} && -f ${SSL_DHPARAM_PATH} ]]; then @@ -1592,6 +1600,7 @@ configure_gitlab() { gitlab_configure_backups gitlab_configure_registry gitlab_configure_pages + gitlab_configure_sentry # remove stale gitlab.socket rm -rf ${GITLAB_INSTALL_DIR}/tmp/sockets/gitlab.socket From 1c7629d5a9917c9a271ecccd155e530bdc4fad6c Mon Sep 17 00:00:00 2001 From: GO Sueyoshi Date: Tue, 24 Sep 2019 14:50:48 +0900 Subject: [PATCH 447/508] Add prepared_statements to database.yml (#1994) * Add prepared_statements to database.yml Co-Authored-By: Niclas Mietz --- README.md | 1 + assets/runtime/config/gitlabhq/database.yml | 1 + assets/runtime/env-defaults | 1 + assets/runtime/functions | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index eaca90bd..5ac2a08c 100644 --- a/README.md +++ b/README.md @@ -931,6 +931,7 @@ Below is the complete list of available options that can be used to customize yo | `DB_USER` | The database database user. Defaults to `root` | | `DB_PASS` | The database database password. Defaults to no password | | `DB_POOL` | The database database connection pool count. Defaults to `10`. | +| `DB_PREPARED_STATEMENTS` | Whether use database prepared statements. No defaults. But set to `false` if you want to use with [PgBouncer](https://pgbouncer.github.io/) | | `SMTP_ENABLED` | Enable mail delivery via SMTP. Defaults to `true` if `SMTP_USER` is defined, else defaults to `false`. | | `SMTP_DOMAIN` | SMTP domain. Defaults to` www.gmail.com` | | `SMTP_HOST` | SMTP server host. Defaults to `smtp.gmail.com`. | diff --git a/assets/runtime/config/gitlabhq/database.yml b/assets/runtime/config/gitlabhq/database.yml index f7845428..6ff2dbc8 100644 --- a/assets/runtime/config/gitlabhq/database.yml +++ b/assets/runtime/config/gitlabhq/database.yml @@ -10,4 +10,5 @@ production: username: {{DB_USER}} password: "{{DB_PASS}}" pool: {{DB_POOL}} + prepared_statements: {{DB_PREPARED_STATEMENTS}} diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 12be5083..68581e66 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -44,6 +44,7 @@ DB_NAME=${DB_NAME:-} DB_USER=${DB_USER:-} DB_PASS=${DB_PASS:-} DB_POOL=${DB_POOL:-10} +DB_PREPARED_STATEMENTS=${DB_PREPARED_STATEMENTS:-true} # backward compatibility case ${DB_TYPE} in diff --git a/assets/runtime/functions b/assets/runtime/functions index dd282d2d..b1bba083 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -182,7 +182,8 @@ gitlab_configure_database() { DB_NAME \ DB_USER \ DB_PASS \ - DB_POOL + DB_POOL \ + DB_PREPARED_STATEMENTS } gitlab_finalize_redis_parameters() { From eadd27cdb00eb2a8a5ccdfa16b408e80e84c3276 Mon Sep 17 00:00:00 2001 From: Niclas Mietz Date: Tue, 24 Sep 2019 11:02:34 +0200 Subject: [PATCH 448/508] Fix Auth0 Scope config parsing (#2007) --- assets/runtime/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index b1bba083..35ab8d35 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -615,7 +615,7 @@ gitlab_configure_oauth_auth0() { OAUTH_AUTH0_DOMAIN \ OAUTH_AUTH0_SCOPE else - exec_as_git sed -i "/name: 'auth0'/,/{{OAUTH_AUTH0_DOMAIN}}/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/name: 'auth0'/,/{{OAUTH_AUTH0_SCOPE}}/d" ${GITLAB_CONFIG} fi } From 97ec6e337a39e738330a1a802e5b4150f292e84b Mon Sep 17 00:00:00 2001 From: Pierre Belloy Date: Tue, 24 Sep 2019 10:52:10 +0200 Subject: [PATCH 449/508] Set Sidekiq default log format to json This follow gitlab default value. See https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/32842 Signed-off-by: Pierre Belloy --- README.md | 2 +- assets/runtime/config/gitlabhq/gitlab.yml | 2 +- assets/runtime/env-defaults | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5ac2a08c..98860562 100644 --- a/README.md +++ b/README.md @@ -922,7 +922,7 @@ Below is the complete list of available options that can be used to customize yo | `SIDEKIQ_CONCURRENCY` | The number of concurrent sidekiq jobs to run. Defaults to `25` | | `SIDEKIQ_SHUTDOWN_TIMEOUT` | Timeout for sidekiq shutdown. Defaults to `4` | | `SIDEKIQ_MEMORY_KILLER_MAX_RSS` | Non-zero value enables the SidekiqMemoryKiller. Defaults to `1000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html) | -| `GITLAB_SIDEKIQ_LOG_FORMAT` | Sidekiq log format that will be used. Defaults to `default` | +| `GITLAB_SIDEKIQ_LOG_FORMAT` | Sidekiq log format that will be used. Defaults to `json` | | `DB_ADAPTER` | The database type. Currently only postgresql is supported. Over 12.1 postgres force. Possible values: `postgresql`. Defaults to `postgresql`. | | `DB_ENCODING` | The database encoding. For `DB_ADAPTER` values `postresql` this parameter defaults and `utf8` respectively. | | `DB_HOST` | The database server hostname. Defaults to `localhost`. | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 7a6d9e7d..2539bea2 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -271,7 +271,7 @@ production: &base ## Sidekiq sidekiq: - log_format: {{GITLAB_SIDEKIQ_LOG_FORMAT}} # (json is also supported) + log_format: {{GITLAB_SIDEKIQ_LOG_FORMAT}} # (default is the original format) ## Auxiliary jobs # Periodically executed jobs, to self-heal GitLab, do external synchronizations, etc. diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 68581e66..c66f185f 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -60,7 +60,7 @@ REDIS_DB_NUMBER=${REDIS_DB_NUMBER:-0} SIDEKIQ_SHUTDOWN_TIMEOUT=${SIDEKIQ_SHUTDOWN_TIMEOUT:-4} SIDEKIQ_CONCURRENCY=${SIDEKIQ_CONCURRENCY:-25} SIDEKIQ_MEMORY_KILLER_MAX_RSS=${SIDEKIQ_MEMORY_KILLER_MAX_RSS:-1000000} -GITLAB_SIDEKIQ_LOG_FORMAT=${GITLAB_SIDEKIQ_LOG_FORMAT:-default} +GITLAB_SIDEKIQ_LOG_FORMAT=${GITLAB_SIDEKIQ_LOG_FORMAT:-json} ## UNICORN UNICORN_WORKERS=${UNICORN_WORKERS:-3} From 432ba2e1835351370e8514ed5522caf1a787bc42 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 23 Sep 2019 06:05:43 +0200 Subject: [PATCH 450/508] Upgrade GitLab CE to 12.3.0 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index 983c7f11..6c0f9026 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.3.0** +- gitlab: upgrade CE to v12.3.0 + **12.2.5** - gitlab: upgrade CE to v12.2.5 diff --git a/Dockerfile b/Dockerfile index a3f1f600..fa93f2a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20190807 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.2.5 +ARG VERSION=12.3.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index 98860562..de505077 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.2.5 +# sameersbn/gitlab:12.3.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.2.5 +docker pull sameersbn/gitlab:12.3.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.2.5 + sameersbn/gitlab:12.3.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.2.5 + sameersbn/gitlab:12.3.0 ``` ## Database @@ -261,7 +261,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.2.5 + sameersbn/gitlab:12.3.0 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.2.5 + sameersbn/gitlab:12.3.0 ``` 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: @@ -332,7 +332,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.2.5 + sameersbn/gitlab:12.3.0 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.2.5 + sameersbn/gitlab:12.3.0 ``` ### Mail @@ -372,7 +372,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.2.5 + sameersbn/gitlab:12.3.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.2.5 + sameersbn/gitlab:12.3.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.2.5 + sameersbn/gitlab:12.3.0 ``` 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. @@ -485,7 +485,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.2.5 + sameersbn/gitlab:12.3.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.2.5 + sameersbn/gitlab:12.3.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.2.5 + sameersbn/gitlab:12.3.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.2.5 + sameersbn/gitlab:12.3.0 ``` 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.2.5 app:sanitize + sameersbn/gitlab:12.3.0 app:sanitize ``` ### Piwik @@ -1092,7 +1092,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.5 app:rake gitlab:backup:create + sameersbn/gitlab:12.3.0 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. @@ -1127,14 +1127,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.5 app:rake db:setup + sameersbn/gitlab:12.3.0 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.2.5 app:rake gitlab:backup:restore + sameersbn/gitlab:12.3.0 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. @@ -1143,7 +1143,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.2.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.3.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1193,7 +1193,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.2.5 app:rake gitlab:env:info + sameersbn/gitlab:12.3.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1206,7 +1206,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.5 app:rake gitlab:import:repos + sameersbn/gitlab:12.3.0 app:rake gitlab:import:repos ``` Or @@ -1237,7 +1237,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.2.5 app:rake gitlab:import:repos + sameersbn/gitlab:12.3.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1259,12 +1259,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.2.5` 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.3.0` 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.2.5 +docker pull sameersbn/gitlab:12.3.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1290,7 +1290,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.2.5 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.3.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index c3cbe7de..4d23cb8e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.2.5 +12.3.0 diff --git a/docker-compose.yml b/docker-compose.yml index 6cbc9580..d4955a02 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.2.5 + image: sameersbn/gitlab:12.3.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 6101ddab..01455429 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.2.5 app:rake gitlab:backup:create + sameersbn/gitlab:12.3.0 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.2.5 app:rake gitlab:backup:restore + sameersbn/gitlab:12.3.0 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.2.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.3.0 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.2.5 +docker pull sameersbn/gitlab:12.3.0 ``` - **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.2.5 +sameersbn/gitlab:12.3.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index fb82c239..992e2596 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.2.5 + image: sameersbn/gitlab:12.3.0 env: - name: TZ value: Asia/Kolkata From f3e3955c61b6e25a07ad6cb47b9b8b721bf347c2 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 23 Sep 2019 06:06:13 +0200 Subject: [PATCH 451/508] Update gitlab-shell to 10.0.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fa93f2a5..9e9910ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG VERSION=12.3.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ GOLANG_VERSION=1.12.9 \ - GITLAB_SHELL_VERSION=9.3.0 \ + GITLAB_SHELL_VERSION=10.0.0 \ GITLAB_WORKHORSE_VERSION=8.8.1 \ GITLAB_PAGES_VERSION=1.7.2 \ GITALY_SERVER_VERSION=1.59.2 \ From 8964a62a2b0c761309525de859baa7d8dc41fc4f Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 23 Sep 2019 06:06:14 +0200 Subject: [PATCH 452/508] Update gitlab-workhorse to 8.10.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9e9910ea..ec3c59b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ GOLANG_VERSION=1.12.9 \ GITLAB_SHELL_VERSION=10.0.0 \ - GITLAB_WORKHORSE_VERSION=8.8.1 \ + GITLAB_WORKHORSE_VERSION=8.10.0 \ GITLAB_PAGES_VERSION=1.7.2 \ GITALY_SERVER_VERSION=1.59.2 \ GITLAB_USER="git" \ From bf04be31b1965e335d946166f26e8514d069a31a Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 23 Sep 2019 06:06:14 +0200 Subject: [PATCH 453/508] Update gitlab-pages to 1.9.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ec3c59b4..86b480d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.12.9 \ GITLAB_SHELL_VERSION=10.0.0 \ GITLAB_WORKHORSE_VERSION=8.10.0 \ - GITLAB_PAGES_VERSION=1.7.2 \ + GITLAB_PAGES_VERSION=1.9.0 \ GITALY_SERVER_VERSION=1.59.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ From f5bc869f46eec3a49d2f7213b91f7f2f19498314 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 23 Sep 2019 06:06:14 +0200 Subject: [PATCH 454/508] Update gitaly to 1.65.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 86b480d4..0ee26783 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=10.0.0 \ GITLAB_WORKHORSE_VERSION=8.10.0 \ GITLAB_PAGES_VERSION=1.9.0 \ - GITALY_SERVER_VERSION=1.59.2 \ + GITALY_SERVER_VERSION=1.65.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 2a6d769e6d3e56e87c469bebbe262d10f8cb6d7d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 24 Sep 2019 11:44:25 +0200 Subject: [PATCH 455/508] Increase waiting to 180 seconds for circle ci --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d9ff09bd..9e1539de 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,7 +65,7 @@ jobs: name: Launching container for testing command: | docker-compose up -d - sleep 120 + sleep 180 - run: name: Testing image From f5a708bfb46cd08c119d9fd9936bd91e5f4c2c82 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 24 Sep 2019 19:16:25 +0200 Subject: [PATCH 456/508] release 12.3.0 From 15097275fb9f5abf4bee45999ce551eaf60cc53b Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 24 Sep 2019 19:18:30 +0200 Subject: [PATCH 457/508] Upgrade GitLab CE to 12.3.1 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index 6c0f9026..014d62e0 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.3.1** +- gitlab: upgrade CE to v12.3.1 + **12.3.0** - gitlab: upgrade CE to v12.3.0 diff --git a/Dockerfile b/Dockerfile index 0ee26783..29adf9de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20190807 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.3.0 +ARG VERSION=12.3.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index de505077..f0240d49 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.3.0 +# sameersbn/gitlab:12.3.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.3.0 +docker pull sameersbn/gitlab:12.3.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.3.0 + sameersbn/gitlab:12.3.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.3.0 + sameersbn/gitlab:12.3.1 ``` ## Database @@ -261,7 +261,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.3.0 + sameersbn/gitlab:12.3.1 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.3.0 + sameersbn/gitlab:12.3.1 ``` 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: @@ -332,7 +332,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.3.0 + sameersbn/gitlab:12.3.1 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.3.0 + sameersbn/gitlab:12.3.1 ``` ### Mail @@ -372,7 +372,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.3.0 + sameersbn/gitlab:12.3.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.3.0 + sameersbn/gitlab:12.3.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.3.0 + sameersbn/gitlab:12.3.1 ``` 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. @@ -485,7 +485,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.3.0 + sameersbn/gitlab:12.3.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.3.0 + sameersbn/gitlab:12.3.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.3.0 + sameersbn/gitlab:12.3.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.3.0 + sameersbn/gitlab:12.3.1 ``` 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.3.0 app:sanitize + sameersbn/gitlab:12.3.1 app:sanitize ``` ### Piwik @@ -1092,7 +1092,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.0 app:rake gitlab:backup:create + sameersbn/gitlab:12.3.1 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. @@ -1127,14 +1127,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.0 app:rake db:setup + sameersbn/gitlab:12.3.1 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.3.0 app:rake gitlab:backup:restore + sameersbn/gitlab:12.3.1 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. @@ -1143,7 +1143,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.3.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.3.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1193,7 +1193,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.3.0 app:rake gitlab:env:info + sameersbn/gitlab:12.3.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1206,7 +1206,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.0 app:rake gitlab:import:repos + sameersbn/gitlab:12.3.1 app:rake gitlab:import:repos ``` Or @@ -1237,7 +1237,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.0 app:rake gitlab:import:repos + sameersbn/gitlab:12.3.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1259,12 +1259,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.3.0` 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.3.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:12.3.0 +docker pull sameersbn/gitlab:12.3.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1290,7 +1290,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.3.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.3.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index 4d23cb8e..9c028e25 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.3.0 +12.3.1 diff --git a/docker-compose.yml b/docker-compose.yml index d4955a02..2814d09a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.3.0 + image: sameersbn/gitlab:12.3.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 01455429..e38cb659 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.3.0 app:rake gitlab:backup:create + sameersbn/gitlab:12.3.1 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.3.0 app:rake gitlab:backup:restore + sameersbn/gitlab:12.3.1 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.3.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.3.1 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.3.0 +docker pull sameersbn/gitlab:12.3.1 ``` - **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.3.0 +sameersbn/gitlab:12.3.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 992e2596..bc9fdb24 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.3.0 + image: sameersbn/gitlab:12.3.1 env: - name: TZ value: Asia/Kolkata From db5a973ac5c3f992059057dc68f20624fd36fcc4 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 24 Sep 2019 19:20:35 +0200 Subject: [PATCH 458/508] release 12.3.1 From 7ca29dfce0cedf51ff47da24c813c9b9984dddbc Mon Sep 17 00:00:00 2001 From: Pierre Belloy Date: Wed, 25 Sep 2019 14:50:44 +0200 Subject: [PATCH 459/508] Use updated gitlab-ce repository name `gitlab-foss` Gitlab is moving to a single codebase for GitLab Community and Enterprise editions. All code and development is moved into the gitlab-ee repository. The code of the gitlab-ce repository remains as is, and won't include any proprietary code. The `gitlab-ce` repository is renamed to `gitlab-foss` See https://about.gitlab.com/2019/08/23/a-single-codebase-for-gitlab-community-and-enterprise-edition/ Signed-off-by: Pierre Belloy --- Changelog.md | 6 +++--- README.md | 8 ++++---- assets/build/install.sh | 6 +++--- assets/runtime/config/nginx/gitlab-registry | 2 +- docs/container_registry.md | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Changelog.md b/Changelog.md index 014d62e0..ce86a709 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,7 +1,7 @@ # Changelog 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. +https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. **12.3.1** - gitlab: upgrade CE to v12.3.1 @@ -42,7 +42,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **12.1.0** - gitlab: upgrade CE to v12.1.0 -- Removed MySQL related information and packages. GitLab v12.1.X or greater requires only PostgreSQL. Do an Migration before upgrading to v12.1.X. For more Information have a look at the [Migration Guide](https://docs.gitlab.com/ce/update/mysql_to_postgresql.html) +- Removed MySQL related information and packages. GitLab v12.1.X or greater requires only PostgreSQL. Do an Migration before upgrading to v12.1.X. For more Information have a look at the [Migration Guide](https://docs.gitlab.com/ce/update/mysql_to_postgresql.html) **12.0.4** - gitlab: upgrade CE to v12.0.4 @@ -569,7 +569,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) for the list o **9.3.8** - gitlab: upgrade to CE v9.3.8 -- Added RE2 library to build dependencies ([issue 35342](https://gitlab.com/gitlab-org/gitlab-ce/issues/35342)) +- Added RE2 library to build dependencies ([issue 35342](https://gitlab.com/gitlab-org/gitlab-foss/issues/35342)) **9.3.7** - gitlab: upgrade to CE v9.3.7 diff --git a/README.md b/README.md index f0240d49..16dec1e3 100644 --- a/README.md +++ b/README.md @@ -69,9 +69,9 @@ Dockerfile to build a [GitLab](https://about.gitlab.com/) image for the [Docker](https://www.docker.com/products/docker-engine) opensource container platform. -GitLab CE is set up in the Docker image using the [install from source](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md) method as documented in the the official GitLab documentation. +GitLab CE is set up in the Docker image using the [install from source](https://docs.gitlab.com/ce/install/installation.html) method as documented in the the official GitLab documentation. -For other methods to install GitLab please refer to the [Official GitLab Installation Guide](https://about.gitlab.com/installation/) which includes a [GitLab image for Docker](https://gitlab.com/gitlab-org/gitlab-ce/tree/master/docker). +For other methods to install GitLab please refer to the [Official GitLab Installation Guide](https://about.gitlab.com/install/) which includes a [GitLab image for Docker](https://docs.gitlab.com/omnibus/docker/). # Contributing @@ -528,8 +528,8 @@ This is simply done by adding the servers certificate into their list of trusted Again, this is a client side configuration which means that everyone who is going to communicate with the server should perform this configuration on their machine. In short, distribute the `gitlab.crt` file among your developers and ask them to add it to their list of trusted ssl certificates. Failure to do so will result in errors that look like this: ```bash -git clone https://git.local.host/gitlab-ce.git -fatal: unable to access 'https://git.local.host/gitlab-ce.git': server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none +git clone https://git.local.host/gitlab-foss.git +fatal: unable to access 'https://git.local.host/gitlab-foss.git': server certificate verification failed. CAfile: /etc/ssl/certs/ca-certificates.crt CRLfile: none ``` You can do the same at the web browser. Instructions for installing the root certificate for firefox can be found [here](http://portal.threatpulse.com/docs/sol/Content/03Solutions/ManagePolicy/SSL/ssl_firefox_cert_ta.htm). You will find similar options chrome, just make sure you install the certificate under the authorities tab of the certificate manager dialog. diff --git a/assets/build/install.sh b/assets/build/install.sh index 734432f0..b69018d6 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -GITLAB_CLONE_URL=https://gitlab.com/gitlab-org/gitlab-ce.git +GITLAB_CLONE_URL=https://gitlab.com/gitlab-org/gitlab-foss.git GITLAB_SHELL_URL=https://gitlab.com/gitlab-org/gitlab-shell/-/archive/v${GITLAB_SHELL_VERSION}/gitlab-shell-v${GITLAB_SHELL_VERSION}.tar.bz2 GITLAB_WORKHORSE_URL=https://gitlab.com/gitlab-org/gitlab-workhorse.git GITLAB_PAGES_URL=https://gitlab.com/gitlab-org/gitlab-pages.git @@ -65,8 +65,8 @@ exec_as_git git config --global repack.writeBitmaps true exec_as_git git config --global receive.advertisePushOptions true -# shallow clone gitlab-ce -echo "Cloning gitlab-ce v.${GITLAB_VERSION}..." +# shallow clone gitlab-foss +echo "Cloning gitlab-foss v.${GITLAB_VERSION}..." exec_as_git git clone -q -b v${GITLAB_VERSION} --depth 1 ${GITLAB_CLONE_URL} ${GITLAB_INSTALL_DIR} GITLAB_SHELL_VERSION=${GITLAB_SHELL_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_SHELL_VERSION)} diff --git a/assets/runtime/config/nginx/gitlab-registry b/assets/runtime/config/nginx/gitlab-registry index 0aa1cc30..f973d39d 100644 --- a/assets/runtime/config/nginx/gitlab-registry +++ b/assets/runtime/config/nginx/gitlab-registry @@ -16,7 +16,7 @@ server { } server { - # If a different port is specified in https://gitlab.com/gitlab-org/gitlab-ce/blob/8-8-stable/config/gitlab.yml.example#L182, + # If a different port is specified in https://gitlab.com/gitlab-org/gitlab-foss/blob/8-8-stable/config/gitlab.yml.example#L182, # it should be declared here as well listen *:{{GITLAB_REGISTRY_PORT}} ssl http2; server_name {{GITLAB_REGISTRY_HOST}}; diff --git a/docs/container_registry.md b/docs/container_registry.md index e38cb659..66af974a 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -378,9 +378,9 @@ sameersbn/gitlab:12.3.1 [wildcard certificate]: https://en.wikipedia.org/wiki/Wildcard_certificate -[ce-4040]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4040 +[ce-4040]: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/4040 [docker-insecure]: https://docs.docker.com/registry/insecure/ [registry-deploy]: https://docs.docker.com/registry/deploying/ [storage-config]: https://docs.docker.com/registry/configuration/#storage [token-config]: https://docs.docker.com/registry/configuration/#token -[8-8-docs]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-8-stable/doc/administration/container_registry.md +[8-8-docs]: https://gitlab.com/gitlab-org/gitlab-foss/blob/8-8-stable/doc/administration/container_registry.md From ea1fce2c4bbaa71411e7340fe2a57c0cc0f5f498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20R=C3=B6mer?= <16097755+hroemer@users.noreply.github.com> Date: Thu, 26 Sep 2019 06:26:12 +0200 Subject: [PATCH 460/508] Documentation update on Docker config and secrets file env and example fix (#1980) * fixed typos in referenced config and secret files * updated documentation on external configs and secrets and added note on hard-coded config keys * updated documentation link to sample config * updated documentation link to sample config * updated documentation links to config keys * updated documentation links to config keys * updated documentation links to config keys --- README.md | 8 +++++++- contrib/docker-swarm/{gitlab.config => gitlab.configs} | 0 contrib/docker-swarm/{gitlab.secret => gitlab.secrets} | 0 3 files changed, 7 insertions(+), 1 deletion(-) rename contrib/docker-swarm/{gitlab.config => gitlab.configs} (100%) rename contrib/docker-swarm/{gitlab.secret => gitlab.secrets} (100%) diff --git a/README.md b/README.md index 16dec1e3..bf454b4f 100644 --- a/README.md +++ b/README.md @@ -1072,7 +1072,13 @@ and then both docker-compose and Docker Swarm can import them into your gitlab c On startup, the gitlab container will source env vars from a config file labeled `gitlab-config`, and then a secrets file labeled `gitlab-secrets` (both mounted in the default locations). -See the exmample `config/docker-swarm/docker-compose.yml` file, and the example `gitlab.config` and `gitlab.secrets` file. +See the example [`contrib/docker-swarm/docker-compose.yml`](./contrib/docker-swarm/docker-compose.yml) file, and the +example `gitlab.configs` and `gitlab.secrets` file. +You may as well choose file names other than the example source files (`gitlab.configs` and `gitlab.secrets`) and update +the `file: ./gitlab.configs` and `file: ./gitlab.secrets` references accordingly. But do not alter the config +keys [`gitlab-configs`](contrib/docker-swarm/docker-compose.yml#L158) and +[`gitlab-secrets`](contrib/docker-swarm/docker-compose.yml#L162) as they are currently +[hardcoded](./assets/runtime/functions#L4:L9) and thus must be kept as in the example. If you're not using one of these files, then don't include its entry in the docker-compose file. diff --git a/contrib/docker-swarm/gitlab.config b/contrib/docker-swarm/gitlab.configs similarity index 100% rename from contrib/docker-swarm/gitlab.config rename to contrib/docker-swarm/gitlab.configs diff --git a/contrib/docker-swarm/gitlab.secret b/contrib/docker-swarm/gitlab.secrets similarity index 100% rename from contrib/docker-swarm/gitlab.secret rename to contrib/docker-swarm/gitlab.secrets From 73cb6392fdf135f60abf949e5de17c970630ad23 Mon Sep 17 00:00:00 2001 From: pbe-axelor Date: Thu, 26 Sep 2019 06:58:29 +0200 Subject: [PATCH 461/508] Add S/MIME Email Signing (#2009) * Add S/MIME Email Signing See https://docs.gitlab.com/ce/administration/smime_signing_email.html Signed-off-by: Pierre Belloy * Remove s/mime email configs if not enabled Signed-off-by: Pierre Belloy --- README.md | 3 +++ assets/runtime/config/gitlabhq/gitlab.yml | 11 +++++++++++ assets/runtime/env-defaults | 3 +++ assets/runtime/functions | 13 ++++++++++++- 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index bf454b4f..028a628f 100644 --- a/README.md +++ b/README.md @@ -772,6 +772,9 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_EMAIL_REPLY_TO` | The reply-to address of emails sent out by GitLab. Defaults to value of `GITLAB_EMAIL`, else defaults to `noreply@example.com`. | | `GITLAB_EMAIL_SUBJECT_SUFFIX` | The e-mail subject suffix used in e-mails sent by GitLab. No defaults. | | `GITLAB_EMAIL_ENABLED` | Enable or disable gitlab mailer. Defaults to the `SMTP_ENABLED` configuration. | +| `GITLAB_EMAIL_SMIME_ENABLE` | Enable or disable email S/MIME signing. Defaults is `false`. | +| `GITLAB_EMAIL_SMIME_KEY_FILE` | Specifies the path to a S/MIME private key file in PEM format, unencrypted. Defaults to ``. | +| `GITLAB_EMAIL_SMIME_CERT_FILE` | Specifies the path to a S/MIME public certificate key in PEM format. Defaults to ``. | | `GITLAB_DEFAULT_THEME` | Default theme ID, by default 2. (1 - Indigo, 2 - Dark, 3 - Light, 4 - Blue, 5 - Green, 6 - Light Indigo, 7 - Light Blue, 8 - Light Green, 9 - Red, 10 - Light Red) | | `GITLAB_INCOMING_EMAIL_ADDRESS` | The incoming email address for reply by email. Defaults to the value of `IMAP_USER`, else defaults to `reply@example.com`. Please read the [reply by email](http://doc.gitlab.com/ce/incoming_email/README.html) documentation to currently set this parameter. | | `GITLAB_INCOMING_EMAIL_ENABLED` | Enable or disable gitlab reply by email feature. Defaults to the value of `IMAP_ENABLED`. | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 2539bea2..e43c58db 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -70,6 +70,17 @@ production: &base email_display_name: {{GITLAB_EMAIL_DISPLAY_NAME}} email_reply_to: {{GITLAB_EMAIL_REPLY_TO}} email_subject_suffix: '{{GITLAB_EMAIL_SUBJECT_SUFFIX}}' + #start-email-smime + email_smime: + # Uncomment and set to true if you need to enable email S/MIME signing (default: false) + enabled: {{GITLAB_EMAIL_SMIME_ENABLE}} + # S/MIME private key file in PEM format, unencrypted + # Default is '.gitlab_smime_key' relative to Rails.root (i.e. root of the GitLab app). + key_file: {{GITLAB_EMAIL_SMIME_KEY_FILE}} + # S/MIME public certificate key in PEM format, will be attached to signed messages + # Default is '.gitlab_smime_cert' relative to Rails.root (i.e. root of the GitLab app). + cert_file: {{GITLAB_EMAIL_SMIME_CERT_FILE}} + #end-email-smime # Email server smtp settings are in config/initializers/smtp_settings.rb.sample diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index c66f185f..7fef1ebd 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -283,6 +283,9 @@ GITLAB_EMAIL_SUBJECT_SUFFIX=${GITLAB_EMAIL_SUBJECT_SUFFIX:-} GITLAB_EMAIL=${GITLAB_EMAIL:-example@example.com} GITLAB_EMAIL_REPLY_TO=${GITLAB_EMAIL_REPLY_TO:-noreply@example.com} GITLAB_EMAIL_DISPLAY_NAME=${GITLAB_EMAIL_DISPLAY_NAME:-GitLab} +GITLAB_EMAIL_SMIME_ENABLE=${GITLAB_EMAIL_SMIME_ENABLE:-false} +GITLAB_EMAIL_SMIME_KEY_FILE=${GITLAB_EMAIL_SMIME_KEY_FILE:-} +GITLAB_EMAIL_SMIME_CERT_FILE=${GITLAB_EMAIL_SMIME_CERT_FILE:-} ## INCOMING MAIL IMAP_HOST=${IMAP_HOST:-imap.gmail.com} diff --git a/assets/runtime/functions b/assets/runtime/functions index 35ab8d35..d641c338 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -125,7 +125,7 @@ gitlab_finalize_database_parameters() { DB_USER=${DB_USER:-${POSTGRESQL_ENV_USER}} DB_PASS=${DB_PASS:-${POSTGRESQL_ENV_PASS}} DB_NAME=${DB_NAME:-${POSTGRESQL_ENV_DB}} - + if [[ -z ${DB_HOST} ]]; then echo @@ -351,6 +351,17 @@ gitlab_configure_mail_delivery() { GITLAB_EMAIL_DISPLAY_NAME \ GITLAB_EMAIL_REPLY_TO \ GITLAB_EMAIL_SUBJECT_SUFFIX + + if [[ ${GITLAB_EMAIL_SMIME_ENABLE} == true ]]; then + exec_as_git sed -i "/#start-email-smime/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#end-email-smime/d" ${GITLAB_CONFIG} + update_template ${GITLAB_CONFIG} \ + GITLAB_EMAIL_SMIME_ENABLE \ + GITLAB_EMAIL_SMIME_KEY_FILE \ + GITLAB_EMAIL_SMIME_CERT_FILE + else + exec_as_git sed -i "/#start-email-smime/,/#end-email-smime/d" ${GITLAB_CONFIG} + fi } gitlab_configure_mailroom() { From 44b432aaae770e7b16ed88f9e6609c571f692307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandra=20Tatarevi=C4=87ov=C3=A1?= Date: Fri, 27 Sep 2019 09:37:20 +0200 Subject: [PATCH 462/508] Fix GITLAB_PAGES_ACCESS_REDIRECT_URI documentation --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 028a628f..2f75392b 100644 --- a/README.md +++ b/README.md @@ -888,7 +888,7 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_PAGES_ACCESS_CONTROL_SERVER` | Gitlab instance URI, example: `https://gitlab.example.io` | | `GITLAB_PAGES_ACCESS_CLIENT_ID` | Client ID from earlier generated OAuth application | | `GITLAB_PAGES_ACCESS_CLIENT_SECRET` | Client Secret from earlier genereated OAuth application | -| `GITLAB_PAGES_ACCESS_REDIRECT_URI` | Redirect URI, non existing pages domain to redirect to pages daemon, `https://projects.example.io` | +| `GITLAB_PAGES_ACCESS_REDIRECT_URI` | Redirect URI, non existing pages domain to redirect to pages daemon, `https://projects.example.io/auth` | | `GITLAB_HTTPS` | Set to `true` to enable https support, disabled by default. | | `GITALY_CLIENT_PATH` | Set default path for gitaly. defaults to `/home/git/gitaly` | | `GITALY_TOKEN` | Set a gitaly token, blank by default. | From 968b7e9c8ffeae8f95c2579f3395742de4a9df87 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 30 Sep 2019 15:13:51 +0200 Subject: [PATCH 463/508] Upgrade GitLab CE to 12.3.2 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index ce86a709..66536ae7 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-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**12.3.2** +- gitlab: upgrade CE to v12.3.2 + **12.3.1** - gitlab: upgrade CE to v12.3.1 diff --git a/Dockerfile b/Dockerfile index 29adf9de..20ac86bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20190807 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.3.1 +ARG VERSION=12.3.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index 2f75392b..0f457f5c 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.3.1 +# sameersbn/gitlab:12.3.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.3.1 +docker pull sameersbn/gitlab:12.3.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.3.1 + sameersbn/gitlab:12.3.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.3.1 + sameersbn/gitlab:12.3.2 ``` ## Database @@ -261,7 +261,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.3.1 + sameersbn/gitlab:12.3.2 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.3.1 + sameersbn/gitlab:12.3.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: @@ -332,7 +332,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.3.1 + sameersbn/gitlab:12.3.2 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.3.1 + sameersbn/gitlab:12.3.2 ``` ### Mail @@ -372,7 +372,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.3.1 + sameersbn/gitlab:12.3.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.3.1 + sameersbn/gitlab:12.3.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.3.1 + sameersbn/gitlab:12.3.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. @@ -485,7 +485,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.3.1 + sameersbn/gitlab:12.3.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.3.1 + sameersbn/gitlab:12.3.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.3.1 + sameersbn/gitlab:12.3.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.3.1 + sameersbn/gitlab:12.3.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.3.1 app:sanitize + sameersbn/gitlab:12.3.2 app:sanitize ``` ### Piwik @@ -1101,7 +1101,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.1 app:rake gitlab:backup:create + sameersbn/gitlab:12.3.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. @@ -1136,14 +1136,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.1 app:rake db:setup + sameersbn/gitlab:12.3.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.3.1 app:rake gitlab:backup:restore + sameersbn/gitlab:12.3.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. @@ -1152,7 +1152,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.3.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.3.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1202,7 +1202,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.3.1 app:rake gitlab:env:info + sameersbn/gitlab:12.3.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.1 app:rake gitlab:import:repos + sameersbn/gitlab:12.3.2 app:rake gitlab:import:repos ``` Or @@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.1 app:rake gitlab:import:repos + sameersbn/gitlab:12.3.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.3.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.3.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.3.1 +docker pull sameersbn/gitlab:12.3.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1299,7 +1299,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.3.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.3.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index 9c028e25..1701b30e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.3.1 +12.3.2 diff --git a/docker-compose.yml b/docker-compose.yml index 2814d09a..01d39e87 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.3.1 + image: sameersbn/gitlab:12.3.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 66af974a..a44f7bcb 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.3.1 app:rake gitlab:backup:create + sameersbn/gitlab:12.3.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.3.1 app:rake gitlab:backup:restore + sameersbn/gitlab:12.3.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.3.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.3.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.3.1 +docker pull sameersbn/gitlab:12.3.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.3.1 +sameersbn/gitlab:12.3.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index bc9fdb24..93ff17eb 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.3.1 + image: sameersbn/gitlab:12.3.2 env: - name: TZ value: Asia/Kolkata From ed38720a9f1e956e300c29a2885c9192144a50d7 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 30 Sep 2019 15:14:08 +0200 Subject: [PATCH 464/508] Update gitaly to 1.65.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 20ac86bc..817eb908 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=10.0.0 \ GITLAB_WORKHORSE_VERSION=8.10.0 \ GITLAB_PAGES_VERSION=1.9.0 \ - GITALY_SERVER_VERSION=1.65.0 \ + GITALY_SERVER_VERSION=1.65.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From c92b4b828485528df36bff5b72a9fddfd28bcffd Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 30 Sep 2019 15:15:34 +0200 Subject: [PATCH 465/508] release 12.3.2 From 491ab7f24515c164d1188dca777bffa6955b4ff9 Mon Sep 17 00:00:00 2001 From: Niclas Mietz Date: Wed, 2 Oct 2019 14:54:29 +0200 Subject: [PATCH 466/508] fix: increase circle no_output_timeout to 60 minutes --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9e1539de..f8fef58e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -60,6 +60,7 @@ jobs: --build-arg BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \ --build-arg VCS_REF=$(git rev-parse --short HEAD) \ -t ${IMAGE_NAME}:$(cat VERSION) . + no_output_timeout: 60m - run: name: Launching container for testing From 121ff35b92c7bf1e092f9044aa9023a33396d100 Mon Sep 17 00:00:00 2001 From: phenomax Date: Wed, 2 Oct 2019 13:48:09 +0200 Subject: [PATCH 467/508] upgrade CE to v12.3.3 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index 66536ae7..939c3660 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-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**12.3.3** +- gitlab: upgrade CE to v12.3.3 + **12.3.2** - gitlab: upgrade CE to v12.3.2 diff --git a/Dockerfile b/Dockerfile index 817eb908..601eb8a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20190807 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.3.2 +ARG VERSION=12.3.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index 0f457f5c..12c5263d 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.3.2 +# sameersbn/gitlab:12.3.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.3.2 +docker pull sameersbn/gitlab:12.3.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.3.2 + sameersbn/gitlab:12.3.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.3.2 + sameersbn/gitlab:12.3.3 ``` ## Database @@ -261,7 +261,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.3.2 + sameersbn/gitlab:12.3.3 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.3.2 + sameersbn/gitlab:12.3.3 ``` 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: @@ -332,7 +332,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.3.2 + sameersbn/gitlab:12.3.3 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.3.2 + sameersbn/gitlab:12.3.3 ``` ### Mail @@ -372,7 +372,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.3.2 + sameersbn/gitlab:12.3.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.3.2 + sameersbn/gitlab:12.3.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.3.2 + sameersbn/gitlab:12.3.3 ``` 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. @@ -485,7 +485,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.3.2 + sameersbn/gitlab:12.3.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.3.2 + sameersbn/gitlab:12.3.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.3.2 + sameersbn/gitlab:12.3.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.3.2 + sameersbn/gitlab:12.3.3 ``` 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.3.2 app:sanitize + sameersbn/gitlab:12.3.3 app:sanitize ``` ### Piwik @@ -1101,7 +1101,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.2 app:rake gitlab:backup:create + sameersbn/gitlab:12.3.3 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. @@ -1136,14 +1136,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.2 app:rake db:setup + sameersbn/gitlab:12.3.3 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.3.2 app:rake gitlab:backup:restore + sameersbn/gitlab:12.3.3 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. @@ -1152,7 +1152,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.3.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.3.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1202,7 +1202,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.3.2 app:rake gitlab:env:info + sameersbn/gitlab:12.3.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.2 app:rake gitlab:import:repos + sameersbn/gitlab:12.3.3 app:rake gitlab:import:repos ``` Or @@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.2 app:rake gitlab:import:repos + sameersbn/gitlab:12.3.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.3.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. +> Upgrading to `sameersbn/gitlab:12.3.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:12.3.2 +docker pull sameersbn/gitlab:12.3.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1299,7 +1299,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.3.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.3.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index 1701b30e..021d5996 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.3.2 +12.3.3 diff --git a/docker-compose.yml b/docker-compose.yml index 01d39e87..cfcfc234 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.3.2 + image: sameersbn/gitlab:12.3.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index a44f7bcb..edb1c1f8 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.3.2 app:rake gitlab:backup:create + sameersbn/gitlab:12.3.3 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.3.2 app:rake gitlab:backup:restore + sameersbn/gitlab:12.3.3 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.3.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.3.3 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.3.2 +docker pull sameersbn/gitlab:12.3.3 ``` - **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.3.2 +sameersbn/gitlab:12.3.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 93ff17eb..1b79e5be 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.3.2 + image: sameersbn/gitlab:12.3.3 env: - name: TZ value: Asia/Kolkata From 7adb375e8c38929c02704763475005edc6bb478d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 2 Oct 2019 17:35:29 +0200 Subject: [PATCH 468/508] release 12.3.3 From 0a50e8eff685b79f8807971cd70954b4f2c7e394 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 4 Oct 2019 10:20:12 +0200 Subject: [PATCH 469/508] Upgrade GitLab CE to 12.3.4 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index 939c3660..9a26bee7 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-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**12.3.4** +- gitlab: upgrade CE to v12.3.4 + **12.3.3** - gitlab: upgrade CE to v12.3.3 diff --git a/Dockerfile b/Dockerfile index 601eb8a1..b19299e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20190807 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.3.3 +ARG VERSION=12.3.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index 12c5263d..48e01741 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.3.3 +# sameersbn/gitlab:12.3.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.3.3 +docker pull sameersbn/gitlab:12.3.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.3.3 + sameersbn/gitlab:12.3.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.3.3 + sameersbn/gitlab:12.3.4 ``` ## Database @@ -261,7 +261,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.3.3 + sameersbn/gitlab:12.3.4 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.3.3 + sameersbn/gitlab:12.3.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: @@ -332,7 +332,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.3.3 + sameersbn/gitlab:12.3.4 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.3.3 + sameersbn/gitlab:12.3.4 ``` ### Mail @@ -372,7 +372,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.3.3 + sameersbn/gitlab:12.3.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.3.3 + sameersbn/gitlab:12.3.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.3.3 + sameersbn/gitlab:12.3.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. @@ -485,7 +485,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.3.3 + sameersbn/gitlab:12.3.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.3.3 + sameersbn/gitlab:12.3.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.3.3 + sameersbn/gitlab:12.3.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.3.3 + sameersbn/gitlab:12.3.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:12.3.3 app:sanitize + sameersbn/gitlab:12.3.4 app:sanitize ``` ### Piwik @@ -1101,7 +1101,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.3 app:rake gitlab:backup:create + sameersbn/gitlab:12.3.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. @@ -1136,14 +1136,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.3 app:rake db:setup + sameersbn/gitlab:12.3.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:12.3.3 app:rake gitlab:backup:restore + sameersbn/gitlab:12.3.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. @@ -1152,7 +1152,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.3.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.3.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1202,7 +1202,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.3.3 app:rake gitlab:env:info + sameersbn/gitlab:12.3.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.3 app:rake gitlab:import:repos + sameersbn/gitlab:12.3.4 app:rake gitlab:import:repos ``` Or @@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.3 app:rake gitlab:import:repos + sameersbn/gitlab:12.3.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.3.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:12.3.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:12.3.3 +docker pull sameersbn/gitlab:12.3.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1299,7 +1299,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.3.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.3.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index 021d5996..ab69bef6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.3.3 +12.3.4 diff --git a/docker-compose.yml b/docker-compose.yml index cfcfc234..bc7b8408 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.3.3 + image: sameersbn/gitlab:12.3.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index edb1c1f8..2a372128 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.3.3 app:rake gitlab:backup:create + sameersbn/gitlab:12.3.4 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.3.3 app:rake gitlab:backup:restore + sameersbn/gitlab:12.3.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. @@ -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.3.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.3.4 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.3.3 +docker pull sameersbn/gitlab:12.3.4 ``` - **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.3.3 +sameersbn/gitlab:12.3.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 1b79e5be..a1026623 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.3.3 + image: sameersbn/gitlab:12.3.4 env: - name: TZ value: Asia/Kolkata From e6cf252fbe6eb46988541a711882b8686c49d0d0 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 4 Oct 2019 11:16:13 +0200 Subject: [PATCH 470/508] release 12.3.4 From f37514ecf8c8cf42856786b2d3fef00e1d046a0a Mon Sep 17 00:00:00 2001 From: solidnerd Date: Fri, 4 Oct 2019 12:03:41 +0200 Subject: [PATCH 471/508] Use docker volumes instead of bind mounts --- docker-compose.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index bc7b8408..e9266b4e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,13 +7,13 @@ services: command: - --loglevel warning volumes: - - /srv/docker/gitlab/redis:/var/lib/redis:Z + - redis-data:/var/lib/redis:Z postgresql: restart: always image: sameersbn/postgresql:10-2 volumes: - - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z + - postgresql-data:/var/lib/postgresql:Z environment: - DB_USER=gitlab - DB_PASS=password @@ -30,7 +30,7 @@ services: - "10080:80" - "10022:22" volumes: - - /srv/docker/gitlab/gitlab:/home/git/data:Z + - gitlab-data:/home/git/data:Z environment: - DEBUG=false @@ -150,3 +150,8 @@ services: - OAUTH_AZURE_API_KEY= - OAUTH_AZURE_API_SECRET= - OAUTH_AZURE_TENANT_ID= + +volumes: + redis-data: + postgresql-data: + gitlab-data: From 7bf3c2b37d6d8c66657ca675ec7af2172cbbe329 Mon Sep 17 00:00:00 2001 From: Abel Tay Date: Tue, 8 Oct 2019 13:25:29 +0800 Subject: [PATCH 472/508] Upgrade GitLab CE to 12.3.5 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index 9a26bee7..f40eabac 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-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**12.3.5** +- gitlab: upgrade CE to v12.3.5 + **12.3.4** - gitlab: upgrade CE to v12.3.4 diff --git a/Dockerfile b/Dockerfile index b19299e2..d03598de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20190807 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.3.4 +ARG VERSION=12.3.5 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index 48e01741..cb0da63b 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.3.4 +# sameersbn/gitlab:12.3.5 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.3.4 +docker pull sameersbn/gitlab:12.3.5 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.3.4 + sameersbn/gitlab:12.3.5 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.3.4 + sameersbn/gitlab:12.3.5 ``` ## Database @@ -261,7 +261,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.3.4 + sameersbn/gitlab:12.3.5 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.3.4 + sameersbn/gitlab:12.3.5 ``` 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: @@ -332,7 +332,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.3.4 + sameersbn/gitlab:12.3.5 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.3.4 + sameersbn/gitlab:12.3.5 ``` ### Mail @@ -372,7 +372,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.3.4 + sameersbn/gitlab:12.3.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.3.4 + sameersbn/gitlab:12.3.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.3.4 + sameersbn/gitlab:12.3.5 ``` 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. @@ -485,7 +485,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.3.4 + sameersbn/gitlab:12.3.5 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.3.4 + sameersbn/gitlab:12.3.5 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.3.4 + sameersbn/gitlab:12.3.5 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.3.4 + sameersbn/gitlab:12.3.5 ``` 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.3.4 app:sanitize + sameersbn/gitlab:12.3.5 app:sanitize ``` ### Piwik @@ -1101,7 +1101,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.4 app:rake gitlab:backup:create + sameersbn/gitlab:12.3.5 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. @@ -1136,14 +1136,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.4 app:rake db:setup + sameersbn/gitlab:12.3.5 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.3.4 app:rake gitlab:backup:restore + sameersbn/gitlab:12.3.5 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. @@ -1152,7 +1152,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.3.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.3.5 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1202,7 +1202,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.3.4 app:rake gitlab:env:info + sameersbn/gitlab:12.3.5 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.4 app:rake gitlab:import:repos + sameersbn/gitlab:12.3.5 app:rake gitlab:import:repos ``` Or @@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.4 app:rake gitlab:import:repos + sameersbn/gitlab:12.3.5 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.3.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. +> Upgrading to `sameersbn/gitlab:12.3.5` 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.3.4 +docker pull sameersbn/gitlab:12.3.5 ``` - **Step 2**: Stop and remove the currently running image @@ -1299,7 +1299,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.3.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.3.5 ``` ## Shell Access diff --git a/VERSION b/VERSION index ab69bef6..a1e7534d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.3.4 +12.3.5 diff --git a/docker-compose.yml b/docker-compose.yml index e9266b4e..6f3bf669 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.3.4 + image: sameersbn/gitlab:12.3.5 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 2a372128..f8d5e730 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.3.4 app:rake gitlab:backup:create + sameersbn/gitlab:12.3.5 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.3.4 app:rake gitlab:backup:restore + sameersbn/gitlab:12.3.5 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.3.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.3.5 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.3.4 +docker pull sameersbn/gitlab:12.3.5 ``` - **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.3.4 +sameersbn/gitlab:12.3.5 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index a1026623..6f7011cf 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.3.4 + image: sameersbn/gitlab:12.3.5 env: - name: TZ value: Asia/Kolkata From 7bba0f62db2a2723a256e77ab828ee3887466461 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 8 Oct 2019 08:13:22 +0200 Subject: [PATCH 473/508] release 12.3.5 From 7e86b54241fa5323827a535ebf53b108d5519796 Mon Sep 17 00:00:00 2001 From: Peter Leitzen Date: Tue, 22 Oct 2019 10:09:09 +0200 Subject: [PATCH 474/508] Remove deprecated "ssl" directives from nginx Before this commit running "nginx -c -f /etc/nginx/nginx.conf" warned: nginx: [warn] the "ssl" directive is deprecated, use the "listen ... ssl" directive instead in /etc/nginx/sites-enabled/gitlab:60 --- assets/runtime/config/nginx/gitlab-pages-ssl | 1 - assets/runtime/config/nginx/gitlab-registry | 1 - assets/runtime/config/nginx/gitlab-ssl | 1 - 3 files changed, 3 deletions(-) diff --git a/assets/runtime/config/nginx/gitlab-pages-ssl b/assets/runtime/config/nginx/gitlab-pages-ssl index 17ab05e9..dba9f0a2 100644 --- a/assets/runtime/config/nginx/gitlab-pages-ssl +++ b/assets/runtime/config/nginx/gitlab-pages-ssl @@ -31,7 +31,6 @@ server { ## Strong SSL Security ## https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html & https://cipherli.st/ - ssl on; ssl_certificate {{SSL_PAGES_CERT_PATH}}; ssl_certificate_key {{SSL_PAGES_KEY_PATH}}; diff --git a/assets/runtime/config/nginx/gitlab-registry b/assets/runtime/config/nginx/gitlab-registry index f973d39d..562b37ef 100644 --- a/assets/runtime/config/nginx/gitlab-registry +++ b/assets/runtime/config/nginx/gitlab-registry @@ -27,7 +27,6 @@ server { ## Strong SSL Security ## https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html & https://cipherli.st/ - ssl on; ssl_certificate {{SSL_REGISTRY_CERT_PATH}}; ssl_certificate_key {{SSL_REGISTRY_KEY_PATH}}; diff --git a/assets/runtime/config/nginx/gitlab-ssl b/assets/runtime/config/nginx/gitlab-ssl index 7674979b..24acfe17 100644 --- a/assets/runtime/config/nginx/gitlab-ssl +++ b/assets/runtime/config/nginx/gitlab-ssl @@ -53,7 +53,6 @@ server { ## Strong SSL Security ## https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html & https://cipherli.st/ - ssl on; ssl_certificate {{SSL_CERTIFICATE_PATH}}; ssl_certificate_key {{SSL_KEY_PATH}}; ssl_verify_client {{SSL_VERIFY_CLIENT}}; From aa10ebcf014b6ae7831b174c0ec77644957cc944 Mon Sep 17 00:00:00 2001 From: Peter Leitzen Date: Tue, 22 Oct 2019 10:41:14 +0200 Subject: [PATCH 475/508] Hide unused envvar DB_COLLATION MySQL support was removed in https://github.com/sameersbn/docker-gitlab/pull/1961 and PostgreSQL doesn't support it anyway. --- assets/runtime/env-defaults | 1 - assets/runtime/functions | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 7fef1ebd..38a78608 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -37,7 +37,6 @@ NGINX_HSTS_MAXAGE=${NGINX_HSTS_MAXAGE:-31536000} ## DATABASE DB_ADAPTER=${DB_ADAPTER:-postgresql} DB_ENCODING=${DB_ENCODING:-} -DB_COLLATION=${DB_COLLATION:-} DB_HOST=${DB_HOST:-} DB_PORT=${DB_PORT:-} DB_NAME=${DB_NAME:-} diff --git a/assets/runtime/functions b/assets/runtime/functions index d641c338..2665edc1 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -138,11 +138,9 @@ gitlab_finalize_database_parameters() { fi # set default port number if not specified - - DB_ENCODING=${DB_ENCODING:-unicode} - # DB_COLLATION: Not supported for postgresql and will be removed below. DB_PORT=${DB_PORT:-5432} + DB_ENCODING=${DB_ENCODING:-unicode} # set default user and database DB_USER=${DB_USER:-root} From 384bfbc5d9233816790927483cdcf30f205b6a4f Mon Sep 17 00:00:00 2001 From: Peter Leitzen Date: Tue, 22 Oct 2019 11:00:01 +0200 Subject: [PATCH 476/508] Enforce `CI_REGISTRY_PASSWORD` dropping `CI_REGISTRY_PASS` --- .gitlab-ci.yml | 6 +++--- CONTRIBUTING.md | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3e190bd..5e7b1798 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ before_script: - export VERSION=$(cat VERSION) - export CI_REGISTRY=${CI_REGISTRY:-hub.docker.com} - export CI_REGISTRY_USER=${CI_REGISTRY_USER:-gitlab-ci-token} - - export CI_REGISTRY_PASSWORD=${CI_REGISTRY_PASS:-${CI_REGISTRY_PASSWORD:-${CI_JOB_TOKEN}}} + - export CI_REGISTRY_PASSWORD=${CI_REGISTRY_PASSWORD:-${CI_JOB_TOKEN}} - export DOCKER_IMAGE=${DOCKER_IMAGE:-${CI_REGISTRY}/${CI_PROJECT_PATH}} - | if [ "${DOCKER_IMAGE}" = "/" ]; then @@ -35,7 +35,7 @@ docker:build:branches: except: - master script: - - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY} + - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY} - docker build --pull --cache-from=${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG} @@ -49,7 +49,7 @@ docker:build:release: only: - tags script: - - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY} + - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY} - docker build --pull --cache-from=${DOCKER_IMAGE}:${VERSION} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d180caab..dbb5cdb4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,5 +9,4 @@ Overrides for these values can be set within the project, under `Settings` -> `C | `CI_REGISTRY` | `hub.docker.com` | If available this will be automatically overriden by registry address which is configured within the GitLab instance | | `CI_REGISTRY_USER` | `gitlab-ci-token` | Username for the registry | | `CI_REGISTRY_PASSWORD` | `${CI_JOB_TOKEN}` | Password for the registry | -| `CI_REGISTRY_PASS` | `${CI_JOB_TOKEN}` | DEPRECATED: Use `CI_REGISTRY_PASSWORD` | | `DOCKER_IMAGE` | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running GitLab instance with the `${CI_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within GitLab. | From cd54bace5ceb1a38bc1767a88e8cf63f34d6fc2e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 22 Oct 2019 21:00:27 +0200 Subject: [PATCH 477/508] Upgrade GitLab CE to 12.4.0 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index f40eabac..32cfddd4 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-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**12.4.0** +- gitlab: upgrade CE to v12.4.0 + **12.3.5** - gitlab: upgrade CE to v12.3.5 diff --git a/Dockerfile b/Dockerfile index d03598de..c4649231 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20190807 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.3.5 +ARG VERSION=12.4.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index cb0da63b..e03de775 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.3.5 +# sameersbn/gitlab:12.4.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.3.5 +docker pull sameersbn/gitlab:12.4.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.3.5 + sameersbn/gitlab:12.4.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.3.5 + sameersbn/gitlab:12.4.0 ``` ## Database @@ -261,7 +261,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.3.5 + sameersbn/gitlab:12.4.0 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.3.5 + sameersbn/gitlab:12.4.0 ``` 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: @@ -332,7 +332,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.3.5 + sameersbn/gitlab:12.4.0 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.3.5 + sameersbn/gitlab:12.4.0 ``` ### Mail @@ -372,7 +372,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.3.5 + sameersbn/gitlab:12.4.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.3.5 + sameersbn/gitlab:12.4.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.3.5 + sameersbn/gitlab:12.4.0 ``` 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. @@ -485,7 +485,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.3.5 + sameersbn/gitlab:12.4.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.3.5 + sameersbn/gitlab:12.4.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.3.5 + sameersbn/gitlab:12.4.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.3.5 + sameersbn/gitlab:12.4.0 ``` 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.3.5 app:sanitize + sameersbn/gitlab:12.4.0 app:sanitize ``` ### Piwik @@ -1101,7 +1101,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.5 app:rake gitlab:backup:create + sameersbn/gitlab:12.4.0 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. @@ -1136,14 +1136,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.5 app:rake db:setup + sameersbn/gitlab:12.4.0 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.3.5 app:rake gitlab:backup:restore + sameersbn/gitlab:12.4.0 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. @@ -1152,7 +1152,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.3.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1202,7 +1202,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.3.5 app:rake gitlab:env:info + sameersbn/gitlab:12.4.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.5 app:rake gitlab:import:repos + sameersbn/gitlab:12.4.0 app:rake gitlab:import:repos ``` Or @@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.3.5 app:rake gitlab:import:repos + sameersbn/gitlab:12.4.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.3.5` 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.4.0` 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.3.5 +docker pull sameersbn/gitlab:12.4.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1299,7 +1299,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.3.5 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.4.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index a1e7534d..f8c17e78 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.3.5 +12.4.0 diff --git a/docker-compose.yml b/docker-compose.yml index 6f3bf669..57dcd78b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.3.5 + image: sameersbn/gitlab:12.4.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index f8d5e730..82f92815 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.3.5 app:rake gitlab:backup:create + sameersbn/gitlab:12.4.0 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.3.5 app:rake gitlab:backup:restore + sameersbn/gitlab:12.4.0 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.3.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.4.0 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.3.5 +docker pull sameersbn/gitlab:12.4.0 ``` - **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.3.5 +sameersbn/gitlab:12.4.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 6f7011cf..c295a22a 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.3.5 + image: sameersbn/gitlab:12.4.0 env: - name: TZ value: Asia/Kolkata From 2e74ea1721839544efe9e47dc2ef528eb1cc0477 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 22 Oct 2019 21:00:44 +0200 Subject: [PATCH 478/508] Update gitlab-shell to 10.2.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c4649231..2efa567f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG VERSION=12.4.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ GOLANG_VERSION=1.12.9 \ - GITLAB_SHELL_VERSION=10.0.0 \ + GITLAB_SHELL_VERSION=10.2.0 \ GITLAB_WORKHORSE_VERSION=8.10.0 \ GITLAB_PAGES_VERSION=1.9.0 \ GITALY_SERVER_VERSION=1.65.1 \ From 7d1c256bace9d91ef27d799414de72bdf0d0dbcf Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 22 Oct 2019 21:00:45 +0200 Subject: [PATCH 479/508] Update gitlab-workhorse to 8.14.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2efa567f..dd9782ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ GOLANG_VERSION=1.12.9 \ GITLAB_SHELL_VERSION=10.2.0 \ - GITLAB_WORKHORSE_VERSION=8.10.0 \ + GITLAB_WORKHORSE_VERSION=8.14.0 \ GITLAB_PAGES_VERSION=1.9.0 \ GITALY_SERVER_VERSION=1.65.1 \ GITLAB_USER="git" \ From a5ed98d58b6ecd55741c2ea66cd5bf42b76db3c4 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 22 Oct 2019 21:00:45 +0200 Subject: [PATCH 480/508] Update gitlab-pages to 1.11.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dd9782ea..ccfc782b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.12.9 \ GITLAB_SHELL_VERSION=10.2.0 \ GITLAB_WORKHORSE_VERSION=8.14.0 \ - GITLAB_PAGES_VERSION=1.9.0 \ + GITLAB_PAGES_VERSION=1.11.0 \ GITALY_SERVER_VERSION=1.65.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ From 35bfc34c469498760dbd1d3be5bcf697c3c89e82 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 22 Oct 2019 21:00:45 +0200 Subject: [PATCH 481/508] Update gitaly to 1.67.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ccfc782b..3f409564 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=10.2.0 \ GITLAB_WORKHORSE_VERSION=8.14.0 \ GITLAB_PAGES_VERSION=1.11.0 \ - GITALY_SERVER_VERSION=1.65.1 \ + GITALY_SERVER_VERSION=1.67.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 19c49d1a45c35bda2e937fae41495143f049a6e4 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 23 Oct 2019 01:09:14 +0200 Subject: [PATCH 482/508] update base-image to ubuntu:bionic-20191010 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3f409564..87877fbc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:bionic-20190807 +FROM ubuntu:bionic-20191010 ARG BUILD_DATE ARG VCS_REF From 4607505c82f3fcb495f4e58bc74dbbde1288173c Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 23 Oct 2019 01:09:34 +0200 Subject: [PATCH 483/508] Update golang to 1.12.12 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 87877fbc..45c77665 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG VERSION=12.4.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ - GOLANG_VERSION=1.12.9 \ + GOLANG_VERSION=1.12.12 \ GITLAB_SHELL_VERSION=10.2.0 \ GITLAB_WORKHORSE_VERSION=8.14.0 \ GITLAB_PAGES_VERSION=1.11.0 \ From 4788ebedd786e53f1d7143dd1ecae5ebe2fffc6b Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 23 Oct 2019 02:18:38 +0200 Subject: [PATCH 484/508] release 12.4.0 From ae4c826c5a8370ee36aabc329d426d02a6151ef5 Mon Sep 17 00:00:00 2001 From: Peter Leitzen Date: Tue, 22 Oct 2019 10:33:37 +0200 Subject: [PATCH 485/508] Remove remaining references to MySQL MySQL support was removed in https://github.com/sameersbn/docker-gitlab/pull/1961 --- README.md | 2 +- assets/runtime/functions | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e03de775..c2835fda 100644 --- a/README.md +++ b/README.md @@ -929,7 +929,7 @@ Below is the complete list of available options that can be used to customize yo | `DB_ADAPTER` | The database type. Currently only postgresql is supported. Over 12.1 postgres force. Possible values: `postgresql`. Defaults to `postgresql`. | | `DB_ENCODING` | The database encoding. For `DB_ADAPTER` values `postresql` this parameter defaults and `utf8` respectively. | | `DB_HOST` | The database server hostname. Defaults to `localhost`. | -| `DB_PORT` | The database server port. Defaults to `3306` for mysql and `5432` for postgresql. | +| `DB_PORT` | The database server port. Defaults to `5432` for postgresql. | | `DB_NAME` | The database database name. Defaults to `gitlabhq_production` | | `DB_USER` | The database database user. Defaults to `root` | | `DB_PASS` | The database database password. Defaults to no password | diff --git a/assets/runtime/functions b/assets/runtime/functions index 2665edc1..573b9892 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -99,9 +99,8 @@ update_template() { } gitlab_finalize_database_parameters() { - # is a mysql or postgresql database linked? - # requires that the mysql or postgresql containers have exposed - # port 3306 and 5432 respectively. + # is a postgresql database linked? + # requires that the postgresql containers have exposed port 5432. DB_HOST=${DB_HOST:-${POSTGRESQL_PORT_5432_TCP_ADDR}} DB_PORT=${DB_PORT:-${POSTGRESQL_PORT_5432_TCP_PORT}} From 6c8ef9d02df45ff472c57225b804e7104400b1f4 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 2 Nov 2019 15:24:15 +0100 Subject: [PATCH 486/508] Upgrade GitLab CE to 12.4.1 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index 32cfddd4..3ef3081a 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-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**12.4.1** +- gitlab: upgrade CE to v12.4.1 + **12.4.0** - gitlab: upgrade CE to v12.4.0 diff --git a/Dockerfile b/Dockerfile index 45c77665..b1dac7bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.4.0 +ARG VERSION=12.4.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index c2835fda..1970e187 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.4.0 +# sameersbn/gitlab:12.4.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.4.0 +docker pull sameersbn/gitlab:12.4.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.4.0 + sameersbn/gitlab:12.4.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.4.0 + sameersbn/gitlab:12.4.1 ``` ## Database @@ -261,7 +261,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.4.0 + sameersbn/gitlab:12.4.1 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.4.0 + sameersbn/gitlab:12.4.1 ``` 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: @@ -332,7 +332,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.4.0 + sameersbn/gitlab:12.4.1 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.4.0 + sameersbn/gitlab:12.4.1 ``` ### Mail @@ -372,7 +372,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.4.0 + sameersbn/gitlab:12.4.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.4.0 + sameersbn/gitlab:12.4.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.4.0 + sameersbn/gitlab:12.4.1 ``` 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. @@ -485,7 +485,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.4.0 + sameersbn/gitlab:12.4.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.4.0 + sameersbn/gitlab:12.4.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.4.0 + sameersbn/gitlab:12.4.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.4.0 + sameersbn/gitlab:12.4.1 ``` 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.4.0 app:sanitize + sameersbn/gitlab:12.4.1 app:sanitize ``` ### Piwik @@ -1101,7 +1101,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.4.0 app:rake gitlab:backup:create + sameersbn/gitlab:12.4.1 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. @@ -1136,14 +1136,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.4.0 app:rake db:setup + sameersbn/gitlab:12.4.1 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.4.0 app:rake gitlab:backup:restore + sameersbn/gitlab:12.4.1 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. @@ -1152,7 +1152,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.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1202,7 +1202,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.4.0 app:rake gitlab:env:info + sameersbn/gitlab:12.4.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.4.0 app:rake gitlab:import:repos + sameersbn/gitlab:12.4.1 app:rake gitlab:import:repos ``` Or @@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.4.0 app:rake gitlab:import:repos + sameersbn/gitlab:12.4.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.4.0` 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.4.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:12.4.0 +docker pull sameersbn/gitlab:12.4.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1299,7 +1299,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.4.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.4.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index f8c17e78..c3b55577 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.4.0 +12.4.1 diff --git a/docker-compose.yml b/docker-compose.yml index 57dcd78b..139f6662 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.4.0 + image: sameersbn/gitlab:12.4.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 82f92815..f2a91172 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.4.0 app:rake gitlab:backup:create + sameersbn/gitlab:12.4.1 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.4.0 app:rake gitlab:backup:restore + sameersbn/gitlab:12.4.1 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.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.4.1 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.4.0 +docker pull sameersbn/gitlab:12.4.1 ``` - **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.4.0 +sameersbn/gitlab:12.4.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index c295a22a..755d9199 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.4.0 + image: sameersbn/gitlab:12.4.1 env: - name: TZ value: Asia/Kolkata From b568dd835a3475f8311d528f9232585e22ad62b6 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 3 Nov 2019 11:07:23 +0100 Subject: [PATCH 487/508] release 12.4.1 From 5ba1b213e81e063f6e0c5a261523402946803ae8 Mon Sep 17 00:00:00 2001 From: "Klos, Jan" Date: Mon, 4 Nov 2019 19:19:33 +0100 Subject: [PATCH 488/508] gitlab: upgrade CE to v12.4.2 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index 3ef3081a..9d944f42 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-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**12.4.2** +- gitlab: upgrade CE to v12.4.2 + **12.4.1** - gitlab: upgrade CE to v12.4.1 diff --git a/Dockerfile b/Dockerfile index b1dac7bf..67f8707f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.4.1 +ARG VERSION=12.4.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index 1970e187..034bad9f 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.4.1 +# sameersbn/gitlab:12.4.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.4.1 +docker pull sameersbn/gitlab:12.4.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.4.1 + sameersbn/gitlab:12.4.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.4.1 + sameersbn/gitlab:12.4.2 ``` ## Database @@ -261,7 +261,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.4.1 + sameersbn/gitlab:12.4.2 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.4.1 + sameersbn/gitlab:12.4.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: @@ -332,7 +332,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.4.1 + sameersbn/gitlab:12.4.2 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.4.1 + sameersbn/gitlab:12.4.2 ``` ### Mail @@ -372,7 +372,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.4.1 + sameersbn/gitlab:12.4.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.4.1 + sameersbn/gitlab:12.4.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.4.1 + sameersbn/gitlab:12.4.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. @@ -485,7 +485,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.4.1 + sameersbn/gitlab:12.4.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.4.1 + sameersbn/gitlab:12.4.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.4.1 + sameersbn/gitlab:12.4.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.4.1 + sameersbn/gitlab:12.4.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.4.1 app:sanitize + sameersbn/gitlab:12.4.2 app:sanitize ``` ### Piwik @@ -1101,7 +1101,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.4.1 app:rake gitlab:backup:create + sameersbn/gitlab:12.4.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. @@ -1136,14 +1136,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.4.1 app:rake db:setup + sameersbn/gitlab:12.4.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.4.1 app:rake gitlab:backup:restore + sameersbn/gitlab:12.4.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. @@ -1152,7 +1152,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.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.4.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1202,7 +1202,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.4.1 app:rake gitlab:env:info + sameersbn/gitlab:12.4.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.4.1 app:rake gitlab:import:repos + sameersbn/gitlab:12.4.2 app:rake gitlab:import:repos ``` Or @@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.4.1 app:rake gitlab:import:repos + sameersbn/gitlab:12.4.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.4.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.4.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.4.1 +docker pull sameersbn/gitlab:12.4.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1299,7 +1299,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.4.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.4.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index c3b55577..efcb73ee 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.4.1 +12.4.2 diff --git a/docker-compose.yml b/docker-compose.yml index 139f6662..bf9639fa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.4.1 + image: sameersbn/gitlab:12.4.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index f2a91172..ec066237 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.4.1 app:rake gitlab:backup:create + sameersbn/gitlab:12.4.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.4.1 app:rake gitlab:backup:restore + sameersbn/gitlab:12.4.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.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.4.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.4.1 +docker pull sameersbn/gitlab:12.4.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.4.1 +sameersbn/gitlab:12.4.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 755d9199..cb865547 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.4.1 + image: sameersbn/gitlab:12.4.2 env: - name: TZ value: Asia/Kolkata From 11b03e24d0d5fce097c90fb4be8db1ac7eafc4ba Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 4 Nov 2019 20:52:25 +0100 Subject: [PATCH 489/508] release 12.4.2 From 33f2cfb61b259e74acc10c8f074af2a307080cdf Mon Sep 17 00:00:00 2001 From: Pierre Belloy Date: Fri, 22 Nov 2019 11:21:53 +0100 Subject: [PATCH 490/508] Upgrade GitLab CE to 12.4.3 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index 9d944f42..c5304f0f 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-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**12.4.3** +- gitlab: upgrade CE to v12.4.3 + **12.4.2** - gitlab: upgrade CE to v12.4.2 diff --git a/Dockerfile b/Dockerfile index 67f8707f..1941aadb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.4.2 +ARG VERSION=12.4.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index 034bad9f..b4b94216 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.4.2 +# sameersbn/gitlab:12.4.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.4.2 +docker pull sameersbn/gitlab:12.4.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.4.2 + sameersbn/gitlab:12.4.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.4.2 + sameersbn/gitlab:12.4.3 ``` ## Database @@ -261,7 +261,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.4.2 + sameersbn/gitlab:12.4.3 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.4.2 + sameersbn/gitlab:12.4.3 ``` 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: @@ -332,7 +332,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.4.2 + sameersbn/gitlab:12.4.3 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.4.2 + sameersbn/gitlab:12.4.3 ``` ### Mail @@ -372,7 +372,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.4.2 + sameersbn/gitlab:12.4.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.4.2 + sameersbn/gitlab:12.4.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.4.2 + sameersbn/gitlab:12.4.3 ``` 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. @@ -485,7 +485,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.4.2 + sameersbn/gitlab:12.4.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.4.2 + sameersbn/gitlab:12.4.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.4.2 + sameersbn/gitlab:12.4.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.4.2 + sameersbn/gitlab:12.4.3 ``` 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.4.2 app:sanitize + sameersbn/gitlab:12.4.3 app:sanitize ``` ### Piwik @@ -1101,7 +1101,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.4.2 app:rake gitlab:backup:create + sameersbn/gitlab:12.4.3 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. @@ -1136,14 +1136,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.4.2 app:rake db:setup + sameersbn/gitlab:12.4.3 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.4.2 app:rake gitlab:backup:restore + sameersbn/gitlab:12.4.3 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. @@ -1152,7 +1152,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.4.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.4.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1202,7 +1202,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.4.2 app:rake gitlab:env:info + sameersbn/gitlab:12.4.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.4.2 app:rake gitlab:import:repos + sameersbn/gitlab:12.4.3 app:rake gitlab:import:repos ``` Or @@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.4.2 app:rake gitlab:import:repos + sameersbn/gitlab:12.4.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.4.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. +> Upgrading to `sameersbn/gitlab:12.4.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:12.4.2 +docker pull sameersbn/gitlab:12.4.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1299,7 +1299,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.4.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.4.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index efcb73ee..9f3bdf87 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.4.2 +12.4.3 diff --git a/docker-compose.yml b/docker-compose.yml index bf9639fa..286d3bc0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.4.2 + image: sameersbn/gitlab:12.4.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ec066237..0db18d19 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.4.2 app:rake gitlab:backup:create + sameersbn/gitlab:12.4.3 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.4.2 app:rake gitlab:backup:restore + sameersbn/gitlab:12.4.3 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.4.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.4.3 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.4.2 +docker pull sameersbn/gitlab:12.4.3 ``` - **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.4.2 +sameersbn/gitlab:12.4.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index cb865547..a3253c76 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.4.2 + image: sameersbn/gitlab:12.4.3 env: - name: TZ value: Asia/Kolkata From 8f704a6c5818db25f3da73f0e0c2d1c142ad36d7 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 25 Nov 2019 07:45:27 +0100 Subject: [PATCH 491/508] release 12.4.3 From 05f9029ef6962bf4f96b98b9970d43e29eec59a3 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 25 Nov 2019 07:50:10 +0100 Subject: [PATCH 492/508] Upgrade GitLab CE to 12.5.0 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index c5304f0f..f1d8fb2c 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-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**12.5.0** +- gitlab: upgrade CE to v12.5.0 + **12.4.3** - gitlab: upgrade CE to v12.4.3 diff --git a/Dockerfile b/Dockerfile index 1941aadb..4a63e733 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.4.3 +ARG VERSION=12.5.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index b4b94216..f18bbc33 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.4.3 +# sameersbn/gitlab:12.5.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.4.3 +docker pull sameersbn/gitlab:12.5.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.4.3 + sameersbn/gitlab:12.5.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.4.3 + sameersbn/gitlab:12.5.0 ``` ## Database @@ -261,7 +261,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.4.3 + sameersbn/gitlab:12.5.0 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.4.3 + sameersbn/gitlab:12.5.0 ``` 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: @@ -332,7 +332,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.4.3 + sameersbn/gitlab:12.5.0 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.4.3 + sameersbn/gitlab:12.5.0 ``` ### Mail @@ -372,7 +372,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.4.3 + sameersbn/gitlab:12.5.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.4.3 + sameersbn/gitlab:12.5.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.4.3 + sameersbn/gitlab:12.5.0 ``` 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. @@ -485,7 +485,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.4.3 + sameersbn/gitlab:12.5.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.4.3 + sameersbn/gitlab:12.5.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.4.3 + sameersbn/gitlab:12.5.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.4.3 + sameersbn/gitlab:12.5.0 ``` 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.4.3 app:sanitize + sameersbn/gitlab:12.5.0 app:sanitize ``` ### Piwik @@ -1101,7 +1101,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.4.3 app:rake gitlab:backup:create + sameersbn/gitlab:12.5.0 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. @@ -1136,14 +1136,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.4.3 app:rake db:setup + sameersbn/gitlab:12.5.0 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.4.3 app:rake gitlab:backup:restore + sameersbn/gitlab:12.5.0 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. @@ -1152,7 +1152,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.4.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1202,7 +1202,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.4.3 app:rake gitlab:env:info + sameersbn/gitlab:12.5.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.4.3 app:rake gitlab:import:repos + sameersbn/gitlab:12.5.0 app:rake gitlab:import:repos ``` Or @@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.4.3 app:rake gitlab:import:repos + sameersbn/gitlab:12.5.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.4.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:12.5.0` 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.4.3 +docker pull sameersbn/gitlab:12.5.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1299,7 +1299,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.4.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.0 ``` ## Shell Access diff --git a/VERSION b/VERSION index 9f3bdf87..b7d7205d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.4.3 +12.5.0 diff --git a/docker-compose.yml b/docker-compose.yml index 286d3bc0..b12d9fec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.4.3 + image: sameersbn/gitlab:12.5.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 0db18d19..de560517 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.4.3 app:rake gitlab:backup:create + sameersbn/gitlab:12.5.0 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.4.3 app:rake gitlab:backup:restore + sameersbn/gitlab:12.5.0 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.4.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.5.0 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.4.3 +docker pull sameersbn/gitlab:12.5.0 ``` - **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.4.3 +sameersbn/gitlab:12.5.0 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index a3253c76..9d762901 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.4.3 + image: sameersbn/gitlab:12.5.0 env: - name: TZ value: Asia/Kolkata From c615a5bb4887b08424299091bc81ba6f5504c542 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 25 Nov 2019 07:50:34 +0100 Subject: [PATCH 493/508] Update gitlab-pages to 1.12.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4a63e733..e0cb59bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.12.12 \ GITLAB_SHELL_VERSION=10.2.0 \ GITLAB_WORKHORSE_VERSION=8.14.0 \ - GITLAB_PAGES_VERSION=1.11.0 \ + GITLAB_PAGES_VERSION=1.12.0 \ GITALY_SERVER_VERSION=1.67.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ From 45e1851d3fbc73c639cdcad9953dbd6974bf8768 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Mon, 25 Nov 2019 07:50:34 +0100 Subject: [PATCH 494/508] Update gitaly to 1.72.0 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e0cb59bc..c7d8cf69 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=10.2.0 \ GITLAB_WORKHORSE_VERSION=8.14.0 \ GITLAB_PAGES_VERSION=1.12.0 \ - GITALY_SERVER_VERSION=1.67.0 \ + GITALY_SERVER_VERSION=1.72.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 4446da4b6df13e961cacd953a058c426030de4b8 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 5 Dec 2019 11:00:01 +0100 Subject: [PATCH 495/508] release 12.5.0 From a656f32e1a5b29902cd854f56ff51e6e1121f7a1 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 5 Dec 2019 11:01:05 +0100 Subject: [PATCH 496/508] Upgrade GitLab CE to 12.5.1 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index f1d8fb2c..5aea9419 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-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**12.5.1** +- gitlab: upgrade CE to v12.5.1 + **12.5.0** - gitlab: upgrade CE to v12.5.0 diff --git a/Dockerfile b/Dockerfile index c7d8cf69..5500ba6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.5.0 +ARG VERSION=12.5.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index f18bbc33..ab84b6ca 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.5.0 +# sameersbn/gitlab:12.5.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.5.0 +docker pull sameersbn/gitlab:12.5.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.5.0 + sameersbn/gitlab:12.5.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.5.0 + sameersbn/gitlab:12.5.1 ``` ## Database @@ -261,7 +261,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.5.0 + sameersbn/gitlab:12.5.1 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.5.0 + sameersbn/gitlab:12.5.1 ``` 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: @@ -332,7 +332,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.5.0 + sameersbn/gitlab:12.5.1 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.5.0 + sameersbn/gitlab:12.5.1 ``` ### Mail @@ -372,7 +372,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.5.0 + sameersbn/gitlab:12.5.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.5.0 + sameersbn/gitlab:12.5.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.5.0 + sameersbn/gitlab:12.5.1 ``` 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. @@ -485,7 +485,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.5.0 + sameersbn/gitlab:12.5.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.5.0 + sameersbn/gitlab:12.5.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.5.0 + sameersbn/gitlab:12.5.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.5.0 + sameersbn/gitlab:12.5.1 ``` 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.5.0 app:sanitize + sameersbn/gitlab:12.5.1 app:sanitize ``` ### Piwik @@ -1101,7 +1101,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.0 app:rake gitlab:backup:create + sameersbn/gitlab:12.5.1 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. @@ -1136,14 +1136,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.0 app:rake db:setup + sameersbn/gitlab:12.5.1 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.5.0 app:rake gitlab:backup:restore + sameersbn/gitlab:12.5.1 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. @@ -1152,7 +1152,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.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.5.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1202,7 +1202,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.5.0 app:rake gitlab:env:info + sameersbn/gitlab:12.5.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.0 app:rake gitlab:import:repos + sameersbn/gitlab:12.5.1 app:rake gitlab:import:repos ``` Or @@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.0 app:rake gitlab:import:repos + sameersbn/gitlab:12.5.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.5.0` 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.5.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:12.5.0 +docker pull sameersbn/gitlab:12.5.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1299,7 +1299,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.5.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index b7d7205d..2b4b4d7c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.5.0 +12.5.1 diff --git a/docker-compose.yml b/docker-compose.yml index b12d9fec..477548a2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.5.0 + image: sameersbn/gitlab:12.5.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index de560517..2c7e9f65 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.5.0 app:rake gitlab:backup:create + sameersbn/gitlab:12.5.1 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.5.0 app:rake gitlab:backup:restore + sameersbn/gitlab:12.5.1 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.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.5.1 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.5.0 +docker pull sameersbn/gitlab:12.5.1 ``` - **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.5.0 +sameersbn/gitlab:12.5.1 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 9d762901..13f053de 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.5.0 + image: sameersbn/gitlab:12.5.1 env: - name: TZ value: Asia/Kolkata From 87b1ec7bb935f326110e3cc240df6b1584db416d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 5 Dec 2019 11:01:12 +0100 Subject: [PATCH 497/508] Update gitlab-workhorse to 8.14.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5500ba6e..40e84dc3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ GOLANG_VERSION=1.12.12 \ GITLAB_SHELL_VERSION=10.2.0 \ - GITLAB_WORKHORSE_VERSION=8.14.0 \ + GITLAB_WORKHORSE_VERSION=8.14.1 \ GITLAB_PAGES_VERSION=1.12.0 \ GITALY_SERVER_VERSION=1.72.0 \ GITLAB_USER="git" \ From c008d5f0da64fc1815270bf07a4cee86c79b3f12 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 5 Dec 2019 11:01:13 +0100 Subject: [PATCH 498/508] Update gitaly to 1.72.1 Signed-off-by: solidnerd --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 40e84dc3..85496644 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=10.2.0 \ GITLAB_WORKHORSE_VERSION=8.14.1 \ GITLAB_PAGES_VERSION=1.12.0 \ - GITALY_SERVER_VERSION=1.72.0 \ + GITALY_SERVER_VERSION=1.72.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From c4283455dfbadc213057d4a1f8d986547b337342 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 5 Dec 2019 11:49:47 +0100 Subject: [PATCH 499/508] release 12.5.1 From 4e05bff84b4aa577073e47bed8bcfad9a7e0ed2a Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 5 Dec 2019 13:44:04 +0100 Subject: [PATCH 500/508] Upgrade GitLab CE to 12.5.2 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index 5aea9419..e50cb351 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-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**12.5.2** +- gitlab: upgrade CE to v12.5.2 + **12.5.1** - gitlab: upgrade CE to v12.5.1 diff --git a/Dockerfile b/Dockerfile index 85496644..a684d3de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.5.1 +ARG VERSION=12.5.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index ab84b6ca..34fb819b 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.5.1 +# sameersbn/gitlab:12.5.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.5.1 +docker pull sameersbn/gitlab:12.5.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.5.1 + sameersbn/gitlab:12.5.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.5.1 + sameersbn/gitlab:12.5.2 ``` ## Database @@ -261,7 +261,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.5.1 + sameersbn/gitlab:12.5.2 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.5.1 + sameersbn/gitlab:12.5.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: @@ -332,7 +332,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.5.1 + sameersbn/gitlab:12.5.2 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.5.1 + sameersbn/gitlab:12.5.2 ``` ### Mail @@ -372,7 +372,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.5.1 + sameersbn/gitlab:12.5.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.5.1 + sameersbn/gitlab:12.5.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.5.1 + sameersbn/gitlab:12.5.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. @@ -485,7 +485,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.5.1 + sameersbn/gitlab:12.5.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.5.1 + sameersbn/gitlab:12.5.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.5.1 + sameersbn/gitlab:12.5.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.5.1 + sameersbn/gitlab:12.5.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.5.1 app:sanitize + sameersbn/gitlab:12.5.2 app:sanitize ``` ### Piwik @@ -1101,7 +1101,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.1 app:rake gitlab:backup:create + sameersbn/gitlab:12.5.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. @@ -1136,14 +1136,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.1 app:rake db:setup + sameersbn/gitlab:12.5.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.5.1 app:rake gitlab:backup:restore + sameersbn/gitlab:12.5.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. @@ -1152,7 +1152,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.5.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.5.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1202,7 +1202,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.5.1 app:rake gitlab:env:info + sameersbn/gitlab:12.5.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.1 app:rake gitlab:import:repos + sameersbn/gitlab:12.5.2 app:rake gitlab:import:repos ``` Or @@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.1 app:rake gitlab:import:repos + sameersbn/gitlab:12.5.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.5.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.5.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.5.1 +docker pull sameersbn/gitlab:12.5.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1299,7 +1299,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.5.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.2 ``` ## Shell Access diff --git a/VERSION b/VERSION index 2b4b4d7c..96f72240 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.5.1 +12.5.2 diff --git a/docker-compose.yml b/docker-compose.yml index 477548a2..37a97c47 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.5.1 + image: sameersbn/gitlab:12.5.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 2c7e9f65..7ab2c2c3 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.5.1 app:rake gitlab:backup:create + sameersbn/gitlab:12.5.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.5.1 app:rake gitlab:backup:restore + sameersbn/gitlab:12.5.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.5.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.5.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.5.1 +docker pull sameersbn/gitlab:12.5.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.5.1 +sameersbn/gitlab:12.5.2 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 13f053de..d6ed505a 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.5.1 + image: sameersbn/gitlab:12.5.2 env: - name: TZ value: Asia/Kolkata From 05693df2fbc939e0384c2b9288d13eca4bc44754 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 5 Dec 2019 14:29:13 +0100 Subject: [PATCH 501/508] release 12.5.2 From 99cd0940cc50cae82a2fa69275406ca29cf73b8d Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 5 Dec 2019 14:30:03 +0100 Subject: [PATCH 502/508] Upgrade GitLab CE to 12.5.3 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index e50cb351..ed341737 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-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**12.5.3** +- gitlab: upgrade CE to v12.5.3 + **12.5.2** - gitlab: upgrade CE to v12.5.2 diff --git a/Dockerfile b/Dockerfile index a684d3de..ce0990af 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.5.2 +ARG VERSION=12.5.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index 34fb819b..fbd22905 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.5.2 +# sameersbn/gitlab:12.5.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.5.2 +docker pull sameersbn/gitlab:12.5.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.5.2 + sameersbn/gitlab:12.5.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.5.2 + sameersbn/gitlab:12.5.3 ``` ## Database @@ -261,7 +261,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.5.2 + sameersbn/gitlab:12.5.3 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.5.2 + sameersbn/gitlab:12.5.3 ``` 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: @@ -332,7 +332,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.5.2 + sameersbn/gitlab:12.5.3 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.5.2 + sameersbn/gitlab:12.5.3 ``` ### Mail @@ -372,7 +372,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.5.2 + sameersbn/gitlab:12.5.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.5.2 + sameersbn/gitlab:12.5.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.5.2 + sameersbn/gitlab:12.5.3 ``` 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. @@ -485,7 +485,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.5.2 + sameersbn/gitlab:12.5.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.5.2 + sameersbn/gitlab:12.5.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.5.2 + sameersbn/gitlab:12.5.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.5.2 + sameersbn/gitlab:12.5.3 ``` 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.5.2 app:sanitize + sameersbn/gitlab:12.5.3 app:sanitize ``` ### Piwik @@ -1101,7 +1101,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.2 app:rake gitlab:backup:create + sameersbn/gitlab:12.5.3 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. @@ -1136,14 +1136,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.2 app:rake db:setup + sameersbn/gitlab:12.5.3 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.5.2 app:rake gitlab:backup:restore + sameersbn/gitlab:12.5.3 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. @@ -1152,7 +1152,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.5.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.5.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1202,7 +1202,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.5.2 app:rake gitlab:env:info + sameersbn/gitlab:12.5.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.2 app:rake gitlab:import:repos + sameersbn/gitlab:12.5.3 app:rake gitlab:import:repos ``` Or @@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.2 app:rake gitlab:import:repos + sameersbn/gitlab:12.5.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.5.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. +> Upgrading to `sameersbn/gitlab:12.5.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. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:12.5.2 +docker pull sameersbn/gitlab:12.5.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1299,7 +1299,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.5.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index 96f72240..321973ed 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.5.2 +12.5.3 diff --git a/docker-compose.yml b/docker-compose.yml index 37a97c47..e5de8cc3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.5.2 + image: sameersbn/gitlab:12.5.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 7ab2c2c3..2294ca09 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.5.2 app:rake gitlab:backup:create + sameersbn/gitlab:12.5.3 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.5.2 app:rake gitlab:backup:restore + sameersbn/gitlab:12.5.3 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.5.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.5.3 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.5.2 +docker pull sameersbn/gitlab:12.5.3 ``` - **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.5.2 +sameersbn/gitlab:12.5.3 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index d6ed505a..35ee5e9e 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.5.2 + image: sameersbn/gitlab:12.5.3 env: - name: TZ value: Asia/Kolkata From a815bbd86168dcca98784865f1e1766e8c37a38e Mon Sep 17 00:00:00 2001 From: solidnerd Date: Wed, 25 Dec 2019 11:07:56 +0100 Subject: [PATCH 503/508] release 12.5.3 From ab49eaef51290b894b6557583c6bd9e63af13797 Mon Sep 17 00:00:00 2001 From: "Klos, Jan" Date: Wed, 11 Dec 2019 18:00:02 +0100 Subject: [PATCH 504/508] gitlab: upgrade CE to v12.5.4 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index ed341737..1ba64b57 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-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**12.5.4** +- gitlab: upgrade CE to v12.5.4 + **12.5.3** - gitlab: upgrade CE to v12.5.3 diff --git a/Dockerfile b/Dockerfile index ce0990af..1394333c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.5.3 +ARG VERSION=12.5.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index fbd22905..ee673c57 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.5.3 +# sameersbn/gitlab:12.5.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.5.3 +docker pull sameersbn/gitlab:12.5.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.5.3 + sameersbn/gitlab:12.5.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.5.3 + sameersbn/gitlab:12.5.4 ``` ## Database @@ -261,7 +261,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.5.3 + sameersbn/gitlab:12.5.4 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.5.3 + sameersbn/gitlab:12.5.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: @@ -332,7 +332,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.5.3 + sameersbn/gitlab:12.5.4 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.5.3 + sameersbn/gitlab:12.5.4 ``` ### Mail @@ -372,7 +372,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.5.3 + sameersbn/gitlab:12.5.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.5.3 + sameersbn/gitlab:12.5.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.5.3 + sameersbn/gitlab:12.5.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. @@ -485,7 +485,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.5.3 + sameersbn/gitlab:12.5.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.5.3 + sameersbn/gitlab:12.5.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.5.3 + sameersbn/gitlab:12.5.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.5.3 + sameersbn/gitlab:12.5.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:12.5.3 app:sanitize + sameersbn/gitlab:12.5.4 app:sanitize ``` ### Piwik @@ -1101,7 +1101,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.3 app:rake gitlab:backup:create + sameersbn/gitlab:12.5.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. @@ -1136,14 +1136,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.3 app:rake db:setup + sameersbn/gitlab:12.5.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:12.5.3 app:rake gitlab:backup:restore + sameersbn/gitlab:12.5.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. @@ -1152,7 +1152,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.5.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.5.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1202,7 +1202,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.5.3 app:rake gitlab:env:info + sameersbn/gitlab:12.5.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.3 app:rake gitlab:import:repos + sameersbn/gitlab:12.5.4 app:rake gitlab:import:repos ``` Or @@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.3 app:rake gitlab:import:repos + sameersbn/gitlab:12.5.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.5.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:12.5.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:12.5.3 +docker pull sameersbn/gitlab:12.5.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1299,7 +1299,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.5.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index 321973ed..b6125ec5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.5.3 +12.5.4 diff --git a/docker-compose.yml b/docker-compose.yml index e5de8cc3..b463c6ba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.5.3 + image: sameersbn/gitlab:12.5.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 2294ca09..6f91c5f7 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.5.3 app:rake gitlab:backup:create + sameersbn/gitlab:12.5.4 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.5.3 app:rake gitlab:backup:restore + sameersbn/gitlab:12.5.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. @@ -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.5.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.5.4 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.5.3 +docker pull sameersbn/gitlab:12.5.4 ``` - **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.5.3 +sameersbn/gitlab:12.5.4 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 35ee5e9e..213b4ce6 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.5.3 + image: sameersbn/gitlab:12.5.4 env: - name: TZ value: Asia/Kolkata From 46e18c9f5ec08ca8f25f1899b02403c64300b098 Mon Sep 17 00:00:00 2001 From: "Klos, Jan" Date: Wed, 11 Dec 2019 18:01:05 +0100 Subject: [PATCH 505/508] Update golang to 1.12.14 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 1ba64b57..36096cb1 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list **12.5.4** - gitlab: upgrade CE to v12.5.4 +- Update golang to 1.12.14 **12.5.3** - gitlab: upgrade CE to v12.5.3 diff --git a/Dockerfile b/Dockerfile index 1394333c..7d610448 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ARG VERSION=12.5.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ - GOLANG_VERSION=1.12.12 \ + GOLANG_VERSION=1.12.14 \ GITLAB_SHELL_VERSION=10.2.0 \ GITLAB_WORKHORSE_VERSION=8.14.1 \ GITLAB_PAGES_VERSION=1.12.0 \ From 1ef03e61aba21f18644f039253cedddd1ab27c5b Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 26 Dec 2019 10:31:36 +0100 Subject: [PATCH 506/508] release 12.5.4 From 1cc351370fd1b355678807bfc30455ad3aaeb700 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 26 Dec 2019 10:33:21 +0100 Subject: [PATCH 507/508] Upgrade GitLab CE to 12.5.5 --- Changelog.md | 3 +++ Dockerfile | 2 +- README.md | 52 +++++++++++++++++++------------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++++---- kubernetes/gitlab-rc.yml | 2 +- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index 36096cb1..f13d9541 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-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**12.5.5** +- gitlab: upgrade CE to v12.5.5 + **12.5.4** - gitlab: upgrade CE to v12.5.4 - Update golang to 1.12.14 diff --git a/Dockerfile b/Dockerfile index 7d610448..403b9c5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010 ARG BUILD_DATE ARG VCS_REF -ARG VERSION=12.5.4 +ARG VERSION=12.5.5 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ diff --git a/README.md b/README.md index ee673c57..eb426bbc 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.5.4 +# sameersbn/gitlab:12.5.5 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,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.5.4 +docker pull sameersbn/gitlab:12.5.5 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -193,7 +193,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.5.4 + sameersbn/gitlab:12.5.5 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -228,7 +228,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.5.4 + sameersbn/gitlab:12.5.5 ``` ## Database @@ -261,7 +261,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.5.4 + sameersbn/gitlab:12.5.5 ``` #### Linking to PostgreSQL Container @@ -305,7 +305,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.5.4 + sameersbn/gitlab:12.5.5 ``` 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: @@ -332,7 +332,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.5.4 + sameersbn/gitlab:12.5.5 ``` ### Linking to Redis Container @@ -359,7 +359,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:12.5.4 + sameersbn/gitlab:12.5.5 ``` ### Mail @@ -372,7 +372,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.5.4 + sameersbn/gitlab:12.5.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -392,7 +392,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.5.4 + sameersbn/gitlab:12.5.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -469,7 +469,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.5.4 + sameersbn/gitlab:12.5.5 ``` 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. @@ -485,7 +485,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.5.4 + sameersbn/gitlab:12.5.5 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -508,7 +508,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.5.4 + sameersbn/gitlab:12.5.5 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -556,7 +556,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.5.4 + sameersbn/gitlab:12.5.5 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -729,14 +729,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.5.4 + sameersbn/gitlab:12.5.5 ``` 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.5.4 app:sanitize + sameersbn/gitlab:12.5.5 app:sanitize ``` ### Piwik @@ -1101,7 +1101,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.4 app:rake gitlab:backup:create + sameersbn/gitlab:12.5.5 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. @@ -1136,14 +1136,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.4 app:rake db:setup + sameersbn/gitlab:12.5.5 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.5.4 app:rake gitlab:backup:restore + sameersbn/gitlab:12.5.5 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. @@ -1152,7 +1152,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.5.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.5.5 app:rake gitlab:backup:restore BACKUP=1417624827 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1202,7 +1202,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.5.4 app:rake gitlab:env:info + sameersbn/gitlab:12.5.5 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1215,7 +1215,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.4 app:rake gitlab:import:repos + sameersbn/gitlab:12.5.5 app:rake gitlab:import:repos ``` Or @@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:12.5.4 app:rake gitlab:import:repos + sameersbn/gitlab:12.5.5 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1268,12 +1268,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:12.5.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. +> Upgrading to `sameersbn/gitlab:12.5.5` 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.5.4 +docker pull sameersbn/gitlab:12.5.5 ``` - **Step 2**: Stop and remove the currently running image @@ -1299,7 +1299,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.5.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.5 ``` ## Shell Access diff --git a/VERSION b/VERSION index b6125ec5..8c966ec2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -12.5.4 +12.5.5 diff --git a/docker-compose.yml b/docker-compose.yml index b463c6ba..6f0b6893 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:12.5.4 + image: sameersbn/gitlab:12.5.5 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 6f91c5f7..a19be506 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.5.4 app:rake gitlab:backup:create + sameersbn/gitlab:12.5.5 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.5.4 app:rake gitlab:backup:restore + sameersbn/gitlab:12.5.5 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.5.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:12.5.5 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.5.4 +docker pull sameersbn/gitlab:12.5.5 ``` - **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.5.4 +sameersbn/gitlab:12.5.5 ``` diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 213b4ce6..f2ed1569 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:12.5.4 + image: sameersbn/gitlab:12.5.5 env: - name: TZ value: Asia/Kolkata From 8ffde0636deac39d5581cba85190852cee03264b Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 26 Dec 2019 10:34:46 +0100 Subject: [PATCH 508/508] release 12.5.5