From 21778c0cf59fa0389cad216d72fef247276c6a73 Mon Sep 17 00:00:00 2001 From: Thomas Lee Date: Tue, 5 Mar 2019 19:40:17 +0800 Subject: [PATCH 001/522] Add GITLAB_SHELL_CUSTOM_HOOKS_DIR --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c917d84d6..312b2024c 100644 --- a/README.md +++ b/README.md @@ -887,6 +887,7 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_PROJECTS_SNIPPETS` | Set if *snippets* feature should be enabled by default for new projects. Defaults to `false`. | | `GITLAB_PROJECTS_BUILDS` | Set if *builds* feature should be enabled by default for new projects. Defaults to `true`. | | `GITLAB_PROJECTS_CONTAINER_REGISTRY` | Set if *container_registry* feature should be enabled by default for new projects. Defaults to `true`. | +| `GITLAB_SHELL_CUSTOM_HOOKS_DIR` | Global custom hooks directory. Defaults to `/home/git/gitlab-shell/hooks`. | | `GITLAB_WEBHOOK_TIMEOUT` | Sets the timeout for webhooks. Defaults to `10` seconds. | | `GITLAB_NOTIFY_ON_BROKEN_BUILDS` | Enable or disable broken build notification emails. Defaults to `true` | | `GITLAB_NOTIFY_PUSHER` | Add pusher to recipients list of broken build notification emails. Defaults to `false` | From 1a13c9f10c55c6690826b99aeb4a86f55ffc3941 Mon Sep 17 00:00:00 2001 From: Thomas Lee Date: Tue, 5 Mar 2019 21:09:54 +0800 Subject: [PATCH 002/522] Add GITLAB_SHELL_CUSTOM_HOOKS_DIR --- assets/runtime/env-defaults | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 3b1f5bc3e..7c4c0221c 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -435,6 +435,9 @@ GITALY_TOKEN=${GITALY_TOKEN:-} GITALY_SOCKET_PATH=${GITLAB_INSTALL_DIR}/tmp/sockets/private/gitaly.socket GITALY_ADDRESS=${GITALY_ADDRESS:-unix:$GITALY_SOCKET_PATH} +## GitLab Shell +GITLAB_SHELL_CUSTOM_HOOKS_DIR=${GITLAB_SHELL_CUSTOM_HOOKS_DIR:-"$GITLAB_SHELL_INSTALL_DIR/hooks"} + ## MONITORING GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL=${GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL:-10} GITLAB_MONITORING_IP_WHITELIST=${GITLAB_MONITORING_IP_WHITELIST:-"0.0.0.0/8"} From 5466c0d43df68ad950969042099768f9067fb984 Mon Sep 17 00:00:00 2001 From: Thomas Lee Date: Tue, 5 Mar 2019 22:02:24 +0800 Subject: [PATCH 003/522] Add GITLAB_SHELL_CUSTOM_HOOKS_DIR --- assets/runtime/functions | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/assets/runtime/functions b/assets/runtime/functions index 53e063c18..ee80cacd2 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1600,6 +1600,13 @@ configure_gitlab_shell() { REDIS_HOST \ REDIS_PORT \ REDIS_DB_NUMBER + + # update custom_hooks_dir if set $GITLAB_SHELL_CUSTOM_HOOKS_DIR + if [[ -n ${GITLAB_SHELL_CUSTOM_HOOKS_DIR} ]]; then + exec_as_git sed -i \ + "s|custom_hooks_dir:.*|custom_hooks_dir: $GITLAB_SHELL_CUSTOM_HOOKS_DIR|g" \ + ${GITLAB_SHELL_CONFIG} + fi } From e07b6010f9c46898977845362d52e137b081c79f Mon Sep 17 00:00:00 2001 From: Thomas Lee Date: Tue, 5 Mar 2019 19:40:17 +0800 Subject: [PATCH 004/522] Add GITLAB_SHELL_CUSTOM_HOOKS_DIR --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6be92f7b7..4a5e6033e 100644 --- a/README.md +++ b/README.md @@ -795,6 +795,7 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_PROJECTS_SNIPPETS` | Set if *snippets* feature should be enabled by default for new projects. Defaults to `false`. | | `GITLAB_PROJECTS_BUILDS` | Set if *builds* feature should be enabled by default for new projects. Defaults to `true`. | | `GITLAB_PROJECTS_CONTAINER_REGISTRY` | Set if *container_registry* feature should be enabled by default for new projects. Defaults to `true`. | +| `GITLAB_SHELL_CUSTOM_HOOKS_DIR` | Global custom hooks directory. Defaults to `/home/git/gitlab-shell/hooks`. | | `GITLAB_WEBHOOK_TIMEOUT` | Sets the timeout for webhooks. Defaults to `10` seconds. | | `GITLAB_NOTIFY_ON_BROKEN_BUILDS` | Enable or disable broken build notification emails. Defaults to `true` | | `GITLAB_NOTIFY_PUSHER` | Add pusher to recipients list of broken build notification emails. Defaults to `false` | From ee50f6899060d69253dafb819ee8a566177b1bd4 Mon Sep 17 00:00:00 2001 From: Thomas Lee Date: Tue, 5 Mar 2019 21:09:54 +0800 Subject: [PATCH 005/522] Add GITLAB_SHELL_CUSTOM_HOOKS_DIR --- assets/runtime/env-defaults | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index c4899f5ff..8e14bc0f3 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -495,6 +495,9 @@ GITALY_TOKEN=${GITALY_TOKEN:-} GITALY_SOCKET_PATH=${GITLAB_INSTALL_DIR}/tmp/sockets/private/gitaly.socket GITALY_ADDRESS=${GITALY_ADDRESS:-unix:$GITALY_SOCKET_PATH} +## GitLab Shell +GITLAB_SHELL_CUSTOM_HOOKS_DIR=${GITLAB_SHELL_CUSTOM_HOOKS_DIR:-"$GITLAB_SHELL_INSTALL_DIR/hooks"} + ## MONITORING GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL=${GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL:-10} GITLAB_MONITORING_IP_WHITELIST=${GITLAB_MONITORING_IP_WHITELIST:-"0.0.0.0/8"} From 4b505aacf8f50664a4ca693d0b412912d5504c58 Mon Sep 17 00:00:00 2001 From: Thomas Lee Date: Tue, 5 Mar 2019 22:02:24 +0800 Subject: [PATCH 006/522] Add GITLAB_SHELL_CUSTOM_HOOKS_DIR --- assets/runtime/functions | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/assets/runtime/functions b/assets/runtime/functions index 1a0335706..83622a48f 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1674,6 +1674,13 @@ configure_gitlab_shell() { REDIS_HOST \ REDIS_PORT \ REDIS_DB_NUMBER + + # update custom_hooks_dir if set $GITLAB_SHELL_CUSTOM_HOOKS_DIR + if [[ -n ${GITLAB_SHELL_CUSTOM_HOOKS_DIR} ]]; then + exec_as_git sed -i \ + "s|custom_hooks_dir:.*|custom_hooks_dir: $GITLAB_SHELL_CUSTOM_HOOKS_DIR|g" \ + ${GITLAB_SHELL_CONFIG} + fi } From d2263980ea645a4aac3be1d27afea2df71a382ad Mon Sep 17 00:00:00 2001 From: Michal Galet Date: Wed, 24 Jun 2020 13:33:04 +0200 Subject: [PATCH 007/522] Obfuscate access_token and private_token in nginx access log Authentication tokens are allowed to be part of URI and therefore they are printed in the access log. This can be a security concern especially when system and application logs are being send to an external logging system (syslog, wazuh, splunk, etc.). --- assets/runtime/config/nginx/gitlab | 11 ++++++++++- assets/runtime/config/nginx/gitlab-ssl | 13 +++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/assets/runtime/config/nginx/gitlab b/assets/runtime/config/nginx/gitlab index 6372aad90..b08c8bff4 100644 --- a/assets/runtime/config/nginx/gitlab +++ b/assets/runtime/config/nginx/gitlab @@ -25,6 +25,15 @@ map $http_upgrade $connection_upgrade_gitlab { '' close; } +## Obfuscate access_token and private_token in access log +map $request_uri $obfuscated_request_uri { + ~(.+\?)(.*&)?(private_token=|access_token=)[^&]*(&.*|$) $1$2$3****$4; + default $request_uri; +} +log_format main '$remote_addr - $remote_user [$time_local] ' + '"$request_method $obfuscated_request_uri $server_protocol" $status $body_bytes_sent ' + '"$http_referer" "$http_user_agent"'; + ## Normal HTTP host server { ## Either remove "default_server" from the listen line below, @@ -49,7 +58,7 @@ server { add_header Strict-Transport-Security "max-age={{NGINX_HSTS_MAXAGE}};"; ## Individual nginx logs for this GitLab vhost - access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log; + access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log main; error_log {{GITLAB_LOG_DIR}}/nginx/gitlab_error.log; location / { diff --git a/assets/runtime/config/nginx/gitlab-ssl b/assets/runtime/config/nginx/gitlab-ssl index 24acfe171..8d8d5c3a8 100644 --- a/assets/runtime/config/nginx/gitlab-ssl +++ b/assets/runtime/config/nginx/gitlab-ssl @@ -29,6 +29,15 @@ map $http_upgrade $connection_upgrade_gitlab_ssl { '' close; } +## Obfuscate access_token and private_token in access log +map $request_uri $obfuscated_request_uri { + ~(.+\?)(.*&)?(private_token=|access_token=)[^&]*(&.*|$) $1$2$3****$4; + default $request_uri; +} +log_format main '$remote_addr - $remote_user [$time_local] ' + '"$request_method $obfuscated_request_uri $server_protocol" $status $body_bytes_sent ' + '"$http_referer" "$http_user_agent"'; + ## Redirects all HTTP traffic to the HTTPS host server { ## Either remove "default_server" from the listen line below, @@ -40,7 +49,7 @@ server { server_name _; ## Replace this with something like gitlab.example.com server_tokens off; ## Don't show the nginx version number, a security best practice return 301 https://$host:{{GITLAB_PORT}}$request_uri; - access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log; + access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log main; error_log {{GITLAB_LOG_DIR}}/nginx/gitlab_error.log; } @@ -94,7 +103,7 @@ server { ssl_dhparam {{SSL_DHPARAM_PATH}}; ## Individual nginx logs for this GitLab vhost - access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log; + access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log main; error_log {{GITLAB_LOG_DIR}}/nginx/gitlab_error.log; location / { From 2d0159b61dab355d16a0f1c60498f0393c301910 Mon Sep 17 00:00:00 2001 From: intec_bf Date: Sun, 8 Nov 2020 23:19:05 +0100 Subject: [PATCH 008/522] reduce image size --- assets/build/install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/build/install.sh b/assets/build/install.sh index a29dfd437..0278c92ac 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -135,6 +135,7 @@ chown -R ${GITLAB_USER}: ${GITLAB_GITALY_INSTALL_DIR} rm -rf ${GITLAB_GITALY_BUILD_DIR} # remove go +go clean --modcache 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 @@ -443,3 +444,4 @@ rm -rf /var/lib/apt/lists/* # clean up caches rm -rf ${GITLAB_HOME}/.cache ${GITLAB_HOME}/.bundle ${GITLAB_HOME}/go +rm -rf /root/.cache /root/.bundle ${GITLAB_HOME}/gitlab/node_modules From 0946fef04c9c55d10fa79f8dd8099e6968a19ef0 Mon Sep 17 00:00:00 2001 From: sue445 Date: Thu, 12 Nov 2020 15:57:50 +0900 Subject: [PATCH 009/522] Add GITLAB_PAGES_ARTIFACTS_SERVER_URL --- README.md | 1 + assets/runtime/config/gitlab-pages/config | 1 + assets/runtime/env-defaults | 1 + assets/runtime/functions | 6 ++++++ 4 files changed, 9 insertions(+) diff --git a/README.md b/README.md index 64755df57..a06006f9b 100644 --- a/README.md +++ b/README.md @@ -891,6 +891,7 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_PAGES_PORT`| Sets GitLab Pages Port that will be used in NGINX. Defaults to `80` | | `GITLAB_PAGES_HTTPS` | Sets GitLab Pages to HTTPS and the gitlab-pages-ssl config will be used. Defaults to `false` | | `GITLAB_PAGES_ARTIFACTS_SERVER` | Set to `true` to enable pages artifactsserver, enabled by default. | +| `GITLAB_PAGES_ARTIFACTS_SERVER_URL` | If `GITLAB_PAGES_ARTIFACTS_SERVER` is enabled, set to API endpoint for GitLab Pages (e.g. `https://example.com/api/v4`). No 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. | diff --git a/assets/runtime/config/gitlab-pages/config b/assets/runtime/config/gitlab-pages/config index 768d5f95d..8b0edb605 100644 --- a/assets/runtime/config/gitlab-pages/config +++ b/assets/runtime/config/gitlab-pages/config @@ -3,3 +3,4 @@ auth-client-secret={{GITLAB_PAGES_ACCESS_CLIENT_SECRET}} auth-redirect-uri={{GITLAB_PAGES_ACCESS_REDIRECT_URI}} auth-secret={{GITLAB_PAGES_ACCESS_SECRET}} gitlab-server={{GITLAB_PAGES_ACCESS_CONTROL_SERVER}} +artifacts-server={{GITLAB_PAGES_ARTIFACTS_SERVER_URL}} diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index db1eb56fc..4a1c65bb1 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -480,6 +480,7 @@ GITLAB_PAGES_DOMAIN=${GITLAB_PAGES_DOMAIN:-"example.com"} GITLAB_PAGES_DIR="${GITLAB_PAGES_DIR:-$GITLAB_SHARED_DIR/pages}" GITLAB_PAGES_PORT=${GITLAB_PAGES_PORT:-80} GITLAB_PAGES_ARTIFACTS_SERVER=${GITLAB_PAGES_ARTIFACTS_SERVER:-true} +GITLAB_PAGES_ARTIFACTS_SERVER_URL=${GITLAB_PAGES_ARTIFACTS_SERVER_URL:-} GITLAB_PAGES_HTTPS=${GITLAB_PAGES_HTTPS:-false} GITLAB_PAGES_EXTERNAL_HTTP=${GITLAB_PAGES_EXTERNAL_HTTP:-} GITLAB_PAGES_EXTERNAL_HTTPS=${GITLAB_PAGES_EXTERNAL_HTTPS:-} diff --git a/assets/runtime/functions b/assets/runtime/functions index a4e0ef4d6..663d26b48 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1719,6 +1719,12 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then GITLAB_PAGES_ACCESS_SECRET \ GITLAB_PAGES_ACCESS_CONTROL_SERVER + if [[ -n ${GITLAB_PAGES_ARTIFACTS_SERVER_URL} ]]; then + update_template ${GITLAB_PAGES_CONFIG} GITLAB_PAGES_ARTIFACTS_SERVER_URL + else + exec_as_git sed -i "/{{GITLAB_PAGES_ARTIFACTS_SERVER_URL}}/d" ${GITLAB_PAGES_CONFIG} + fi + cat >> /etc/supervisor/conf.d/gitlab-pages.conf < Date: Sat, 14 Nov 2020 12:50:34 +0100 Subject: [PATCH 010/522] Upgrade GitLab CE to 13.5.4 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 56 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 1181a5235..5675e4ad6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.5.4** +- gitlab: upgrade CE to v13.5.4 +- gitaly: upgrade v13.5.4 + **13.5.3** - gitlab: upgrade CE to v13.5.3 - gitaly: upgrade v13.5.3 diff --git a/Dockerfile b/Dockerfile index 2130a6f9b..0cd054d9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:bionic-20200921 -ARG VERSION=13.5.3 +ARG VERSION=13.5.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=13.11.0 \ GITLAB_WORKHORSE_VERSION=8.51.0 \ GITLAB_PAGES_VERSION=1.28.0 \ - GITALY_SERVER_VERSION=13.5.3 \ + GITALY_SERVER_VERSION=13.5.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index a06006f9b..b2e7172b4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.5.3 +# sameersbn/gitlab:13.5.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.5.3 +docker pull sameersbn/gitlab:13.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:13.5.3 + sameersbn/gitlab:13.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:13.5.3 + sameersbn/gitlab:13.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:13.5.3 + sameersbn/gitlab:13.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:13.5.3 + sameersbn/gitlab:13.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:13.5.3 + sameersbn/gitlab:13.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:13.5.3 + sameersbn/gitlab:13.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:13.5.3 + sameersbn/gitlab:13.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:13.5.3 + sameersbn/gitlab:13.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:13.5.3 + sameersbn/gitlab:13.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:13.5.3 + sameersbn/gitlab:13.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:13.5.3 + sameersbn/gitlab:13.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:13.5.3 + sameersbn/gitlab:13.5.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.5.3 + sameersbn/gitlab:13.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:13.5.3 app:sanitize + sameersbn/gitlab:13.5.4 app:sanitize ``` ### Piwik @@ -1129,7 +1129,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.5.3 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1164,14 +1164,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.5.3 app:rake db:setup + sameersbn/gitlab:13.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:13.5.3 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1180,14 +1180,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.5.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.5.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.5.3 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.5.4 # Choose to restore from 1515629493 ``` @@ -1230,7 +1230,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.5.3 app:rake gitlab:env:info + sameersbn/gitlab:13.5.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1243,7 +1243,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.5.3 app:rake gitlab:import:repos + sameersbn/gitlab:13.5.4 app:rake gitlab:import:repos ``` Or @@ -1274,7 +1274,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.5.3 app:rake gitlab:import:repos + sameersbn/gitlab:13.5.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1296,12 +1296,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.5.3 +docker pull sameersbn/gitlab:13.5.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1327,7 +1327,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.5.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.5.4 ``` ## Shell Access @@ -1365,7 +1365,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.5.3 + image: sameersbn/gitlab:13.5.4 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 6d883115a..ef52cf386 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.5.3 +13.5.4 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index ac7ca0b1e..fbf90f15e 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.5.3 + image: sameersbn/gitlab:13.5.4 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 28aa167af..d32932778 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.5.3 + image: sameersbn/gitlab:13.5.4 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 01681ef30..a3aa80241 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.5.3 + image: sameersbn/gitlab:13.5.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 00fa10ca1..77492380b 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.5.3 app:rake gitlab:backup:create + sameersbn/gitlab:13.5.4 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.5.3 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.5.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.5.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.5.3 +docker pull sameersbn/gitlab:13.5.4 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.5.3 +sameersbn/gitlab:13.5.4 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index d1bf70c4c..f69a38a31 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.5.3 + image: sameersbn/gitlab:13.5.4 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index ae55e507d..7067c8b05 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.5.3 + image: sameersbn/gitlab:13.5.4 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index a74f8000f..7a64eabbe 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.5.3 + image: sameersbn/gitlab:13.5.4 env: - name: TZ value: Asia/Kolkata From 9e47e44111f8f963f9109da95f978a6356a5b03e Mon Sep 17 00:00:00 2001 From: intec_bf Date: Sat, 14 Nov 2020 12:51:02 +0100 Subject: [PATCH 011/522] go release 1.15.5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0cd054d9d..a120ed463 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG VERSION=13.5.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ - GOLANG_VERSION=1.15.3 \ + GOLANG_VERSION=1.15.5 \ GITLAB_SHELL_VERSION=13.11.0 \ GITLAB_WORKHORSE_VERSION=8.51.0 \ GITLAB_PAGES_VERSION=1.28.0 \ From 812de4a1cfa9b0a3b965998dcf7cfdd20578858a Mon Sep 17 00:00:00 2001 From: intec_bf Date: Mon, 23 Nov 2020 13:22:09 +0100 Subject: [PATCH 012/522] upgrade Gitlab CE to 13.6.0 --- Changelog.md | 7 ++++ Dockerfile | 10 ++--- README.md | 56 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 45 deletions(-) diff --git a/Changelog.md b/Changelog.md index 5675e4ad6..0d26ea6bb 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,13 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.6.0** +- gitlab: upgrade CE to v13.6.0 +- gitaly: upgrade v13.6.0 +- gitlab-shell: upgrade to v13.13.0 +- gitlab-pages: upgrade to v1.30.0 +- gitlab-workhorse: upgrade to v8.54.0 + **13.5.4** - gitlab: upgrade CE to v13.5.4 - gitaly: upgrade v13.5.4 diff --git a/Dockerfile b/Dockerfile index a120ed463..3edeb6697 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:bionic-20200921 -ARG VERSION=13.5.4 +ARG VERSION=13.6.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.6 \ GOLANG_VERSION=1.15.5 \ - GITLAB_SHELL_VERSION=13.11.0 \ - GITLAB_WORKHORSE_VERSION=8.51.0 \ - GITLAB_PAGES_VERSION=1.28.0 \ - GITALY_SERVER_VERSION=13.5.4 \ + GITLAB_SHELL_VERSION=13.13.0 \ + GITLAB_WORKHORSE_VERSION=8.54.0 \ + GITLAB_PAGES_VERSION=1.30.0 \ + GITALY_SERVER_VERSION=13.6.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index b2e7172b4..20990a44f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.5.4 +# sameersbn/gitlab:13.6.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.5.4 +docker pull sameersbn/gitlab:13.6.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:13.5.4 + sameersbn/gitlab:13.6.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:13.5.4 + sameersbn/gitlab:13.6.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:13.5.4 + sameersbn/gitlab:13.6.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:13.5.4 + sameersbn/gitlab:13.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: @@ -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:13.5.4 + sameersbn/gitlab:13.6.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:13.5.4 + sameersbn/gitlab:13.6.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:13.5.4 + sameersbn/gitlab:13.6.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:13.5.4 + sameersbn/gitlab:13.6.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:13.5.4 + sameersbn/gitlab:13.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. @@ -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:13.5.4 + sameersbn/gitlab:13.6.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:13.5.4 + sameersbn/gitlab:13.6.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:13.5.4 + sameersbn/gitlab:13.6.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.5.4 + sameersbn/gitlab:13.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:13.5.4 app:sanitize + sameersbn/gitlab:13.6.0 app:sanitize ``` ### Piwik @@ -1129,7 +1129,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.5.4 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1164,14 +1164,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.5.4 app:rake db:setup + sameersbn/gitlab:13.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:13.5.4 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1180,14 +1180,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.5.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.5.4 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.6.0 # Choose to restore from 1515629493 ``` @@ -1230,7 +1230,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.5.4 app:rake gitlab:env:info + sameersbn/gitlab:13.6.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1243,7 +1243,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.5.4 app:rake gitlab:import:repos + sameersbn/gitlab:13.6.0 app:rake gitlab:import:repos ``` Or @@ -1274,7 +1274,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.5.4 app:rake gitlab:import:repos + sameersbn/gitlab:13.6.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1296,12 +1296,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.5.4 +docker pull sameersbn/gitlab:13.6.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1327,7 +1327,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.5.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.6.0 ``` ## Shell Access @@ -1365,7 +1365,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.5.4 + image: sameersbn/gitlab:13.6.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index ef52cf386..fc9c00c1b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.5.4 +13.6.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index fbf90f15e..9f50a6e81 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.5.4 + image: sameersbn/gitlab:13.6.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index d32932778..4f6972abc 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.5.4 + image: sameersbn/gitlab:13.6.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index a3aa80241..76d1c36cf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.5.4 + image: sameersbn/gitlab:13.6.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 77492380b..90cbd53c8 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.5.4 app:rake gitlab:backup:create + sameersbn/gitlab:13.6.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.5.4 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.5.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.6.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.5.4 +docker pull sameersbn/gitlab:13.6.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.5.4 +sameersbn/gitlab:13.6.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index f69a38a31..142dbd26b 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.5.4 + image: sameersbn/gitlab:13.6.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 7067c8b05..a27c1e5ef 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.5.4 + image: sameersbn/gitlab:13.6.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 7a64eabbe..9f46d5fa5 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.5.4 + image: sameersbn/gitlab:13.6.0 env: - name: TZ value: Asia/Kolkata From abb5d0e6c02878a99dbf98316ea9439f8dc41f08 Mon Sep 17 00:00:00 2001 From: intec_bf Date: Mon, 23 Nov 2020 15:07:40 +0100 Subject: [PATCH 013/522] use bundler 2.1.4 --- Changelog.md | 3 ++- Dockerfile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index 0d26ea6bb..1acd27716 100644 --- a/Changelog.md +++ b/Changelog.md @@ -8,7 +8,8 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list - gitaly: upgrade v13.6.0 - gitlab-shell: upgrade to v13.13.0 - gitlab-pages: upgrade to v1.30.0 -- gitlab-workhorse: upgrade to v8.54.0 +- gitlab-workhorse: upgrade to v8.54.0 +- use bundler 2.1.4 **13.5.4** - gitlab: upgrade CE to v13.5.4 diff --git a/Dockerfile b/Dockerfile index 3edeb6697..c56afaf7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,7 +51,7 @@ RUN set -ex && \ && 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 -v 1.17.3 \ + && gem install --no-document bundler -v 2.1.4 \ && rm -rf /var/lib/apt/lists/* COPY assets/build/ ${GITLAB_BUILD_DIR}/ From 9ef34bc35d051960bb342f88c946007a41a92d4b Mon Sep 17 00:00:00 2001 From: intec_bf Date: Mon, 23 Nov 2020 17:16:51 +0100 Subject: [PATCH 014/522] use ruby 2.7 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 1acd27716..874269627 100644 --- a/Changelog.md +++ b/Changelog.md @@ -10,6 +10,7 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list - gitlab-pages: upgrade to v1.30.0 - gitlab-workhorse: upgrade to v8.54.0 - use bundler 2.1.4 +- use ruby 2.7 **13.5.4** - gitlab: upgrade CE to v13.5.4 diff --git a/Dockerfile b/Dockerfile index c56afaf7e..b2fddd792 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:bionic-20200921 ARG VERSION=13.6.0 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=2.6 \ + RUBY_VERSION=2.7 \ GOLANG_VERSION=1.15.5 \ GITLAB_SHELL_VERSION=13.13.0 \ GITLAB_WORKHORSE_VERSION=8.54.0 \ From b1b4e8a238d41568db1ff8863436b0cbb7d8ba0c Mon Sep 17 00:00:00 2001 From: intec_bf Date: Tue, 24 Nov 2020 13:45:33 +0100 Subject: [PATCH 015/522] upgrade Gitlab CE to 13.6.1 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 56 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 874269627..fce79ca25 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.6.1** +- gitlab: upgrade CE to v13.6.1 +- gitaly: upgrade v13.6.1 + **13.6.0** - gitlab: upgrade CE to v13.6.0 - gitaly: upgrade v13.6.0 diff --git a/Dockerfile b/Dockerfile index b2fddd792..cf34c708e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:bionic-20200921 -ARG VERSION=13.6.0 +ARG VERSION=13.6.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=13.13.0 \ GITLAB_WORKHORSE_VERSION=8.54.0 \ GITLAB_PAGES_VERSION=1.30.0 \ - GITALY_SERVER_VERSION=13.6.0 \ + GITALY_SERVER_VERSION=13.6.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 20990a44f..e0aa68874 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.6.0 +# sameersbn/gitlab:13.6.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.6.0 +docker pull sameersbn/gitlab:13.6.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:13.6.0 + sameersbn/gitlab:13.6.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:13.6.0 + sameersbn/gitlab:13.6.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:13.6.0 + sameersbn/gitlab:13.6.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:13.6.0 + sameersbn/gitlab:13.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: @@ -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:13.6.0 + sameersbn/gitlab:13.6.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:13.6.0 + sameersbn/gitlab:13.6.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:13.6.0 + sameersbn/gitlab:13.6.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:13.6.0 + sameersbn/gitlab:13.6.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:13.6.0 + sameersbn/gitlab:13.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. @@ -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:13.6.0 + sameersbn/gitlab:13.6.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:13.6.0 + sameersbn/gitlab:13.6.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:13.6.0 + sameersbn/gitlab:13.6.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.6.0 + sameersbn/gitlab:13.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:13.6.0 app:sanitize + sameersbn/gitlab:13.6.1 app:sanitize ``` ### Piwik @@ -1129,7 +1129,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.0 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1164,14 +1164,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.0 app:rake db:setup + sameersbn/gitlab:13.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:13.6.0 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1180,14 +1180,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.6.0 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.6.1 # Choose to restore from 1515629493 ``` @@ -1230,7 +1230,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.0 app:rake gitlab:env:info + sameersbn/gitlab:13.6.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1243,7 +1243,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.0 app:rake gitlab:import:repos + sameersbn/gitlab:13.6.1 app:rake gitlab:import:repos ``` Or @@ -1274,7 +1274,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.0 app:rake gitlab:import:repos + sameersbn/gitlab:13.6.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1296,12 +1296,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.6.0 +docker pull sameersbn/gitlab:13.6.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1327,7 +1327,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.6.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.6.1 ``` ## Shell Access @@ -1365,7 +1365,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.6.0 + image: sameersbn/gitlab:13.6.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index fc9c00c1b..4daad9a5c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.6.0 +13.6.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 9f50a6e81..efd511f5b 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.6.0 + image: sameersbn/gitlab:13.6.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 4f6972abc..1d8f51ad0 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.6.0 + image: sameersbn/gitlab:13.6.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 76d1c36cf..d0cad181b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.6.0 + image: sameersbn/gitlab:13.6.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 90cbd53c8..169915054 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.0 app:rake gitlab:backup:create + sameersbn/gitlab:13.6.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.0 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.6.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.6.0 +docker pull sameersbn/gitlab:13.6.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.6.0 +sameersbn/gitlab:13.6.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 142dbd26b..2ed9576c6 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.6.0 + image: sameersbn/gitlab:13.6.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index a27c1e5ef..352a169ed 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.6.0 + image: sameersbn/gitlab:13.6.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 9f46d5fa5..23a8b000d 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.6.0 + image: sameersbn/gitlab:13.6.1 env: - name: TZ value: Asia/Kolkata From 94a41b3ae22d015cffee6a6874006829337fabfd Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 8 Dec 2020 19:30:54 +0100 Subject: [PATCH 016/522] upgrade Gitlab CE to 13.6.2 --- Changelog.md | 4 +++ Dockerfile | 4 +-- README.md | 56 ++++++++++++++++---------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++--- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 8 files changed, 43 insertions(+), 39 deletions(-) diff --git a/Changelog.md b/Changelog.md index fce79ca25..f7f5d7a4e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.6.2** +- gitlab: upgrade CE to v13.6.2 +- gitaly: upgrade v13.6.2 + **13.6.1** - gitlab: upgrade CE to v13.6.1 - gitaly: upgrade v13.6.1 diff --git a/Dockerfile b/Dockerfile index cf34c708e..7cc5517b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:bionic-20200921 -ARG VERSION=13.6.1 +ARG VERSION=13.6.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=13.13.0 \ GITLAB_WORKHORSE_VERSION=8.54.0 \ GITLAB_PAGES_VERSION=1.30.0 \ - GITALY_SERVER_VERSION=13.6.1 \ + GITALY_SERVER_VERSION=13.6.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index e0aa68874..aeda7ed8a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.6.1 +# sameersbn/gitlab:13.6.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.6.1 +docker pull sameersbn/gitlab:13.6.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:13.6.1 + sameersbn/gitlab:13.6.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:13.6.1 + sameersbn/gitlab:13.6.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:13.6.1 + sameersbn/gitlab:13.6.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:13.6.1 + sameersbn/gitlab:13.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: @@ -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:13.6.1 + sameersbn/gitlab:13.6.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:13.6.1 + sameersbn/gitlab:13.6.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:13.6.1 + sameersbn/gitlab:13.6.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:13.6.1 + sameersbn/gitlab:13.6.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:13.6.1 + sameersbn/gitlab:13.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. @@ -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:13.6.1 + sameersbn/gitlab:13.6.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:13.6.1 + sameersbn/gitlab:13.6.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:13.6.1 + sameersbn/gitlab:13.6.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.6.1 + sameersbn/gitlab:13.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:13.6.1 app:sanitize + sameersbn/gitlab:13.6.2 app:sanitize ``` ### Piwik @@ -1129,7 +1129,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.1 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1164,14 +1164,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.1 app:rake db:setup + sameersbn/gitlab:13.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:13.6.1 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1180,14 +1180,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.6.1 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.6.2 # Choose to restore from 1515629493 ``` @@ -1230,7 +1230,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.1 app:rake gitlab:env:info + sameersbn/gitlab:13.6.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1243,7 +1243,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.1 app:rake gitlab:import:repos + sameersbn/gitlab:13.6.2 app:rake gitlab:import:repos ``` Or @@ -1274,7 +1274,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.1 app:rake gitlab:import:repos + sameersbn/gitlab:13.6.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1296,12 +1296,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.6.1 +docker pull sameersbn/gitlab:13.6.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1327,7 +1327,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.6.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.6.2 ``` ## Shell Access @@ -1365,7 +1365,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.6.1 + image: sameersbn/gitlab:13.6.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 4daad9a5c..c4d83dcde 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.6.1 +13.6.2 diff --git a/docker-compose.yml b/docker-compose.yml index d0cad181b..90274d088 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.6.1 + image: sameersbn/gitlab:13.6.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 169915054..1887e6d4e 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.1 app:rake gitlab:backup:create + sameersbn/gitlab:13.6.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.1 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.6.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.6.1 +docker pull sameersbn/gitlab:13.6.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.6.1 +sameersbn/gitlab:13.6.2 ``` diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 352a169ed..4804ceeba 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.6.1 + image: sameersbn/gitlab:13.6.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 23a8b000d..747426d64 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.6.1 + image: sameersbn/gitlab:13.6.2 env: - name: TZ value: Asia/Kolkata From a0a3af5b6569eaed372d9d443fe2c112f4c2e8bd Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 8 Dec 2020 19:39:34 +0100 Subject: [PATCH 017/522] remove unnecessary package lists --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7cc5517b2..cd45f111f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,7 +25,9 @@ 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 gnupg2 + wget ca-certificates apt-transport-https gnupg2 \ + && rm -rf /var/lib/apt/lists/* + 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 \ From e95c3b744af2ed0302424c40c049717630522b67 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 8 Dec 2020 19:50:58 +0100 Subject: [PATCH 018/522] go release 1.15.6 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cd45f111f..a156d1cb1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG VERSION=13.6.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ - GOLANG_VERSION=1.15.5 \ + GOLANG_VERSION=1.15.6 \ GITLAB_SHELL_VERSION=13.13.0 \ GITLAB_WORKHORSE_VERSION=8.54.0 \ GITLAB_PAGES_VERSION=1.30.0 \ From 78e909cd88089bdcf37853aba98bb67e67f7db22 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 13 Dec 2020 11:51:55 +0100 Subject: [PATCH 019/522] upgrade Gitlab CE to 13.6.3 --- Changelog.md | 4 +++ Dockerfile | 4 +-- README.md | 56 ++++++++++++++++---------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++--- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 8 files changed, 43 insertions(+), 39 deletions(-) diff --git a/Changelog.md b/Changelog.md index f7f5d7a4e..831bff9a8 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.6.3** +- gitlab: upgrade CE to v13.6.3 +- gitaly: upgrade v13.6.3 + **13.6.2** - gitlab: upgrade CE to v13.6.2 - gitaly: upgrade v13.6.2 diff --git a/Dockerfile b/Dockerfile index a156d1cb1..b77803e70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:bionic-20200921 -ARG VERSION=13.6.2 +ARG VERSION=13.6.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=13.13.0 \ GITLAB_WORKHORSE_VERSION=8.54.0 \ GITLAB_PAGES_VERSION=1.30.0 \ - GITALY_SERVER_VERSION=13.6.2 \ + GITALY_SERVER_VERSION=13.6.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index aeda7ed8a..8c7968ad8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.6.2 +# sameersbn/gitlab:13.6.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.6.2 +docker pull sameersbn/gitlab:13.6.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:13.6.2 + sameersbn/gitlab:13.6.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:13.6.2 + sameersbn/gitlab:13.6.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:13.6.2 + sameersbn/gitlab:13.6.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:13.6.2 + sameersbn/gitlab:13.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: @@ -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:13.6.2 + sameersbn/gitlab:13.6.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:13.6.2 + sameersbn/gitlab:13.6.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:13.6.2 + sameersbn/gitlab:13.6.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:13.6.2 + sameersbn/gitlab:13.6.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:13.6.2 + sameersbn/gitlab:13.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. @@ -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:13.6.2 + sameersbn/gitlab:13.6.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:13.6.2 + sameersbn/gitlab:13.6.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:13.6.2 + sameersbn/gitlab:13.6.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.6.2 + sameersbn/gitlab:13.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:13.6.2 app:sanitize + sameersbn/gitlab:13.6.3 app:sanitize ``` ### Piwik @@ -1129,7 +1129,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.2 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1164,14 +1164,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.2 app:rake db:setup + sameersbn/gitlab:13.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:13.6.2 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1180,14 +1180,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.6.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.6.2 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.6.3 # Choose to restore from 1515629493 ``` @@ -1230,7 +1230,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.2 app:rake gitlab:env:info + sameersbn/gitlab:13.6.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1243,7 +1243,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.2 app:rake gitlab:import:repos + sameersbn/gitlab:13.6.3 app:rake gitlab:import:repos ``` Or @@ -1274,7 +1274,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.2 app:rake gitlab:import:repos + sameersbn/gitlab:13.6.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1296,12 +1296,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.6.2 +docker pull sameersbn/gitlab:13.6.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1327,7 +1327,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.6.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.6.3 ``` ## Shell Access @@ -1365,7 +1365,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.6.2 + image: sameersbn/gitlab:13.6.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index c4d83dcde..b550f7448 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.6.2 +13.6.3 diff --git a/docker-compose.yml b/docker-compose.yml index 90274d088..82b8abec3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.6.2 + image: sameersbn/gitlab:13.6.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 1887e6d4e..97cf437e1 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.2 app:rake gitlab:backup:create + sameersbn/gitlab:13.6.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.2 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.6.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.6.2 +docker pull sameersbn/gitlab:13.6.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.6.2 +sameersbn/gitlab:13.6.3 ``` diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 4804ceeba..58b7562e1 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.6.2 + image: sameersbn/gitlab:13.6.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 747426d64..f53134b4a 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.6.2 + image: sameersbn/gitlab:13.6.3 env: - name: TZ value: Asia/Kolkata From 283bd540f12b3d16ced53bc00fbaae251a0b1157 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 26 Dec 2020 12:39:10 +0100 Subject: [PATCH 020/522] upgrade Gitlab CE to 13.7.0 Signed-off-by: solidnerd # Conflicts: # Changelog.md # Dockerfile # README.md # VERSION # docker-compose.yml # docs/container_registry.md # docs/docker-compose-registry.yml # kubernetes/gitlab-rc.yml --- Changelog.md | 7 ++++ Dockerfile | 10 +++--- README.md | 56 ++++++++++++++++---------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++--- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 8 files changed, 49 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 831bff9a8..7676ad4a0 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,13 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.7.0** +- gitlab: upgrade CE to v13.7.0 +- gitaly: upgrade v13.7.0 +- gitlab-shell: upgrade to 13.14.0 +- gitlab-pages: upgrade to v1.32.0 +- gitlab-workhorse: upgrade to v8.58.0 + **13.6.3** - gitlab: upgrade CE to v13.6.3 - gitaly: upgrade v13.6.3 diff --git a/Dockerfile b/Dockerfile index b77803e70..ae67d51d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:bionic-20200921 -ARG VERSION=13.6.3 +ARG VERSION=13.7.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.15.6 \ - GITLAB_SHELL_VERSION=13.13.0 \ - GITLAB_WORKHORSE_VERSION=8.54.0 \ - GITLAB_PAGES_VERSION=1.30.0 \ - GITALY_SERVER_VERSION=13.6.3 \ + GITLAB_SHELL_VERSION=13.14.0 \ + GITLAB_WORKHORSE_VERSION=8.58.0 \ + GITLAB_PAGES_VERSION=1.32.0 \ + GITALY_SERVER_VERSION=13.7.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 8c7968ad8..866817078 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.6.3 +# sameersbn/gitlab:13.7.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.6.3 +docker pull sameersbn/gitlab:13.7.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:13.6.3 + sameersbn/gitlab:13.7.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:13.6.3 + sameersbn/gitlab:13.7.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:13.6.3 + sameersbn/gitlab:13.7.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:13.6.3 + sameersbn/gitlab:13.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: @@ -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:13.6.3 + sameersbn/gitlab:13.7.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:13.6.3 + sameersbn/gitlab:13.7.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:13.6.3 + sameersbn/gitlab:13.7.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:13.6.3 + sameersbn/gitlab:13.7.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:13.6.3 + sameersbn/gitlab:13.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. @@ -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:13.6.3 + sameersbn/gitlab:13.7.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:13.6.3 + sameersbn/gitlab:13.7.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:13.6.3 + sameersbn/gitlab:13.7.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.6.3 + sameersbn/gitlab:13.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:13.6.3 app:sanitize + sameersbn/gitlab:13.7.0 app:sanitize ``` ### Piwik @@ -1129,7 +1129,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.3 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1164,14 +1164,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.3 app:rake db:setup + sameersbn/gitlab:13.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:13.6.3 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1180,14 +1180,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.6.3 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.7.0 # Choose to restore from 1515629493 ``` @@ -1230,7 +1230,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.3 app:rake gitlab:env:info + sameersbn/gitlab:13.7.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1243,7 +1243,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.3 app:rake gitlab:import:repos + sameersbn/gitlab:13.7.0 app:rake gitlab:import:repos ``` Or @@ -1274,7 +1274,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.3 app:rake gitlab:import:repos + sameersbn/gitlab:13.7.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1296,12 +1296,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.6.3 +docker pull sameersbn/gitlab:13.7.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1327,7 +1327,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.6.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.7.0 ``` ## Shell Access @@ -1365,7 +1365,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.6.3 + image: sameersbn/gitlab:13.7.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index b550f7448..d6ef99820 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.6.3 +13.7.0 diff --git a/docker-compose.yml b/docker-compose.yml index 82b8abec3..e6877cd9a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.6.3 + image: sameersbn/gitlab:13.7.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 97cf437e1..04815a7b9 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.3 app:rake gitlab:backup:create + sameersbn/gitlab:13.7.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.3 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.6.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.7.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.6.3 +docker pull sameersbn/gitlab:13.7.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.6.3 +sameersbn/gitlab:13.7.0 ``` diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 58b7562e1..1d9be86af 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.6.3 + image: sameersbn/gitlab:13.7.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index f53134b4a..a3dd1b667 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.6.3 + image: sameersbn/gitlab:13.7.0 env: - name: TZ value: Asia/Kolkata From ec81aa33d45013cc89baf6d4d61c3539f193d0b7 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 22 Dec 2020 19:09:06 +0100 Subject: [PATCH 021/522] build from ubuntu:bionic-20201119 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 7676ad4a0..3ba17c9fe 100644 --- a/Changelog.md +++ b/Changelog.md @@ -9,6 +9,7 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list - gitlab-shell: upgrade to 13.14.0 - gitlab-pages: upgrade to v1.32.0 - gitlab-workhorse: upgrade to v8.58.0 +- ubuntu: upgrade to ubuntu bionic-20201119 **13.6.3** - gitlab: upgrade CE to v13.6.3 diff --git a/Dockerfile b/Dockerfile index ae67d51d2..fc64c1195 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:bionic-20200921 +FROM ubuntu:bionic-20201119 ARG VERSION=13.7.0 From ca34ea04866b91653bc6494afce3a12be6657b7c Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 26 Dec 2020 12:35:03 +0100 Subject: [PATCH 022/522] fix: GITLAB_RELATIVE_URL_ROOT installation method MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the last remove of the node_modules folder it wasn’t possbile to recompile assets on the start of the container. This is neccesarry for the GITLAB_RELATIVE_URL_ROOT to work correctly. Signed-off-by: solidnerd --- Dockerfile | 2 +- assets/runtime/functions | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fc64c1195..5279f6e12 100644 --- a/Dockerfile +++ b/Dockerfile @@ -79,7 +79,7 @@ LABEL \ EXPOSE 22/tcp 80/tcp 443/tcp -VOLUME ["${GITLAB_DATA_DIR}", "${GITLAB_LOG_DIR}"] +VOLUME ["${GITLAB_DATA_DIR}", "${GITLAB_LOG_DIR}","${GITLAB_HOME}/gitlab/node_modules"] WORKDIR ${GITLAB_INSTALL_DIR} ENTRYPOINT ["/sbin/entrypoint.sh"] CMD ["app:start"] diff --git a/assets/runtime/functions b/assets/runtime/functions index 663d26b48..6eb19ecf5 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1806,6 +1806,14 @@ migrate_database() { if [[ ! -f ${GITLAB_TEMP_DIR}/GITLAB_RELATIVE_URL_ROOT || ${GITLAB_RELATIVE_URL_ROOT} != ${CACHE_GITLAB_RELATIVE_URL_ROOT} ]]; then # assets need to be recompiled when GITLAB_RELATIVE_URL_ROOT is used if [[ -n ${GITLAB_RELATIVE_URL_ROOT} ]]; then + if [[ ! -d ${GITLAB_HOME}/gitlab/node_modules ]]; then + mkdir -p ${GITLAB_HOME}/gitlab/node_modules + chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules + fi + echo "Prepare recomplie assets... Installing missing node_modules for assets" + chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules + exec_as_git yarn install --production --pure-lockfile + exec_as_git yarn add ajv@^4.0.0 echo "Recompiling assets (relative_url in use), this could take a while..." exec_as_git bundle exec rake gitlab:assets:compile NODE_OPTIONS="--max-old-space-size=4096" >/dev/null 2>&1 fi From 52cfe8b8af93b7b838e0f427edeed25926e72d88 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sat, 26 Dec 2020 12:44:10 +0100 Subject: [PATCH 023/522] chore: upgrade to postgres 12 Signed-off-by: solidnerd --- Changelog.md | 1 + contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/postgresql-rc.yml | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Changelog.md b/Changelog.md index 3ba17c9fe..a8578bd50 100644 --- a/Changelog.md +++ b/Changelog.md @@ -10,6 +10,7 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list - gitlab-pages: upgrade to v1.32.0 - gitlab-workhorse: upgrade to v8.58.0 - ubuntu: upgrade to ubuntu bionic-20201119 +- postgresql: upgrade to postgresql 12 **13.6.3** - gitlab: upgrade CE to v13.6.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index efd511f5b..64019cbbc 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -11,7 +11,7 @@ services: postgresql: restart: always - image: sameersbn/postgresql:11-20200524 + image: sameersbn/postgresql:12-20200524 volumes: - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z environment: diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 1d8f51ad0..18ad24e0e 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -12,7 +12,7 @@ services: - node.labels.gitlab.redis-data == true postgresql: - image: sameersbn/postgresql:11-20200524 + image: sameersbn/postgresql:12-20200524 volumes: - postgresql-data:/var/lib/postgresql:Z environment: diff --git a/docker-compose.yml b/docker-compose.yml index e6877cd9a..affddf0f2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: postgresql: restart: always - image: sameersbn/postgresql:11-20200524 + image: sameersbn/postgresql:12-20200524 volumes: - postgresql-data:/var/lib/postgresql:Z environment: diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 2ed9576c6..38f1dcb3c 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -11,7 +11,7 @@ services: postgresql: restart: always - image: sameersbn/postgresql:11-20200524 + image: sameersbn/postgresql:12-20200524 volumes: - postgresql-data:/var/lib/postgresql:Z environment: diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 1d9be86af..d02428015 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -11,7 +11,7 @@ services: postgresql: restart: always - image: sameersbn/postgresql:11-20200524 + image: sameersbn/postgresql:12-20200524 volumes: - postgresql:/var/lib/postgresql:Z environment: diff --git a/kubernetes/postgresql-rc.yml b/kubernetes/postgresql-rc.yml index de00601e2..dee508791 100644 --- a/kubernetes/postgresql-rc.yml +++ b/kubernetes/postgresql-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: postgresql - image: sameersbn/postgresql:11-20200524 + image: sameersbn/postgresql:12-20200524 env: - name: DB_USER value: gitlab From cd339fea288171a9b46a2669ddc2138d5a8266d2 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 25 Dec 2020 18:50:51 +0100 Subject: [PATCH 024/522] Use PostgreSQL 12 --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 866817078..45ad6ebe5 100644 --- a/README.md +++ b/README.md @@ -171,7 +171,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:11-20200524 + sameersbn/postgresql:12-20200524 ``` Step 2. Launch a redis container @@ -275,7 +275,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:11-20200524 +docker pull sameersbn/postgresql:12-20200524 ``` For data persistence lets create a store for the postgresql and start the container. @@ -295,7 +295,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:11-20200524 + sameersbn/postgresql:12-20200524 ``` 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. @@ -1288,7 +1288,7 @@ Usage when using `docker-compose` can also be found there. > > Since GitLab release `8.6.0` PostgreSQL users should enable `pg_trgm` extension on the GitLab database. Refer to GitLab's [Postgresql Requirements](http://doc.gitlab.com/ce/install/requirements.html#postgresql-requirements) for more information > -> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:11-20200524` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L8). +> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:12-20200524` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L8). GitLabHQ releases new versions on the 22nd of every month, bugfix releases immediately follow. I update this project almost immediately when a release is made (at least it has been the case so far). If you are using the image in production environments I recommend that you delay updates by a couple of days after the gitlab release, allowing some time for the dust to settle down. From 9077bbb48f3e65511b55ace65cd4f174a6703cba Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 25 Dec 2020 09:28:54 +0100 Subject: [PATCH 025/522] upgrade Gitlab CE to 13.7.1 --- Changelog.md | 4 +++ Dockerfile | 4 +-- README.md | 56 ++++++++++++++++---------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++--- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 8 files changed, 43 insertions(+), 39 deletions(-) diff --git a/Changelog.md b/Changelog.md index a8578bd50..86f4acdc6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.7.1** +- gitlab: upgrade CE to v13.7.1 +- gitaly: upgrade v13.7.1 + **13.7.0** - gitlab: upgrade CE to v13.7.0 - gitaly: upgrade v13.7.0 diff --git a/Dockerfile b/Dockerfile index 5279f6e12..cb3554479 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:bionic-20201119 -ARG VERSION=13.7.0 +ARG VERSION=13.7.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=13.14.0 \ GITLAB_WORKHORSE_VERSION=8.58.0 \ GITLAB_PAGES_VERSION=1.32.0 \ - GITALY_SERVER_VERSION=13.7.0 \ + GITALY_SERVER_VERSION=13.7.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 45ad6ebe5..edf34a805 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.7.0 +# sameersbn/gitlab:13.7.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -124,7 +124,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.7.0 +docker pull sameersbn/gitlab:13.7.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:13.7.0 + sameersbn/gitlab:13.7.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:13.7.0 + sameersbn/gitlab:13.7.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:13.7.0 + sameersbn/gitlab:13.7.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:13.7.0 + sameersbn/gitlab:13.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: @@ -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:13.7.0 + sameersbn/gitlab:13.7.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:13.7.0 + sameersbn/gitlab:13.7.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:13.7.0 + sameersbn/gitlab:13.7.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:13.7.0 + sameersbn/gitlab:13.7.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:13.7.0 + sameersbn/gitlab:13.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. @@ -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:13.7.0 + sameersbn/gitlab:13.7.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:13.7.0 + sameersbn/gitlab:13.7.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:13.7.0 + sameersbn/gitlab:13.7.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.7.0 + sameersbn/gitlab:13.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:13.7.0 app:sanitize + sameersbn/gitlab:13.7.1 app:sanitize ``` ### Piwik @@ -1129,7 +1129,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.0 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1164,14 +1164,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.0 app:rake db:setup + sameersbn/gitlab:13.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:13.7.0 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1180,14 +1180,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.7.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.7.0 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.7.1 # Choose to restore from 1515629493 ``` @@ -1230,7 +1230,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.0 app:rake gitlab:env:info + sameersbn/gitlab:13.7.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1243,7 +1243,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.0 app:rake gitlab:import:repos + sameersbn/gitlab:13.7.1 app:rake gitlab:import:repos ``` Or @@ -1274,7 +1274,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.0 app:rake gitlab:import:repos + sameersbn/gitlab:13.7.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1296,12 +1296,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.7.0 +docker pull sameersbn/gitlab:13.7.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1327,7 +1327,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.7.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.7.1 ``` ## Shell Access @@ -1365,7 +1365,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.7.0 + image: sameersbn/gitlab:13.7.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index d6ef99820..06e5e084c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.7.0 +13.7.1 diff --git a/docker-compose.yml b/docker-compose.yml index affddf0f2..b1c700066 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.7.0 + image: sameersbn/gitlab:13.7.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 04815a7b9..013c83946 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.0 app:rake gitlab:backup:create + sameersbn/gitlab:13.7.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.0 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.7.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.7.0 +docker pull sameersbn/gitlab:13.7.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.7.0 +sameersbn/gitlab:13.7.1 ``` diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index d02428015..7e96be8b7 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.7.0 + image: sameersbn/gitlab:13.7.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index a3dd1b667..4b9012dc2 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.7.0 + image: sameersbn/gitlab:13.7.1 env: - name: TZ value: Asia/Kolkata From bb7bc3f0ae137579a07854794ab31f73fdd3ca7e Mon Sep 17 00:00:00 2001 From: tomastzn <33376457+tomastzn@users.noreply.github.com> Date: Wed, 30 Dec 2020 18:33:09 -0500 Subject: [PATCH 026/522] Add info about PostgreSQL upgrade This change adds more information about upgrading PostgreSQL used with this image. --- README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/README.md b/README.md index edf34a805..ec225920a 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ - [PostgreSQL (Recommended)](#postgresql) - [External PostgreSQL Server](#external-postgresql-server) - [Linking to PostgreSQL Container](#linking-to-postgresql-container) + - [Upgrading PostgreSQL](#upgrading-postgresql) - [Redis](#redis) - [Internal Redis Server](#internal-redis-server) - [External Redis Server](#external-redis-server) @@ -239,6 +240,8 @@ GitLab uses a database backend to store its data. You can configure this image t ### PostgreSQL +*NOTE:* version 13.7.0 and later requires PostgreSQL version 12.x + #### External PostgreSQL Server The image also supports using an external PostgreSQL Server. This is also controlled via environment variables. @@ -315,6 +318,18 @@ 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/) +#### Upgrading PostgreSQL + +When this Gitlab image upgrades its dependency on specific version of PostgreSQL you will need to make sure to use corresponding version of PostgreSQL. + +If you are setting a brand new install, there is no data migration involved. However, if you already have an existing setup, the PostgreSQL data will need to be migrated as you are upgrading the version of PostgreSQL. + +If you are using PostgreSQL image other than [sameersbn/postgresql](https://quay.io/repository/sameersbn/postgresql/) you will need make sure that the image you are using can handle migration itself, **or**, you will need to migrate the data yourself before starting newer version of PostgreSQL. + +Following project provides Docker image that handles migration of PostgreSQL data: [tianon/postgres-upgrade](https://hub.docker.com/r/tianon/postgres-upgrade/) + +After migration of the data, verify that other PostgreSQL configuration files in its data folder are copied over as well. One such file is `pg_hba.conf`, it will need to be copied from old version data folder into new version data folder. + ## Redis GitLab uses the redis server for its key-value data store. The redis server connection details can be specified using environment variables. @@ -1289,6 +1304,8 @@ Usage when using `docker-compose` can also be found there. > Since GitLab release `8.6.0` PostgreSQL users should enable `pg_trgm` extension on the GitLab database. Refer to GitLab's [Postgresql Requirements](http://doc.gitlab.com/ce/install/requirements.html#postgresql-requirements) for more information > > If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:12-20200524` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L8). +> +> As of version 13.7.0, the required PostgreSQL is version 12.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql). GitLabHQ releases new versions on the 22nd of every month, bugfix releases immediately follow. I update this project almost immediately when a release is made (at least it has been the case so far). If you are using the image in production environments I recommend that you delay updates by a couple of days after the gitlab release, allowing some time for the dust to settle down. From 7d852590e4d0f73d055f7f7f9eac440bb3e4ea9d Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 8 Jan 2021 20:34:28 +0100 Subject: [PATCH 027/522] upgrade Gitlab CE to 13.7.1 --- Changelog.md | 8 ++++- Dockerfile | 8 ++--- README.md | 56 ++++++++++++++++---------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++--- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 8 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 86f4acdc6..950b406e4 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.7.3** +- gitlab: upgrade CE to v13.7.3 +- gitlab-pages: upgrade to v1.34.0 +- gitlab-shell: upgrade to c13.7.3 +- gitlab-workhorse: upgrade to v8.58.2 + **13.7.1** - gitlab: upgrade CE to v13.7.1 - gitaly: upgrade v13.7.1 @@ -10,7 +16,7 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list **13.7.0** - gitlab: upgrade CE to v13.7.0 - gitaly: upgrade v13.7.0 -- gitlab-shell: upgrade to 13.14.0 +- gitlab-shell: upgrade to v13.14.0 - gitlab-pages: upgrade to v1.32.0 - gitlab-workhorse: upgrade to v8.58.0 - ubuntu: upgrade to ubuntu bionic-20201119 diff --git a/Dockerfile b/Dockerfile index cb3554479..92a0cfbe0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:bionic-20201119 -ARG VERSION=13.7.1 +ARG VERSION=13.7.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.15.6 \ GITLAB_SHELL_VERSION=13.14.0 \ - GITLAB_WORKHORSE_VERSION=8.58.0 \ - GITLAB_PAGES_VERSION=1.32.0 \ - GITALY_SERVER_VERSION=13.7.1 \ + GITLAB_WORKHORSE_VERSION=8.58.2 \ + GITLAB_PAGES_VERSION=1.34.0 \ + GITALY_SERVER_VERSION=13.7.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index ec225920a..165f77f3a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.7.1 +# sameersbn/gitlab:13.7.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.7.1 +docker pull sameersbn/gitlab:13.7.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.1 + sameersbn/gitlab:13.7.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.1 + sameersbn/gitlab:13.7.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:13.7.1 + sameersbn/gitlab:13.7.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:13.7.1 + sameersbn/gitlab:13.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.7.1 + sameersbn/gitlab:13.7.3 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.7.1 + sameersbn/gitlab:13.7.3 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.1 + sameersbn/gitlab:13.7.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.1 + sameersbn/gitlab:13.7.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.1 + sameersbn/gitlab:13.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.1 + sameersbn/gitlab:13.7.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.1 + sameersbn/gitlab:13.7.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.1 + sameersbn/gitlab:13.7.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.7.1 + sameersbn/gitlab:13.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:13.7.1 app:sanitize + sameersbn/gitlab:13.7.3 app:sanitize ``` ### Piwik @@ -1144,7 +1144,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.1 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1179,14 +1179,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.1 app:rake db:setup + sameersbn/gitlab:13.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:13.7.1 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1195,14 +1195,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.7.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.7.1 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.7.3 # Choose to restore from 1515629493 ``` @@ -1245,7 +1245,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.1 app:rake gitlab:env:info + sameersbn/gitlab:13.7.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1258,7 +1258,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.1 app:rake gitlab:import:repos + sameersbn/gitlab:13.7.3 app:rake gitlab:import:repos ``` Or @@ -1289,7 +1289,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.1 app:rake gitlab:import:repos + sameersbn/gitlab:13.7.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1313,12 +1313,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.7.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:13.7.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.7.1 +docker pull sameersbn/gitlab:13.7.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1344,7 +1344,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.7.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.7.3 ``` ## Shell Access @@ -1382,7 +1382,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.7.1 + image: sameersbn/gitlab:13.7.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 06e5e084c..f74186a78 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.7.1 +13.7.3 diff --git a/docker-compose.yml b/docker-compose.yml index b1c700066..e1e1fad29 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.7.1 + image: sameersbn/gitlab:13.7.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 013c83946..f14884502 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.1 app:rake gitlab:backup:create + sameersbn/gitlab:13.7.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.1 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.7.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.7.1 +docker pull sameersbn/gitlab:13.7.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.7.1 +sameersbn/gitlab:13.7.3 ``` diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 7e96be8b7..64fde5226 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.7.1 + image: sameersbn/gitlab:13.7.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 4b9012dc2..acbacbca1 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.7.1 + image: sameersbn/gitlab:13.7.3 env: - name: TZ value: Asia/Kolkata From c3228c20e3c1bbda3cfc882f50a3ea0dfd3e06b1 Mon Sep 17 00:00:00 2001 From: intec_bf Date: Thu, 14 Jan 2021 19:48:43 +0100 Subject: [PATCH 028/522] upgrade Gitlab CE to 13.7.4 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 56 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 950b406e4..f6a79d8c5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. + +**13.7.4** +- gitlab: upgrade CE to v13.7.4 + **13.7.3** - gitlab: upgrade CE to v13.7.3 - gitlab-pages: upgrade to v1.34.0 diff --git a/Dockerfile b/Dockerfile index 92a0cfbe0..578bb952d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:bionic-20201119 -ARG VERSION=13.7.3 +ARG VERSION=13.7.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=13.14.0 \ GITLAB_WORKHORSE_VERSION=8.58.2 \ GITLAB_PAGES_VERSION=1.34.0 \ - GITALY_SERVER_VERSION=13.7.3 \ + GITALY_SERVER_VERSION=13.7.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 165f77f3a..ab0585051 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.7.3 +# sameersbn/gitlab:13.7.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.7.3 +docker pull sameersbn/gitlab:13.7.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` ## Database @@ -264,7 +264,7 @@ docker run --name gitlab -d \ --env 'DB_NAME=gitlabhq_production' \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` #### Linking to PostgreSQL Container @@ -308,7 +308,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-postgresql:postgresql \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.7.3 + sameersbn/gitlab:13.7.4 ``` When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command: ```bash docker run --name gitlab -d [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:sanitize + sameersbn/gitlab:13.7.4 app:sanitize ``` ### Piwik @@ -1144,7 +1144,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:rake gitlab:backup:create + sameersbn/gitlab:13.7.4 app:rake gitlab:backup:create ``` A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter. @@ -1179,14 +1179,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:rake db:setup + sameersbn/gitlab:13.7.4 app:rake db:setup ``` Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:rake gitlab:backup:restore + sameersbn/gitlab:13.7.4 app:rake gitlab:backup:restore ``` The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue. @@ -1195,14 +1195,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.7.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.7.3 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.7.4 # Choose to restore from 1515629493 ``` @@ -1245,7 +1245,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:rake gitlab:env:info + sameersbn/gitlab:13.7.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1258,7 +1258,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:rake gitlab:import:repos + sameersbn/gitlab:13.7.4 app:rake gitlab:import:repos ``` Or @@ -1289,7 +1289,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:rake gitlab:import:repos + sameersbn/gitlab:13.7.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1313,12 +1313,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.7.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher. +> Upgrading to `sameersbn/gitlab:13.7.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.7.3 +docker pull sameersbn/gitlab:13.7.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1344,7 +1344,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.7.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.7.4 ``` ## Shell Access @@ -1382,7 +1382,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.7.3 + image: sameersbn/gitlab:13.7.4 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index f74186a78..59abc5978 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.7.3 +13.7.4 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 64019cbbc..9453d2c60 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.6.1 + image: sameersbn/gitlab:13.7.4 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 18ad24e0e..d96a93f23 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.6.1 + image: sameersbn/gitlab:13.7.4 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index e1e1fad29..1c9f385d5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.7.3 + image: sameersbn/gitlab:13.7.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index f14884502..1db06b96f 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:rake gitlab:backup:create + sameersbn/gitlab:13.7.4 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:rake gitlab:backup:restore + sameersbn/gitlab:13.7.4 app:rake gitlab:backup:restore ``` The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.7.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.7.3 +docker pull sameersbn/gitlab:13.7.4 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.7.3 +sameersbn/gitlab:13.7.4 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 38f1dcb3c..b3ee20b74 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.6.1 + image: sameersbn/gitlab:13.7.4 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 64fde5226..fdaa19363 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.7.3 + image: sameersbn/gitlab:13.7.4 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index acbacbca1..c34529c40 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.7.3 + image: sameersbn/gitlab:13.7.4 env: - name: TZ value: Asia/Kolkata From 4003641f27910a6ad0e2675fc810339db4615128 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 23 Jan 2021 11:59:48 +0100 Subject: [PATCH 029/522] upgrade Gitlab CE to 13.8.0 --- Changelog.md | 10 +++++- Dockerfile | 12 +++---- README.md | 56 ++++++++++++++++---------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++--- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 8 files changed, 52 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index f6a79d8c5..c42ad738c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,14 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.8.0** +- gitlab: upgrade CE to v13.8.0 +- gitaly: upgrade v13.8.0 +- gitlab-shell: upgrade to v13.15.0 +- gitlab-workhorse: upgrade to v8.59.0 +- gitlab-pages: upgrade to v1.34.0 +- golang: upgrade to v1.15.7 +- ubuntu: upgrade to bionic-20210118 **13.7.4** - gitlab: upgrade CE to v13.7.4 @@ -10,7 +18,7 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list **13.7.3** - gitlab: upgrade CE to v13.7.3 - gitlab-pages: upgrade to v1.34.0 -- gitlab-shell: upgrade to c13.7.3 +- gitlab-shell: upgrade to v13.7.3 - gitlab-workhorse: upgrade to v8.58.2 **13.7.1** diff --git a/Dockerfile b/Dockerfile index 578bb952d..3379acae1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:bionic-20201119 +FROM ubuntu:bionic-20210118 -ARG VERSION=13.7.4 +ARG VERSION=13.8.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ - GOLANG_VERSION=1.15.6 \ - GITLAB_SHELL_VERSION=13.14.0 \ - GITLAB_WORKHORSE_VERSION=8.58.2 \ + GOLANG_VERSION=1.15.7 \ + GITLAB_SHELL_VERSION=13.15.0 \ + GITLAB_WORKHORSE_VERSION=8.59.0 \ GITLAB_PAGES_VERSION=1.34.0 \ - GITALY_SERVER_VERSION=13.7.4 \ + GITALY_SERVER_VERSION=13.8.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index ab0585051..9d5c890bb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.7.4 +# sameersbn/gitlab:13.8.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.7.4 +docker pull sameersbn/gitlab:13.8.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.4 + sameersbn/gitlab:13.8.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.4 + sameersbn/gitlab:13.8.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:13.7.4 + sameersbn/gitlab:13.8.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:13.7.4 + sameersbn/gitlab:13.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.7.4 + sameersbn/gitlab:13.8.0 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.7.4 + sameersbn/gitlab:13.8.0 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.4 + sameersbn/gitlab:13.8.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.4 + sameersbn/gitlab:13.8.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.4 + sameersbn/gitlab:13.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.4 + sameersbn/gitlab:13.8.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.4 + sameersbn/gitlab:13.8.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.7.4 + sameersbn/gitlab:13.8.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.7.4 + sameersbn/gitlab:13.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:13.7.4 app:sanitize + sameersbn/gitlab:13.8.0 app:sanitize ``` ### Piwik @@ -1144,7 +1144,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.4 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1179,14 +1179,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.4 app:rake db:setup + sameersbn/gitlab:13.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:13.7.4 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1195,14 +1195,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.7.4 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.0 # Choose to restore from 1515629493 ``` @@ -1245,7 +1245,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.4 app:rake gitlab:env:info + sameersbn/gitlab:13.8.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1258,7 +1258,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.4 app:rake gitlab:import:repos + sameersbn/gitlab:13.8.0 app:rake gitlab:import:repos ``` Or @@ -1289,7 +1289,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.4 app:rake gitlab:import:repos + sameersbn/gitlab:13.8.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1313,12 +1313,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.7.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:13.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:13.7.4 +docker pull sameersbn/gitlab:13.8.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1344,7 +1344,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.7.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.0 ``` ## Shell Access @@ -1382,7 +1382,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.7.4 + image: sameersbn/gitlab:13.8.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 59abc5978..447269552 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.7.4 +13.8.0 diff --git a/docker-compose.yml b/docker-compose.yml index 1c9f385d5..9b51696bb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.7.4 + image: sameersbn/gitlab:13.8.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 1db06b96f..77c5cd559 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.4 app:rake gitlab:backup:create + sameersbn/gitlab:13.8.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.4 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.7.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.8.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.7.4 +docker pull sameersbn/gitlab:13.8.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.7.4 +sameersbn/gitlab:13.8.0 ``` diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index fdaa19363..b0bbee85e 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.7.4 + image: sameersbn/gitlab:13.8.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index c34529c40..4900ade85 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.7.4 + image: sameersbn/gitlab:13.8.0 env: - name: TZ value: Asia/Kolkata From 5bdb02fab234153c1387ef2da6e0ccfb0dae681b Mon Sep 17 00:00:00 2001 From: intec_bf Date: Tue, 26 Jan 2021 15:08:19 +0100 Subject: [PATCH 030/522] upgrade Gitlab CE to 13.8.1 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 56 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index c42ad738c..e9e61a110 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.8.1** +- gitlab: upgrade CE to v13.8.1 +- gitaly: upgrade v13.8.1 + **13.8.0** - gitlab: upgrade CE to v13.8.0 - gitaly: upgrade v13.8.0 diff --git a/Dockerfile b/Dockerfile index 3379acae1..39b8a172b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:bionic-20210118 -ARG VERSION=13.8.0 +ARG VERSION=13.8.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=13.15.0 \ GITLAB_WORKHORSE_VERSION=8.59.0 \ GITLAB_PAGES_VERSION=1.34.0 \ - GITALY_SERVER_VERSION=13.8.0 \ + GITALY_SERVER_VERSION=13.8.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 9d5c890bb..14c8247e3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.8.0 +# sameersbn/gitlab:13.8.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.8.0 +docker pull sameersbn/gitlab:13.8.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.0 + sameersbn/gitlab:13.8.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.0 + sameersbn/gitlab:13.8.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:13.8.0 + sameersbn/gitlab:13.8.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:13.8.0 + sameersbn/gitlab:13.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.8.0 + sameersbn/gitlab:13.8.1 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.8.0 + sameersbn/gitlab:13.8.1 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.0 + sameersbn/gitlab:13.8.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.0 + sameersbn/gitlab:13.8.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.0 + sameersbn/gitlab:13.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.0 + sameersbn/gitlab:13.8.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.0 + sameersbn/gitlab:13.8.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.0 + sameersbn/gitlab:13.8.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.8.0 + sameersbn/gitlab:13.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:13.8.0 app:sanitize + sameersbn/gitlab:13.8.1 app:sanitize ``` ### Piwik @@ -1144,7 +1144,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.0 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1179,14 +1179,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.0 app:rake db:setup + sameersbn/gitlab:13.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:13.8.0 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1195,14 +1195,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.0 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.1 # Choose to restore from 1515629493 ``` @@ -1245,7 +1245,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.0 app:rake gitlab:env:info + sameersbn/gitlab:13.8.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1258,7 +1258,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.0 app:rake gitlab:import:repos + sameersbn/gitlab:13.8.1 app:rake gitlab:import:repos ``` Or @@ -1289,7 +1289,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.0 app:rake gitlab:import:repos + sameersbn/gitlab:13.8.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1313,12 +1313,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.8.0 +docker pull sameersbn/gitlab:13.8.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1344,7 +1344,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.1 ``` ## Shell Access @@ -1382,7 +1382,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.8.0 + image: sameersbn/gitlab:13.8.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 447269552..44486feca 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.8.0 +13.8.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 9453d2c60..10d0d065d 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.7.4 + image: sameersbn/gitlab:13.8.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index d96a93f23..d38f0cfe9 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.7.4 + image: sameersbn/gitlab:13.8.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 9b51696bb..92fbd3809 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.8.0 + image: sameersbn/gitlab:13.8.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 77c5cd559..1ea48317d 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.0 app:rake gitlab:backup:create + sameersbn/gitlab:13.8.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.0 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.8.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.8.0 +docker pull sameersbn/gitlab:13.8.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.8.0 +sameersbn/gitlab:13.8.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index b3ee20b74..167ada2b1 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.7.4 + image: sameersbn/gitlab:13.8.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index b0bbee85e..be6bdd470 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.8.0 + image: sameersbn/gitlab:13.8.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 4900ade85..32de1f3e0 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.8.0 + image: sameersbn/gitlab:13.8.1 env: - name: TZ value: Asia/Kolkata From cd85150edaf8d73dc2d476253f686736aeb2a62a Mon Sep 17 00:00:00 2001 From: Michael Joseph Walsh Date: Thu, 14 Jan 2021 14:48:10 -0500 Subject: [PATCH 031/522] Update keycloak-idp.md Correction to the documentation to address #2282. --- docs/keycloak-idp.md | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md index 23f3eb08d..80f1013e7 100644 --- a/docs/keycloak-idp.md +++ b/docs/keycloak-idp.md @@ -26,6 +26,9 @@ Next, click save, get the client secret generated by Keycloak and start filling ![Keycloak client secret](images/keycloak-secret.png) +Set the following in the docker-compose file: + + ```yaml - OAUTH2_GENERIC_APP_SECRET= - OAUTH2_GENERIC_CLIENT_SITE=http://:10081 @@ -35,7 +38,19 @@ Next, click save, get the client secret generated by Keycloak and start filling - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=http://:10081/auth/realms/master/protocol/openid-connect/logout ``` -Make sure the following variables are filled in the docker-compose file: +`` is the IP address of your keycloak for this example this would be your IP address, but if your Keycloak existed elsewhere `` would be different for your deployment as would the port and the realm. + +The following must also be configured: + +``yaml + - OAUTH2_GENERIC_USER_UID='username' + - OAUTH2_GENERIC_USER_NAME='full name' + - OAUTH2_GENERIC_USER_EMAIL='email' +``` + +The values set may be different for your deployment. + +Also, make sure the following variables are filled in the docker-compose file: ```yaml - GITLAB_HOST='' @@ -46,9 +61,10 @@ Make sure the following variables are filled in the docker-compose file: - OAUTH_BLOCK_AUTO_CREATED_USERS=false - OAUTH_AUTO_LINK_LDAP_USER=false - OAUTH_AUTO_LINK_SAML_USER=false - - OAUTH_EXTERNAL_PROVIDERS=Keycloak ``` +`` is the IP address of your GitLAB for this exampke this would be the your IP address, but if your GitLab was to be proxied or deployed elsewhere `` would be another value appropriate for your deployment. + GitLab does not allow login from users in Keycloak with an empty email or name. To prevent this, you can create a new user in Keycloak or you can add email and name for the admin account. Visit the `Users` tab and click on `View all users` to modify the Admin user. @@ -62,4 +78,4 @@ Deploy GitLab, Reddis and PostgreSQL by running the following command: `docker-c You can now login on the local GitLab instance with with Keycloak on your [local IP](http://localhost:10080). -![gitlab-login](images/keycloak-gitlab-login.png) \ No newline at end of file +![gitlab-login](images/keycloak-gitlab-login.png) From ac51dc02bad7552dbf1ca7ed21b605446d0a35c4 Mon Sep 17 00:00:00 2001 From: Michael Joseph Walsh Date: Thu, 14 Jan 2021 14:48:40 -0500 Subject: [PATCH 032/522] Update keycloak-idp.md --- docs/keycloak-idp.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md index 80f1013e7..4f238a406 100644 --- a/docs/keycloak-idp.md +++ b/docs/keycloak-idp.md @@ -42,7 +42,7 @@ Set the following in the docker-compose file: The following must also be configured: -``yaml +```yaml - OAUTH2_GENERIC_USER_UID='username' - OAUTH2_GENERIC_USER_NAME='full name' - OAUTH2_GENERIC_USER_EMAIL='email' From 3eaf1671ff03408663836bda8d51835a5624fca9 Mon Sep 17 00:00:00 2001 From: Michael Joseph Walsh Date: Sat, 16 Jan 2021 17:38:00 -0500 Subject: [PATCH 033/522] Update keycloak-idp.md Typos corrected. --- docs/keycloak-idp.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md index 4f238a406..c6d2b898e 100644 --- a/docs/keycloak-idp.md +++ b/docs/keycloak-idp.md @@ -38,7 +38,7 @@ Set the following in the docker-compose file: - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=http://:10081/auth/realms/master/protocol/openid-connect/logout ``` -`` is the IP address of your keycloak for this example this would be your IP address, but if your Keycloak existed elsewhere `` would be different for your deployment as would the port and the realm. +`` is the IP address of your keycloak. For this example this would be your IP address, but if your Keycloak existed elsewhere for your deployment `` would be different as would the port and the realm. The following must also be configured: @@ -63,7 +63,7 @@ Also, make sure the following variables are filled in the docker-compose file: - OAUTH_AUTO_LINK_SAML_USER=false ``` -`` is the IP address of your GitLAB for this exampke this would be the your IP address, but if your GitLab was to be proxied or deployed elsewhere `` would be another value appropriate for your deployment. +`` is the IP address of your GitLab for this example this would be the your IP address, but if your GitLab was to be proxied or deployed elsewhere `` would be another value appropriate for your deployment. GitLab does not allow login from users in Keycloak with an empty email or name. To prevent this, you can create a new user in Keycloak or you can add email and name for the admin account. From d718d933954af8f1f2265bc5e243b340d4952e41 Mon Sep 17 00:00:00 2001 From: Michael Joseph Walsh Date: Wed, 20 Jan 2021 15:48:19 -0500 Subject: [PATCH 034/522] Update keycloak-idp.md Added more on the values needed. --- docs/keycloak-idp.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md index c6d2b898e..37d11ab4e 100644 --- a/docs/keycloak-idp.md +++ b/docs/keycloak-idp.md @@ -43,12 +43,13 @@ Set the following in the docker-compose file: The following must also be configured: ```yaml - - OAUTH2_GENERIC_USER_UID='username' - - OAUTH2_GENERIC_USER_NAME='full name' + - OAUTH2_GENERIC_USER_UID='preffered_usename' + - OAUTH2_GENERIC_USER_NAME='name' - OAUTH2_GENERIC_USER_EMAIL='email' ``` -The values set may be different for your deployment. +The values will be different for your deployment. Navigate Keycloak's UI, select `Clients`, click `[your client]`, then open the `Client Scopes` tab, then open `Evaluate` sub-tab, enter a username you know in the `User` field, select the match, then `Generate Access Token` to see the values you need to configure. + Also, make sure the following variables are filled in the docker-compose file: From f6750c56770d248f961515c7d31bc013703230bd Mon Sep 17 00:00:00 2001 From: intec_bf Date: Mon, 1 Feb 2021 23:33:40 +0100 Subject: [PATCH 035/522] upgrade Gitlab CE to 13.8.2 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 56 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index e9e61a110..cc1cd9a89 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.8.2** +- gitlab: upgrade CE to v13.8.2 +- gitaly: upgrade v13.8.2 + **13.8.1** - gitlab: upgrade CE to v13.8.1 - gitaly: upgrade v13.8.1 diff --git a/Dockerfile b/Dockerfile index 39b8a172b..415fa2f36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:bionic-20210118 -ARG VERSION=13.8.1 +ARG VERSION=13.8.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=13.15.0 \ GITLAB_WORKHORSE_VERSION=8.59.0 \ GITLAB_PAGES_VERSION=1.34.0 \ - GITALY_SERVER_VERSION=13.8.1 \ + GITALY_SERVER_VERSION=13.8.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 14c8247e3..2704c1668 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.8.1 +# sameersbn/gitlab:13.8.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.8.1 +docker pull sameersbn/gitlab:13.8.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.1 + sameersbn/gitlab:13.8.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.1 + sameersbn/gitlab:13.8.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:13.8.1 + sameersbn/gitlab:13.8.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:13.8.1 + sameersbn/gitlab:13.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.8.1 + sameersbn/gitlab:13.8.2 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.8.1 + sameersbn/gitlab:13.8.2 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.1 + sameersbn/gitlab:13.8.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.1 + sameersbn/gitlab:13.8.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.1 + sameersbn/gitlab:13.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.1 + sameersbn/gitlab:13.8.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.1 + sameersbn/gitlab:13.8.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.1 + sameersbn/gitlab:13.8.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.8.1 + sameersbn/gitlab:13.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:13.8.1 app:sanitize + sameersbn/gitlab:13.8.2 app:sanitize ``` ### Piwik @@ -1144,7 +1144,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.1 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1179,14 +1179,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.1 app:rake db:setup + sameersbn/gitlab:13.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:13.8.1 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1195,14 +1195,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.1 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.2 # Choose to restore from 1515629493 ``` @@ -1245,7 +1245,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.1 app:rake gitlab:env:info + sameersbn/gitlab:13.8.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1258,7 +1258,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.1 app:rake gitlab:import:repos + sameersbn/gitlab:13.8.2 app:rake gitlab:import:repos ``` Or @@ -1289,7 +1289,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.1 app:rake gitlab:import:repos + sameersbn/gitlab:13.8.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1313,12 +1313,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.8.1 +docker pull sameersbn/gitlab:13.8.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1344,7 +1344,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.2 ``` ## Shell Access @@ -1382,7 +1382,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.8.1 + image: sameersbn/gitlab:13.8.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 44486feca..b8a1cf372 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.8.1 +13.8.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 10d0d065d..af74ec6de 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.8.1 + image: sameersbn/gitlab:13.8.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index d38f0cfe9..1a085ceea 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.8.1 + image: sameersbn/gitlab:13.8.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 92fbd3809..bb0479b50 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.8.1 + image: sameersbn/gitlab:13.8.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 1ea48317d..23e6d3298 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.1 app:rake gitlab:backup:create + sameersbn/gitlab:13.8.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.1 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.8.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.8.1 +docker pull sameersbn/gitlab:13.8.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.8.1 +sameersbn/gitlab:13.8.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 167ada2b1..cf41609c3 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.8.1 + image: sameersbn/gitlab:13.8.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index be6bdd470..3053c7d85 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.8.1 + image: sameersbn/gitlab:13.8.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 32de1f3e0..9b4c42c9f 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.8.1 + image: sameersbn/gitlab:13.8.2 env: - name: TZ value: Asia/Kolkata From 30883516e0eaa0a9676cfb955bda347b2cd83a81 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 6 Feb 2021 10:24:38 +0100 Subject: [PATCH 036/522] upgrade Gitlab CE to 13.8.3 --- Changelog.md | 5 +++ Dockerfile | 6 ++-- README.md | 56 ++++++++++++++++---------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++--- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 8 files changed, 45 insertions(+), 40 deletions(-) diff --git a/Changelog.md b/Changelog.md index cc1cd9a89..4160fdfec 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.8.3** +- gitlab: upgrade CE to v13.8.3 +- gitaly: upgrade v13.8.3 +- golang: upgrade to v1.15.8 + **13.8.2** - gitlab: upgrade CE to v13.8.2 - gitaly: upgrade v13.8.2 diff --git a/Dockerfile b/Dockerfile index 415fa2f36..7b8b80c26 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:bionic-20210118 -ARG VERSION=13.8.2 +ARG VERSION=13.8.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ - GOLANG_VERSION=1.15.7 \ + GOLANG_VERSION=1.15.8 \ GITLAB_SHELL_VERSION=13.15.0 \ GITLAB_WORKHORSE_VERSION=8.59.0 \ GITLAB_PAGES_VERSION=1.34.0 \ - GITALY_SERVER_VERSION=13.8.2 \ + GITALY_SERVER_VERSION=13.8.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 2704c1668..8b54fe5fc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.8.2 +# sameersbn/gitlab:13.8.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.8.2 +docker pull sameersbn/gitlab:13.8.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.2 + sameersbn/gitlab:13.8.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.2 + sameersbn/gitlab:13.8.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:13.8.2 + sameersbn/gitlab:13.8.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:13.8.2 + sameersbn/gitlab:13.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.8.2 + sameersbn/gitlab:13.8.3 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.8.2 + sameersbn/gitlab:13.8.3 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.2 + sameersbn/gitlab:13.8.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.2 + sameersbn/gitlab:13.8.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.2 + sameersbn/gitlab:13.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.2 + sameersbn/gitlab:13.8.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.2 + sameersbn/gitlab:13.8.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.2 + sameersbn/gitlab:13.8.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.8.2 + sameersbn/gitlab:13.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:13.8.2 app:sanitize + sameersbn/gitlab:13.8.3 app:sanitize ``` ### Piwik @@ -1144,7 +1144,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.2 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1179,14 +1179,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.2 app:rake db:setup + sameersbn/gitlab:13.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:13.8.2 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1195,14 +1195,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.8.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.2 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.3 # Choose to restore from 1515629493 ``` @@ -1245,7 +1245,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.2 app:rake gitlab:env:info + sameersbn/gitlab:13.8.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1258,7 +1258,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.2 app:rake gitlab:import:repos + sameersbn/gitlab:13.8.3 app:rake gitlab:import:repos ``` Or @@ -1289,7 +1289,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.2 app:rake gitlab:import:repos + sameersbn/gitlab:13.8.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1313,12 +1313,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.8.2 +docker pull sameersbn/gitlab:13.8.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1344,7 +1344,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.3 ``` ## Shell Access @@ -1382,7 +1382,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.8.2 + image: sameersbn/gitlab:13.8.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index b8a1cf372..5d32a7569 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.8.2 +13.8.3 diff --git a/docker-compose.yml b/docker-compose.yml index bb0479b50..c6f349204 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.8.2 + image: sameersbn/gitlab:13.8.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 23e6d3298..f681c1509 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.2 app:rake gitlab:backup:create + sameersbn/gitlab:13.8.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.2 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.8.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.8.2 +docker pull sameersbn/gitlab:13.8.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.8.2 +sameersbn/gitlab:13.8.3 ``` diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 3053c7d85..555a9c490 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.8.2 + image: sameersbn/gitlab:13.8.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 9b4c42c9f..e8cca3c1a 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.8.2 + image: sameersbn/gitlab:13.8.3 env: - name: TZ value: Asia/Kolkata From 83202cdf6af241443592ab9623bd630ee29ca334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BA=A6=E5=BD=93=E8=8B=97=E5=84=BF?= Date: Tue, 16 Feb 2021 16:21:06 +0900 Subject: [PATCH 037/522] added `SSL_PROTOCOLS` option to change protocols of the nginx (#2304) --- Changelog.md | 7 +++++++ README.md | 9 +++++++-- assets/runtime/config/nginx/gitlab-pages-ssl | 4 ++-- assets/runtime/config/nginx/gitlab-registry | 4 ++-- assets/runtime/config/nginx/gitlab-ssl | 4 ++-- assets/runtime/env-defaults | 5 +++++ assets/runtime/functions | 9 +++++++-- 7 files changed, 32 insertions(+), 10 deletions(-) diff --git a/Changelog.md b/Changelog.md index 4160fdfec..4a4c5ce65 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,13 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.8.3-1** +- added `SSL_PROTOCOLS` option to change protocols of the nginx +- added `SSL_REGISTRY_CIPHERS` +- added `SSL_REGISTRY_PROTOCOLS` +- added `SSL_PAGES_CIPHERS` +- added `SSL_PAGES_PROTOCOLS` + **13.8.3** - gitlab: upgrade CE to v13.8.3 - gitaly: upgrade v13.8.3 diff --git a/README.md b/README.md index 8b54fe5fc..42f872990 100644 --- a/README.md +++ b/README.md @@ -935,6 +935,11 @@ Below is the complete list of available options that can be used to customize yo | `SSL_PAGES_KEY_PATH` | Location of the ssl private key for gitlab pages. Defaults to `/home/git/data/certs/pages.key` | | `SSL_PAGES_CERT_PATH` | Location of the ssl certificate for the gitlab pages. Defaults to `/home/git/data/certs/pages.crt` | | `SSL_CIPHERS` | List of supported SSL ciphers: Defaults to `ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4` | +| `SSL_PROTOCOLS` | List of supported SSL protocols: Defaults to `TLSv1 TLSv1.1 TLSv1.2 TLSv1.3` | +| `SSL_PAGES_CIPHERS` | List of supported SSL ciphers for the gitlab pages: Defaults to `SSL_CIPHERS` | +| `SSL_PAGES_PROTOCOLS` | List of supported SSL protocols for the gitlab pages: Defaults to `SSL_PROTOCOLS` | +| `SSL_REGISTRY_CIPHERS` | List of supported SSL ciphers for gitlab container registry: Defaults to `SSL_CIPHERS` | +| `SSL_REGISTRY_PROTOCOLS` | List of supported SSL protocols for gitlab container registry: Defaults to `SSL_PROTOCOLS` | | `NGINX_WORKERS` | The number of nginx workers to start. Defaults to `1`. | | `NGINX_SERVER_NAMES_HASH_BUCKET_SIZE` | Sets the bucket size for the server names hash tables. This is needed when you have long server_names or your an error message from nginx like *nginx: [emerg] could not build server_names_hash, you should increase server_names_hash_bucket_size:..*. It should be only increment by a power of 2. Defaults to `32`. | | `NGINX_HSTS_ENABLED` | Advanced configuration option for turning off the HSTS configuration. Applicable only when SSL is in use. Defaults to `true`. See [#138](https://github.com/sameersbn/docker-gitlab/issues/138) for use case scenario. | @@ -1304,8 +1309,8 @@ Usage when using `docker-compose` can also be found there. > Since GitLab release `8.6.0` PostgreSQL users should enable `pg_trgm` extension on the GitLab database. Refer to GitLab's [Postgresql Requirements](http://doc.gitlab.com/ce/install/requirements.html#postgresql-requirements) for more information > > If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:12-20200524` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L8). -> -> As of version 13.7.0, the required PostgreSQL is version 12.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql). +> +> As of version 13.7.0, the required PostgreSQL is version 12.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql). GitLabHQ releases new versions on the 22nd of every month, bugfix releases immediately follow. I update this project almost immediately when a release is made (at least it has been the case so far). If you are using the image in production environments I recommend that you delay updates by a couple of days after the gitlab release, allowing some time for the dust to settle down. diff --git a/assets/runtime/config/nginx/gitlab-pages-ssl b/assets/runtime/config/nginx/gitlab-pages-ssl index dba9f0a2e..d18956d3c 100644 --- a/assets/runtime/config/nginx/gitlab-pages-ssl +++ b/assets/runtime/config/nginx/gitlab-pages-ssl @@ -35,8 +35,8 @@ server { ssl_certificate_key {{SSL_PAGES_KEY_PATH}}; # GitLab needs backwards compatible ciphers to retain compatibility with Java IDEs - ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers "{{SSL_PAGES_CIPHERS}}"; + ssl_protocols {{SSL_PAGES_PROTOCOLS}}; ssl_prefer_server_ciphers on; ssl_session_cache shared:SSL:10m; ssl_session_timeout 5m; diff --git a/assets/runtime/config/nginx/gitlab-registry b/assets/runtime/config/nginx/gitlab-registry index 562b37ef2..280436561 100644 --- a/assets/runtime/config/nginx/gitlab-registry +++ b/assets/runtime/config/nginx/gitlab-registry @@ -30,8 +30,8 @@ server { ssl_certificate {{SSL_REGISTRY_CERT_PATH}}; ssl_certificate_key {{SSL_REGISTRY_KEY_PATH}}; - ssl_ciphers 'ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4'; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers "{{SSL_REGISTRY_CIPHERS}}"; + ssl_protocols {{SSL_REGISTRY_PROTOCOLS}}; ssl_prefer_server_ciphers on; ssl_session_cache builtin:1000 shared:SSL:10m; ssl_session_timeout 5m; diff --git a/assets/runtime/config/nginx/gitlab-ssl b/assets/runtime/config/nginx/gitlab-ssl index 24acfe171..79bd0966e 100644 --- a/assets/runtime/config/nginx/gitlab-ssl +++ b/assets/runtime/config/nginx/gitlab-ssl @@ -60,7 +60,7 @@ server { # GitLab needs backwards compatible ciphers to retain compatibility with Java IDEs ssl_ciphers "{{SSL_CIPHERS}}"; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_protocols {{SSL_PROTOCOLS}}; ssl_prefer_server_ciphers on; ssl_session_cache shared:SSL:10m; ssl_session_timeout 5m; @@ -117,7 +117,7 @@ server { proxy_set_header X-Forwarded-Proto {{NGINX_X_FORWARDED_PROTO}}; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $connection_upgrade_gitlab_ssl; - + proxy_pass http://gitlab-workhorse; } diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 4a1c65bb1..14b0d4148 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -214,14 +214,19 @@ SSL_KEY_PATH=${SSL_KEY_PATH:-$GITLAB_DATA_DIR/certs/gitlab.key} SSL_DHPARAM_PATH=${SSL_DHPARAM_PATH:-$GITLAB_DATA_DIR/certs/dhparam.pem} SSL_VERIFY_CLIENT=${SSL_VERIFY_CLIENT:-off} SSL_CIPHERS=${SSL_CIPHERS:-'ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4'} +SSL_PROTOCOLS=${SSL_PROTOCOLS:-'TLSv1 TLSv1.1 TLSv1.2 TLSv1.3'} SSL_REGISTRY_KEY_PATH=${SSL_REGISTRY_KEY_PATH:-$GITLAB_REGISTRY_KEY_PATH} SSL_REGISTRY_KEY_PATH=${SSL_REGISTRY_KEY_PATH:-$GITLAB_DATA_DIR/certs/registry.key} SSL_REGISTRY_CERT_PATH=${SSL_REGISTRY_CERT_PATH:-$GITLAB_REGISTRY_CERT_PATH} SSL_REGISTRY_CERT_PATH=${SSL_REGISTRY_CERT_PATH:-$GITLAB_DATA_DIR/certs/registry.crt} +SSL_REGISTRY_CIPHERS=${SSL_REGISTRY_CIPHERS:-$SSL_CIPHERS} +SSL_REGISTRY_PROTOCOLS=${SSL_REGISTRY_PROTOCOLS:-$SSL_PROTOCOLS} SSL_PAGES_KEY_PATH=${SSL_PAGES_KEY_PATH:-$GITLAB_DATA_DIR/certs/pages.key} SSL_PAGES_CERT_PATH=${SSL_PAGES_CERT_PATH:-$GITLAB_DATA_DIR/certs/pages.crt} +SSL_PAGES_CIPHERS=${SSL_PAGES_CIPHERS:-$SSL_CIPHERS} +SSL_PAGES_PROTOCOLS=${SSL_PAGES_PROTOCOLS:-$SSL_PROTOCOLS} SSL_CA_CERTIFICATES_PATH=${SSL_CA_CERTIFICATES_PATH:-$CA_CERTIFICATES_PATH} # backward compatibility SSL_CA_CERTIFICATES_PATH=${SSL_CA_CERTIFICATES_PATH:-$GITLAB_DATA_DIR/certs/ca.crt} diff --git a/assets/runtime/functions b/assets/runtime/functions index 6eb19ecf5..7b58bf38f 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1176,7 +1176,8 @@ nginx_configure_gitlab_ssl() { SSL_DHPARAM_PATH \ SSL_VERIFY_CLIENT \ SSL_CA_CERTIFICATES_PATH \ - SSL_CIPHERS + SSL_CIPHERS \ + SSL_PROTOCOLS fi } @@ -1265,7 +1266,9 @@ nginx_configure_gitlab_registry() { GITLAB_REGISTRY_HOST \ GITLAB_REGISTRY_API_URL \ SSL_REGISTRY_KEY_PATH \ - SSL_REGISTRY_CERT_PATH + SSL_REGISTRY_CERT_PATH \ + SSL_REGISTRY_CIPHERS \ + SSL_REGISTRY_PROTOCOLS fi } @@ -1283,6 +1286,8 @@ nginx_configure_pages(){ GITLAB_PAGES_DOMAIN \ SSL_PAGES_CERT_PATH \ SSL_PAGES_KEY_PATH \ + SSL_PAGES_CIPHERS \ + SSL_PAGES_PROTOCOLS \ SSL_DHPARAM_PATH \ GITLAB_LOG_DIR else From 21252e898a8ae83e59025f525e4004463714ad31 Mon Sep 17 00:00:00 2001 From: sachilles Date: Tue, 16 Feb 2021 08:22:42 +0100 Subject: [PATCH 038/522] upgrade Gitlab CE to 13.8.4 (#2306) --- Changelog.md | 13 +++++--- Dockerfile | 6 ++-- README.md | 56 ++++++++++++++++---------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++--- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 8 files changed, 49 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index 4a4c5ce65..85eedfae3 100644 --- a/Changelog.md +++ b/Changelog.md @@ -10,22 +10,27 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list - added `SSL_PAGES_CIPHERS` - added `SSL_PAGES_PROTOCOLS` +**13.8.3** +- gitlab: upgrade CE to v13.8.4 +- gitaly: upgrade to v13.8.4 +- gitlab-shell: upgrade to v13.15.1 + **13.8.3** - gitlab: upgrade CE to v13.8.3 -- gitaly: upgrade v13.8.3 +- gitaly: upgrade to v13.8.3 - golang: upgrade to v1.15.8 **13.8.2** - gitlab: upgrade CE to v13.8.2 -- gitaly: upgrade v13.8.2 +- gitaly: upgrade to v13.8.2 **13.8.1** - gitlab: upgrade CE to v13.8.1 -- gitaly: upgrade v13.8.1 +- gitaly: upgrade to v13.8.1 **13.8.0** - gitlab: upgrade CE to v13.8.0 -- gitaly: upgrade v13.8.0 +- gitaly: upgrade to v13.8.0 - gitlab-shell: upgrade to v13.15.0 - gitlab-workhorse: upgrade to v8.59.0 - gitlab-pages: upgrade to v1.34.0 diff --git a/Dockerfile b/Dockerfile index 7b8b80c26..0f03171aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:bionic-20210118 -ARG VERSION=13.8.3 +ARG VERSION=13.8.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.15.8 \ - GITLAB_SHELL_VERSION=13.15.0 \ + GITLAB_SHELL_VERSION=13.15.1 \ GITLAB_WORKHORSE_VERSION=8.59.0 \ GITLAB_PAGES_VERSION=1.34.0 \ - GITALY_SERVER_VERSION=13.8.3 \ + GITALY_SERVER_VERSION=13.8.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 42f872990..5f6a164fc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.8.3 +# sameersbn/gitlab:13.8.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.8.3 +docker pull sameersbn/gitlab:13.8.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.3 + sameersbn/gitlab:13.8.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.3 + sameersbn/gitlab:13.8.4 ``` ## Database @@ -264,7 +264,7 @@ docker run --name gitlab -d \ --env 'DB_NAME=gitlabhq_production' \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.3 + sameersbn/gitlab:13.8.4 ``` #### Linking to PostgreSQL Container @@ -308,7 +308,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-postgresql:postgresql \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.3 + sameersbn/gitlab:13.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.8.3 + sameersbn/gitlab:13.8.4 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.8.3 + sameersbn/gitlab:13.8.4 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.3 + sameersbn/gitlab:13.8.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.3 + sameersbn/gitlab:13.8.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.3 + sameersbn/gitlab:13.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.3 + sameersbn/gitlab:13.8.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.3 + sameersbn/gitlab:13.8.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.3 + sameersbn/gitlab:13.8.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.8.3 + sameersbn/gitlab:13.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:13.8.3 app:sanitize + sameersbn/gitlab:13.8.4 app:sanitize ``` ### Piwik @@ -1149,7 +1149,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.3 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1184,14 +1184,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.3 app:rake db:setup + sameersbn/gitlab:13.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:13.8.3 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1200,14 +1200,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.8.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.3 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.4 # Choose to restore from 1515629493 ``` @@ -1250,7 +1250,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.3 app:rake gitlab:env:info + sameersbn/gitlab:13.8.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1263,7 +1263,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.3 app:rake gitlab:import:repos + sameersbn/gitlab:13.8.4 app:rake gitlab:import:repos ``` Or @@ -1294,7 +1294,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.3 app:rake gitlab:import:repos + sameersbn/gitlab:13.8.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1318,12 +1318,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.8.3 +docker pull sameersbn/gitlab:13.8.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1349,7 +1349,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.4 ``` ## Shell Access @@ -1387,7 +1387,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.8.3 + image: sameersbn/gitlab:13.8.4 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 5d32a7569..5389ed889 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.8.3 +13.8.4 diff --git a/docker-compose.yml b/docker-compose.yml index c6f349204..297c3e038 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.8.3 + image: sameersbn/gitlab:13.8.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index f681c1509..bf90ee1bc 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.3 app:rake gitlab:backup:create + sameersbn/gitlab:13.8.4 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.3 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.8.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.8.3 +docker pull sameersbn/gitlab:13.8.4 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.8.3 +sameersbn/gitlab:13.8.4 ``` diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 555a9c490..f0849bc12 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.8.3 + image: sameersbn/gitlab:13.8.4 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index e8cca3c1a..7313db34f 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.8.3 + image: sameersbn/gitlab:13.8.4 env: - name: TZ value: Asia/Kolkata From 0271dec8bc0d2deee691350ac4a8326a916a2b83 Mon Sep 17 00:00:00 2001 From: Niclas Mietz Date: Tue, 16 Feb 2021 08:14:49 +0000 Subject: [PATCH 039/522] docs: fix changelog (#2307) --- Changelog.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Changelog.md b/Changelog.md index 85eedfae3..aa8ea17ef 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,14 +3,12 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. -**13.8.3-1** +**13.8.4** - added `SSL_PROTOCOLS` option to change protocols of the nginx - added `SSL_REGISTRY_CIPHERS` - added `SSL_REGISTRY_PROTOCOLS` - added `SSL_PAGES_CIPHERS` - added `SSL_PAGES_PROTOCOLS` - -**13.8.3** - gitlab: upgrade CE to v13.8.4 - gitaly: upgrade to v13.8.4 - gitlab-shell: upgrade to v13.15.1 From 68a093cae325f62d83bfe2746bd760c5b9eb7957 Mon Sep 17 00:00:00 2001 From: intec_bf Date: Mon, 22 Feb 2021 16:08:25 +0100 Subject: [PATCH 040/522] upgrade Gitlab CE to 13.9.0 --- Changelog.md | 8 ++++ Dockerfile | 12 +++--- README.md | 56 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 54 insertions(+), 46 deletions(-) diff --git a/Changelog.md b/Changelog.md index aa8ea17ef..47c14e560 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,14 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.9.0** +- gitlab: upgrade CE to v13.9.0 +- gitaly: upgrade to v13.9.0 +- gitlab-shell: upgrade to v13.16.1 +- gitlab-pages: upgrade to v1.35.0 +- gitlab-workhorse: upgrade to v8.63.0 +- golang: upgrade to v1.16 + **13.8.4** - added `SSL_PROTOCOLS` option to change protocols of the nginx - added `SSL_REGISTRY_CIPHERS` diff --git a/Dockerfile b/Dockerfile index 0f03171aa..49925debc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:bionic-20210118 -ARG VERSION=13.8.4 +ARG VERSION=13.9.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ - GOLANG_VERSION=1.15.8 \ - GITLAB_SHELL_VERSION=13.15.1 \ - GITLAB_WORKHORSE_VERSION=8.59.0 \ - GITLAB_PAGES_VERSION=1.34.0 \ - GITALY_SERVER_VERSION=13.8.4 \ + GOLANG_VERSION=1.16 \ + GITLAB_SHELL_VERSION=13.16.1 \ + GITLAB_WORKHORSE_VERSION=8.63.0 \ + GITLAB_PAGES_VERSION=1.35.0 \ + GITALY_SERVER_VERSION=13.9.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 5f6a164fc..570eb0234 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.8.4 +# sameersbn/gitlab:13.9.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.8.4 +docker pull sameersbn/gitlab:13.9.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.4 + sameersbn/gitlab:13.9.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.4 + sameersbn/gitlab:13.9.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:13.8.4 + sameersbn/gitlab:13.9.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:13.8.4 + sameersbn/gitlab:13.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.8.4 + sameersbn/gitlab:13.9.0 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.8.4 + sameersbn/gitlab:13.9.0 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.4 + sameersbn/gitlab:13.9.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.4 + sameersbn/gitlab:13.9.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.4 + sameersbn/gitlab:13.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.4 + sameersbn/gitlab:13.9.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.4 + sameersbn/gitlab:13.9.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.8.4 + sameersbn/gitlab:13.9.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.8.4 + sameersbn/gitlab:13.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:13.8.4 app:sanitize + sameersbn/gitlab:13.9.0 app:sanitize ``` ### Piwik @@ -1149,7 +1149,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.4 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1184,14 +1184,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.4 app:rake db:setup + sameersbn/gitlab:13.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:13.8.4 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1200,14 +1200,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.8.4 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.0 # Choose to restore from 1515629493 ``` @@ -1250,7 +1250,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.4 app:rake gitlab:env:info + sameersbn/gitlab:13.9.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1263,7 +1263,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.4 app:rake gitlab:import:repos + sameersbn/gitlab:13.9.0 app:rake gitlab:import:repos ``` Or @@ -1294,7 +1294,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.4 app:rake gitlab:import:repos + sameersbn/gitlab:13.9.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1318,12 +1318,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.8.4 +docker pull sameersbn/gitlab:13.9.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1349,7 +1349,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.8.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.0 ``` ## Shell Access @@ -1387,7 +1387,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.8.4 + image: sameersbn/gitlab:13.9.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 5389ed889..c662e83bd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.8.4 +13.9.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index af74ec6de..3538fe195 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.8.2 + image: sameersbn/gitlab:13.9.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 1a085ceea..8186815ae 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.8.2 + image: sameersbn/gitlab:13.9.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 297c3e038..49a395bdd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.8.4 + image: sameersbn/gitlab:13.9.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index bf90ee1bc..49472e61d 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.4 app:rake gitlab:backup:create + sameersbn/gitlab:13.9.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.4 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.8.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.9.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.8.4 +docker pull sameersbn/gitlab:13.9.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.8.4 +sameersbn/gitlab:13.9.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index cf41609c3..46faeb1cd 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.8.2 + image: sameersbn/gitlab:13.9.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index f0849bc12..0db9d74e8 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.8.4 + image: sameersbn/gitlab:13.9.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 7313db34f..32dabcf57 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.8.4 + image: sameersbn/gitlab:13.9.0 env: - name: TZ value: Asia/Kolkata From 8311b1ee749768eccb3c61e40c6d43ec16fda672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20L=C3=A9on?= Date: Tue, 23 Feb 2021 08:19:52 +0100 Subject: [PATCH 041/522] Set default value for BITBUCKET_URL If this value is not set importing repo fails when connecting to bitbucket. --- README.md | 1 + assets/runtime/config/gitlabhq/gitlab.yml | 3 ++- assets/runtime/env-defaults | 1 + assets/runtime/functions | 3 ++- contrib/docker-swarm/docker-compose.yml | 1 + docker-compose.swarm.yml | 1 + docker-compose.yml | 1 + docs/docker-compose-keycloak.yml | 1 + docs/s3_compatible_storage.md | 1 + 9 files changed, 11 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5f6a164fc..08b90ad32 100644 --- a/README.md +++ b/README.md @@ -1047,6 +1047,7 @@ Below is the complete list of available options that can be used to customize yo | `OAUTH_GITLAB_APP_SECRET` | GitLab App Client secret. No defaults. | | `OAUTH_BITBUCKET_API_KEY` | BitBucket App Client ID. No defaults. | | `OAUTH_BITBUCKET_APP_SECRET` | BitBucket App Client secret. No defaults. | +| `OAUTH_BITBUCKET_URL` | Bitbucket URL. Defaults: https://bitbucket.org/ | | `OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL` | The URL at which the SAML assertion should be received. When `GITLAB_HTTPS=true`, defaults to `https://${GITLAB_HOST}/users/auth/saml/callback` else defaults to `http://${GITLAB_HOST}/users/auth/saml/callback`. | | `OAUTH_SAML_IDP_CERT_FINGERPRINT` | The SHA1 fingerprint of the certificate. No Defaults. | | `OAUTH_SAML_IDP_SSO_TARGET_URL` | The URL to which the authentication request should be sent. No defaults. | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 4f549a037..eaa2cdad3 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -928,7 +928,8 @@ production: &base args: { scope: '{{OAUTH_GITHUB_SCOPE}}' } } - { name: 'bitbucket', app_id: '{{OAUTH_BITBUCKET_API_KEY}}', - app_secret: '{{OAUTH_BITBUCKET_APP_SECRET}}' } + app_secret: '{{OAUTH_BITBUCKET_APP_SECRET}}', + url: '{{OAUTH_BITBUCKET_URL}}'} - { name: 'gitlab', label: 'GitLab.com', app_id: '{{OAUTH_GITLAB_API_KEY}}', diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 14b0d4148..06fe83940 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -403,6 +403,7 @@ OAUTH_GITLAB_SCOPE=${OAUTH_GITLAB_SCOPE:-api} ### BITBUCKET OAUTH_BITBUCKET_API_KEY=${OAUTH_BITBUCKET_API_KEY:-} OAUTH_BITBUCKET_APP_SECRET=${OAUTH_BITBUCKET_APP_SECRET:-} +OAUTH_BITBUCKET_URL=${OAUTH_BITBUCKET_URL:-https://bitbucket.org/} ### CROWD OAUTH_CROWD_SERVER_URL=${OAUTH_CROWD_SERVER_URL:-} diff --git a/assets/runtime/functions b/assets/runtime/functions index 7b58bf38f..72465e384 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -553,7 +553,8 @@ gitlab_configure_oauth_bitbucket() { OAUTH_ENABLED=${OAUTH_ENABLED:-true} update_template ${GITLAB_CONFIG} \ OAUTH_BITBUCKET_API_KEY \ - OAUTH_BITBUCKET_APP_SECRET + OAUTH_BITBUCKET_APP_SECRET \ + OAUTH_BITBUCKET_URL else exec_as_git sed -i "/name: 'bitbucket'/,/{{OAUTH_BITBUCKET_APP_SECRET}}/d" ${GITLAB_CONFIG} fi diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index af74ec6de..bf8c793a7 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -127,6 +127,7 @@ services: - OAUTH_BITBUCKET_API_KEY= - OAUTH_BITBUCKET_APP_SECRET= + - OAUTH_BITBUCKET_URL= - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL= - OAUTH_SAML_IDP_CERT_FINGERPRINT= diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 1a085ceea..ebc75b275 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -189,6 +189,7 @@ services: - OAUTH_BITBUCKET_API_KEY= - OAUTH_BITBUCKET_APP_SECRET= + - OAUTH_BITBUCKET_URL= - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL= - OAUTH_SAML_IDP_CERT_FINGERPRINT= diff --git a/docker-compose.yml b/docker-compose.yml index 297c3e038..a6c3f6a4d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -129,6 +129,7 @@ services: - OAUTH_BITBUCKET_API_KEY= - OAUTH_BITBUCKET_APP_SECRET= + - OAUTH_BITBUCKET_URL= - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL= - OAUTH_SAML_IDP_CERT_FINGERPRINT= diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index cf41609c3..344140366 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -123,6 +123,7 @@ services: - OAUTH_BITBUCKET_API_KEY= - OAUTH_BITBUCKET_APP_SECRET= + - OAUTH_BITBUCKET_URL= - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL= - OAUTH_SAML_IDP_CERT_FINGERPRINT= diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md index 7471206bc..1a4914109 100644 --- a/docs/s3_compatible_storage.md +++ b/docs/s3_compatible_storage.md @@ -174,6 +174,7 @@ services: - OAUTH_GITLAB_APP_SECRET= - OAUTH_BITBUCKET_API_KEY= - OAUTH_BITBUCKET_APP_SECRET= + - OAUTH_BITBUCKET_URL= - OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL= - OAUTH_SAML_IDP_CERT_FINGERPRINT= - OAUTH_SAML_IDP_SSO_TARGET_URL= From 936d942936d399ed869a7d89eb6586623bf285f1 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 25 Feb 2021 20:51:45 +0100 Subject: [PATCH 042/522] upgrade Gitlab CE to 13.9.1 --- Changelog.md | 5 +++ Dockerfile | 4 +-- README.md | 56 ++++++++++++++++---------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++--- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 8 files changed, 44 insertions(+), 39 deletions(-) diff --git a/Changelog.md b/Changelog.md index 47c14e560..be1bfbc6e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.9.1** +- gitlab: upgrade CE to v13.9.1 +- gitaly: upgrade to v13.9.1 + + **13.9.0** - gitlab: upgrade CE to v13.9.0 - gitaly: upgrade to v13.9.0 diff --git a/Dockerfile b/Dockerfile index 49925debc..c3268bed3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:bionic-20210118 -ARG VERSION=13.9.0 +ARG VERSION=13.9.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=13.16.1 \ GITLAB_WORKHORSE_VERSION=8.63.0 \ GITLAB_PAGES_VERSION=1.35.0 \ - GITALY_SERVER_VERSION=13.9.0 \ + GITALY_SERVER_VERSION=13.9.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 570eb0234..7fac10c3d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.9.0 +# sameersbn/gitlab:13.9.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.9.0 +docker pull sameersbn/gitlab:13.9.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.0 + sameersbn/gitlab:13.9.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.0 + sameersbn/gitlab:13.9.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:13.9.0 + sameersbn/gitlab:13.9.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:13.9.0 + sameersbn/gitlab:13.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.9.0 + sameersbn/gitlab:13.9.1 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.9.0 + sameersbn/gitlab:13.9.1 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.0 + sameersbn/gitlab:13.9.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.0 + sameersbn/gitlab:13.9.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.0 + sameersbn/gitlab:13.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.0 + sameersbn/gitlab:13.9.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.0 + sameersbn/gitlab:13.9.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.0 + sameersbn/gitlab:13.9.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.9.0 + sameersbn/gitlab:13.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:13.9.0 app:sanitize + sameersbn/gitlab:13.9.1 app:sanitize ``` ### Piwik @@ -1149,7 +1149,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.0 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1184,14 +1184,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.0 app:rake db:setup + sameersbn/gitlab:13.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:13.9.0 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1200,14 +1200,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.0 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.1 # Choose to restore from 1515629493 ``` @@ -1250,7 +1250,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.0 app:rake gitlab:env:info + sameersbn/gitlab:13.9.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1263,7 +1263,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.0 app:rake gitlab:import:repos + sameersbn/gitlab:13.9.1 app:rake gitlab:import:repos ``` Or @@ -1294,7 +1294,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.0 app:rake gitlab:import:repos + sameersbn/gitlab:13.9.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1318,12 +1318,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.9.0 +docker pull sameersbn/gitlab:13.9.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1349,7 +1349,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.1 ``` ## Shell Access @@ -1387,7 +1387,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.9.0 + image: sameersbn/gitlab:13.9.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index c662e83bd..8ba26053a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.9.0 +13.9.1 diff --git a/docker-compose.yml b/docker-compose.yml index 49a395bdd..ced3a3ae1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.0 + image: sameersbn/gitlab:13.9.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 49472e61d..c4348c8f4 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.0 app:rake gitlab:backup:create + sameersbn/gitlab:13.9.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.0 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.9.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.9.0 +docker pull sameersbn/gitlab:13.9.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.9.0 +sameersbn/gitlab:13.9.1 ``` diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 0db9d74e8..4d0dec317 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.0 + image: sameersbn/gitlab:13.9.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 32dabcf57..eb8f066e6 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.9.0 + image: sameersbn/gitlab:13.9.1 env: - name: TZ value: Asia/Kolkata From 7197de2f3e7506e97348215b13fd74c3432cbdaf Mon Sep 17 00:00:00 2001 From: 3kami3 Date: Thu, 4 Mar 2021 00:15:58 +0900 Subject: [PATCH 043/522] Update Puma Worker Killer RAM limits --- README.md | 4 ++-- assets/runtime/env-defaults | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5f6a164fc..78bf6c90a 100644 --- a/README.md +++ b/README.md @@ -956,8 +956,8 @@ Below is the complete list of available options that can be used to customize yo | `PUMA_TIMEOUT` | Sets the timeout of puma worker processes. Defaults to `60` seconds. | | `PUMA_THREADS_MIN` | The number of puma minimum threads. Defaults to `1`. | | `PUMA_THREADS_MAX` | The number of puma maximum threads. Defaults to `16`. | -| `PUMA_PER_WORKER_MAX_MEMORY_MB` | Maximum memory size of per puma worker process. Defaults to `850`. | -| `PUMA_MASTER_MAX_MEMORY_MB` | Maximum memory size of puma master process. Defaults to `550`. | +| `PUMA_PER_WORKER_MAX_MEMORY_MB` | Maximum memory size of per puma worker process. Defaults to `1024`. | +| `PUMA_MASTER_MAX_MEMORY_MB` | Maximum memory size of puma master process. Defaults to `800`. | | `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) | diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 14b0d4148..bbca231ea 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -68,8 +68,8 @@ PUMA_THREADS_MIN=${PUMA_THREADS_MIN:-1} PUMA_THREADS_MAX=${PUMA_THREADS_MAX:-16} PUMA_WORKERS=${PUMA_WORKERS:-3} PUMA_TIMEOUT=${PUMA_TIMEOUT:-60} -PUMA_PER_WORKER_MAX_MEMORY_MB=${PUMA_PER_WORKER_MAX_MEMORY_MB:-850} -PUMA_MASTER_MAX_MEMORY_MB=${PUMA_MASTER_MAX_MEMORY_MB:-550} +PUMA_PER_WORKER_MAX_MEMORY_MB=${PUMA_PER_WORKER_MAX_MEMORY_MB:-1024} +PUMA_MASTER_MAX_MEMORY_MB=${PUMA_MASTER_MAX_MEMORY_MB:-800} # Set Default values according to the documentation # https://docs.gitlab.com/ee/administration/operations/unicorn.html#unicorn-worker-killer From d79ed948a9cbf1e0c1abf6cd730d2f20ffd85d5a Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 4 Mar 2021 23:14:26 +0100 Subject: [PATCH 044/522] upgrade Gitlab CE to 13.9.2 --- Changelog.md | 6 ++++ Dockerfile | 6 ++-- README.md | 56 ++++++++++++++++---------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++--- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 8 files changed, 46 insertions(+), 40 deletions(-) diff --git a/Changelog.md b/Changelog.md index be1bfbc6e..07a049bb5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.9.1** +- gitlab: upgrade CE to v13.9.2 +- gitaly: upgrade to v13.9.2 +- gitlab-workhorse: upgrade to v8.63.2 + + **13.9.1** - gitlab: upgrade CE to v13.9.1 - gitaly: upgrade to v13.9.1 diff --git a/Dockerfile b/Dockerfile index c3268bed3..c3bf983f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:bionic-20210118 -ARG VERSION=13.9.1 +ARG VERSION=13.9.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16 \ GITLAB_SHELL_VERSION=13.16.1 \ - GITLAB_WORKHORSE_VERSION=8.63.0 \ + GITLAB_WORKHORSE_VERSION=8.63.2 \ GITLAB_PAGES_VERSION=1.35.0 \ - GITALY_SERVER_VERSION=13.9.1 \ + GITALY_SERVER_VERSION=13.9.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 7fac10c3d..76e37be7e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.9.1 +# sameersbn/gitlab:13.9.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.9.1 +docker pull sameersbn/gitlab:13.9.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.1 + sameersbn/gitlab:13.9.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.1 + sameersbn/gitlab:13.9.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:13.9.1 + sameersbn/gitlab:13.9.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:13.9.1 + sameersbn/gitlab:13.9.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.9.1 + sameersbn/gitlab:13.9.2 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.9.1 + sameersbn/gitlab:13.9.2 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.1 + sameersbn/gitlab:13.9.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.1 + sameersbn/gitlab:13.9.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.1 + sameersbn/gitlab:13.9.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.1 + sameersbn/gitlab:13.9.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.1 + sameersbn/gitlab:13.9.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.1 + sameersbn/gitlab:13.9.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.9.1 + sameersbn/gitlab:13.9.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:13.9.1 app:sanitize + sameersbn/gitlab:13.9.2 app:sanitize ``` ### Piwik @@ -1149,7 +1149,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.1 app:rake gitlab:backup:create + sameersbn/gitlab:13.9.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. @@ -1184,14 +1184,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.1 app:rake db:setup + sameersbn/gitlab:13.9.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:13.9.1 app:rake gitlab:backup:restore + sameersbn/gitlab:13.9.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. @@ -1200,14 +1200,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.1 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.2 # Choose to restore from 1515629493 ``` @@ -1250,7 +1250,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.1 app:rake gitlab:env:info + sameersbn/gitlab:13.9.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1263,7 +1263,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.1 app:rake gitlab:import:repos + sameersbn/gitlab:13.9.2 app:rake gitlab:import:repos ``` Or @@ -1294,7 +1294,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.1 app:rake gitlab:import:repos + sameersbn/gitlab:13.9.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1318,12 +1318,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.9.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:13.9.1 +docker pull sameersbn/gitlab:13.9.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1349,7 +1349,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.2 ``` ## Shell Access @@ -1387,7 +1387,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.9.1 + image: sameersbn/gitlab:13.9.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 8ba26053a..561a05bc7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.9.1 +13.9.2 diff --git a/docker-compose.yml b/docker-compose.yml index ced3a3ae1..be7d853af 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.1 + image: sameersbn/gitlab:13.9.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index c4348c8f4..5d8ec509b 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.1 app:rake gitlab:backup:create + sameersbn/gitlab:13.9.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.1 app:rake gitlab:backup:restore + sameersbn/gitlab:13.9.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.9.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.9.1 +docker pull sameersbn/gitlab:13.9.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.9.1 +sameersbn/gitlab:13.9.2 ``` diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 4d0dec317..ae288a1a5 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.1 + image: sameersbn/gitlab:13.9.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index eb8f066e6..1bd26d03a 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.9.1 + image: sameersbn/gitlab:13.9.2 env: - name: TZ value: Asia/Kolkata From 22d33c9b3bab9bc2c4a11c09351ccc6d2ff3a9d3 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 9 Mar 2021 19:38:32 +0100 Subject: [PATCH 045/522] upgrade Gitlab CE to 13.9.3 --- Changelog.md | 7 +++- Dockerfile | 6 ++-- README.md | 56 ++++++++++++++++---------------- VERSION | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++--- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 8 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 07a049bb5..f24756bb6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,7 +3,12 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. -**13.9.1** +**13.9.3** +- gitlab: upgrade CE to v13.9.3 +- gitaly: upgrade to v13.9.3 +- gitlab-shell: upgrade to v13.17.0 + +**13.9.2** - gitlab: upgrade CE to v13.9.2 - gitaly: upgrade to v13.9.2 - gitlab-workhorse: upgrade to v8.63.2 diff --git a/Dockerfile b/Dockerfile index c3bf983f5..375931d4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:bionic-20210118 -ARG VERSION=13.9.2 +ARG VERSION=13.9.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16 \ - GITLAB_SHELL_VERSION=13.16.1 \ + GITLAB_SHELL_VERSION=13.17.0 \ GITLAB_WORKHORSE_VERSION=8.63.2 \ GITLAB_PAGES_VERSION=1.35.0 \ - GITALY_SERVER_VERSION=13.9.2 \ + GITALY_SERVER_VERSION=13.9.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 76e37be7e..e064e595f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.9.2 +# sameersbn/gitlab:13.9.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.9.2 +docker pull sameersbn/gitlab:13.9.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.2 + sameersbn/gitlab:13.9.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.2 + sameersbn/gitlab:13.9.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:13.9.2 + sameersbn/gitlab:13.9.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:13.9.2 + sameersbn/gitlab:13.9.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.9.2 + sameersbn/gitlab:13.9.3 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.9.2 + sameersbn/gitlab:13.9.3 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.2 + sameersbn/gitlab:13.9.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.2 + sameersbn/gitlab:13.9.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.2 + sameersbn/gitlab:13.9.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.2 + sameersbn/gitlab:13.9.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.2 + sameersbn/gitlab:13.9.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.2 + sameersbn/gitlab:13.9.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.9.2 + sameersbn/gitlab:13.9.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:13.9.2 app:sanitize + sameersbn/gitlab:13.9.3 app:sanitize ``` ### Piwik @@ -1149,7 +1149,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.2 app:rake gitlab:backup:create + sameersbn/gitlab:13.9.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. @@ -1184,14 +1184,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.2 app:rake db:setup + sameersbn/gitlab:13.9.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:13.9.2 app:rake gitlab:backup:restore + sameersbn/gitlab:13.9.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. @@ -1200,14 +1200,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.9.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.2 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.3 # Choose to restore from 1515629493 ``` @@ -1250,7 +1250,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.2 app:rake gitlab:env:info + sameersbn/gitlab:13.9.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1263,7 +1263,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.2 app:rake gitlab:import:repos + sameersbn/gitlab:13.9.3 app:rake gitlab:import:repos ``` Or @@ -1294,7 +1294,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.2 app:rake gitlab:import:repos + sameersbn/gitlab:13.9.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1318,12 +1318,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.9.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:13.9.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:13.9.2 +docker pull sameersbn/gitlab:13.9.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1349,7 +1349,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.3 ``` ## Shell Access @@ -1387,7 +1387,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.9.2 + image: sameersbn/gitlab:13.9.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 561a05bc7..077947381 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.9.2 +13.9.3 diff --git a/docker-compose.yml b/docker-compose.yml index be7d853af..20a61178e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.2 + image: sameersbn/gitlab:13.9.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 5d8ec509b..48b0f9f87 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.2 app:rake gitlab:backup:create + sameersbn/gitlab:13.9.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.2 app:rake gitlab:backup:restore + sameersbn/gitlab:13.9.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.9.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.9.2 +docker pull sameersbn/gitlab:13.9.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.9.2 +sameersbn/gitlab:13.9.3 ``` diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index ae288a1a5..7574abc26 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.2 + image: sameersbn/gitlab:13.9.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 1bd26d03a..59a0790a2 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.9.2 + image: sameersbn/gitlab:13.9.3 env: - name: TZ value: Asia/Kolkata From c76d3734f2295803a7a4c81c6cfcf9af6a96b5b3 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 10 Mar 2021 10:32:10 +0530 Subject: [PATCH 046/522] removed extra newlines --- docs/keycloak-idp.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md index 37d11ab4e..149e639cb 100644 --- a/docs/keycloak-idp.md +++ b/docs/keycloak-idp.md @@ -28,7 +28,6 @@ Next, click save, get the client secret generated by Keycloak and start filling Set the following in the docker-compose file: - ```yaml - OAUTH2_GENERIC_APP_SECRET= - OAUTH2_GENERIC_CLIENT_SITE=http://:10081 @@ -50,7 +49,6 @@ The following must also be configured: The values will be different for your deployment. Navigate Keycloak's UI, select `Clients`, click `[your client]`, then open the `Client Scopes` tab, then open `Evaluate` sub-tab, enter a username you know in the `User` field, select the match, then `Generate Access Token` to see the values you need to configure. - Also, make sure the following variables are filled in the docker-compose file: ```yaml From adf79a6c112d0b50e71256a90b8a297b82833968 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 10 Mar 2021 13:42:54 +0530 Subject: [PATCH 047/522] functions: properly delete the bitbucket auth config when not in use --- assets/runtime/config/gitlabhq/gitlab.yml | 2 +- assets/runtime/functions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index eaa2cdad3..c39311e8a 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -929,7 +929,7 @@ production: &base - { name: 'bitbucket', app_id: '{{OAUTH_BITBUCKET_API_KEY}}', app_secret: '{{OAUTH_BITBUCKET_APP_SECRET}}', - url: '{{OAUTH_BITBUCKET_URL}}'} + url: '{{OAUTH_BITBUCKET_URL}}' } - { name: 'gitlab', label: 'GitLab.com', app_id: '{{OAUTH_GITLAB_API_KEY}}', diff --git a/assets/runtime/functions b/assets/runtime/functions index 72465e384..7d65ae1f4 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -556,7 +556,7 @@ gitlab_configure_oauth_bitbucket() { OAUTH_BITBUCKET_APP_SECRET \ OAUTH_BITBUCKET_URL else - exec_as_git sed -i "/name: 'bitbucket'/,/{{OAUTH_BITBUCKET_APP_SECRET}}/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/name: 'bitbucket'/,/{{OAUTH_BITBUCKET_URL}}/d" ${GITLAB_CONFIG} fi } From 7fe3673540878607d3cb51903033eb7cba98cf0b Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 11 Mar 2021 11:01:22 +0530 Subject: [PATCH 048/522] fix versions used in yaml samples --- contrib/docker-swarm/docker-compose.yml | 2 +- docs/docker-compose-keycloak.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 582be8e62..056cad229 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.0 + image: sameersbn/gitlab:13.9.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 9d82586eb..0a21815f6 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.0 + image: sameersbn/gitlab:13.9.3 depends_on: - redis - postgresql From 9b7536a32ebefa58ab4eb81457c823213cc1a521 Mon Sep 17 00:00:00 2001 From: l00v3 Date: Fri, 12 Mar 2021 11:59:03 +0100 Subject: [PATCH 049/522] Add LDAP_PREVENT_LDAP_SIGN_IN configuration parameter Committer: l00v3 --- 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 52381bfc3..a28a37418 100644 --- a/README.md +++ b/README.md @@ -1015,6 +1015,7 @@ Below is the complete list of available options that can be used to customize yo | `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` | +| `LDAP_PREVENT_LDAP_SIGN_IN` | Set to `true` to [Disable LDAP web sign in](https://docs.gitlab.com/ce/administration/auth/ldap/#disable-ldap-web-sign-in), 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 c39311e8a..f80dc63d2 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -593,7 +593,7 @@ production: &base # bundle exec rake gitlab:ldap:check RAILS_ENV=production ldap: enabled: {{LDAP_ENABLED}} - prevent_ldap_sign_in: false + prevent_ldap_sign_in: {{LDAP_PREVENT_LDAP_SIGN_IN}} # This setting controls the number of seconds between LDAP permission checks # for each user. After this time has expired for a given user, their next diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 1f2249739..409b1ca7d 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -344,6 +344,7 @@ 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:-} +LDAP_PREVENT_LDAP_SIGN_IN=${LDAP_PREVENT_LDAP_SIGN_IN:-false} case ${LDAP_UID} in userPrincipalName) LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN=${LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN:-false} ;; *) LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN=${LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN:-true} diff --git a/assets/runtime/functions b/assets/runtime/functions index 7d65ae1f4..82698acab 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -439,7 +439,8 @@ gitlab_configure_ldap() { LDAP_USER_ATTRIBUTE_NAME \ LDAP_USER_ATTRIBUTE_FIRSTNAME \ LDAP_USER_ATTRIBUTE_LASTNAME \ - LDAP_LABEL + LDAP_LABEL \ + LDAP_PREVENT_LDAP_SIGN_IN } gitlab_configure_oauth_cas3() { From 5d27e362c136fcd917a84ccef0b88d1fb2f0e28d Mon Sep 17 00:00:00 2001 From: "a.shibata" Date: Fri, 12 Mar 2021 23:42:10 +0900 Subject: [PATCH 050/522] docs: upgrade redis to redis:5.0.9 --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 52381bfc3..9c25e3119 100644 --- a/README.md +++ b/README.md @@ -180,7 +180,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-2 + redis:5.0.9 ``` Step 3. Launch the gitlab container @@ -359,7 +359,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-2 +docker pull redis:5.0.9 ``` Lets start the redis container @@ -367,7 +367,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-2 + redis:5.0.9 ``` We are now ready to start the GitLab application. From 0eafcfb3956de7320f4c53a8303b57c57e5d4efd Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 17 Mar 2021 19:23:33 +0100 Subject: [PATCH 051/522] upgrade Gitlab CE to 13.9.4 --- Changelog.md | 6 +++ Dockerfile | 8 ++-- README.md | 56 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 10 files changed, 49 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index f24756bb6..a378fe513 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.9.3** +- gitlab: upgrade CE to v13.9.4 +- gitaly: upgrade to v13.9.4 +- golang: upgrade to v1.16.2 +- ubuntu: upgrade to bionic-20210222 + **13.9.3** - gitlab: upgrade CE to v13.9.3 - gitaly: upgrade to v13.9.3 diff --git a/Dockerfile b/Dockerfile index 375931d4f..9f53c7c80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:bionic-20210118 +FROM ubuntu:bionic-20210222 -ARG VERSION=13.9.3 +ARG VERSION=13.9.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ - GOLANG_VERSION=1.16 \ + GOLANG_VERSION=1.16.2 \ GITLAB_SHELL_VERSION=13.17.0 \ GITLAB_WORKHORSE_VERSION=8.63.2 \ GITLAB_PAGES_VERSION=1.35.0 \ - GITALY_SERVER_VERSION=13.9.3 \ + GITALY_SERVER_VERSION=13.9.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 52381bfc3..bb78f2456 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.9.3 +# sameersbn/gitlab:13.9.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.9.3 +docker pull sameersbn/gitlab:13.9.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.3 + sameersbn/gitlab:13.9.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.3 + sameersbn/gitlab:13.9.4 ``` ## Database @@ -264,7 +264,7 @@ docker run --name gitlab -d \ --env 'DB_NAME=gitlabhq_production' \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.3 + sameersbn/gitlab:13.9.4 ``` #### Linking to PostgreSQL Container @@ -308,7 +308,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-postgresql:postgresql \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.3 + sameersbn/gitlab:13.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.9.3 + sameersbn/gitlab:13.9.4 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.9.3 + sameersbn/gitlab:13.9.4 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.3 + sameersbn/gitlab:13.9.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.3 + sameersbn/gitlab:13.9.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.3 + sameersbn/gitlab:13.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.3 + sameersbn/gitlab:13.9.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.3 + sameersbn/gitlab:13.9.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.3 + sameersbn/gitlab:13.9.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.9.3 + sameersbn/gitlab:13.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:13.9.3 app:sanitize + sameersbn/gitlab:13.9.4 app:sanitize ``` ### Piwik @@ -1150,7 +1150,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.3 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1185,14 +1185,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.3 app:rake db:setup + sameersbn/gitlab:13.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:13.9.3 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1201,14 +1201,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.3 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.4 # Choose to restore from 1515629493 ``` @@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.3 app:rake gitlab:env:info + sameersbn/gitlab:13.9.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.3 app:rake gitlab:import:repos + sameersbn/gitlab:13.9.4 app:rake gitlab:import:repos ``` Or @@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.3 app:rake gitlab:import:repos + sameersbn/gitlab:13.9.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.9.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher. +> Upgrading to `sameersbn/gitlab:13.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:13.9.3 +docker pull sameersbn/gitlab:13.9.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.4 ``` ## Shell Access @@ -1388,7 +1388,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.9.3 + image: sameersbn/gitlab:13.9.4 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 077947381..e66137553 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.9.3 +13.9.4 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 056cad229..7d89c7577 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.3 + image: sameersbn/gitlab:13.9.4 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 4d9645786..cfe43c564 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.3 + image: sameersbn/gitlab:13.9.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 48b0f9f87..ee24f91ad 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.3 app:rake gitlab:backup:create + sameersbn/gitlab:13.9.4 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.3 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.9.3 +docker pull sameersbn/gitlab:13.9.4 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.9.3 +sameersbn/gitlab:13.9.4 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 0a21815f6..30c5bddda 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.3 + image: sameersbn/gitlab:13.9.4 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 7574abc26..8b7d9f859 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.3 + image: sameersbn/gitlab:13.9.4 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 59a0790a2..9778e11e2 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.9.3 + image: sameersbn/gitlab:13.9.4 env: - name: TZ value: Asia/Kolkata From a301e50dea2d7ffccf35a38ec3684154479a5ebe Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 19 Mar 2021 05:43:52 +0100 Subject: [PATCH 052/522] Fix typo --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index a378fe513..076884dd5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,7 +3,7 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. -**13.9.3** +**13.9.4** - gitlab: upgrade CE to v13.9.4 - gitaly: upgrade to v13.9.4 - golang: upgrade to v1.16.2 From d289ed1cd116fc46461a5bccb26880ab9fe852da Mon Sep 17 00:00:00 2001 From: intec_bf Date: Mon, 22 Mar 2021 21:30:12 +0100 Subject: [PATCH 053/522] upgrade to gitlab CE 13.10.0 --- Dockerfile | 7 ++-- README.md | 56 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 9 files changed, 42 insertions(+), 43 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9f53c7c80..b8a5794d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,13 @@ FROM ubuntu:bionic-20210222 -ARG VERSION=13.9.4 +ARG VERSION=13.10.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.2 \ GITLAB_SHELL_VERSION=13.17.0 \ - GITLAB_WORKHORSE_VERSION=8.63.2 \ - GITLAB_PAGES_VERSION=1.35.0 \ - GITALY_SERVER_VERSION=13.9.4 \ + GITLAB_PAGES_VERSION=1.36.0 \ + GITALY_SERVER_VERSION=13.10.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index bb78f2456..c400fdfc3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.9.4 +# sameersbn/gitlab:13.10.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.9.4 +docker pull sameersbn/gitlab:13.10.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.10.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.10.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:13.9.4 + sameersbn/gitlab:13.10.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:13.9.4 + sameersbn/gitlab:13.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.10.0 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.10.0 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.10.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.10.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.10.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.10.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.10.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.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:13.9.4 app:sanitize + sameersbn/gitlab:13.10.0 app:sanitize ``` ### Piwik @@ -1150,7 +1150,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.4 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1185,14 +1185,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.4 app:rake db:setup + sameersbn/gitlab:13.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:13.9.4 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1201,14 +1201,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.4 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.10.0 # Choose to restore from 1515629493 ``` @@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.4 app:rake gitlab:env:info + sameersbn/gitlab:13.10.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.4 app:rake gitlab:import:repos + sameersbn/gitlab:13.10.0 app:rake gitlab:import:repos ``` Or @@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.4 app:rake gitlab:import:repos + sameersbn/gitlab:13.10.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.9.4 +docker pull sameersbn/gitlab:13.10.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.10.0 ``` ## Shell Access @@ -1388,7 +1388,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.9.4 + image: sameersbn/gitlab:13.10.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index e66137553..c554e7e86 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.9.4 +13.10.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 7d89c7577..0a89e6825 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.4 + image: sameersbn/gitlab:13.10.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index cfe43c564..87ac1f956 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.4 + image: sameersbn/gitlab:13.10.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ee24f91ad..d326fa548 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.4 app:rake gitlab:backup:create + sameersbn/gitlab:13.10.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.10.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.9.4 +docker pull sameersbn/gitlab:13.10.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.9.4 +sameersbn/gitlab:13.10.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 30c5bddda..6ff123b2c 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.4 + image: sameersbn/gitlab:13.10.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 8b7d9f859..4caaac6e8 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.4 + image: sameersbn/gitlab:13.10.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 9778e11e2..10007f4bc 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.9.4 + image: sameersbn/gitlab:13.10.0 env: - name: TZ value: Asia/Kolkata From af6bfcb7897e002598195e2eaf564499fb225aed Mon Sep 17 00:00:00 2001 From: intec_bf Date: Mon, 22 Mar 2021 21:55:05 +0100 Subject: [PATCH 054/522] workhorse is now bundled with gitlab --- assets/build/install.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index 0278c92ac..63f0c155e 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -3,11 +3,10 @@ set -e 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 GITLAB_GITALY_URL=https://gitlab.com/gitlab-org/gitaly.git -GITLAB_WORKHORSE_BUILD_DIR=/tmp/gitlab-workhorse +GITLAB_WORKHORSE_BUILD_DIR=${GITLAB_INSTALL_DIR}/workhorse GITLAB_PAGES_BUILD_DIR=/tmp/gitlab-pages GITLAB_GITALY_BUILD_DIR=/tmp/gitaly @@ -74,7 +73,6 @@ exec_as_git git -C ${GITLAB_INSTALL_DIR} apply --ignore-whitespace < ${GITLAB_BU fi GITLAB_SHELL_VERSION=${GITLAB_SHELL_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_SHELL_VERSION)} -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 @@ -100,11 +98,9 @@ exec_as_git "PATH=$PATH" make verify setup # remove unused repositories directory created by gitlab-shell install rm -rf ${GITLAB_HOME}/repositories -# download gitlab-workhorse -echo "Cloning gitlab-workhorse v.${GITLAB_WORKHORSE_VERSION}..." -git clone -q -b v${GITLAB_WORKHORSE_VERSION} --depth 1 ${GITLAB_WORKHORSE_URL} ${GITLAB_WORKHORSE_BUILD_DIR} +# build gitlab-workhorse +echo "Build gitlab-workhorse" make -C ${GITLAB_WORKHORSE_BUILD_DIR} install - # clean up rm -rf ${GITLAB_WORKHORSE_BUILD_DIR} @@ -445,3 +441,4 @@ rm -rf /var/lib/apt/lists/* # clean up caches rm -rf ${GITLAB_HOME}/.cache ${GITLAB_HOME}/.bundle ${GITLAB_HOME}/go rm -rf /root/.cache /root/.bundle ${GITLAB_HOME}/gitlab/node_modules +rm -r /tmp/* From 68f78f8c89824f1829bc9793606356dc277d16b1 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 31 Mar 2021 21:16:42 +0200 Subject: [PATCH 055/522] upgrade GitLab CE to 13.10.1 --- Changelog.md | 9 +++++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 076884dd5..31adec2a2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,15 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.10.1** +- gitlab: upgrade CE to v13.10.1 +- gitaly: upgrade to v13.10.1 + +**13.10.0** +- gitlab: upgrade CE to v13.10.0 +- gitaly: upgrade to v13.10.0 +- gitlab-pages: upgrade to v1.36.0 + **13.9.4** - gitlab: upgrade CE to v13.9.4 - gitaly: upgrade to v13.9.4 diff --git a/Dockerfile b/Dockerfile index b8a5794d4..d7cad1354 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:bionic-20210222 -ARG VERSION=13.10.0 +ARG VERSION=13.10.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.2 \ GITLAB_SHELL_VERSION=13.17.0 \ GITLAB_PAGES_VERSION=1.36.0 \ - GITALY_SERVER_VERSION=13.10.0 \ + GITALY_SERVER_VERSION=13.10.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index c400fdfc3..41a383777 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.10.0 +# sameersbn/gitlab:13.10.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.10.0 +docker pull sameersbn/gitlab:13.10.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.0 + sameersbn/gitlab:13.10.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.0 + sameersbn/gitlab:13.10.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:13.10.0 + sameersbn/gitlab:13.10.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:13.10.0 + sameersbn/gitlab:13.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.10.0 + sameersbn/gitlab:13.10.1 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.10.0 + sameersbn/gitlab:13.10.1 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.0 + sameersbn/gitlab:13.10.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.0 + sameersbn/gitlab:13.10.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.0 + sameersbn/gitlab:13.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.0 + sameersbn/gitlab:13.10.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.0 + sameersbn/gitlab:13.10.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.0 + sameersbn/gitlab:13.10.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.10.0 + sameersbn/gitlab:13.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:13.10.0 app:sanitize + sameersbn/gitlab:13.10.1 app:sanitize ``` ### Piwik @@ -1150,7 +1150,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.0 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1185,14 +1185,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.0 app:rake db:setup + sameersbn/gitlab:13.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:13.10.0 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1201,7 +1201,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.0 app:rake gitlab:env:info + sameersbn/gitlab:13.10.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.0 app:rake gitlab:import:repos + sameersbn/gitlab:13.10.1 app:rake gitlab:import:repos ``` Or @@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.0 app:rake gitlab:import:repos + sameersbn/gitlab:13.10.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.10.0 +docker pull sameersbn/gitlab:13.10.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.10.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.10.1 ``` ## Shell Access @@ -1388,7 +1388,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.10.0 + image: sameersbn/gitlab:13.10.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index c554e7e86..81c05ffb8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.10.0 +13.10.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 0a89e6825..cbba868bb 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.10.0 + image: sameersbn/gitlab:13.10.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index e4f7dbdc3..7fd289c80 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.9.0 + image: sameersbn/gitlab:13.10.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 87ac1f956..c3db865aa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.10.0 + image: sameersbn/gitlab:13.10.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index d326fa548..15279b6f6 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.0 app:rake gitlab:backup:create + sameersbn/gitlab:13.10.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.0 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.10.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.10.0 +docker pull sameersbn/gitlab:13.10.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.10.0 +sameersbn/gitlab:13.10.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 6ff123b2c..e2389883e 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.10.0 + image: sameersbn/gitlab:13.10.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 4caaac6e8..a443b5ef6 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.10.0 + image: sameersbn/gitlab:13.10.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 10007f4bc..ba6def6d5 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.10.0 + image: sameersbn/gitlab:13.10.1 env: - name: TZ value: Asia/Kolkata From 1cc7036cadd5e00a2b5ec0a2faeaef3e669ce92a Mon Sep 17 00:00:00 2001 From: Erwin Junge Date: Thu, 1 Apr 2021 10:08:27 +0200 Subject: [PATCH 056/522] v13.9.5 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 56 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 10 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 076884dd5..aac48149d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.9.5** +- gitlab: upgrade CE to v13.9.5 +- gitaly: upgrade to v13.9.5 + **13.9.4** - gitlab: upgrade CE to v13.9.4 - gitaly: upgrade to v13.9.4 diff --git a/Dockerfile b/Dockerfile index 9f53c7c80..20764f240 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:bionic-20210222 -ARG VERSION=13.9.4 +ARG VERSION=13.9.5 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_SHELL_VERSION=13.17.0 \ GITLAB_WORKHORSE_VERSION=8.63.2 \ GITLAB_PAGES_VERSION=1.35.0 \ - GITALY_SERVER_VERSION=13.9.4 \ + GITALY_SERVER_VERSION=13.9.5 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index bb78f2456..02687bd2b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.9.4 +# sameersbn/gitlab:13.9.5 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.9.4 +docker pull sameersbn/gitlab:13.9.5 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.9.5 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.9.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:13.9.4 + sameersbn/gitlab:13.9.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:13.9.4 + sameersbn/gitlab:13.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.9.5 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.9.5 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.9.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.9.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.9.5 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.9.5 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.9.5 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.9.4 + sameersbn/gitlab:13.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:13.9.4 app:sanitize + sameersbn/gitlab:13.9.5 app:sanitize ``` ### Piwik @@ -1150,7 +1150,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.4 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1185,14 +1185,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.4 app:rake db:setup + sameersbn/gitlab:13.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:13.9.4 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1201,14 +1201,14 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.9.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. ```bash docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups -docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.4 # Choose to restore from 1515629493 +docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.9.5 # Choose to restore from 1515629493 ``` @@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.4 app:rake gitlab:env:info + sameersbn/gitlab:13.9.5 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.4 app:rake gitlab:import:repos + sameersbn/gitlab:13.9.5 app:rake gitlab:import:repos ``` Or @@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.4 app:rake gitlab:import:repos + sameersbn/gitlab:13.9.5 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.9.4 +docker pull sameersbn/gitlab:13.9.5 ``` - **Step 2**: Stop and remove the currently running image @@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.9.5 ``` ## Shell Access @@ -1388,7 +1388,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.9.4 + image: sameersbn/gitlab:13.9.5 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index e66137553..46ebf3b7a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.9.4 +13.9.5 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 7d89c7577..f8c479cb2 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.4 + image: sameersbn/gitlab:13.9.5 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index cfe43c564..0364f41f0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.4 + image: sameersbn/gitlab:13.9.5 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ee24f91ad..b6d2eb02e 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.4 app:rake gitlab:backup:create + sameersbn/gitlab:13.9.5 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.9.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.9.5 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.9.4 +docker pull sameersbn/gitlab:13.9.5 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.9.4 +sameersbn/gitlab:13.9.5 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 30c5bddda..c7b54b456 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.4 + image: sameersbn/gitlab:13.9.5 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 8b7d9f859..334e972d4 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.9.4 + image: sameersbn/gitlab:13.9.5 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 9778e11e2..6be0fb3fb 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.9.4 + image: sameersbn/gitlab:13.9.5 env: - name: TZ value: Asia/Kolkata From 80ebf3b5e95a3be9a7de51385df636337471ea97 Mon Sep 17 00:00:00 2001 From: Erwin Junge Date: Thu, 1 Apr 2021 22:12:54 +0200 Subject: [PATCH 057/522] Add missing library (needed for the new mimemagic dependency) --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 20764f240..67ab7dd27 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,6 +50,7 @@ RUN set -ex && \ libpq5 zlib1g libyaml-0-2 libssl1.0.0 \ libgdbm5 libreadline7 libncurses5 libffi6 \ libxml2 libxslt1.1 libcurl4 libicu60 libre2-dev tzdata unzip libimage-exiftool-perl \ + libmagic1 \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \ From 9fb04969fcf94bfa258444847959e552c0f62150 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 2 Apr 2021 23:58:35 +0200 Subject: [PATCH 058/522] Add missing library (needed for the new mimemagic dependency) --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index d7cad1354..677de43e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,6 +49,7 @@ RUN set -ex && \ libpq5 zlib1g libyaml-0-2 libssl1.0.0 \ libgdbm5 libreadline7 libncurses5 libffi6 \ libxml2 libxslt1.1 libcurl4 libicu60 libre2-dev tzdata unzip libimage-exiftool-perl \ + libmagic1 \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \ From e786b094ddafb132c16316e901762b9ceed0b4ce Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 3 Apr 2021 00:07:17 +0200 Subject: [PATCH 059/522] Complete changelog.md --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index 31adec2a2..e4a90cc13 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list **13.10.1** - gitlab: upgrade CE to v13.10.1 - gitaly: upgrade to v13.10.1 +- added libmagic1 to fit requirements of ruby-magic-static-0.3.4 (necessary for puma) **13.10.0** - gitlab: upgrade CE to v13.10.0 From ea35c5d0b4a4db05cb6dd7db30e461dae5293944 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 2 Apr 2021 19:16:01 +0200 Subject: [PATCH 060/522] upgrade GitLab CE to 13.10.2 --- Changelog.md | 6 +++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 10 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index e4a90cc13..ea7e988e6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.10.2** +- gitlab: upgrade CE to v13.10.2 +- gitaly: upgrade to v13.10.2 +- golang: upgrade to v1.16.3 +- ubuntu: upgrade to bionic-20210325 + **13.10.1** - gitlab: upgrade CE to v13.10.1 - gitaly: upgrade to v13.10.1 diff --git a/Dockerfile b/Dockerfile index 677de43e4..a464dd480 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ -FROM ubuntu:bionic-20210222 +FROM ubuntu:bionic-20210325 -ARG VERSION=13.10.1 +ARG VERSION=13.10.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ - GOLANG_VERSION=1.16.2 \ + GOLANG_VERSION=1.16.3 \ GITLAB_SHELL_VERSION=13.17.0 \ GITLAB_PAGES_VERSION=1.36.0 \ - GITALY_SERVER_VERSION=13.10.1 \ + GITALY_SERVER_VERSION=13.10.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 41a383777..b6bf90ed0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.10.1 +# sameersbn/gitlab:13.10.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.10.1 +docker pull sameersbn/gitlab:13.10.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.1 + sameersbn/gitlab:13.10.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.1 + sameersbn/gitlab:13.10.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:13.10.1 + sameersbn/gitlab:13.10.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:13.10.1 + sameersbn/gitlab:13.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.10.1 + sameersbn/gitlab:13.10.2 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.10.1 + sameersbn/gitlab:13.10.2 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.1 + sameersbn/gitlab:13.10.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.1 + sameersbn/gitlab:13.10.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.1 + sameersbn/gitlab:13.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.1 + sameersbn/gitlab:13.10.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.1 + sameersbn/gitlab:13.10.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.1 + sameersbn/gitlab:13.10.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.10.1 + sameersbn/gitlab:13.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:13.10.1 app:sanitize + sameersbn/gitlab:13.10.2 app:sanitize ``` ### Piwik @@ -1150,7 +1150,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.1 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1185,14 +1185,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.1 app:rake db:setup + sameersbn/gitlab:13.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:13.10.1 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1201,7 +1201,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.10.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.1 app:rake gitlab:env:info + sameersbn/gitlab:13.10.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.1 app:rake gitlab:import:repos + sameersbn/gitlab:13.10.2 app:rake gitlab:import:repos ``` Or @@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.1 app:rake gitlab:import:repos + sameersbn/gitlab:13.10.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.10.1 +docker pull sameersbn/gitlab:13.10.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.10.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.10.2 ``` ## Shell Access @@ -1388,7 +1388,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.10.1 + image: sameersbn/gitlab:13.10.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index cbba868bb..ebcf2e5e7 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.10.1 + image: sameersbn/gitlab:13.10.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 7fd289c80..fa7f857da 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.10.1 + image: sameersbn/gitlab:13.10.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index c3db865aa..d8021004d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.10.1 + image: sameersbn/gitlab:13.10.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 15279b6f6..bc1d45932 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.1 app:rake gitlab:backup:create + sameersbn/gitlab:13.10.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.1 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.10.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.10.1 +docker pull sameersbn/gitlab:13.10.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.10.1 +sameersbn/gitlab:13.10.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index e2389883e..23b119613 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.10.1 + image: sameersbn/gitlab:13.10.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index a443b5ef6..7f1b623ef 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.10.1 + image: sameersbn/gitlab:13.10.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index ba6def6d5..fbeb2b84f 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.10.1 + image: sameersbn/gitlab:13.10.2 env: - name: TZ value: Asia/Kolkata From 82630d2d93e424467c1ab9d5f43918f1a8ba023a Mon Sep 17 00:00:00 2001 From: intec_bf Date: Sat, 3 Apr 2021 00:22:21 +0200 Subject: [PATCH 061/522] use Ubuntu 20.04 as base image --- Dockerfile | 21 +++++++++++---------- assets/build/install.sh | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index a464dd480..8a9ebe37a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:bionic-20210325 +FROM ubuntu:focal-20210325 ARG VERSION=13.10.2 @@ -25,19 +25,20 @@ 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 gnupg2 \ + && apt-get upgrade -y \ && rm -rf /var/lib/apt/lists/* 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 E1DD270288B4E6030699E45FA1715D88E1DF1F24 \ + && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu focal 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 bionic main" >> /etc/apt/sources.list \ + && echo "deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu focal 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 bionic main" >> /etc/apt/sources.list \ + && echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu focal 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/ bionic-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ + && echo 'deb http://apt.postgresql.org/pub/repos/apt/ focal-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_12.x bionic main' > /etc/apt/sources.list.d/nodesource.list \ + && echo 'deb https://deb.nodesource.com/node_12.x focal 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 \ @@ -46,9 +47,9 @@ RUN set -ex && \ sudo supervisor logrotate locales curl \ nginx openssh-server postgresql-client-12 postgresql-contrib-12 redis-tools \ git-core ruby${RUBY_VERSION} python3 python3-docutils nodejs yarn gettext-base graphicsmagick \ - libpq5 zlib1g libyaml-0-2 libssl1.0.0 \ - libgdbm5 libreadline7 libncurses5 libffi6 \ - libxml2 libxslt1.1 libcurl4 libicu60 libre2-dev tzdata unzip libimage-exiftool-perl \ + libpq5 zlib1g libyaml-0-2 libssl1.1 \ + libgdbm6 libreadline8 libncurses5 libffi7 \ + libxml2 libxslt1.1 libcurl4 libicu66 libre2-dev tzdata unzip libimage-exiftool-perl \ libmagic1 \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ diff --git a/assets/build/install.sh b/assets/build/install.sh index 63f0c155e..868e5744b 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -43,7 +43,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y ${BUIL # only for simplicity. paxctl -cvm "$(command -v ruby${RUBY_VERSION})" # https://en.wikibooks.org/wiki/Grsecurity/Application-specific_Settings#Node.js -paxctl -cvm "$(command -v nodejs)" +paxctl -cvm "$(command -v node)" # remove the host keys generated during openssh-server installation rm -rf /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub From 4ccb8eefb550f44520e4ca9123e926c8c8fa7a1c Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sat, 13 Mar 2021 20:43:30 +0900 Subject: [PATCH 062/522] Support healthcheck with relative URL traditional one with relative url always returns 404 (unhealthy). Now we can use ${GITLAB_RELATIVE_URL_ROOT} variable to set healcheck URL after moving script generation to runtime, --- assets/build/install.sh | 11 ----------- assets/runtime/functions | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index 868e5744b..32cfd21fe 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -423,17 +423,6 @@ programs=sshd,nginx,mail_room,cron priority=20 EOF -# configure healthcheck script -## https://docs.gitlab.com/ee/user/admin_area/monitoring/health_check.html -cat > /usr/local/sbin/healthcheck < /usr/local/sbin/healthcheck < Date: Wed, 14 Apr 2021 21:30:58 +0200 Subject: [PATCH 063/522] upgrade GitLab CE to 13.10.3 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 10 files changed, 44 insertions(+), 40 deletions(-) diff --git a/Changelog.md b/Changelog.md index c5fb01457..08470310a 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.10.3** +- gitlab: upgrade CE to v13.10.3 +- gitaly: upgrade to v13.10.3 + **13.10.2** - gitlab: upgrade CE to v13.10.2 - gitaly: upgrade to v13.10.2 diff --git a/Dockerfile b/Dockerfile index 8a9ebe37a..db8a46118 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210325 -ARG VERSION=13.10.2 +ARG VERSION=13.10.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.3 \ GITLAB_SHELL_VERSION=13.17.0 \ GITLAB_PAGES_VERSION=1.36.0 \ - GITALY_SERVER_VERSION=13.10.2 \ + GITALY_SERVER_VERSION=13.10.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index b6bf90ed0..7482b215e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.10.2 +# sameersbn/gitlab:13.10.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.10.2 +docker pull sameersbn/gitlab:13.10.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.2 + sameersbn/gitlab:13.10.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.2 + sameersbn/gitlab:13.10.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:13.10.2 + sameersbn/gitlab:13.10.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:13.10.2 + sameersbn/gitlab:13.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.10.2 + sameersbn/gitlab:13.10.3 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.10.2 + sameersbn/gitlab:13.10.3 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.2 + sameersbn/gitlab:13.10.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.2 + sameersbn/gitlab:13.10.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.2 + sameersbn/gitlab:13.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.2 + sameersbn/gitlab:13.10.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.2 + sameersbn/gitlab:13.10.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.2 + sameersbn/gitlab:13.10.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.10.2 + sameersbn/gitlab:13.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:13.10.2 app:sanitize + sameersbn/gitlab:13.10.3 app:sanitize ``` ### Piwik @@ -1150,7 +1150,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.2 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1185,14 +1185,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.2 app:rake db:setup + sameersbn/gitlab:13.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:13.10.2 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1201,7 +1201,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.2 app:rake gitlab:env:info + sameersbn/gitlab:13.10.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.2 app:rake gitlab:import:repos + sameersbn/gitlab:13.10.3 app:rake gitlab:import:repos ``` Or @@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.2 app:rake gitlab:import:repos + sameersbn/gitlab:13.10.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.10.2 +docker pull sameersbn/gitlab:13.10.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.10.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.10.3 ``` ## Shell Access @@ -1388,7 +1388,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.10.2 + image: sameersbn/gitlab:13.10.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index ebcf2e5e7..f3432f9a6 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.10.2 + image: sameersbn/gitlab:13.10.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index fa7f857da..19eb56744 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.10.2 + image: sameersbn/gitlab:13.10.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index d8021004d..3b0c78c17 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.10.2 + image: sameersbn/gitlab:13.10.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index bc1d45932..f83e5c0b0 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.2 app:rake gitlab:backup:create + sameersbn/gitlab:13.10.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.2 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.10.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.10.2 +docker pull sameersbn/gitlab:13.10.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.10.2 +sameersbn/gitlab:13.10.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 23b119613..b9020c6fd 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.10.2 + image: sameersbn/gitlab:13.10.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 7f1b623ef..36ba55ff8 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.10.2 + image: sameersbn/gitlab:13.10.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index fbeb2b84f..8d00889a0 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.10.2 + image: sameersbn/gitlab:13.10.3 env: - name: TZ value: Asia/Kolkata From 53219535d3c282b11f1c21b256f0a602265534ea Mon Sep 17 00:00:00 2001 From: Erwin Junge Date: Thu, 15 Apr 2021 22:01:58 +0200 Subject: [PATCH 064/522] Update VERSION to 13.10.3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 81c05ffb8..f82ccdb09 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.10.1 +13.10.3 From b820c61f33d83a7644657585b6f586cbc640b89b Mon Sep 17 00:00:00 2001 From: sue445 Date: Thu, 25 Feb 2021 15:48:11 +0900 Subject: [PATCH 065/522] Add content_security_policy params --- README.md | 18 ++++++++++++ assets/runtime/config/gitlabhq/gitlab.yml | 36 +++++++++++------------ assets/runtime/env-defaults | 21 +++++++++++++ assets/runtime/functions | 24 +++++++++++++++ 4 files changed, 81 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index b6bf90ed0..fbe64ca53 100644 --- a/README.md +++ b/README.md @@ -924,6 +924,24 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED` | Set to `true` to enable the sidekiq exporter, enabled by default. | | `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS` | Sidekiq exporter address, defaults to `0.0.0.0` | | `GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT` | Sidekiq exporter port, defaults to `3807` | +| `GITLAB_CONTENT_SECURITY_POLICY_ENABLED` | Set to `true` to enable [Content Security Policy](https://guides.rubyonrails.org/security.html#content-security-policy), enabled by default. | +| `GITLAB_CONTENT_SECURITY_POLICY_REPORT_ONLY` | Set to `true` to set `Content-Security-Policy-Report-Only` header, disabled by default | +| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_BASE_URI` | The value of the `base-uri` directive in the `Content-Security-Policy` header | +| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CHILD_SRC` | The value of the `child-src` directive in the `Content-Security-Policy` header | +| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CONNECT_SRC` | The value of the `connect-src` directive in the `Content-Security-Policy` header. Default to `'self' http://localhost:* ws://localhost:* wss://localhost:*` | +| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_DEFAULT_SRC` | The value of the `default-src` directive in the `Content-Security-Policy` header. Default to `'self'` | +| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FONT_SRC` | The value of the `font-src` directive in the `Content-Security-Policy` header | +| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FORM_ACTION` | The value of the `form-action` directive in the `Content-Security-Policy` header | +| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_ANCESTORS` | The value of the `frame-ancestors` directive in the `Content-Security-Policy` header. Default to `'self'` | +| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_SRC` | The value of the `frame-src` directive in the `Content-Security-Policy` header. Default to `'self' https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://content.googleapis.com https://content-compute.googleapis.com https://content-cloudbilling.googleapis.com https://content-cloudresourcemanager.googleapis.com` | +| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_IMG_SRC` | The value of the `img-src` directive in the `Content-Security-Policy` header. Default to `* data: blob:` | +| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MANIFEST_SRC` | The value of the `manifest-src` directive in the `Content-Security-Policy` header | +| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MEDIA_SRC` | The value of the `media-src` directive in the `Content-Security-Policy` header | +| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_OBJECT_SRC` | The value of the `object-src` directive in the `Content-Security-Policy` header. Default to `'none'` | +| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC` | The value of the `script-src` directive in the `Content-Security-Policy` header. Default to `'self' 'unsafe-eval' http://localhost:* https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://www.gstatic.com/recaptcha/ https://apis.google.com` | +| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC` | The value of the `style-src` directive in the `Content-Security-Policy` header. Default to `'self' 'unsafe-inline'` | +| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC` | The value of the `worker-src` directive in the `Content-Security-Policy` header. Default to `'self' blob:` | +| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI` | The value of the `report-uri` directive in the `Content-Security-Policy` header | | `SSL_SELF_SIGNED` | Set to `true` when using self signed ssl certificates. `false` by default. | | `SSL_CERTIFICATE_PATH` | Location of the ssl certificate. Defaults to `/home/git/data/certs/gitlab.crt` | | `SSL_KEY_PATH` | Location of the ssl private key. Defaults to `/home/git/data/certs/gitlab.key` | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index c39311e8a..42befb7b0 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -53,25 +53,25 @@ production: &base # Content Security Policy # See https://guides.rubyonrails.org/security.html#content-security-policy content_security_policy: - enabled: true - report_only: false + enabled: {{GITLAB_CONTENT_SECURITY_POLICY_ENABLED}} + report_only: {{GITLAB_CONTENT_SECURITY_POLICY_REPORT_ONLY}} directives: - base_uri: - child_src: - connect_src: "'self' http://localhost:* ws://localhost:* wss://localhost:*" - default_src: "'self'" - font_src: - form_action: - frame_ancestors: "'self'" - frame_src: "'self' https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://content.googleapis.com https://content-compute.googleapis.com https://content-cloudbilling.googleapis.com https://content-cloudresourcemanager.googleapis.com" - img_src: "* data: blob:" - manifest_src: - media_src: - object_src: "'none'" - script_src: "'self' 'unsafe-eval' http://localhost:* https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://www.gstatic.com/recaptcha/ https://apis.google.com" - style_src: "'self' 'unsafe-inline'" - worker_src: "'self' blob:" - report_uri: + base_uri: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_BASE_URI}}" + child_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CHILD_SRC}}" + connect_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CONNECT_SRC}}" + default_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_DEFAULT_SRC}}" + font_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FONT_SRC}}" + form_action: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FORM_ACTION}}" + frame_ancestors: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_ANCESTORS}}" + frame_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_SRC}}" + img_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_IMG_SRC}}" + manifest_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MANIFEST_SRC}}" + media_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MEDIA_SRC}}" + object_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_OBJECT_SRC}}" + script_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC}}" + style_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC}}" + worker_src: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC}}" + report_uri: "{{GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI}}" # Trusted Proxies # Customize if you have GitLab behind a reverse proxy which is running on a different machine. diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 1f2249739..40ff90b25 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -516,3 +516,24 @@ SENTRY_ENABLED=${SENTRY_ENABLED:-false} SENTRY_DSN=${SENTRY_DSN:-} SENTRY_CLIENTSIDE_DSN=${SENTRY_CLIENTSIDE_DSN:-} SENTRY_ENVIRONMENT=${SENTRY_ENVIRONMENT:-production} + +## Content Security Policy +# See https://guides.rubyonrails.org/security.html#content-security-policy +GITLAB_CONTENT_SECURITY_POLICY_ENABLED=${GITLAB_CONTENT_SECURITY_POLICY_ENABLED:-true} +GITLAB_CONTENT_SECURITY_POLICY_REPORT_ONLY=${GITLAB_CONTENT_SECURITY_POLICY_REPORT_ONLY:-false} +GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_BASE_URI=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_BASE_URI:-} +GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CHILD_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CHILD_SRC:-} +GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CONNECT_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CONNECT_SRC:-"'self' http://localhost:* ws://localhost:* wss://localhost:*"} +GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_DEFAULT_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_DEFAULT_SRC:-"'self'"} +GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FONT_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FONT_SRC:-} +GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FORM_ACTION=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FORM_ACTION:-} +GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_ANCESTORS=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_ANCESTORS:-"'self'"} +GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_SRC:-"'self' https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://content.googleapis.com https://content-compute.googleapis.com https://content-cloudbilling.googleapis.com https://content-cloudresourcemanager.googleapis.com"} +GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_IMG_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_IMG_SRC:-"* data: blob:"} +GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MANIFEST_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MANIFEST_SRC:-} +GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MEDIA_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MEDIA_SRC:-} +GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_OBJECT_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_OBJECT_SRC:-"'none'"} +GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC:-"'self' 'unsafe-eval' http://localhost:* https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://www.gstatic.com/recaptcha/ https://apis.google.com"} +GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC:-"'self' 'unsafe-inline'"} +GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC:-"'self' blob:"} +GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI:-} diff --git a/assets/runtime/functions b/assets/runtime/functions index c341c3099..8c1253c8e 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1164,6 +1164,29 @@ gitlab_configure_sentry(){ SENTRY_ENVIRONMENT } +gitlab_configure_content_security_policy(){ + echo "Configuring gitlab::content_security_policy..." + update_template ${GITLAB_CONFIG} \ + GITLAB_CONTENT_SECURITY_POLICY_ENABLED \ + GITLAB_CONTENT_SECURITY_POLICY_REPORT_ONLY \ + GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_BASE_URI \ + GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CHILD_SRC \ + GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CONNECT_SRC \ + GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_DEFAULT_SRC \ + GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FONT_SRC \ + GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FORM_ACTION \ + GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_ANCESTORS \ + GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_SRC \ + GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_IMG_SRC \ + GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MANIFEST_SRC \ + GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MEDIA_SRC \ + GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_OBJECT_SRC \ + GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC \ + GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC \ + GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC \ + GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI +} + nginx_configure_gitlab_ssl() { if [[ ${GITLAB_HTTPS} == true && -f ${SSL_CERTIFICATE_PATH} && -f ${SSL_KEY_PATH} && -f ${SSL_DHPARAM_PATH} ]]; then echo "Configuring nginx::gitlab::ssl..." @@ -1679,6 +1702,7 @@ configure_gitlab() { gitlab_configure_pages gitlab_configure_sentry generate_healthcheck_script + gitlab_configure_content_security_policy # remove stale gitlab.socket rm -rf ${GITLAB_INSTALL_DIR}/tmp/sockets/gitlab.socket From 74425065d3e50761863e5d81c044606df24b8262 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 22 Apr 2021 17:00:38 +0200 Subject: [PATCH 066/522] upgrade GitLab CE to 13.11.0 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 08470310a..a703f795f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.11.0** +- gitlab: upgrade CE to v13.11.0 +- gitaly: upgrade to v13.11.0 +- gitlab-pages: upgrade to v1.38.0 +- ubuntu: upgrade to focal-20210401 + **13.10.3** - gitlab: upgrade CE to v13.10.3 - gitaly: upgrade to v13.10.3 diff --git a/Dockerfile b/Dockerfile index db8a46118..71e0b1a98 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ -FROM ubuntu:focal-20210325 +FROM ubuntu:focal-20210401 -ARG VERSION=13.10.3 +ARG VERSION=13.11.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.3 \ GITLAB_SHELL_VERSION=13.17.0 \ GITLAB_PAGES_VERSION=1.36.0 \ - GITALY_SERVER_VERSION=13.10.3 \ + GITALY_SERVER_VERSION=13.11.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 7482b215e..c4a4455ae 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.10.3 +# sameersbn/gitlab:13.11.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.10.3 +docker pull sameersbn/gitlab:13.11.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.3 + sameersbn/gitlab:13.11.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.3 + sameersbn/gitlab:13.11.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:13.10.3 + sameersbn/gitlab:13.11.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:13.10.3 + sameersbn/gitlab:13.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.10.3 + sameersbn/gitlab:13.11.0 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.10.3 + sameersbn/gitlab:13.11.0 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.3 + sameersbn/gitlab:13.11.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.3 + sameersbn/gitlab:13.11.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.3 + sameersbn/gitlab:13.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.3 + sameersbn/gitlab:13.11.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.3 + sameersbn/gitlab:13.11.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.10.3 + sameersbn/gitlab:13.11.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.10.3 + sameersbn/gitlab:13.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:13.10.3 app:sanitize + sameersbn/gitlab:13.11.0 app:sanitize ``` ### Piwik @@ -1150,7 +1150,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.3 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1185,14 +1185,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.3 app:rake db:setup + sameersbn/gitlab:13.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:13.10.3 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1201,7 +1201,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.3 app:rake gitlab:env:info + sameersbn/gitlab:13.11.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.3 app:rake gitlab:import:repos + sameersbn/gitlab:13.11.0 app:rake gitlab:import:repos ``` Or @@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.3 app:rake gitlab:import:repos + sameersbn/gitlab:13.11.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.10.3 +docker pull sameersbn/gitlab:13.11.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.10.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.0 ``` ## Shell Access @@ -1388,7 +1388,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.10.3 + image: sameersbn/gitlab:13.11.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index f82ccdb09..fbda4b8d7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.10.3 +13.11.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index f3432f9a6..f720a133d 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.10.3 + image: sameersbn/gitlab:13.11.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 19eb56744..875783f83 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.10.3 + image: sameersbn/gitlab:13.11.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 3b0c78c17..ab2fecedc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.10.3 + image: sameersbn/gitlab:13.11.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index f83e5c0b0..206b36725 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.3 app:rake gitlab:backup:create + sameersbn/gitlab:13.11.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.3 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.10.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.11.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.10.3 +docker pull sameersbn/gitlab:13.11.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.10.3 +sameersbn/gitlab:13.11.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index b9020c6fd..4df2d7949 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.10.3 + image: sameersbn/gitlab:13.11.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 36ba55ff8..a1c83061c 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.10.3 + image: sameersbn/gitlab:13.11.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 8d00889a0..73abf04ae 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.10.3 + image: sameersbn/gitlab:13.11.0 env: - name: TZ value: Asia/Kolkata From 2a6cddfd886c5c50799efe28cfdc72a239fdec31 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 23 Apr 2021 16:06:14 +0200 Subject: [PATCH 067/522] Add missing update for gitlab-pages --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 71e0b1a98..a48a9772b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.3 \ GITLAB_SHELL_VERSION=13.17.0 \ - GITLAB_PAGES_VERSION=1.36.0 \ + GITLAB_PAGES_VERSION=1.38.0 \ GITALY_SERVER_VERSION=13.11.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ From 3382e90f0ce52e4817b4d2c6b0043d5c03cfbcab Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 23 Apr 2021 16:07:45 +0200 Subject: [PATCH 068/522] upgrade GitLab CE to 13.11.1 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index a703f795f..0969d91f5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.11.1** +- gitlab: upgrade CE to v13.11.1 +- gitaly: upgrade to v13.11.1 + **13.11.0** - gitlab: upgrade CE to v13.11.0 - gitaly: upgrade to v13.11.0 diff --git a/Dockerfile b/Dockerfile index a48a9772b..7b5b3c61a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210401 -ARG VERSION=13.11.0 +ARG VERSION=13.11.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.3 \ GITLAB_SHELL_VERSION=13.17.0 \ GITLAB_PAGES_VERSION=1.38.0 \ - GITALY_SERVER_VERSION=13.11.0 \ + GITALY_SERVER_VERSION=13.11.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index c4a4455ae..0e01d6302 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.11.0 +# sameersbn/gitlab:13.11.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.11.0 +docker pull sameersbn/gitlab:13.11.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.0 + sameersbn/gitlab:13.11.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.0 + sameersbn/gitlab:13.11.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:13.11.0 + sameersbn/gitlab:13.11.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:13.11.0 + sameersbn/gitlab:13.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.11.0 + sameersbn/gitlab:13.11.1 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.11.0 + sameersbn/gitlab:13.11.1 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.0 + sameersbn/gitlab:13.11.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.0 + sameersbn/gitlab:13.11.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.0 + sameersbn/gitlab:13.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.0 + sameersbn/gitlab:13.11.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.0 + sameersbn/gitlab:13.11.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.0 + sameersbn/gitlab:13.11.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.11.0 + sameersbn/gitlab:13.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:13.11.0 app:sanitize + sameersbn/gitlab:13.11.1 app:sanitize ``` ### Piwik @@ -1150,7 +1150,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.0 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1185,14 +1185,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.0 app:rake db:setup + sameersbn/gitlab:13.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:13.11.0 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1201,7 +1201,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.11.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.0 app:rake gitlab:env:info + sameersbn/gitlab:13.11.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.0 app:rake gitlab:import:repos + sameersbn/gitlab:13.11.1 app:rake gitlab:import:repos ``` Or @@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.0 app:rake gitlab:import:repos + sameersbn/gitlab:13.11.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.11.0 +docker pull sameersbn/gitlab:13.11.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.1 ``` ## Shell Access @@ -1388,7 +1388,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.11.0 + image: sameersbn/gitlab:13.11.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index fbda4b8d7..f35ba5099 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.11.0 +13.11.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index f720a133d..e1e7810b1 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.0 + image: sameersbn/gitlab:13.11.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 875783f83..b550811cb 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.11.0 + image: sameersbn/gitlab:13.11.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index ab2fecedc..36ed42c49 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.0 + image: sameersbn/gitlab:13.11.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 206b36725..a5b896b72 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.0 app:rake gitlab:backup:create + sameersbn/gitlab:13.11.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.0 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.11.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.11.0 +docker pull sameersbn/gitlab:13.11.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.11.0 +sameersbn/gitlab:13.11.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 4df2d7949..6668f1227 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.0 + image: sameersbn/gitlab:13.11.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index a1c83061c..517799e95 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.0 + image: sameersbn/gitlab:13.11.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 73abf04ae..d0ef22ca2 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.11.0 + image: sameersbn/gitlab:13.11.1 env: - name: TZ value: Asia/Kolkata From 9a8e4281030e750b6b9bdda7d67853565342cfdf Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 28 Apr 2021 19:53:15 +0200 Subject: [PATCH 069/522] upgrade GitLab CE to 13.11.2 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 0969d91f5..25d23c83b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.11.2** +- gitlab: upgrade CE to v13.11.2 +- gitaly: upgrade to v13.11.2 + **13.11.1** - gitlab: upgrade CE to v13.11.1 - gitaly: upgrade to v13.11.1 diff --git a/Dockerfile b/Dockerfile index 7b5b3c61a..c4eed5637 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210401 -ARG VERSION=13.11.1 +ARG VERSION=13.11.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.3 \ GITLAB_SHELL_VERSION=13.17.0 \ GITLAB_PAGES_VERSION=1.38.0 \ - GITALY_SERVER_VERSION=13.11.1 \ + GITALY_SERVER_VERSION=13.11.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 0e01d6302..9d9490c37 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.11.1 +# sameersbn/gitlab:13.11.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.11.1 +docker pull sameersbn/gitlab:13.11.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.1 + sameersbn/gitlab:13.11.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.1 + sameersbn/gitlab:13.11.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:13.11.1 + sameersbn/gitlab:13.11.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:13.11.1 + sameersbn/gitlab:13.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.11.1 + sameersbn/gitlab:13.11.2 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.11.1 + sameersbn/gitlab:13.11.2 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.1 + sameersbn/gitlab:13.11.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.1 + sameersbn/gitlab:13.11.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.1 + sameersbn/gitlab:13.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.1 + sameersbn/gitlab:13.11.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.1 + sameersbn/gitlab:13.11.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.1 + sameersbn/gitlab:13.11.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.11.1 + sameersbn/gitlab:13.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:13.11.1 app:sanitize + sameersbn/gitlab:13.11.2 app:sanitize ``` ### Piwik @@ -1150,7 +1150,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.1 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1185,14 +1185,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.1 app:rake db:setup + sameersbn/gitlab:13.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:13.11.1 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1201,7 +1201,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.1 app:rake gitlab:env:info + sameersbn/gitlab:13.11.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.1 app:rake gitlab:import:repos + sameersbn/gitlab:13.11.2 app:rake gitlab:import:repos ``` Or @@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.1 app:rake gitlab:import:repos + sameersbn/gitlab:13.11.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.11.1 +docker pull sameersbn/gitlab:13.11.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.2 ``` ## Shell Access @@ -1388,7 +1388,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.11.1 + image: sameersbn/gitlab:13.11.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index f35ba5099..a62e1ab6d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.11.1 +13.11.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index e1e7810b1..72c24b5ae 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.1 + image: sameersbn/gitlab:13.11.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index b550811cb..59f021576 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.11.1 + image: sameersbn/gitlab:13.11.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 36ed42c49..447e4137d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.1 + image: sameersbn/gitlab:13.11.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index a5b896b72..b7dc0d2a9 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.1 app:rake gitlab:backup:create + sameersbn/gitlab:13.11.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.1 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.11.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.11.1 +docker pull sameersbn/gitlab:13.11.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.11.1 +sameersbn/gitlab:13.11.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 6668f1227..8f742bc10 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.1 + image: sameersbn/gitlab:13.11.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 517799e95..e7e70e93f 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.1 + image: sameersbn/gitlab:13.11.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index d0ef22ca2..8ef9d5d84 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.11.1 + image: sameersbn/gitlab:13.11.2 env: - name: TZ value: Asia/Kolkata From bb6a889e0bbd1ee4b3869c6088d6eab28b511518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=20G=C3=A4rtner?= Date: Fri, 30 Apr 2021 14:17:28 +0200 Subject: [PATCH 070/522] added OAUTH_AUTO_LINK_USER option --- README.md | 1 + assets/runtime/config/gitlabhq/gitlab.yml | 6 ++++++ assets/runtime/functions | 1 + 3 files changed, 8 insertions(+) diff --git a/README.md b/README.md index 9d9490c37..1f0791326 100644 --- a/README.md +++ b/README.md @@ -1021,6 +1021,7 @@ Below is the complete list of available options that can be used to customize yo | `OAUTH_BLOCK_AUTO_CREATED_USERS` | Locks down those users until they have been cleared by the admin. Defaults to `true`. | | `OAUTH_AUTO_LINK_LDAP_USER` | Look up new users in LDAP servers. If a match is found (same uid), automatically link the omniauth identity with the LDAP account. Defaults to `false`. | | `OAUTH_AUTO_LINK_SAML_USER` | Allow users with existing accounts to login and auto link their account via SAML login, without having to do a manual login first and manually add SAML. Defaults to `false`. | +| `OAUTH_AUTO_LINK_USER` | Allow users with existing accounts to login and auto link their account via the defined Omniauth providers login, without having to do a manual login first and manually connect their chosen provider. Defaults to `[]`. | | `OAUTH_EXTERNAL_PROVIDERS` | Comma separated list if oauth providers to disallow access to `internal` projects. Users creating accounts via these providers will have access internal projects. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default. | | `OAUTH_CAS3_LABEL` | The "Sign in with" button label. Defaults to "cas3". | | `OAUTH_CAS3_SERVER` | CAS3 server URL. No defaults. | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index c39311e8a..e2dae1bff 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -883,6 +883,12 @@ production: &base # (default: false) auto_link_saml_user: {{OAUTH_AUTO_LINK_SAML_USER}} + # Allow users with existing accounts to login and auto link their account via the + # defined Omniauth providers login, without having to do a manual login first and + # manually connect their chosen provider. + # (default: []) + auto_link_user: [{{OAUTH_AUTO_LINK_USER}}] + # Set different Omniauth providers as external so that all users creating accounts # via these providers will not be able to have access to internal projects. You # will need to use the full name of the provider, like `google_oauth2` for Google. diff --git a/assets/runtime/functions b/assets/runtime/functions index c341c3099..28497d46b 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -699,6 +699,7 @@ gitlab_configure_oauth() { OAUTH_BLOCK_AUTO_CREATED_USERS \ OAUTH_AUTO_LINK_LDAP_USER \ OAUTH_AUTO_LINK_SAML_USER \ + OAUTH_AUTO_LINK_USER \ OAUTH_EXTERNAL_PROVIDERS case ${OAUTH_AUTO_SIGN_IN_WITH_PROVIDER} in From 8c548066632ee8cfd72d0ae648214ad018effdf5 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 1 May 2021 09:18:52 +0200 Subject: [PATCH 071/522] upgrade GitLab CE to 13.11.3 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 25d23c83b..4f903b87d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.11.3** +- gitlab: upgrade CE to v13.11.3 +- gitaly: upgrade to v13.11.3 + **13.11.2** - gitlab: upgrade CE to v13.11.2 - gitaly: upgrade to v13.11.2 diff --git a/Dockerfile b/Dockerfile index c4eed5637..084217865 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210401 -ARG VERSION=13.11.2 +ARG VERSION=13.11.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.3 \ GITLAB_SHELL_VERSION=13.17.0 \ GITLAB_PAGES_VERSION=1.38.0 \ - GITALY_SERVER_VERSION=13.11.2 \ + GITALY_SERVER_VERSION=13.11.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 9d9490c37..49020230a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.11.2 +# sameersbn/gitlab:13.11.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.11.2 +docker pull sameersbn/gitlab:13.11.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.2 + sameersbn/gitlab:13.11.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.2 + sameersbn/gitlab:13.11.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:13.11.2 + sameersbn/gitlab:13.11.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:13.11.2 + sameersbn/gitlab:13.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.11.2 + sameersbn/gitlab:13.11.3 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.11.2 + sameersbn/gitlab:13.11.3 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.2 + sameersbn/gitlab:13.11.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.2 + sameersbn/gitlab:13.11.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.2 + sameersbn/gitlab:13.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.2 + sameersbn/gitlab:13.11.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.2 + sameersbn/gitlab:13.11.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.2 + sameersbn/gitlab:13.11.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.11.2 + sameersbn/gitlab:13.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:13.11.2 app:sanitize + sameersbn/gitlab:13.11.3 app:sanitize ``` ### Piwik @@ -1150,7 +1150,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.2 app:rake gitlab:backup:create + sameersbn/gitlab:13.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. @@ -1185,14 +1185,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.2 app:rake db:setup + sameersbn/gitlab:13.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:13.11.2 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -1201,7 +1201,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.11.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.2 app:rake gitlab:env:info + sameersbn/gitlab:13.11.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.2 app:rake gitlab:import:repos + sameersbn/gitlab:13.11.3 app:rake gitlab:import:repos ``` Or @@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.2 app:rake gitlab:import:repos + sameersbn/gitlab:13.11.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.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:13.11.2 +docker pull sameersbn/gitlab:13.11.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.3 ``` ## Shell Access @@ -1388,7 +1388,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.11.2 + image: sameersbn/gitlab:13.11.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index a62e1ab6d..4b97b1a30 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.11.2 +13.11.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 72c24b5ae..85b54bacd 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.2 + image: sameersbn/gitlab:13.11.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 59f021576..d7502c628 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.11.2 + image: sameersbn/gitlab:13.11.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 447e4137d..14fc22a61 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.2 + image: sameersbn/gitlab:13.11.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index b7dc0d2a9..9c406a269 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.2 app:rake gitlab:backup:create + sameersbn/gitlab:13.11.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.2 app:rake gitlab:backup:restore + sameersbn/gitlab:13.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.11.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.11.2 +docker pull sameersbn/gitlab:13.11.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.11.2 +sameersbn/gitlab:13.11.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 8f742bc10..a0e48e903 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.2 + image: sameersbn/gitlab:13.11.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index e7e70e93f..19c868954 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.2 + image: sameersbn/gitlab:13.11.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 8ef9d5d84..a08593457 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.11.2 + image: sameersbn/gitlab:13.11.3 env: - name: TZ value: Asia/Kolkata From d66733c0b4a54bac66a6e7ce78d7a03e16c1a27c Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 15 May 2021 08:49:37 +0200 Subject: [PATCH 072/522] upgrade GitLab CE to 13.11.4 --- Changelog.md | 6 +++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 49 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 4f903b87d..9538c826d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.11.4** +- gitlab: upgrade CE to v13.11.4 +- gitaly: upgrade to v13.11.4 +- golang: upgrade to v1.16.4 +- ubuntu: upgrade to focal-20210416 + **13.11.3** - gitlab: upgrade CE to v13.11.3 - gitaly: upgrade to v13.11.3 diff --git a/Dockerfile b/Dockerfile index 084217865..d2dca874e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ -FROM ubuntu:focal-20210401 +FROM ubuntu:focal-20210416 -ARG VERSION=13.11.3 +ARG VERSION=13.11.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ - GOLANG_VERSION=1.16.3 \ + GOLANG_VERSION=1.16.4 \ GITLAB_SHELL_VERSION=13.17.0 \ GITLAB_PAGES_VERSION=1.38.0 \ - GITALY_SERVER_VERSION=13.11.3 \ + GITALY_SERVER_VERSION=13.11.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 49020230a..ebdc5dc4b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.11.3 +# sameersbn/gitlab:13.11.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.11.3 +docker pull sameersbn/gitlab:13.11.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.3 + sameersbn/gitlab:13.11.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.3 + sameersbn/gitlab:13.11.4 ``` ## Database @@ -264,7 +264,7 @@ docker run --name gitlab -d \ --env 'DB_NAME=gitlabhq_production' \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.3 + sameersbn/gitlab:13.11.4 ``` #### Linking to PostgreSQL Container @@ -308,7 +308,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-postgresql:postgresql \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.3 + sameersbn/gitlab:13.11.4 ``` Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.11.3 + sameersbn/gitlab:13.11.4 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.11.3 + sameersbn/gitlab:13.11.4 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.3 + sameersbn/gitlab:13.11.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.3 + sameersbn/gitlab:13.11.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.3 + sameersbn/gitlab:13.11.4 ``` In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.3 + sameersbn/gitlab:13.11.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.3 + sameersbn/gitlab:13.11.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.3 + sameersbn/gitlab:13.11.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.11.3 + sameersbn/gitlab:13.11.4 ``` When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command: ```bash docker run --name gitlab -d [OPTIONS] \ - sameersbn/gitlab:13.11.3 app:sanitize + sameersbn/gitlab:13.11.4 app:sanitize ``` ### Piwik @@ -1150,7 +1150,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.3 app:rake gitlab:backup:create + sameersbn/gitlab:13.11.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. @@ -1185,14 +1185,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.3 app:rake db:setup + sameersbn/gitlab:13.11.4 app:rake db:setup ``` Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.3 app:rake gitlab:backup:restore + sameersbn/gitlab:13.11.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. @@ -1201,7 +1201,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.11.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1251,7 +1251,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.3 app:rake gitlab:env:info + sameersbn/gitlab:13.11.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1264,7 +1264,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.3 app:rake gitlab:import:repos + sameersbn/gitlab:13.11.4 app:rake gitlab:import:repos ``` Or @@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.3 app:rake gitlab:import:repos + sameersbn/gitlab:13.11.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1319,12 +1319,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.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:13.11.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.11.3 +docker pull sameersbn/gitlab:13.11.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.4 ``` ## Shell Access @@ -1388,7 +1388,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.11.3 + image: sameersbn/gitlab:13.11.4 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 4b97b1a30..75ef6fe61 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.11.3 +13.11.4 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 85b54bacd..e5f0f8796 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.3 + image: sameersbn/gitlab:13.11.4 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index d7502c628..f98341770 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.11.3 + image: sameersbn/gitlab:13.11.4 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 14fc22a61..1e89a0f8b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.3 + image: sameersbn/gitlab:13.11.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 9c406a269..6aa3bc8e3 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.3 app:rake gitlab:backup:create + sameersbn/gitlab:13.11.4 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.3 app:rake gitlab:backup:restore + sameersbn/gitlab:13.11.4 app:rake gitlab:backup:restore ``` The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.11.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.11.3 +docker pull sameersbn/gitlab:13.11.4 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.11.3 +sameersbn/gitlab:13.11.4 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index a0e48e903..8799624d4 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.3 + image: sameersbn/gitlab:13.11.4 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 19c868954..f6e30d7dd 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.3 + image: sameersbn/gitlab:13.11.4 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index a08593457..9700a84e7 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.11.3 + image: sameersbn/gitlab:13.11.4 env: - name: TZ value: Asia/Kolkata From 6419d3378d376ba8afa2ddd722958a4d47659830 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 23 May 2021 10:23:29 +0200 Subject: [PATCH 073/522] upgrade GitLab CE to 13.12.0 --- Changelog.md | 6 +++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 49 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 9538c826d..c0436d576 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.12.0** +- gitlab: upgrade CE to v13.12.0 +- gitlab-shell: upgrade to v13.18.0 +- gitlab-pages: upgrade to v1.39.0 +- gitaly: upgrade to v13.12.0 + **13.11.4** - gitlab: upgrade CE to v13.11.4 - gitaly: upgrade to v13.11.4 diff --git a/Dockerfile b/Dockerfile index d2dca874e..20f696701 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210416 -ARG VERSION=13.11.4 +ARG VERSION=13.12.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.4 \ - GITLAB_SHELL_VERSION=13.17.0 \ - GITLAB_PAGES_VERSION=1.38.0 \ - GITALY_SERVER_VERSION=13.11.4 \ + GITLAB_SHELL_VERSION=13.18.0 \ + GITLAB_PAGES_VERSION=1.39.0 \ + GITALY_SERVER_VERSION=13.12.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 0d6715d9d..abaf9ebb6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.11.4 +# sameersbn/gitlab:13.12.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.11.4 +docker pull sameersbn/gitlab:13.12.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.4 + sameersbn/gitlab:13.12.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.4 + sameersbn/gitlab:13.12.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:13.11.4 + sameersbn/gitlab:13.12.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:13.11.4 + sameersbn/gitlab:13.12.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.11.4 + sameersbn/gitlab:13.12.0 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.11.4 + sameersbn/gitlab:13.12.0 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.4 + sameersbn/gitlab:13.12.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.4 + sameersbn/gitlab:13.12.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.4 + sameersbn/gitlab:13.12.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.4 + sameersbn/gitlab:13.12.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.4 + sameersbn/gitlab:13.12.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.11.4 + sameersbn/gitlab:13.12.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.11.4 + sameersbn/gitlab:13.12.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:13.11.4 app:sanitize + sameersbn/gitlab:13.12.0 app:sanitize ``` ### Piwik @@ -1151,7 +1151,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.4 app:rake gitlab:backup:create + sameersbn/gitlab:13.12.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. @@ -1186,14 +1186,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.4 app:rake db:setup + sameersbn/gitlab:13.12.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:13.11.4 app:rake gitlab:backup:restore + sameersbn/gitlab:13.12.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. @@ -1202,7 +1202,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.12.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1252,7 +1252,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.4 app:rake gitlab:env:info + sameersbn/gitlab:13.12.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1265,7 +1265,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.4 app:rake gitlab:import:repos + sameersbn/gitlab:13.12.0 app:rake gitlab:import:repos ``` Or @@ -1296,7 +1296,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.4 app:rake gitlab:import:repos + sameersbn/gitlab:13.12.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1320,12 +1320,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.11.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:13.12.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:13.11.4 +docker pull sameersbn/gitlab:13.12.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1351,7 +1351,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.11.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.0 ``` ## Shell Access @@ -1389,7 +1389,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.11.4 + image: sameersbn/gitlab:13.12.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 75ef6fe61..6665a53d3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.11.4 +13.12.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index e5f0f8796..e97b91444 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.4 + image: sameersbn/gitlab:13.12.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index f98341770..27c9f4f15 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.11.4 + image: sameersbn/gitlab:13.12.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 1e89a0f8b..b132c59c0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.4 + image: sameersbn/gitlab:13.12.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 6aa3bc8e3..5fe83317c 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.4 app:rake gitlab:backup:create + sameersbn/gitlab:13.12.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.4 app:rake gitlab:backup:restore + sameersbn/gitlab:13.12.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.11.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.12.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.11.4 +docker pull sameersbn/gitlab:13.12.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.11.4 +sameersbn/gitlab:13.12.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 8799624d4..ce964d935 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.4 + image: sameersbn/gitlab:13.12.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index f6e30d7dd..f38a9158f 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.11.4 + image: sameersbn/gitlab:13.12.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 9700a84e7..bc68cfb0d 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.11.4 + image: sameersbn/gitlab:13.12.0 env: - name: TZ value: Asia/Kolkata From 358a73344a4e40b7d3db08b49bff00220414a3c4 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 26 May 2021 20:16:42 +0200 Subject: [PATCH 074/522] upgrade Gitlab CE to 13.12.1 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index c0436d576..ab99a0b41 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.12.1** +- gitlab: upgrade CE to v13.12.1 +- gitaly: upgrade to v13.12.1 + **13.12.0** - gitlab: upgrade CE to v13.12.0 - gitlab-shell: upgrade to v13.18.0 diff --git a/Dockerfile b/Dockerfile index 20f696701..99f11ef58 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210416 -ARG VERSION=13.12.0 +ARG VERSION=13.12.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.4 \ GITLAB_SHELL_VERSION=13.18.0 \ GITLAB_PAGES_VERSION=1.39.0 \ - GITALY_SERVER_VERSION=13.12.0 \ + GITALY_SERVER_VERSION=13.12.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index abaf9ebb6..20781d7f7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.12.0 +# sameersbn/gitlab:13.12.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.12.0 +docker pull sameersbn/gitlab:13.12.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.0 + sameersbn/gitlab:13.12.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.0 + sameersbn/gitlab:13.12.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:13.12.0 + sameersbn/gitlab:13.12.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:13.12.0 + sameersbn/gitlab:13.12.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.12.0 + sameersbn/gitlab:13.12.1 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.12.0 + sameersbn/gitlab:13.12.1 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.0 + sameersbn/gitlab:13.12.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.0 + sameersbn/gitlab:13.12.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.0 + sameersbn/gitlab:13.12.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.0 + sameersbn/gitlab:13.12.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.0 + sameersbn/gitlab:13.12.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.0 + sameersbn/gitlab:13.12.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.12.0 + sameersbn/gitlab:13.12.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:13.12.0 app:sanitize + sameersbn/gitlab:13.12.1 app:sanitize ``` ### Piwik @@ -1151,7 +1151,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.0 app:rake gitlab:backup:create + sameersbn/gitlab:13.12.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. @@ -1186,14 +1186,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.0 app:rake db:setup + sameersbn/gitlab:13.12.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:13.12.0 app:rake gitlab:backup:restore + sameersbn/gitlab:13.12.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. @@ -1202,7 +1202,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.12.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1252,7 +1252,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.0 app:rake gitlab:env:info + sameersbn/gitlab:13.12.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1265,7 +1265,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.0 app:rake gitlab:import:repos + sameersbn/gitlab:13.12.1 app:rake gitlab:import:repos ``` Or @@ -1296,7 +1296,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.0 app:rake gitlab:import:repos + sameersbn/gitlab:13.12.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1320,12 +1320,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.12.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:13.12.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:13.12.0 +docker pull sameersbn/gitlab:13.12.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1351,7 +1351,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.1 ``` ## Shell Access @@ -1389,7 +1389,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.12.0 + image: sameersbn/gitlab:13.12.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 6665a53d3..05d5d0f4a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.12.0 +13.12.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index e97b91444..46ab1abb4 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.0 + image: sameersbn/gitlab:13.12.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 27c9f4f15..d7b22f59a 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.12.0 + image: sameersbn/gitlab:13.12.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index b132c59c0..b862824c0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.0 + image: sameersbn/gitlab:13.12.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 5fe83317c..7e68ea61c 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.0 app:rake gitlab:backup:create + sameersbn/gitlab:13.12.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.0 app:rake gitlab:backup:restore + sameersbn/gitlab:13.12.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.12.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.12.0 +docker pull sameersbn/gitlab:13.12.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.12.0 +sameersbn/gitlab:13.12.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index ce964d935..fbcae6dee 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.0 + image: sameersbn/gitlab:13.12.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index f38a9158f..b6a2d097a 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.0 + image: sameersbn/gitlab:13.12.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index bc68cfb0d..1d3269487 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.12.0 + image: sameersbn/gitlab:13.12.1 env: - name: TZ value: Asia/Kolkata From 8fde44f93ee4a21f3e592ab42b1e14737a291021 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 2 Jun 2021 16:18:34 +0200 Subject: [PATCH 075/522] upgrade GitLab CE to 13.12.2 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index ab99a0b41..3c019b569 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.12.1** +- gitlab: upgrade CE to v13.12.2 +- gitaly: upgrade to v13.12.2 + **13.12.1** - gitlab: upgrade CE to v13.12.1 - gitaly: upgrade to v13.12.1 diff --git a/Dockerfile b/Dockerfile index 99f11ef58..4abc89295 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210416 -ARG VERSION=13.12.1 +ARG VERSION=13.12.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.4 \ GITLAB_SHELL_VERSION=13.18.0 \ GITLAB_PAGES_VERSION=1.39.0 \ - GITALY_SERVER_VERSION=13.12.1 \ + GITALY_SERVER_VERSION=13.12.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 20781d7f7..3f07010e3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.12.1 +# sameersbn/gitlab:13.12.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.12.1 +docker pull sameersbn/gitlab:13.12.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.1 + sameersbn/gitlab:13.12.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.1 + sameersbn/gitlab:13.12.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:13.12.1 + sameersbn/gitlab:13.12.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:13.12.1 + sameersbn/gitlab:13.12.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.12.1 + sameersbn/gitlab:13.12.2 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.12.1 + sameersbn/gitlab:13.12.2 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.1 + sameersbn/gitlab:13.12.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.1 + sameersbn/gitlab:13.12.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.1 + sameersbn/gitlab:13.12.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.1 + sameersbn/gitlab:13.12.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.1 + sameersbn/gitlab:13.12.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.1 + sameersbn/gitlab:13.12.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.12.1 + sameersbn/gitlab:13.12.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:13.12.1 app:sanitize + sameersbn/gitlab:13.12.2 app:sanitize ``` ### Piwik @@ -1151,7 +1151,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.1 app:rake gitlab:backup:create + sameersbn/gitlab:13.12.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. @@ -1186,14 +1186,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.1 app:rake db:setup + sameersbn/gitlab:13.12.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:13.12.1 app:rake gitlab:backup:restore + sameersbn/gitlab:13.12.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. @@ -1202,7 +1202,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.12.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1252,7 +1252,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.1 app:rake gitlab:env:info + sameersbn/gitlab:13.12.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1265,7 +1265,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.1 app:rake gitlab:import:repos + sameersbn/gitlab:13.12.2 app:rake gitlab:import:repos ``` Or @@ -1296,7 +1296,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.1 app:rake gitlab:import:repos + sameersbn/gitlab:13.12.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1320,12 +1320,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.12.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:13.12.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:13.12.1 +docker pull sameersbn/gitlab:13.12.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1351,7 +1351,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.2 ``` ## Shell Access @@ -1389,7 +1389,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.12.1 + image: sameersbn/gitlab:13.12.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 05d5d0f4a..87c9416fd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.12.1 +13.12.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 46ab1abb4..5fa3171f5 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.1 + image: sameersbn/gitlab:13.12.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index d7b22f59a..e0c2d33e1 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.12.1 + image: sameersbn/gitlab:13.12.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index b862824c0..669ea5c77 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.1 + image: sameersbn/gitlab:13.12.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 7e68ea61c..cdb826ae8 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.1 app:rake gitlab:backup:create + sameersbn/gitlab:13.12.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.1 app:rake gitlab:backup:restore + sameersbn/gitlab:13.12.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.12.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.12.1 +docker pull sameersbn/gitlab:13.12.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.12.1 +sameersbn/gitlab:13.12.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index fbcae6dee..1d3eb9fac 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.1 + image: sameersbn/gitlab:13.12.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index b6a2d097a..4cf61b5ea 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.1 + image: sameersbn/gitlab:13.12.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 1d3269487..29bc96e6d 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.12.1 + image: sameersbn/gitlab:13.12.2 env: - name: TZ value: Asia/Kolkata From bda490f5086daab0bdb9dc6f4d2cc99e5a947ecf Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 8 Jun 2021 06:02:18 +0200 Subject: [PATCH 076/522] upgrade GitLab CE to 13.12.3 --- Changelog.md | 7 +++- Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 3c019b569..9b8e02b9b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,7 +3,12 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. -**13.12.1** +**13.12.3** +- gitlab: upgrade CE to v13.12.3 +- gitaly: upgrade to v13.12.3 +- golang: upgrade to v1.16.5 + +**13.12.2** - gitlab: upgrade CE to v13.12.2 - gitaly: upgrade to v13.12.2 diff --git a/Dockerfile b/Dockerfile index 4abc89295..c3c018511 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210416 -ARG VERSION=13.12.2 +ARG VERSION=13.12.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ - GOLANG_VERSION=1.16.4 \ + GOLANG_VERSION=1.16.5 \ GITLAB_SHELL_VERSION=13.18.0 \ GITLAB_PAGES_VERSION=1.39.0 \ - GITALY_SERVER_VERSION=13.12.2 \ + GITALY_SERVER_VERSION=13.12.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 3f07010e3..bbde935e3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.12.2 +# sameersbn/gitlab:13.12.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.12.2 +docker pull sameersbn/gitlab:13.12.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.2 + sameersbn/gitlab:13.12.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.2 + sameersbn/gitlab:13.12.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:13.12.2 + sameersbn/gitlab:13.12.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:13.12.2 + sameersbn/gitlab:13.12.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.12.2 + sameersbn/gitlab:13.12.3 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.12.2 + sameersbn/gitlab:13.12.3 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.2 + sameersbn/gitlab:13.12.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.2 + sameersbn/gitlab:13.12.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.2 + sameersbn/gitlab:13.12.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.2 + sameersbn/gitlab:13.12.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.2 + sameersbn/gitlab:13.12.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.2 + sameersbn/gitlab:13.12.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.12.2 + sameersbn/gitlab:13.12.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:13.12.2 app:sanitize + sameersbn/gitlab:13.12.3 app:sanitize ``` ### Piwik @@ -1151,7 +1151,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.2 app:rake gitlab:backup:create + sameersbn/gitlab:13.12.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. @@ -1186,14 +1186,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.2 app:rake db:setup + sameersbn/gitlab:13.12.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:13.12.2 app:rake gitlab:backup:restore + sameersbn/gitlab:13.12.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. @@ -1202,7 +1202,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.12.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1252,7 +1252,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.2 app:rake gitlab:env:info + sameersbn/gitlab:13.12.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1265,7 +1265,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.2 app:rake gitlab:import:repos + sameersbn/gitlab:13.12.3 app:rake gitlab:import:repos ``` Or @@ -1296,7 +1296,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.2 app:rake gitlab:import:repos + sameersbn/gitlab:13.12.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1320,12 +1320,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.12.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:13.12.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:13.12.2 +docker pull sameersbn/gitlab:13.12.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1351,7 +1351,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.3 ``` ## Shell Access @@ -1389,7 +1389,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.12.2 + image: sameersbn/gitlab:13.12.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 87c9416fd..b5362cc92 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.12.2 +13.12.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 5fa3171f5..2ac19fbbc 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.2 + image: sameersbn/gitlab:13.12.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index e0c2d33e1..78635ae4f 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.12.2 + image: sameersbn/gitlab:13.12.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 669ea5c77..8eac4898c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.2 + image: sameersbn/gitlab:13.12.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index cdb826ae8..ee0074b24 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.2 app:rake gitlab:backup:create + sameersbn/gitlab:13.12.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.2 app:rake gitlab:backup:restore + sameersbn/gitlab:13.12.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.12.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.12.2 +docker pull sameersbn/gitlab:13.12.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.12.2 +sameersbn/gitlab:13.12.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 1d3eb9fac..13cd591e3 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.2 + image: sameersbn/gitlab:13.12.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 4cf61b5ea..9254a0b03 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.2 + image: sameersbn/gitlab:13.12.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 29bc96e6d..652b69cde 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.12.2 + image: sameersbn/gitlab:13.12.3 env: - name: TZ value: Asia/Kolkata From 0336ee90abdfded15d3f442e455ab0e84b6b4724 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 15 Jun 2021 06:04:27 +0200 Subject: [PATCH 077/522] upgrade GitLab CE to 13.12.4 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 9b8e02b9b..8ee3e0b75 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.12.4** +- gitlab: upgrade CE to v13.12.4 +- gitaly: upgrade to v13.12.4 + **13.12.3** - gitlab: upgrade CE to v13.12.3 - gitaly: upgrade to v13.12.3 diff --git a/Dockerfile b/Dockerfile index c3c018511..39b464c22 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210416 -ARG VERSION=13.12.3 +ARG VERSION=13.12.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.5 \ GITLAB_SHELL_VERSION=13.18.0 \ GITLAB_PAGES_VERSION=1.39.0 \ - GITALY_SERVER_VERSION=13.12.3 \ + GITALY_SERVER_VERSION=13.12.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index bbde935e3..49118cbb3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.12.3 +# sameersbn/gitlab:13.12.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.12.3 +docker pull sameersbn/gitlab:13.12.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.3 + sameersbn/gitlab:13.12.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.3 + sameersbn/gitlab:13.12.4 ``` ## Database @@ -264,7 +264,7 @@ docker run --name gitlab -d \ --env 'DB_NAME=gitlabhq_production' \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.3 + sameersbn/gitlab:13.12.4 ``` #### Linking to PostgreSQL Container @@ -308,7 +308,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-postgresql:postgresql \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.3 + sameersbn/gitlab:13.12.4 ``` Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.12.3 + sameersbn/gitlab:13.12.4 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.12.3 + sameersbn/gitlab:13.12.4 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.3 + sameersbn/gitlab:13.12.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.3 + sameersbn/gitlab:13.12.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.3 + sameersbn/gitlab:13.12.4 ``` In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.3 + sameersbn/gitlab:13.12.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.3 + sameersbn/gitlab:13.12.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.3 + sameersbn/gitlab:13.12.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.12.3 + sameersbn/gitlab:13.12.4 ``` When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command: ```bash docker run --name gitlab -d [OPTIONS] \ - sameersbn/gitlab:13.12.3 app:sanitize + sameersbn/gitlab:13.12.4 app:sanitize ``` ### Piwik @@ -1151,7 +1151,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.3 app:rake gitlab:backup:create + sameersbn/gitlab:13.12.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. @@ -1186,14 +1186,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.3 app:rake db:setup + sameersbn/gitlab:13.12.4 app:rake db:setup ``` Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.3 app:rake gitlab:backup:restore + sameersbn/gitlab:13.12.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. @@ -1202,7 +1202,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.12.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1252,7 +1252,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.3 app:rake gitlab:env:info + sameersbn/gitlab:13.12.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1265,7 +1265,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.3 app:rake gitlab:import:repos + sameersbn/gitlab:13.12.4 app:rake gitlab:import:repos ``` Or @@ -1296,7 +1296,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.3 app:rake gitlab:import:repos + sameersbn/gitlab:13.12.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1320,12 +1320,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.12.3` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher. +> Upgrading to `sameersbn/gitlab:13.12.4` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.12.3 +docker pull sameersbn/gitlab:13.12.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1351,7 +1351,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.4 ``` ## Shell Access @@ -1389,7 +1389,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.12.3 + image: sameersbn/gitlab:13.12.4 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index b5362cc92..4e148f624 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.12.3 +13.12.4 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 2ac19fbbc..bea99b292 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.3 + image: sameersbn/gitlab:13.12.4 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 78635ae4f..9f57c72f2 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.12.3 + image: sameersbn/gitlab:13.12.4 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 8eac4898c..60bae6e27 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.3 + image: sameersbn/gitlab:13.12.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ee0074b24..a68b860de 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.3 app:rake gitlab:backup:create + sameersbn/gitlab:13.12.4 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.3 app:rake gitlab:backup:restore + sameersbn/gitlab:13.12.4 app:rake gitlab:backup:restore ``` The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.12.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.12.3 +docker pull sameersbn/gitlab:13.12.4 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.12.3 +sameersbn/gitlab:13.12.4 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 13cd591e3..f874d8f4d 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.3 + image: sameersbn/gitlab:13.12.4 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 9254a0b03..657d1531a 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.3 + image: sameersbn/gitlab:13.12.4 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 652b69cde..29be1fba6 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.12.3 + image: sameersbn/gitlab:13.12.4 env: - name: TZ value: Asia/Kolkata From c2ed0e60335f7ebf3619dba267f052be8238ab6e Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 22 Jun 2021 05:55:37 +0200 Subject: [PATCH 078/522] upgrade GitLab CE to 13.12.5 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 8ee3e0b75..80002ee24 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**13.12.5** +- gitlab: upgrade CE to v13.12.5 +- gitaly: upgrade to v13.12.5 +- ubuntu: upgrade to focal-20210609 + **13.12.4** - gitlab: upgrade CE to v13.12.4 - gitaly: upgrade to v13.12.4 diff --git a/Dockerfile b/Dockerfile index 39b464c22..bb41a4348 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ -FROM ubuntu:focal-20210416 +FROM ubuntu:focal-20210609 -ARG VERSION=13.12.4 +ARG VERSION=13.12.5 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.5 \ GITLAB_SHELL_VERSION=13.18.0 \ GITLAB_PAGES_VERSION=1.39.0 \ - GITALY_SERVER_VERSION=13.12.4 \ + GITALY_SERVER_VERSION=13.12.5 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index a4c3cc873..6165d31b9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.12.4 +# sameersbn/gitlab:13.12.5 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.12.4 +docker pull sameersbn/gitlab:13.12.5 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.4 + sameersbn/gitlab:13.12.5 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.4 + sameersbn/gitlab:13.12.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:13.12.4 + sameersbn/gitlab:13.12.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:13.12.4 + sameersbn/gitlab:13.12.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.12.4 + sameersbn/gitlab:13.12.5 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.12.4 + sameersbn/gitlab:13.12.5 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.4 + sameersbn/gitlab:13.12.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.4 + sameersbn/gitlab:13.12.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.4 + sameersbn/gitlab:13.12.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.4 + sameersbn/gitlab:13.12.5 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.4 + sameersbn/gitlab:13.12.5 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.4 + sameersbn/gitlab:13.12.5 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.12.4 + sameersbn/gitlab:13.12.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:13.12.4 app:sanitize + sameersbn/gitlab:13.12.5 app:sanitize ``` ### Piwik @@ -1152,7 +1152,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.4 app:rake gitlab:backup:create + sameersbn/gitlab:13.12.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. @@ -1187,14 +1187,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.4 app:rake db:setup + sameersbn/gitlab:13.12.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:13.12.4 app:rake gitlab:backup:restore + sameersbn/gitlab:13.12.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. @@ -1203,7 +1203,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:13.12.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1253,7 +1253,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.4 app:rake gitlab:env:info + sameersbn/gitlab:13.12.5 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1266,7 +1266,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.4 app:rake gitlab:import:repos + sameersbn/gitlab:13.12.5 app:rake gitlab:import:repos ``` Or @@ -1297,7 +1297,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.4 app:rake gitlab:import:repos + sameersbn/gitlab:13.12.5 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1321,12 +1321,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.12.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:13.12.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:13.12.4 +docker pull sameersbn/gitlab:13.12.5 ``` - **Step 2**: Stop and remove the currently running image @@ -1352,7 +1352,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.5 ``` ## Shell Access @@ -1390,7 +1390,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.12.4 + image: sameersbn/gitlab:13.12.5 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 4e148f624..44d9ed739 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.12.4 +13.12.5 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index bea99b292..40322d578 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.4 + image: sameersbn/gitlab:13.12.5 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 9f57c72f2..99f5ddb32 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.12.4 + image: sameersbn/gitlab:13.12.5 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 60bae6e27..6debc3807 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.4 + image: sameersbn/gitlab:13.12.5 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index a68b860de..771d0d8d5 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.4 app:rake gitlab:backup:create + sameersbn/gitlab:13.12.5 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.4 app:rake gitlab:backup:restore + sameersbn/gitlab:13.12.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:13.12.5 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.12.4 +docker pull sameersbn/gitlab:13.12.5 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.12.4 +sameersbn/gitlab:13.12.5 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index f874d8f4d..57424b1e6 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.4 + image: sameersbn/gitlab:13.12.5 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 657d1531a..4d1e38812 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.4 + image: sameersbn/gitlab:13.12.5 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 29be1fba6..c05fad74d 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.12.4 + image: sameersbn/gitlab:13.12.5 env: - name: TZ value: Asia/Kolkata From def519997c18476e56267b4e9dbf2c30875666d2 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 22 Jun 2021 17:30:43 +0200 Subject: [PATCH 079/522] upgrade GitLab CE to 14.0.0 --- Changelog.md | 6 +++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 49 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 80002ee24..7c029ab2d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.0.0** +- gitlab: upgrade CE to v14.0.0 +- gitaly: upgrade to v14.0.0 +- gitlab-shell: upgrade to v13.19.0 +- gitlab-pages: upgrade to v1.40.0 + **13.12.5** - gitlab: upgrade CE to v13.12.5 - gitaly: upgrade to v13.12.5 diff --git a/Dockerfile b/Dockerfile index bb41a4348..ee4648bc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210609 -ARG VERSION=13.12.5 +ARG VERSION=14.0.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.5 \ - GITLAB_SHELL_VERSION=13.18.0 \ - GITLAB_PAGES_VERSION=1.39.0 \ - GITALY_SERVER_VERSION=13.12.5 \ + GITLAB_SHELL_VERSION=13.19.0 \ + GITLAB_PAGES_VERSION=1.40.0 \ + GITALY_SERVER_VERSION=14.0.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 6165d31b9..16ae5da27 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:13.12.5 +# sameersbn/gitlab:14.0.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:13.12.5 +docker pull sameersbn/gitlab:14.0.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.5 + sameersbn/gitlab:14.0.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.5 + sameersbn/gitlab:14.0.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:13.12.5 + sameersbn/gitlab:14.0.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:13.12.5 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:13.12.5 + sameersbn/gitlab:14.0.0 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:13.12.5 + sameersbn/gitlab:14.0.0 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.5 + sameersbn/gitlab:14.0.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.5 + sameersbn/gitlab:14.0.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.5 + sameersbn/gitlab:14.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.5 + sameersbn/gitlab:14.0.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.5 + sameersbn/gitlab:14.0.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:13.12.5 + sameersbn/gitlab:14.0.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:13.12.5 + sameersbn/gitlab:14.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:13.12.5 app:sanitize + sameersbn/gitlab:14.0.0 app:sanitize ``` ### Piwik @@ -1152,7 +1152,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.5 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1187,14 +1187,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.5 app:rake db:setup + sameersbn/gitlab:14.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:13.12.5 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1203,7 +1203,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1253,7 +1253,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.5 app:rake gitlab:env:info + sameersbn/gitlab:14.0.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1266,7 +1266,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.5 app:rake gitlab:import:repos + sameersbn/gitlab:14.0.0 app:rake gitlab:import:repos ``` Or @@ -1297,7 +1297,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.5 app:rake gitlab:import:repos + sameersbn/gitlab:14.0.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1321,12 +1321,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:13.12.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:14.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:13.12.5 +docker pull sameersbn/gitlab:14.0.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1352,7 +1352,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.11.0` you need to provide the `GITLAB_SECRETS_SECRET_KEY_BASE` and `GITLAB_SECRETS_OTP_KEY_BASE` parameters while starting the image. These should initially both have the same value as the contents of the `/home/git/data/.secret` file. See [Available Configuration Parameters](#available-configuration-parameters) for more information on these parameters. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.12.5 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.0 ``` ## Shell Access @@ -1390,7 +1390,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:13.12.5 + image: sameersbn/gitlab:14.0.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 44d9ed739..4b964e965 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -13.12.5 +14.0.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 40322d578..36b96063e 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.5 + image: sameersbn/gitlab:14.0.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 99f5ddb32..8fd240467 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:13.12.5 + image: sameersbn/gitlab:14.0.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 6debc3807..6b1506994 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.5 + image: sameersbn/gitlab:14.0.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 771d0d8d5..62e210d62 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.5 app:rake gitlab:backup:create + sameersbn/gitlab:14.0.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.5 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:13.12.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.0.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:13.12.5 +docker pull sameersbn/gitlab:14.0.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:13.12.5 +sameersbn/gitlab:14.0.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 57424b1e6..43bfc0deb 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.5 + image: sameersbn/gitlab:14.0.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 4d1e38812..49906e633 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:13.12.5 + image: sameersbn/gitlab:14.0.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index c05fad74d..3da9aff77 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:13.12.5 + image: sameersbn/gitlab:14.0.0 env: - name: TZ value: Asia/Kolkata From 19f8c4927ef8ae9a01d107fb80f173a91dd9301d Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 23 Jun 2021 11:11:37 +0530 Subject: [PATCH 080/522] Update README.md --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9c25e3119..dd1d3b2c3 100644 --- a/README.md +++ b/README.md @@ -179,8 +179,8 @@ Step 2. Launch a redis container ```bash docker run --name gitlab-redis -d \ - --volume /srv/docker/gitlab/redis:/var/lib/redis \ - redis:5.0.9 + --volume /srv/docker/gitlab/redis:/data \ + redis:6.2 ``` Step 3. Launch the gitlab container @@ -354,20 +354,20 @@ docker run --name gitlab -it --rm \ You can link this image with a redis container to satisfy gitlab's redis requirement. The alias of the redis server container should be set to **redisio** while linking with the gitlab image. -To illustrate linking with a redis container, we will use the [sameersbn/redis](https://github.com/sameersbn/docker-redis) image. Please refer the [README](https://github.com/sameersbn/docker-redis/blob/master/README.md) of docker-redis for details. +To illustrate linking with a redis container, we will use the [redis](https://github.com/docker-library/redis) image. Please refer the [README](https://github.com/docker-library/docs/blob/master/redis/README.md) for details. First, lets pull the redis image from the docker index. ```bash -docker pull redis:5.0.9 +docker pull redis:6.2 ``` Lets start the redis container ```bash docker run --name gitlab-redis -d \ - --volume /srv/docker/gitlab/redis:/var/lib/redis \ - redis:5.0.9 + --volume /srv/docker/gitlab/redis:/data \ + redis:6.2 ``` We are now ready to start the GitLab application. From 0ba02c4881d4c46aba95c56c4ab70c2016a08289 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 23 Jun 2021 11:13:01 +0530 Subject: [PATCH 081/522] Update docker-compose.yml --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4d9645786..00535faa7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,11 +3,11 @@ version: '2.3' services: redis: restart: always - image: redis:5.0.9 + image: redis:6.2 command: - --loglevel warning volumes: - - redis-data:/var/lib/redis:Z + - redis-data:/data:Z postgresql: restart: always From 8ce166bfd1a56842052cccb58a77253ad71d8451 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 23 Jun 2021 11:14:29 +0530 Subject: [PATCH 082/522] Update s3_compatible_storage.md --- docs/s3_compatible_storage.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md index 1a4914109..b6e9f3db8 100644 --- a/docs/s3_compatible_storage.md +++ b/docs/s3_compatible_storage.md @@ -72,11 +72,11 @@ version: '2' services: redis: restart: always - image: sameersbn/redis:4.0.9-2 + image: sameersbn/redis:6.2 command: - --loglevel warning volumes: - - /tmp/docker/gitlab/redis:/var/lib/redis:Z + - /tmp/docker/gitlab/redis:/data:Z postgresql: restart: always From 2472f6c8543aa9d5aee91321e7c978dca865adeb Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 25 Jun 2021 21:46:48 +0200 Subject: [PATCH 083/522] upgrade GitLab CE to 14.0.1 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 7c029ab2d..315d66a67 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.0.1** +- gitlab: upgrade CE to v14.0.1 +- gitaly: upgrade to v14.0.1 + **14.0.0** - gitlab: upgrade CE to v14.0.0 - gitaly: upgrade to v14.0.0 diff --git a/Dockerfile b/Dockerfile index ee4648bc9..89876de1d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210609 -ARG VERSION=14.0.0 +ARG VERSION=14.0.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.5 \ GITLAB_SHELL_VERSION=13.19.0 \ GITLAB_PAGES_VERSION=1.40.0 \ - GITALY_SERVER_VERSION=14.0.0 \ + GITALY_SERVER_VERSION=14.0.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 79af36c2a..cb903f331 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.0.0 +# sameersbn/gitlab:14.0.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.0.0 +docker pull sameersbn/gitlab:14.0.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.0 + sameersbn/gitlab:14.0.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.0 + sameersbn/gitlab:14.0.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:14.0.0 + sameersbn/gitlab:14.0.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:14.0.0 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.0.0 + sameersbn/gitlab:14.0.1 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.0.0 + sameersbn/gitlab:14.0.1 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.0 + sameersbn/gitlab:14.0.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.0 + sameersbn/gitlab:14.0.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.0 + sameersbn/gitlab:14.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.0 + sameersbn/gitlab:14.0.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.0 + sameersbn/gitlab:14.0.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.0 + sameersbn/gitlab:14.0.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:14.0.0 + sameersbn/gitlab:14.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:14.0.0 app:sanitize + sameersbn/gitlab:14.0.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:14.0.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1206,14 +1206,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.0 app:rake db:setup + sameersbn/gitlab:14.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:14.0.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1222,7 +1222,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1272,7 +1272,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:14.0.0 app:rake gitlab:env:info + sameersbn/gitlab:14.0.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1285,7 +1285,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.0.1 app:rake gitlab:import:repos ``` Or @@ -1316,7 +1316,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.0.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1340,12 +1340,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.0.0 +docker pull sameersbn/gitlab:14.0.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1371,7 +1371,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:14.0.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.1 ``` ## Shell Access @@ -1409,7 +1409,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.0.0 + image: sameersbn/gitlab:14.0.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 4b964e965..63dba868a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.0.0 +14.0.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 36b96063e..92c5e3eee 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.0 + image: sameersbn/gitlab:14.0.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 8fd240467..c3eb96cef 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.0.0 + image: sameersbn/gitlab:14.0.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 6596dbff7..595a8fdde 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.0 + image: sameersbn/gitlab:14.0.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 62e210d62..1b1dd21d2 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.0.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.0.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.0.0 +docker pull sameersbn/gitlab:14.0.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.0.0 +sameersbn/gitlab:14.0.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 43bfc0deb..10988c8bc 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.0 + image: sameersbn/gitlab:14.0.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 49906e633..8d0753286 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.0 + image: sameersbn/gitlab:14.0.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 3da9aff77..33421ebd4 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.0.0 + image: sameersbn/gitlab:14.0.1 env: - name: TZ value: Asia/Kolkata From 9180bed1fe1428ab0222825c4b78090e45c9d0c4 Mon Sep 17 00:00:00 2001 From: Gert-Jan Timmer Date: Thu, 8 Nov 2018 16:26:06 +0100 Subject: [PATCH 084/522] fix Container TimeZone Fix Container TimeZone Fix Container TimeZone --- README.md | 3 ++- assets/runtime/functions | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index cb903f331..f42089b31 100644 --- a/README.md +++ b/README.md @@ -781,13 +781,14 @@ Below is the complete list of available options that can be used to customize yo | Parameter | Description | |-----------|-------------| | `DEBUG` | Set this to `true` to enable entrypoint debugging. | +| `TZ` | Set the container timezone. Defaults to `UTC`. Values are expected to be in Canonical format. Example: `Europe/Amsterdam` See the list of [acceptable values](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones). For configuring the timezone of gitlab see variable `GITLAB_TIMEZONE`. | | `GITLAB_HOST` | The hostname of the GitLab server. Defaults to `localhost` | | `GITLAB_CI_HOST` | If you are migrating from GitLab CI use this parameter to configure the redirection to the GitLab service so that your existing runners continue to work without any changes. No defaults. | | `GITLAB_PORT` | The port of the GitLab server. This value indicates the public port on which the GitLab application will be accessible on the network and appropriately configures GitLab to generate the correct urls. It does not affect the port on which the internal nginx server will be listening on. Defaults to `443` if `GITLAB_HTTPS=true`, else defaults to `80`. | | `GITLAB_SECRETS_DB_KEY_BASE` | Encryption key for GitLab CI secret variables, as well as import credentials, in the database. Ensure that your key is at least 32 characters long and that you don't lose it. You can generate one using `pwgen -Bsv1 64`. If you are migrating from GitLab CI, you need to set this value to the value of `GITLAB_CI_SECRETS_DB_KEY_BASE`. No defaults. | | `GITLAB_SECRETS_SECRET_KEY_BASE` | Encryption key for session secrets. Ensure that your key is at least 64 characters long and that you don't lose it. This secret can be rotated with minimal impact - the main effect is that previously-sent password reset emails will no longer work. You can generate one using `pwgen -Bsv1 64`. No defaults. | | `GITLAB_SECRETS_OTP_KEY_BASE` | Encryption key for OTP related stuff with GitLab. Ensure that your key is at least 64 characters long and that you don't lose it. **If you lose or change this secret, 2FA will stop working for all users.** You can generate one using `pwgen -Bsv1 64`. No defaults. | -| `GITLAB_TIMEZONE` | Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`. See the list of [acceptable values](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html). | +| `GITLAB_TIMEZONE` | Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`. See the list of [acceptable values](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html). For settings the container timezone which will effect cron, see variable `TZ` | | `GITLAB_ROOT_PASSWORD` | The password for the root user on firstrun. Defaults to `5iveL!fe`. GitLab requires this to be at least **8 characters long**. | | `GITLAB_ROOT_EMAIL` | The email for the root user on firstrun. Defaults to `admin@example.com` | | `GITLAB_EMAIL` | The email address for the GitLab server. Defaults to value of `SMTP_USER`, else defaults to `example@example.com`. | diff --git a/assets/runtime/functions b/assets/runtime/functions index 18bc8d524..82beafc10 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1561,6 +1561,23 @@ EOF chmod +x /usr/local/sbin/healthcheck } +configure_container_timezone() { + TIMEZONE=${TZ:-UTC} + + # Preform sanity check of provided timezone value + if [ -e /usr/share/zoneinfo/${TIMEZONE} ]; then + # Configured timezone is available + + # Set localtime + ln -snf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime + + # Set timezone + echo ${TIMEZONE} > /etc/timezone + + echo "Container TimeZone -> ${TIMEZONE}" + fi +} + initialize_system() { map_uidgid initialize_logdir @@ -1568,6 +1585,7 @@ initialize_system() { update_ca_certificates generate_ssh_host_keys update_ssh_listen_port + configure_container_timezone install_configuration_templates rm -rf /var/run/supervisor.sock } From e194e7d8d01da6b5d845ebe81a8de77531018899 Mon Sep 17 00:00:00 2001 From: "G.J.R. Timmer" Date: Fri, 2 Oct 2020 13:37:13 +0200 Subject: [PATCH 085/522] moved default TIMEZONE variable to env-defaults Resolve conversation --- assets/runtime/env-defaults | 2 ++ assets/runtime/functions | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index a2967a53f..ad1ebc18f 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -1,6 +1,8 @@ #!/bin/bash +# CONTAINER DEBUG=${DEBUG:-$DEBUG_ENTRYPOINT} +TIMEZONE=${TZ:-UTC} ## GITLAB CORE GITLAB_TEMP_DIR="${GITLAB_DATA_DIR}/tmp" diff --git a/assets/runtime/functions b/assets/runtime/functions index 82beafc10..5d1d0a2b2 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1562,8 +1562,6 @@ EOF } configure_container_timezone() { - TIMEZONE=${TZ:-UTC} - # Preform sanity check of provided timezone value if [ -e /usr/share/zoneinfo/${TIMEZONE} ]; then # Configured timezone is available From 6ed4aa776ce1a387f3668185ac0ba5605f28517f Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Wed, 10 Mar 2021 10:34:07 +0530 Subject: [PATCH 086/522] fixed typo --- assets/runtime/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index 5d1d0a2b2..c0561674e 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1562,7 +1562,7 @@ EOF } configure_container_timezone() { - # Preform sanity check of provided timezone value + # Perform sanity check of provided timezone value if [ -e /usr/share/zoneinfo/${TIMEZONE} ]; then # Configured timezone is available From a493ca37ab681e1c2ea9fcd3a092541c82f31193 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 1 Jul 2021 20:55:10 +0200 Subject: [PATCH 087/522] upgrade GitLab CE to 14.0.2 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 315d66a67..7e23246a9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.0.2** +- gitlab: upgrade CE to v14.0.2 +- gitaly: upgrade to v14.0.2 + **14.0.1** - gitlab: upgrade CE to v14.0.1 - gitaly: upgrade to v14.0.1 diff --git a/Dockerfile b/Dockerfile index 89876de1d..0d566b7c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210609 -ARG VERSION=14.0.1 +ARG VERSION=14.0.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.5 \ GITLAB_SHELL_VERSION=13.19.0 \ GITLAB_PAGES_VERSION=1.40.0 \ - GITALY_SERVER_VERSION=14.0.1 \ + GITALY_SERVER_VERSION=14.0.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index cb903f331..e5b1d1181 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.0.1 +# sameersbn/gitlab:14.0.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.0.1 +docker pull sameersbn/gitlab:14.0.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.1 + sameersbn/gitlab:14.0.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.1 + sameersbn/gitlab:14.0.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:14.0.1 + sameersbn/gitlab:14.0.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:14.0.1 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.0.1 + sameersbn/gitlab:14.0.2 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.0.1 + sameersbn/gitlab:14.0.2 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.1 + sameersbn/gitlab:14.0.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.1 + sameersbn/gitlab:14.0.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.1 + sameersbn/gitlab:14.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.1 + sameersbn/gitlab:14.0.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.1 + sameersbn/gitlab:14.0.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.1 + sameersbn/gitlab:14.0.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:14.0.1 + sameersbn/gitlab:14.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:14.0.1 app:sanitize + sameersbn/gitlab:14.0.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:14.0.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1206,14 +1206,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.1 app:rake db:setup + sameersbn/gitlab:14.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:14.0.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1222,7 +1222,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1272,7 +1272,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:14.0.1 app:rake gitlab:env:info + sameersbn/gitlab:14.0.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1285,7 +1285,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.0.2 app:rake gitlab:import:repos ``` Or @@ -1316,7 +1316,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.0.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1340,12 +1340,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.0.1 +docker pull sameersbn/gitlab:14.0.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1371,7 +1371,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:14.0.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.2 ``` ## Shell Access @@ -1409,7 +1409,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.0.1 + image: sameersbn/gitlab:14.0.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 63dba868a..be44f252a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.0.1 +14.0.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 92c5e3eee..b2b6743ab 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.1 + image: sameersbn/gitlab:14.0.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index c3eb96cef..f8a6f0292 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.0.1 + image: sameersbn/gitlab:14.0.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 595a8fdde..c078f060e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.1 + image: sameersbn/gitlab:14.0.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 1b1dd21d2..7ba999015 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.0.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.0.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.0.1 +docker pull sameersbn/gitlab:14.0.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.0.1 +sameersbn/gitlab:14.0.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 10988c8bc..aa4a72a94 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.1 + image: sameersbn/gitlab:14.0.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 8d0753286..5e0383c52 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.1 + image: sameersbn/gitlab:14.0.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 33421ebd4..05fc2e216 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.0.1 + image: sameersbn/gitlab:14.0.2 env: - name: TZ value: Asia/Kolkata From 0265fc72d73aefa1fe1858618c4751a8b26dd303 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 7 Jul 2021 17:46:52 +0200 Subject: [PATCH 088/522] upgrade GitLab CE to 14.0.3 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 7e23246a9..173bccde7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.0.3** +- gitlab: upgrade CE to v14.0.3 +- gitaly: upgrade to v14.0.3 + **14.0.2** - gitlab: upgrade CE to v14.0.2 - gitaly: upgrade to v14.0.2 diff --git a/Dockerfile b/Dockerfile index 0d566b7c1..e2bb39e88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210609 -ARG VERSION=14.0.2 +ARG VERSION=14.0.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.5 \ GITLAB_SHELL_VERSION=13.19.0 \ GITLAB_PAGES_VERSION=1.40.0 \ - GITALY_SERVER_VERSION=14.0.2 \ + GITALY_SERVER_VERSION=14.0.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 677a27693..0dbe98bc0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.0.2 +# sameersbn/gitlab:14.0.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.0.2 +docker pull sameersbn/gitlab:14.0.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.2 + sameersbn/gitlab:14.0.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.2 + sameersbn/gitlab:14.0.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:14.0.2 + sameersbn/gitlab:14.0.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:14.0.2 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.0.2 + sameersbn/gitlab:14.0.3 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.0.2 + sameersbn/gitlab:14.0.3 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.2 + sameersbn/gitlab:14.0.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.2 + sameersbn/gitlab:14.0.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.2 + sameersbn/gitlab:14.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.2 + sameersbn/gitlab:14.0.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.2 + sameersbn/gitlab:14.0.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.2 + sameersbn/gitlab:14.0.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:14.0.2 + sameersbn/gitlab:14.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:14.0.2 app:sanitize + sameersbn/gitlab:14.0.3 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:14.0.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1207,14 +1207,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.2 app:rake db:setup + sameersbn/gitlab:14.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:14.0.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1223,7 +1223,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.0.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1273,7 +1273,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:14.0.2 app:rake gitlab:env:info + sameersbn/gitlab:14.0.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1286,7 +1286,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.0.3 app:rake gitlab:import:repos ``` Or @@ -1317,7 +1317,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.0.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1341,12 +1341,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.0.2 +docker pull sameersbn/gitlab:14.0.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1372,7 +1372,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:14.0.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.3 ``` ## Shell Access @@ -1410,7 +1410,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.0.2 + image: sameersbn/gitlab:14.0.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index be44f252a..de29f6758 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.0.2 +14.0.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index b2b6743ab..cf1db44b7 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.2 + image: sameersbn/gitlab:14.0.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index f8a6f0292..564921f1b 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.0.2 + image: sameersbn/gitlab:14.0.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index c078f060e..3e7867e6d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.2 + image: sameersbn/gitlab:14.0.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 7ba999015..895442aa2 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.0.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.0.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.0.2 +docker pull sameersbn/gitlab:14.0.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.0.2 +sameersbn/gitlab:14.0.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index aa4a72a94..58256bd1f 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.2 + image: sameersbn/gitlab:14.0.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 5e0383c52..dd8d8018f 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.2 + image: sameersbn/gitlab:14.0.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 05fc2e216..615499697 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.0.2 + image: sameersbn/gitlab:14.0.3 env: - name: TZ value: Asia/Kolkata From 366a6e1d2538e69390a7ca2dfd727bf4b758df57 Mon Sep 17 00:00:00 2001 From: Erwin Junge Date: Thu, 8 Jul 2021 08:43:53 +0200 Subject: [PATCH 089/522] upgrade GitLab CE to 14.0.4 --- Changelog.md | 4 ++++ Dockerfile | 4 ++-- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++++----- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 10 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Changelog.md b/Changelog.md index 173bccde7..ce74f5281 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.0.4** +- gitlab: upgrade CE to v14.0.4 +- gitaly: upgrade to v14.0.4 + **14.0.3** - gitlab: upgrade CE to v14.0.3 - gitaly: upgrade to v14.0.3 diff --git a/Dockerfile b/Dockerfile index e2bb39e88..6dfa6657b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210609 -ARG VERSION=14.0.3 +ARG VERSION=14.0.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.5 \ GITLAB_SHELL_VERSION=13.19.0 \ GITLAB_PAGES_VERSION=1.40.0 \ - GITALY_SERVER_VERSION=14.0.3 \ + GITALY_SERVER_VERSION=14.0.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/VERSION b/VERSION index de29f6758..560dec006 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.0.3 +14.0.4 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index cf1db44b7..222735621 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.3 + image: sameersbn/gitlab:14.0.4 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 564921f1b..f9085b020 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.0.3 + image: sameersbn/gitlab:14.0.4 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 3e7867e6d..838e4c394 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.3 + image: sameersbn/gitlab:14.0.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 895442aa2..7c8ae4255 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.3 app:rake gitlab:backup:create + sameersbn/gitlab:14.0.4 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.3 app:rake gitlab:backup:restore + sameersbn/gitlab:14.0.4 app:rake gitlab:backup:restore ``` The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.0.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.0.3 +docker pull sameersbn/gitlab:14.0.4 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.0.3 +sameersbn/gitlab:14.0.4 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 58256bd1f..315866e85 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.3 + image: sameersbn/gitlab:14.0.4 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index dd8d8018f..919bae4bd 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.3 + image: sameersbn/gitlab:14.0.4 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 615499697..4d5b51de6 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.0.3 + image: sameersbn/gitlab:14.0.4 env: - name: TZ value: Asia/Kolkata From 47bc7989876898b30ce099564d0a651f73c071fa Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 8 Jul 2021 19:30:36 +0200 Subject: [PATCH 090/522] Add missing adjustments to README.md --- README.md | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 0dbe98bc0..54dadb226 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.0.3 +# sameersbn/gitlab:14.0.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.0.3 +docker pull sameersbn/gitlab:14.0.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.3 + sameersbn/gitlab:14.0.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.3 + sameersbn/gitlab:14.0.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:14.0.3 + sameersbn/gitlab:14.0.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:14.0.3 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.0.3 + sameersbn/gitlab:14.0.4 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.0.3 + sameersbn/gitlab:14.0.4 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.3 + sameersbn/gitlab:14.0.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.3 + sameersbn/gitlab:14.0.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.3 + sameersbn/gitlab:14.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.3 + sameersbn/gitlab:14.0.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.3 + sameersbn/gitlab:14.0.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.3 + sameersbn/gitlab:14.0.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:14.0.3 + sameersbn/gitlab:14.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:14.0.3 app:sanitize + sameersbn/gitlab:14.0.4 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:14.0.3 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1207,14 +1207,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.3 app:rake db:setup + sameersbn/gitlab:14.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:14.0.3 app:rake gitlab:backup:restore + sameersbn/gitlab:14.0.4 app:rake gitlab:backup:restore ``` The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue. @@ -1223,7 +1223,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.0.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1273,7 +1273,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:14.0.3 app:rake gitlab:env:info + sameersbn/gitlab:14.0.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1286,7 +1286,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.3 app:rake gitlab:import:repos + sameersbn/gitlab:14.0.4 app:rake gitlab:import:repos ``` Or @@ -1317,7 +1317,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.3 app:rake gitlab:import:repos + sameersbn/gitlab:14.0.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1341,12 +1341,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.0.3 +docker pull sameersbn/gitlab:14.0.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1372,7 +1372,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:14.0.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.4 ``` ## Shell Access @@ -1410,7 +1410,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.0.3 + image: sameersbn/gitlab:14.0.4 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m From 5c8526955fdac74cb4a00f2c9c53385a65af4c10 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 8 Jul 2021 19:23:36 +0200 Subject: [PATCH 091/522] upgrade GitLab CE to 14.0.5 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index ce74f5281..2b9041c98 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.0.5** +- gitlab: upgrade CE to v14.0.5 +- gitaly: upgrade to v14.0.5 + **14.0.4** - gitlab: upgrade CE to v14.0.4 - gitaly: upgrade to v14.0.4 diff --git a/Dockerfile b/Dockerfile index 6dfa6657b..b7007e0f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210609 -ARG VERSION=14.0.4 +ARG VERSION=14.0.5 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.5 \ GITLAB_SHELL_VERSION=13.19.0 \ GITLAB_PAGES_VERSION=1.40.0 \ - GITALY_SERVER_VERSION=14.0.4 \ + GITALY_SERVER_VERSION=14.0.5 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 54dadb226..823ac2670 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.0.4 +# sameersbn/gitlab:14.0.5 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.0.4 +docker pull sameersbn/gitlab:14.0.5 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.4 + sameersbn/gitlab:14.0.5 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.4 + sameersbn/gitlab:14.0.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:14.0.4 + sameersbn/gitlab:14.0.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:14.0.4 + sameersbn/gitlab:14.0.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.0.4 + sameersbn/gitlab:14.0.5 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.0.4 + sameersbn/gitlab:14.0.5 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.4 + sameersbn/gitlab:14.0.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.4 + sameersbn/gitlab:14.0.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.4 + sameersbn/gitlab:14.0.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.4 + sameersbn/gitlab:14.0.5 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.4 + sameersbn/gitlab:14.0.5 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.4 + sameersbn/gitlab:14.0.5 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:14.0.4 + sameersbn/gitlab:14.0.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:14.0.4 app:sanitize + sameersbn/gitlab:14.0.5 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:14.0.4 app:rake gitlab:backup:create + sameersbn/gitlab:14.0.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. @@ -1207,14 +1207,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.4 app:rake db:setup + sameersbn/gitlab:14.0.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:14.0.4 app:rake gitlab:backup:restore + sameersbn/gitlab:14.0.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. @@ -1223,7 +1223,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.0.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1273,7 +1273,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:14.0.4 app:rake gitlab:env:info + sameersbn/gitlab:14.0.5 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1286,7 +1286,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.4 app:rake gitlab:import:repos + sameersbn/gitlab:14.0.5 app:rake gitlab:import:repos ``` Or @@ -1317,7 +1317,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.4 app:rake gitlab:import:repos + sameersbn/gitlab:14.0.5 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1341,12 +1341,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.0.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:14.0.4 +docker pull sameersbn/gitlab:14.0.5 ``` - **Step 2**: Stop and remove the currently running image @@ -1372,7 +1372,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:14.0.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.5 ``` ## Shell Access @@ -1410,7 +1410,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.0.4 + image: sameersbn/gitlab:14.0.5 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 560dec006..1327813cb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.0.4 +14.0.5 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 222735621..ca142d39b 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.4 + image: sameersbn/gitlab:14.0.5 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index f9085b020..67058c7e8 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.0.4 + image: sameersbn/gitlab:14.0.5 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 838e4c394..5867bbba4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.4 + image: sameersbn/gitlab:14.0.5 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 7c8ae4255..5a0a619be 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.4 app:rake gitlab:backup:create + sameersbn/gitlab:14.0.5 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.4 app:rake gitlab:backup:restore + sameersbn/gitlab:14.0.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.0.5 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.0.4 +docker pull sameersbn/gitlab:14.0.5 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.0.4 +sameersbn/gitlab:14.0.5 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 315866e85..3a155271b 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.4 + image: sameersbn/gitlab:14.0.5 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 919bae4bd..81d13ad4c 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.4 + image: sameersbn/gitlab:14.0.5 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 4d5b51de6..6f51ac2a5 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.0.4 + image: sameersbn/gitlab:14.0.5 env: - name: TZ value: Asia/Kolkata From 50bad158454f4ee5f592b77fb83778065329508b Mon Sep 17 00:00:00 2001 From: sue445 Date: Tue, 20 Jul 2021 18:20:33 +0900 Subject: [PATCH 092/522] Resolved. GitLab Pages doesn't work since GitLab v14.0 ref. #2375 As I can see from the error message below, it looks like both `api-secret-key` and `gitlab-server` (or `internal-gitlab-server` ) are required since GitLab v14.0 ``` time="2021-06-28T02:28:34Z" level=fatal msg="could not create domains config source" error="GitLab API URL or API secret has not been provided" ``` https://gitlab.com/gitlab-org/gitlab-pages/-/blob/v1.41.0/internal/source/gitlab/client/client.go#L50-52 --- assets/runtime/config/gitlab-pages/config | 2 ++ assets/runtime/functions | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/assets/runtime/config/gitlab-pages/config b/assets/runtime/config/gitlab-pages/config index 8b0edb605..f98fe4d17 100644 --- a/assets/runtime/config/gitlab-pages/config +++ b/assets/runtime/config/gitlab-pages/config @@ -4,3 +4,5 @@ auth-redirect-uri={{GITLAB_PAGES_ACCESS_REDIRECT_URI}} auth-secret={{GITLAB_PAGES_ACCESS_SECRET}} gitlab-server={{GITLAB_PAGES_ACCESS_CONTROL_SERVER}} artifacts-server={{GITLAB_PAGES_ARTIFACTS_SERVER_URL}} +internal-gitlab-server=http://localhost:8181 +api-secret-key=/home/git/gitlab/.gitlab_pages_secret diff --git a/assets/runtime/functions b/assets/runtime/functions index c0561674e..dc82cb43b 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -752,6 +752,12 @@ gitlab_configure_secrets() { exec_as_git openssl rand -base64 -out "${workhorse_secret}" 32 chmod 600 "${workhorse_secret}" fi + + local pages_secret="${GITLAB_INSTALL_DIR}/.gitlab_pages_secret" + if [[ ! -f "${pages_secret}" ]]; then + exec_as_git openssl rand -base64 -out "${pages_secret}" 32 + chmod 600 "${pages_secret}" + fi } gitlab_configure_sidekiq() { From 73dae28e31167ff16539f31959a7a7fe9cd439d5 Mon Sep 17 00:00:00 2001 From: sue445 Date: Wed, 21 Jul 2021 09:38:37 +0900 Subject: [PATCH 093/522] Pass {{GITLAB_INSTALL_DIR}} to gitlab-pages/config --- assets/runtime/config/gitlab-pages/config | 2 +- assets/runtime/functions | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/assets/runtime/config/gitlab-pages/config b/assets/runtime/config/gitlab-pages/config index f98fe4d17..409786090 100644 --- a/assets/runtime/config/gitlab-pages/config +++ b/assets/runtime/config/gitlab-pages/config @@ -5,4 +5,4 @@ auth-secret={{GITLAB_PAGES_ACCESS_SECRET}} gitlab-server={{GITLAB_PAGES_ACCESS_CONTROL_SERVER}} artifacts-server={{GITLAB_PAGES_ARTIFACTS_SERVER_URL}} internal-gitlab-server=http://localhost:8181 -api-secret-key=/home/git/gitlab/.gitlab_pages_secret +api-secret-key={{GITLAB_INSTALL_DIR}}/.gitlab_pages_secret diff --git a/assets/runtime/functions b/assets/runtime/functions index dc82cb43b..cd5f501ff 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1792,7 +1792,8 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then GITLAB_PAGES_ACCESS_CLIENT_SECRET \ GITLAB_PAGES_ACCESS_REDIRECT_URI \ GITLAB_PAGES_ACCESS_SECRET \ - GITLAB_PAGES_ACCESS_CONTROL_SERVER + GITLAB_PAGES_ACCESS_CONTROL_SERVER \ + GITLAB_INSTALL_DIR if [[ -n ${GITLAB_PAGES_ARTIFACTS_SERVER_URL} ]]; then update_template ${GITLAB_PAGES_CONFIG} GITLAB_PAGES_ARTIFACTS_SERVER_URL From 206baef0ded64ddd1a2d218b3c3cc7d178c348b4 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 21 Jul 2021 20:53:59 +0200 Subject: [PATCH 094/522] upgrade GitLab CE to 14.0.6 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 2b9041c98..5fdd5517c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.0.6** +- gitlab: upgrade CE to v14.0.6 +- gitaly: upgrade to v14.0.6 +- golang: upgrade to v1.16.6 + **14.0.5** - gitlab: upgrade CE to v14.0.5 - gitaly: upgrade to v14.0.5 diff --git a/Dockerfile b/Dockerfile index b7007e0f8..4d7622ef1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210609 -ARG VERSION=14.0.5 +ARG VERSION=14.0.6 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ - GOLANG_VERSION=1.16.5 \ + GOLANG_VERSION=1.16.6 \ GITLAB_SHELL_VERSION=13.19.0 \ GITLAB_PAGES_VERSION=1.40.0 \ - GITALY_SERVER_VERSION=14.0.5 \ + GITALY_SERVER_VERSION=14.0.6 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 823ac2670..9c4439723 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.0.5 +# sameersbn/gitlab:14.0.6 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.0.5 +docker pull sameersbn/gitlab:14.0.6 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.5 + sameersbn/gitlab:14.0.6 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.5 + sameersbn/gitlab:14.0.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:14.0.5 + sameersbn/gitlab:14.0.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:14.0.5 + sameersbn/gitlab:14.0.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.0.5 + sameersbn/gitlab:14.0.6 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.0.5 + sameersbn/gitlab:14.0.6 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.5 + sameersbn/gitlab:14.0.6 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.5 + sameersbn/gitlab:14.0.6 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.5 + sameersbn/gitlab:14.0.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.5 + sameersbn/gitlab:14.0.6 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.5 + sameersbn/gitlab:14.0.6 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.5 + sameersbn/gitlab:14.0.6 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:14.0.5 + sameersbn/gitlab:14.0.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:14.0.5 app:sanitize + sameersbn/gitlab:14.0.6 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:14.0.5 app:rake gitlab:backup:create + sameersbn/gitlab:14.0.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. @@ -1207,14 +1207,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.5 app:rake db:setup + sameersbn/gitlab:14.0.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:14.0.5 app:rake gitlab:backup:restore + sameersbn/gitlab:14.0.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. @@ -1223,7 +1223,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.0.6 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1273,7 +1273,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:14.0.5 app:rake gitlab:env:info + sameersbn/gitlab:14.0.6 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1286,7 +1286,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.5 app:rake gitlab:import:repos + sameersbn/gitlab:14.0.6 app:rake gitlab:import:repos ``` Or @@ -1317,7 +1317,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.5 app:rake gitlab:import:repos + sameersbn/gitlab:14.0.6 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1341,12 +1341,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.0.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:14.0.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:14.0.5 +docker pull sameersbn/gitlab:14.0.6 ``` - **Step 2**: Stop and remove the currently running image @@ -1372,7 +1372,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:14.0.5 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.6 ``` ## Shell Access @@ -1410,7 +1410,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.0.5 + image: sameersbn/gitlab:14.0.6 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 1327813cb..122855f1d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.0.5 +14.0.6 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index ca142d39b..bf941a757 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.5 + image: sameersbn/gitlab:14.0.6 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 67058c7e8..7c9990910 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.0.5 + image: sameersbn/gitlab:14.0.6 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 5867bbba4..fd6c87653 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.5 + image: sameersbn/gitlab:14.0.6 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 5a0a619be..2b56ab78a 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.5 app:rake gitlab:backup:create + sameersbn/gitlab:14.0.6 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.5 app:rake gitlab:backup:restore + sameersbn/gitlab:14.0.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.0.6 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.0.5 +docker pull sameersbn/gitlab:14.0.6 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.0.5 +sameersbn/gitlab:14.0.6 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 3a155271b..82c8f1ab2 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.5 + image: sameersbn/gitlab:14.0.6 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 81d13ad4c..540a36f72 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.5 + image: sameersbn/gitlab:14.0.6 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 6f51ac2a5..13a6abf96 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.0.5 + image: sameersbn/gitlab:14.0.6 env: - name: TZ value: Asia/Kolkata From a07ca15aa4eb995dedff68380b4d0ace0f661c92 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 24 Jul 2021 10:11:07 +0200 Subject: [PATCH 095/522] upgrade GitLab CE to 14.1.0 --- Changelog.md | 4 ++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 5fdd5517c..4bbb28e2a 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.1.0** +- gitlab: upgrade CE to v14.1.0 +- gitaly: upgrade to v14.1.0 + **14.0.6** - gitlab: upgrade CE to v14.0.6 - gitaly: upgrade to v14.0.6 diff --git a/Dockerfile b/Dockerfile index 4d7622ef1..547861a8b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210609 -ARG VERSION=14.0.6 +ARG VERSION=14.1.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.6 \ GITLAB_SHELL_VERSION=13.19.0 \ - GITLAB_PAGES_VERSION=1.40.0 \ - GITALY_SERVER_VERSION=14.0.6 \ + GITLAB_PAGES_VERSION=1.41.0 \ + GITALY_SERVER_VERSION=14.1.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 9c4439723..3690a4fac 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.0.6 +# sameersbn/gitlab:14.1.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.0.6 +docker pull sameersbn/gitlab:14.1.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.6 + sameersbn/gitlab:14.1.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.6 + sameersbn/gitlab:14.1.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:14.0.6 + sameersbn/gitlab:14.1.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:14.0.6 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.0.6 + sameersbn/gitlab:14.1.0 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.0.6 + sameersbn/gitlab:14.1.0 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.6 + sameersbn/gitlab:14.1.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.6 + sameersbn/gitlab:14.1.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -484,7 +484,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.6 + sameersbn/gitlab:14.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. @@ -500,7 +500,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.6 + sameersbn/gitlab:14.1.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -523,7 +523,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.6 + sameersbn/gitlab:14.1.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.0.6 + sameersbn/gitlab:14.1.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:14.0.6 + sameersbn/gitlab:14.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:14.0.6 app:sanitize + sameersbn/gitlab:14.1.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:14.0.6 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1207,14 +1207,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.6 app:rake db:setup + sameersbn/gitlab:14.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:14.0.6 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1223,7 +1223,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.6 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1273,7 +1273,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:14.0.6 app:rake gitlab:env:info + sameersbn/gitlab:14.1.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1286,7 +1286,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.6 app:rake gitlab:import:repos + sameersbn/gitlab:14.1.0 app:rake gitlab:import:repos ``` Or @@ -1317,7 +1317,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.6 app:rake gitlab:import:repos + sameersbn/gitlab:14.1.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1341,12 +1341,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.0.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:14.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:14.0.6 +docker pull sameersbn/gitlab:14.1.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1372,7 +1372,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:14.0.6 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.1.0 ``` ## Shell Access @@ -1410,7 +1410,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.0.6 + image: sameersbn/gitlab:14.1.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 122855f1d..7b3b6e02b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.0.6 +14.1.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index bf941a757..9e3c24be5 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.6 + image: sameersbn/gitlab:14.1.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 7c9990910..b3e815e50 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.0.6 + image: sameersbn/gitlab:14.1.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index fd6c87653..415208015 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.6 + image: sameersbn/gitlab:14.1.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 2b56ab78a..3a8ad568c 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.6 app:rake gitlab:backup:create + sameersbn/gitlab:14.1.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.6 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.0.6 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.1.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.0.6 +docker pull sameersbn/gitlab:14.1.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.0.6 +sameersbn/gitlab:14.1.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 82c8f1ab2..4a2281d38 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.6 + image: sameersbn/gitlab:14.1.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 540a36f72..32093a8a5 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.0.6 + image: sameersbn/gitlab:14.1.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 13a6abf96..3fbfeb88f 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.0.6 + image: sameersbn/gitlab:14.1.0 env: - name: TZ value: Asia/Kolkata From cce452ba97e65a9e8de253b9e3bbc8879e6ccb52 Mon Sep 17 00:00:00 2001 From: Carlos Leite Date: Sun, 25 Jul 2021 08:25:00 -0300 Subject: [PATCH 096/522] Fix #2392 - update comments about "_gitlab-data" volume mount point. --- README.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9c4439723..365b74241 100644 --- a/README.md +++ b/README.md @@ -215,7 +215,7 @@ GitLab is a code hosting software and as such you don't want to lose your code w * `/home/git/data` -Note that if you are using the `docker-compose` approach, this has already been done for you. +*Note: that if you are using the `docker-compose` approach, you must "inpect" the volumes (```docker volume inpect```) to check the mounted path.* SELinux users are also required to change the security context of the mount point so that it plays nicely with selinux. @@ -462,7 +462,14 @@ Out of the four files generated above, we need to install the `gitlab.key`, `git The default path that the gitlab application is configured to look for the SSL certificates is at `/home/git/data/certs`, this can however be changed using the `SSL_KEY_PATH`, `SSL_CERTIFICATE_PATH` and `SSL_DHPARAM_PATH` configuration options. -If you remember from above, the `/home/git/data` path is the path of the [data store](#data-store), which means that we have to create a folder named `certs/` inside `/srv/docker/gitlab/gitlab/` and copy the files into it and as a measure of security we'll update the permission on the `gitlab.key` file to only be readable by the owner. +If you remember from above, the `/home/git/data` path is the path of the [data store](#data-store), which means that we have to create a folder named `certs/` inside the volume to where `/home/git/data` point and copy the files into it and as a measure of security we'll update the permission on the `gitlab.key` file to only be readable by the owner. + +In case use of docker-compose ... + +```$>docker volume inspect``` + +look for "< user >_gitlab-data" and copy the "certs" directory into the "Mountpoint" + ```bash mkdir -p /srv/docker/gitlab/gitlab/certs From 8fd3598b88766aa6d6d1fb0c74e3526a55eec784 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 30 Jul 2021 16:38:16 +0200 Subject: [PATCH 097/522] upgrade GitLab CE to 14.1.1 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 4bbb28e2a..51e838dda 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.1.1** +- gitlab: upgrade CE to v14.1.1 +- gitaly: upgrade to v14.1.1 +- ubuntu: upgrade to focal-20210723 + **14.1.0** - gitlab: upgrade CE to v14.1.0 - gitaly: upgrade to v14.1.0 diff --git a/Dockerfile b/Dockerfile index 547861a8b..b83efd78a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ -FROM ubuntu:focal-20210609 +FROM ubuntu:focal-20210723 -ARG VERSION=14.1.0 +ARG VERSION=14.1.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.6 \ GITLAB_SHELL_VERSION=13.19.0 \ GITLAB_PAGES_VERSION=1.41.0 \ - GITALY_SERVER_VERSION=14.1.0 \ + GITALY_SERVER_VERSION=14.1.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index a95ff93ba..2477adcb9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.1.0 +# sameersbn/gitlab:14.1.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.1.0 +docker pull sameersbn/gitlab:14.1.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.1.0 + sameersbn/gitlab:14.1.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.1.0 + sameersbn/gitlab:14.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:14.1.0 + sameersbn/gitlab:14.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:14.1.0 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.1.0 + sameersbn/gitlab:14.1.1 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.1.0 + sameersbn/gitlab:14.1.1 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.1.0 + sameersbn/gitlab:14.1.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.1.0 + sameersbn/gitlab:14.1.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.1.0 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.1.0 + sameersbn/gitlab:14.1.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.1.0 + sameersbn/gitlab:14.1.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.1.0 + sameersbn/gitlab:14.1.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.1.0 + sameersbn/gitlab:14.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:14.1.0 app:sanitize + sameersbn/gitlab:14.1.1 app:sanitize ``` ### Piwik @@ -1179,7 +1179,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1214,14 +1214,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.0 app:rake db:setup + sameersbn/gitlab:14.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:14.1.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1230,7 +1230,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -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:14.1.0 app:rake gitlab:env:info + sameersbn/gitlab:14.1.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:14.1.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.1.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:14.1.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.1.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1348,12 +1348,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.1.0 +docker pull sameersbn/gitlab:14.1.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1379,7 +1379,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:14.1.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.1.1 ``` ## Shell Access @@ -1417,7 +1417,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.1.0 + image: sameersbn/gitlab:14.1.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 7b3b6e02b..26f2bbc19 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.1.0 +14.1.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 9e3c24be5..c90e9b498 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.1.0 + image: sameersbn/gitlab:14.1.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index b3e815e50..ff0e1e36f 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.1.0 + image: sameersbn/gitlab:14.1.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 415208015..98abec56b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.1.0 + image: sameersbn/gitlab:14.1.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 3a8ad568c..71f3af74c 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.1.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.1.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.1.0 +docker pull sameersbn/gitlab:14.1.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.1.0 +sameersbn/gitlab:14.1.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 4a2281d38..dd656df50 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.1.0 + image: sameersbn/gitlab:14.1.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 32093a8a5..b38a373af 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.1.0 + image: sameersbn/gitlab:14.1.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 3fbfeb88f..278609cc7 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.1.0 + image: sameersbn/gitlab:14.1.1 env: - name: TZ value: Asia/Kolkata From bed4200b02790cbe1c8d1fefc93ea1a076945115 Mon Sep 17 00:00:00 2001 From: Akanoa Date: Sat, 3 Jul 2021 14:32:17 +0000 Subject: [PATCH 098/522] feat: allow to configure the packages registry from environment variables --- README.md | 43 ++++++++++++----- assets/runtime/config/gitlabhq/gitlab.yml | 40 +++++++++------- assets/runtime/env-defaults | 56 ++++++++++++++++++----- assets/runtime/functions | 45 ++++++++++++++++++ 4 files changed, 144 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index a95ff93ba..a17a19cd2 100644 --- a/README.md +++ b/README.md @@ -835,6 +835,10 @@ 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` | | `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`| +| `AWS_REGION`| AWS Region. Defaults to `us-east-1` | +| `AWS_HOST`| Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`. Defaults to `s3.amazon.com`| +| `AWS_ENDPOINT`| AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil`| +| `AWS_PATH_STYLE`| Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` | | `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`| @@ -847,10 +851,10 @@ Below is the complete list of available options that can be used to customize yo | `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_AWS_REGION` | AWS Region. Defaults to `$AWS_REGION` | +| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` | +| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` | +| `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 `$AWS_PATH_STYLE` | | `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`)| @@ -864,13 +868,28 @@ Below is the complete list of available options that can be used to customize yo | `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_AWS_REGION` | AWS Region. Defaults to `$AWS_REGION` | +| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` | +| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` | +| `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 `AWS_PATH_STYLE` | | `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_PACKAGES_OBJECT_STORE_ENABLED` | Enables Object Store for Packages that will be remote stored. Defaults to `false` | +| `GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the packages. Defaults to `packages` | +| `GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD` | Set to true to enable direct upload of Packages without the need of local shared storage. Defaults to `false` | +| `GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD` | Temporary option to limit automatic upload. Defaults to `false` | +| `GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD` | Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` | +| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) | +| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `$AWS_ACCESS_KEY_ID` | +| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `$AWS_SECRET_ACCESS_KEY` | +| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `$AWS_REGION` | +| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` | +| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` | +| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE` | +| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| +| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| +| `GITLAB_PACKAGES_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` | @@ -880,10 +899,10 @@ Below is the complete list of available options that can be used to customize yo | `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_AWS_REGION` | AWS Region. Defaults to `$AWS_REGION` | +| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` | +| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` | +| `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 `AWS_PATH_STYLE` | | `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`)| diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 18d3b980e..b8ddc6210 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -320,25 +320,33 @@ production: &base ## Packages (maven repository, npm registry, etc...) packages: - enabled: true + enabled: {{GITLAB_PACKAGES_ENABLED}} # The location where build packages are stored (default: shared/packages). - # storage_path: shared/packages + path: {{GITLAB_PACKAGES_DIR}} object_store: - enabled: false - remote_directory: packages # The bucket name - # direct_upload: false # Use Object Storage directly for uploads instead of background uploads if enabled (Default: false) - # background_upload: false # Temporary option to limit automatic upload (Default: true) - # proxy_download: false # Passthrough all downloads via GitLab instead of using Redirects to Object Storage + enabled: {{GITLAB_PACKAGES_OBJECT_STORE_ENABLED}} + remote_directory: {{GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name + direct_upload: {{GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD}} # Set to true to enable direct upload of Artifacts without the need of local shared storage. + background_upload: {{GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true) + proxy_download: {{GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD}} # Passthrough all downloads via GitLab instead of using Redirects to Object Storage connection: - provider: AWS - aws_access_key_id: AWS_ACCESS_KEY_ID - aws_secret_access_key: AWS_SECRET_ACCESS_KEY - region: us-east-1 - # host: 'localhost' # default: s3.amazonaws.com - # endpoint: 'http://127.0.0.1:9000/' # default: nil - # aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4. - # path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' - + provider: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER}} # Only AWS supported at the moment + #start-packages-aws + aws_access_key_id: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID}} + aws_secret_access_key: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}} + region: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION}} + host: '{{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com + aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4. + endpoint: '{{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil - Useful for S3 compliant services such as DigitalOcean Spaces + path_style: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' + #end-packages-aws + #start-packages-gcs + google_project: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}} + google_client_email: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}} + google_json_key_location: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}} + #end-packages-gcs + + ## Dependency Proxy dependency_proxy: enabled: true diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index ad1ebc18f..32a4a4327 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -103,8 +103,16 @@ GITLAB_WORKHORSE_TIMEOUT=${GITLAB_WORKHORSE_TIMEOUT:-5m0s} # OBJECTSTORE GITLAB_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_OBJECT_STORE_CONNECTION_PROVIDER:-AWS} + +#-- 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} +AWS_HOST=${AWS_REGION:-us-east-1} +AWS_HOST=${AWS_HOST:-s3.amazonaws.com} +AWS_ENDPOINT=${AWS_ENDPOINT:nil} +AWS_ENDPOINT=${AWS_PATH_STYLE:true} + +#-- Google 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"} @@ -124,16 +132,40 @@ GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_ARTIFACTS_OBJECT_STOR # 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} +GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION:-$AWS_REGION} +GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST:-$AWS_HOST} +GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-$AWS_ENDPOINT} +GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-$AWS_PATH_STYLE} # 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} +## PACKAGES +GITLAB_PACKAGES_ENABLED=${GITLAB_PACKAGES_ENABLED:-true} +GITLAB_PACKAGES_DIR="${GITLAB_PACKAGES_DIR:-$GITLAB_SHARED_DIR/packages}" + + +GITLAB_PACKAGES_OBJECT_STORE_ENABLED=${GITLAB_PACKAGES_OBJECT_STORE_ENABLED:-false} +GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY:-packages} +GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD=${GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD:-false} +GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD=${GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD:-false} +GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD=${GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD:-false} +GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER:-$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER} + +# PACKAGES:AWS +GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-$AWS_ACCESS_KEY_ID} +GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-$AWS_SECRET_ACCESS_KEY} +GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION:-$AWS_REGION} +GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST:-$AWS_HOST} +GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-$AWS_ENDPOINT} +GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-$AWS_PATH_STYLE} + +# PACKAGES:Google +GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT} +GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL} +GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB_PACKAGES_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 * * * *"} @@ -152,10 +184,10 @@ GITLAB_LFS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_LFS_OBJECT_STORE_CONNECTION # 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} +GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION:-$AWS_REGION} +GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST:-$AWS_HOST} +GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-$AWS_ENDPOINT} +GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-$AWS_PATH_STYLE} # LFS:Google GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT} @@ -176,10 +208,10 @@ GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_UPLOADS_OBJECT_STORE_CO # 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} +GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION:-$AWS_REGION} +GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST:-$AWS_HOST} +GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-$AWS_ENDPOINT} +GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-$AWS_PATH_STYLE} # Uploads:Google GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT} diff --git a/assets/runtime/functions b/assets/runtime/functions index cd5f501ff..dba058d2a 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1010,6 +1010,50 @@ gitlab_configure_artifacts() { GITLAB_ARTIFACTS_DIR } + +gitlab_configure_packages() { + if [[ ${GITLAB_PACKAGES_OBJECT_STORE_ENABLED} == true ]]; then + echo "Configuring gitlab::packages:object_store" + + if [[ "${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER}" == "Google" ]]; then + echo " -> Google PACKAGES provider selected removing aws config" + exec_as_git sed -i "/#start-packages-aws/,/#end-packages-aws/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#start-packages-gcs/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#end-packages-gcs/d" ${GITLAB_CONFIG} + fi + if [[ "${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER}" == "AWS" ]]; then + echo " -> AWS PACKAGES provider selected removing Google config" + exec_as_git sed -i "/#start-packages-gcs/,/#end-packages-gcs/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#start-packages-aws/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#end-packages-aws/d" ${GITLAB_CONFIG} + fi + + update_template ${GITLAB_CONFIG} \ + GITLAB_PACKAGES_OBJECT_STORE_ENABLED \ + GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY \ + GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD \ + GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD \ + GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD \ + GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER \ + GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \ + GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \ + GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION \ + GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST \ + GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ + GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE \ + GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \ + GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \ + GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION + else + exec_as_git sed -i -e "/path: {{GITLAB_PACKAGES_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::packages..." + update_template ${GITLAB_CONFIG} \ + GITLAB_PACKAGES_ENABLED \ + GITLAB_PACKAGES_DIR +} + gitlab_configure_lfs() { if [[ ${GITLAB_LFS_OBJECT_STORE_ENABLED} == true ]]; then echo "Configuring gitlab::lfs:object_store" @@ -1709,6 +1753,7 @@ configure_gitlab() { gitlab_configure_rack_attack gitlab_configure_ci gitlab_configure_artifacts + gitlab_configure_packages gitlab_configure_lfs gitlab_configure_uploads gitlab_configure_mattermost From a59cf8c65ce61a940ea3bd8b1c7ed06835c11b1e Mon Sep 17 00:00:00 2001 From: Akanoa Date: Sat, 3 Jul 2021 15:24:58 +0000 Subject: [PATCH 099/522] fix: add missing ENV about packages registry --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a17a19cd2..99c5ceccb 100644 --- a/README.md +++ b/README.md @@ -875,6 +875,8 @@ Below is the complete list of available options that can be used to customize yo | `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_PACKAGES_ENABLED` | Enable/Disable Pakages support. Defaults to `true`. | +| `GITLAB_PACKAGES_DIR` | Directory to store the packages data. Defaults to `$GITLAB_SHARED_DIR/packages` | | `GITLAB_PACKAGES_OBJECT_STORE_ENABLED` | Enables Object Store for Packages that will be remote stored. Defaults to `false` | | `GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the packages. Defaults to `packages` | | `GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD` | Set to true to enable direct upload of Packages without the need of local shared storage. Defaults to `false` | From cfa1fe2e28f98d936eeffe8d9416e5cdd439398a Mon Sep 17 00:00:00 2001 From: Akanoa Date: Sat, 3 Jul 2021 17:45:56 +0000 Subject: [PATCH 100/522] fix: bad default value --- assets/runtime/config/gitlabhq/gitlab.yml | 2 +- assets/runtime/env-defaults | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index b8ddc6210..236c27b7a 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -326,7 +326,7 @@ production: &base object_store: enabled: {{GITLAB_PACKAGES_OBJECT_STORE_ENABLED}} remote_directory: {{GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name - direct_upload: {{GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD}} # Set to true to enable direct upload of Artifacts without the need of local shared storage. + direct_upload: {{GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD}} # Set to true to enable direct upload of Packages without the need of local shared storage. background_upload: {{GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD}} # Temporary option to limit automatic upload (Default: true) proxy_download: {{GITLAB_PACKAGES_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 32a4a4327..3674ad175 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -107,10 +107,10 @@ GITLAB_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_OBJECT_STORE_CONNECTION_PROVIDE #-- 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} -AWS_HOST=${AWS_REGION:-us-east-1} +AWS_REGION=${AWS_REGION:-us-east-1} AWS_HOST=${AWS_HOST:-s3.amazonaws.com} -AWS_ENDPOINT=${AWS_ENDPOINT:nil} -AWS_ENDPOINT=${AWS_PATH_STYLE:true} +AWS_ENDPOINT=${AWS_ENDPOINT:-nil} +AWS_PATH_STYLE=${AWS_PATH_STYLE:-true} #-- Google GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT} From e2354ed8aa8e60a4a35a16e4b9e5df10b571c0f8 Mon Sep 17 00:00:00 2001 From: Akanoa Date: Fri, 30 Jul 2021 22:41:31 +0000 Subject: [PATCH 101/522] feat: Add "AWS_SIGNATURE_VERSION" related environment variables --- README.md | 4 ++++ assets/runtime/config/gitlabhq/gitlab.yml | 7 ++++--- assets/runtime/env-defaults | 5 +++++ assets/runtime/functions | 4 ++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 99c5ceccb..8bc7497fd 100644 --- a/README.md +++ b/README.md @@ -839,6 +839,7 @@ Below is the complete list of available options that can be used to customize yo | `AWS_HOST`| Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`. Defaults to `s3.amazon.com`| | `AWS_ENDPOINT`| AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil`| | `AWS_PATH_STYLE`| Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` | +| `AWS_SIGNATURE_VERSION`| AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `4` | | `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`| @@ -855,6 +856,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 `$AWS_HOST` | | `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` | | `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 `$AWS_PATH_STYLE` | +| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` | AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION` | | `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`)| @@ -872,6 +874,7 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` | | `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` | | `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 `AWS_PATH_STYLE` | +| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` | AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION` | | `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`)| @@ -905,6 +908,7 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` | | `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` | | `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 `AWS_PATH_STYLE` | +| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` | AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION` | | `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`)| diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 236c27b7a..c5dd61269 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -229,7 +229,7 @@ production: &base 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 - aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4. + aws_signature_version: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION}} # For creation of signed URLs. Set to 2 if provider does not support v4. endpoint: '{{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil - Useful for S3 compliant services such as DigitalOcean Spaces path_style: {{GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' #end-artifacts-aws @@ -273,6 +273,7 @@ production: &base #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}} + aws_signature_version: {{GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION}} # For creation of signed URLs. Set to 2 if provider does not support v4. 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 @@ -306,7 +307,7 @@ production: &base #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}} - aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4. + aws_signature_version: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION}} # For creation of signed URLs. Set to 2 if provider does not support v4. 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 @@ -336,7 +337,7 @@ production: &base aws_secret_access_key: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}} region: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION}} host: '{{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com - aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4. + aws_signature_version: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION}} # For creation of signed URLs. Set to 2 if provider does not support v4. endpoint: '{{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil - Useful for S3 compliant services such as DigitalOcean Spaces path_style: {{GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' #end-packages-aws diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 3674ad175..7dac47c09 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -111,6 +111,7 @@ AWS_REGION=${AWS_REGION:-us-east-1} AWS_HOST=${AWS_HOST:-s3.amazonaws.com} AWS_ENDPOINT=${AWS_ENDPOINT:-nil} AWS_PATH_STYLE=${AWS_PATH_STYLE:-true} +AWS_SIGNATURE_VERSION=${AWS_SIGNATURE_VERSION:-4} #-- Google GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT} @@ -136,6 +137,7 @@ GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_ARTIFACTS_OBJECT_ST GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST:-$AWS_HOST} GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-$AWS_ENDPOINT} GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-$AWS_PATH_STYLE} +GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION:-$AWS_SIGNATURE_VERSION} # ARTIFACTS:Google GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT} @@ -161,6 +163,7 @@ GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_PACKAGES_OBJECT_STOR GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST:-$AWS_HOST} GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-$AWS_ENDPOINT} GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-$AWS_PATH_STYLE} +GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION:-$AWS_SIGNATURE_VERSION} # PACKAGES:Google GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT} @@ -188,6 +191,7 @@ GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_LFS_OBJECT_STORE_CONNECTI GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST:-$AWS_HOST} GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-$AWS_ENDPOINT} GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-$AWS_PATH_STYLE} +GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION=${GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION:-$AWS_SIGNATURE_VERSION} # LFS:Google GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT} @@ -212,6 +216,7 @@ GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_UPLOADS_OBJECT_STORE_ GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST:-$AWS_HOST} GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-$AWS_ENDPOINT} GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-$AWS_PATH_STYLE} +GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION:-$AWS_SIGNATURE_VERSION} # Uploads:Google GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT} diff --git a/assets/runtime/functions b/assets/runtime/functions index dba058d2a..4655af157 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -997,6 +997,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 \ + GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION \ GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \ GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \ GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION @@ -1041,6 +1042,7 @@ gitlab_configure_packages() { GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST \ GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE \ + GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION \ GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \ GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \ GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION @@ -1084,6 +1086,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 \ + GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION \ GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \ GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \ GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION @@ -1127,6 +1130,7 @@ 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 \ + GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION \ GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \ GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \ GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION From f32348120679fdb13232bcb38f4e19172d488b32 Mon Sep 17 00:00:00 2001 From: Jonathan Kline Date: Mon, 2 Aug 2021 16:39:10 -0500 Subject: [PATCH 102/522] Corrected a typo in the artifacts section to allow proper updating and replacement of the AWS_SIGNING_VERSION for artifacts --- assets/runtime/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index 4655af157..c691ffe58 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -997,7 +997,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 \ - GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION \ + GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION \ GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \ GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \ GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION From d17a838e32fe6588abb49ea7b1253338ef0ab6a7 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 4 Aug 2021 16:46:17 +0200 Subject: [PATCH 103/522] upgrade GitLab CE to 14.1.2 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 51e838dda..cf913fa74 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.1.2** +- gitlab: upgrade CE to v14.1.2 +- gitaly: upgrade to v14.1.2 +- gitlab-shell: upgrade to v13.19.1 + **14.1.1** - gitlab: upgrade CE to v14.1.1 - gitaly: upgrade to v14.1.1 diff --git a/Dockerfile b/Dockerfile index b83efd78a..327f008c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210723 -ARG VERSION=14.1.1 +ARG VERSION=14.1.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.16.6 \ - GITLAB_SHELL_VERSION=13.19.0 \ + GITLAB_SHELL_VERSION=13.19.1 \ GITLAB_PAGES_VERSION=1.41.0 \ - GITALY_SERVER_VERSION=14.1.1 \ + GITALY_SERVER_VERSION=14.1.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 3cda1b29c..3345b8fd5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.1.1 +# sameersbn/gitlab:14.1.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.1.1 +docker pull sameersbn/gitlab:14.1.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.1.1 + sameersbn/gitlab:14.1.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.1.1 + sameersbn/gitlab:14.1.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:14.1.1 + sameersbn/gitlab:14.1.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:14.1.1 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.1.1 + sameersbn/gitlab:14.1.2 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.1.1 + sameersbn/gitlab:14.1.2 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.1.1 + sameersbn/gitlab:14.1.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.1.1 + sameersbn/gitlab:14.1.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.1.1 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.1.1 + sameersbn/gitlab:14.1.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.1.1 + sameersbn/gitlab:14.1.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.1.1 + sameersbn/gitlab:14.1.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.1.1 + sameersbn/gitlab:14.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:14.1.1 app:sanitize + sameersbn/gitlab:14.1.2 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.1 app:rake db:setup + sameersbn/gitlab:14.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:14.1.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.1.1 app:rake gitlab:env:info + sameersbn/gitlab:14.1.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.1.2 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.1.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.1.1 +docker pull sameersbn/gitlab:14.1.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.1.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.1.2 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.1.1 + image: sameersbn/gitlab:14.1.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 26f2bbc19..900dba2dd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.1.1 +14.1.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index c90e9b498..52f1e5117 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.1.1 + image: sameersbn/gitlab:14.1.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index ff0e1e36f..d9ad5a1b2 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.1.1 + image: sameersbn/gitlab:14.1.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 98abec56b..406e62868 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.1.1 + image: sameersbn/gitlab:14.1.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 71f3af74c..64d290946 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.1.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.1.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.1.1 +docker pull sameersbn/gitlab:14.1.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.1.1 +sameersbn/gitlab:14.1.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index dd656df50..46fc88236 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.1.1 + image: sameersbn/gitlab:14.1.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index b38a373af..34f9caafe 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.1.1 + image: sameersbn/gitlab:14.1.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 278609cc7..156c427c2 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.1.1 + image: sameersbn/gitlab:14.1.2 env: - name: TZ value: Asia/Kolkata From edb13cf1b8066a05c37ed6607f352d0653b085df Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 21 Aug 2021 09:32:03 +0200 Subject: [PATCH 104/522] upgrade GitLab CE to 14.1.3 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index cf913fa74..0e33dd66e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.1.3** +- gitlab: upgrade CE to v14.1.3 +- gitaly: upgrade to v14.1.3 +- golang: upgrade to v1.16.7 + **14.1.2** - gitlab: upgrade CE to v14.1.2 - gitaly: upgrade to v14.1.2 diff --git a/Dockerfile b/Dockerfile index 327f008c5..6633c6d2c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210723 -ARG VERSION=14.1.2 +ARG VERSION=14.1.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ - GOLANG_VERSION=1.16.6 \ + GOLANG_VERSION=1.16.7 \ GITLAB_SHELL_VERSION=13.19.1 \ GITLAB_PAGES_VERSION=1.41.0 \ - GITALY_SERVER_VERSION=14.1.2 \ + GITALY_SERVER_VERSION=14.1.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 3345b8fd5..f602655ec 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.1.2 +# sameersbn/gitlab:14.1.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.1.2 +docker pull sameersbn/gitlab:14.1.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.1.2 + sameersbn/gitlab:14.1.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.1.2 + sameersbn/gitlab:14.1.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:14.1.2 + sameersbn/gitlab:14.1.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:14.1.2 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.1.2 + sameersbn/gitlab:14.1.3 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.1.2 + sameersbn/gitlab:14.1.3 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.1.2 + sameersbn/gitlab:14.1.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.1.2 + sameersbn/gitlab:14.1.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.1.2 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.1.2 + sameersbn/gitlab:14.1.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.1.2 + sameersbn/gitlab:14.1.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.1.2 + sameersbn/gitlab:14.1.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.1.2 + sameersbn/gitlab:14.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:14.1.2 app:sanitize + sameersbn/gitlab:14.1.3 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.2 app:rake db:setup + sameersbn/gitlab:14.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:14.1.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.1.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.1.2 app:rake gitlab:env:info + sameersbn/gitlab:14.1.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.1.3 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.1.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.1.2 +docker pull sameersbn/gitlab:14.1.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.1.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.1.3 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.1.2 + image: sameersbn/gitlab:14.1.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 900dba2dd..e84178ff7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.1.2 +14.1.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 52f1e5117..cacb7f5c2 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.1.2 + image: sameersbn/gitlab:14.1.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index d9ad5a1b2..9c1156bcd 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.1.2 + image: sameersbn/gitlab:14.1.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 406e62868..5b5d5f72d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.1.2 + image: sameersbn/gitlab:14.1.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 64d290946..5fa3b6f51 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.1.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.1.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.1.2 +docker pull sameersbn/gitlab:14.1.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.1.2 +sameersbn/gitlab:14.1.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 46fc88236..df526e76f 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.1.2 + image: sameersbn/gitlab:14.1.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 34f9caafe..fcf78c54c 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.1.2 + image: sameersbn/gitlab:14.1.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 156c427c2..8d4ad70ff 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.1.2 + image: sameersbn/gitlab:14.1.3 env: - name: TZ value: Asia/Kolkata From adc74554af48cdddbb899df0d2f0313f54e82956 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 22 Aug 2021 21:15:28 +0200 Subject: [PATCH 105/522] upgrade GitLab CE to 14.2.0 --- Changelog.md | 6 +++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 49 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 0e33dd66e..947343dab 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.2.0** +- gitlab: upgrade CE to v14.2.0 +- gitaly: upgrade to v14.2.0 +- gitlab-pages: upgrade to v1.42.0 +- golang: upgrade to v1.17 + **14.1.3** - gitlab: upgrade CE to v14.1.3 - gitaly: upgrade to v14.1.3 diff --git a/Dockerfile b/Dockerfile index 6633c6d2c..4acc4f7d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210723 -ARG VERSION=14.1.3 +ARG VERSION=14.2.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ - GOLANG_VERSION=1.16.7 \ + GOLANG_VERSION=1.17 \ GITLAB_SHELL_VERSION=13.19.1 \ - GITLAB_PAGES_VERSION=1.41.0 \ - GITALY_SERVER_VERSION=14.1.3 \ + GITLAB_PAGES_VERSION=1.42.0 \ + GITALY_SERVER_VERSION=14.2.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index f602655ec..abcf7bc64 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.1.3 +# sameersbn/gitlab:14.2.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.1.3 +docker pull sameersbn/gitlab:14.2.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.1.3 + sameersbn/gitlab:14.2.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.1.3 + sameersbn/gitlab:14.2.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:14.1.3 + sameersbn/gitlab:14.2.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:14.1.3 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.1.3 + sameersbn/gitlab:14.2.0 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.1.3 + sameersbn/gitlab:14.2.0 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.1.3 + sameersbn/gitlab:14.2.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.1.3 + sameersbn/gitlab:14.2.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.1.3 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.1.3 + sameersbn/gitlab:14.2.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.1.3 + sameersbn/gitlab:14.2.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.1.3 + sameersbn/gitlab:14.2.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.1.3 + sameersbn/gitlab:14.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:14.1.3 app:sanitize + sameersbn/gitlab:14.2.0 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.3 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.3 app:rake db:setup + sameersbn/gitlab:14.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:14.1.3 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.1.3 app:rake gitlab:env:info + sameersbn/gitlab:14.2.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.3 app:rake gitlab:import:repos + sameersbn/gitlab:14.2.0 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.3 app:rake gitlab:import:repos + sameersbn/gitlab:14.2.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.1.3 +docker pull sameersbn/gitlab:14.2.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.1.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.0 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.1.3 + image: sameersbn/gitlab:14.2.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index e84178ff7..07ea9fa43 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.1.3 +14.2.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index cacb7f5c2..a8706fa92 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.1.3 + image: sameersbn/gitlab:14.2.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 9c1156bcd..45b41b549 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.1.3 + image: sameersbn/gitlab:14.2.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 5b5d5f72d..e7969e8d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.1.3 + image: sameersbn/gitlab:14.2.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 5fa3b6f51..f043b1d0e 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.3 app:rake gitlab:backup:create + sameersbn/gitlab:14.2.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.3 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.1.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.2.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.1.3 +docker pull sameersbn/gitlab:14.2.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.1.3 +sameersbn/gitlab:14.2.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index df526e76f..32a63bd69 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.1.3 + image: sameersbn/gitlab:14.2.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index fcf78c54c..665573b2f 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.1.3 + image: sameersbn/gitlab:14.2.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 8d4ad70ff..dcfa0e36c 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.1.3 + image: sameersbn/gitlab:14.2.0 env: - name: TZ value: Asia/Kolkata From 93a47b7d75d984c612475ffcdc636d84e632d468 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 24 Aug 2021 20:55:08 +0200 Subject: [PATCH 106/522] Update patch '0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch' --- ...eature-checking-for-gitaly-on-a-fresh-install.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch b/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch index 86c366105..2b80cde1d 100644 --- a/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch +++ b/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch @@ -1,19 +1,19 @@ diff --git a/lib/feature.rb b/lib/feature.rb -index 7cf40b63fdf..f225a666cfc 100644 +index f8d34e9c386..549c7fc063e 100644 --- a/lib/feature.rb +++ b/lib/feature.rb -@@ -33,6 +33,7 @@ class Feature +@@ -37,6 +37,7 @@ def get(key) def persisted_names - return [] unless Gitlab::Database.exists? + return [] unless Gitlab::Database.main.exists? + return [] unless Feature::FlipperFeature.table_exists? # This loads names of all stored feature flags # and returns a stable Set in the following order: -@@ -67,6 +68,7 @@ class Feature +@@ -74,6 +75,7 @@ def enabled?(key, thing = nil, type: :development, default_enabled: false) # During setup the database does not exist yet. So we haven't stored a value # for the feature yet and return the default. - return default_enabled unless Gitlab::Database.exists? + return default_enabled unless Gitlab::Database.main.exists? + return default_enabled unless Feature::FlipperFeature.table_exists? feature = get(key) From 6cfafa60bc6bf47860d8e217bbd55e934afdeafe Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 25 Aug 2021 06:09:32 +0200 Subject: [PATCH 107/522] upgrade GitLab CE to 14.2.1 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 947343dab..415e9d181 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.2.0** +- gitlab: upgrade CE to v14.2.1 +- gitaly: upgrade to v14.2.1 + **14.2.0** - gitlab: upgrade CE to v14.2.0 - gitaly: upgrade to v14.2.0 diff --git a/Dockerfile b/Dockerfile index 4acc4f7d6..7524ddc32 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210723 -ARG VERSION=14.2.0 +ARG VERSION=14.2.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.17 \ GITLAB_SHELL_VERSION=13.19.1 \ GITLAB_PAGES_VERSION=1.42.0 \ - GITALY_SERVER_VERSION=14.2.0 \ + GITALY_SERVER_VERSION=14.2.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index abcf7bc64..8704540fa 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.2.0 +# sameersbn/gitlab:14.2.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.2.0 +docker pull sameersbn/gitlab:14.2.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.0 + sameersbn/gitlab:14.2.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.0 + sameersbn/gitlab:14.2.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:14.2.0 + sameersbn/gitlab:14.2.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:14.2.0 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.2.0 + sameersbn/gitlab:14.2.1 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.2.0 + sameersbn/gitlab:14.2.1 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.0 + sameersbn/gitlab:14.2.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.0 + sameersbn/gitlab:14.2.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.2.0 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.2.0 + sameersbn/gitlab:14.2.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.2.0 + sameersbn/gitlab:14.2.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.2.0 + sameersbn/gitlab:14.2.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.2.0 + sameersbn/gitlab:14.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:14.2.0 app:sanitize + sameersbn/gitlab:14.2.1 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.0 app:rake db:setup + sameersbn/gitlab:14.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:14.2.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.2.0 app:rake gitlab:env:info + sameersbn/gitlab:14.2.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.2.1 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.2.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.2.0 +docker pull sameersbn/gitlab:14.2.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.2.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.1 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.2.0 + image: sameersbn/gitlab:14.2.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 07ea9fa43..dab6a80f4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.2.0 +14.2.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index a8706fa92..abf12237b 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.0 + image: sameersbn/gitlab:14.2.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 45b41b549..2f41597a9 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.2.0 + image: sameersbn/gitlab:14.2.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index e7969e8d8..7f7daa7bb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.0 + image: sameersbn/gitlab:14.2.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index f043b1d0e..96a30891b 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.2.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.2.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.2.0 +docker pull sameersbn/gitlab:14.2.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.2.0 +sameersbn/gitlab:14.2.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 32a63bd69..4c90d2c80 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.0 + image: sameersbn/gitlab:14.2.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 665573b2f..06ed540cb 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.0 + image: sameersbn/gitlab:14.2.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index dcfa0e36c..2dc6632d6 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.2.0 + image: sameersbn/gitlab:14.2.1 env: - name: TZ value: Asia/Kolkata From b63a36883276140e06708e53c622a771671f654e Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 1 Sep 2021 08:31:39 +0200 Subject: [PATCH 108/522] upgrade GitLab CE to 14.2.2 --- Changelog.md | 7 +++- Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 415e9d181..62870f1d0 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,7 +3,12 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. -**14.2.0** +**14.2.2** +- gitlab: upgrade CE to v14.2.2 +- gitaly: upgrade to v14.2.2 +- ubuntu: upgrade to focal-20210827 + +**14.2.1** - gitlab: upgrade CE to v14.2.1 - gitaly: upgrade to v14.2.1 diff --git a/Dockerfile b/Dockerfile index 7524ddc32..2178de715 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ -FROM ubuntu:focal-20210723 +FROM ubuntu:focal-20210827 -ARG VERSION=14.2.1 +ARG VERSION=14.2.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.17 \ GITLAB_SHELL_VERSION=13.19.1 \ GITLAB_PAGES_VERSION=1.42.0 \ - GITALY_SERVER_VERSION=14.2.1 \ + GITALY_SERVER_VERSION=14.2.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 8704540fa..dedd8e8f7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.2.1 +# sameersbn/gitlab:14.2.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.2.1 +docker pull sameersbn/gitlab:14.2.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.1 + sameersbn/gitlab:14.2.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.1 + sameersbn/gitlab:14.2.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:14.2.1 + sameersbn/gitlab:14.2.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:14.2.1 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.2.1 + sameersbn/gitlab:14.2.2 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.2.1 + sameersbn/gitlab:14.2.2 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.1 + sameersbn/gitlab:14.2.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.1 + sameersbn/gitlab:14.2.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.2.1 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.2.1 + sameersbn/gitlab:14.2.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.2.1 + sameersbn/gitlab:14.2.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.2.1 + sameersbn/gitlab:14.2.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.2.1 + sameersbn/gitlab:14.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:14.2.1 app:sanitize + sameersbn/gitlab:14.2.2 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.1 app:rake db:setup + sameersbn/gitlab:14.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:14.2.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.2.1 app:rake gitlab:env:info + sameersbn/gitlab:14.2.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.2.2 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.2.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.2.1 +docker pull sameersbn/gitlab:14.2.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.2.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.2 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.2.1 + image: sameersbn/gitlab:14.2.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index dab6a80f4..e4eccd4e6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.2.1 +14.2.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index abf12237b..4a9bd6270 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.1 + image: sameersbn/gitlab:14.2.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 2f41597a9..85b2d0b62 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.2.1 + image: sameersbn/gitlab:14.2.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 7f7daa7bb..d0a48f610 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.1 + image: sameersbn/gitlab:14.2.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 96a30891b..9ecd4031f 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.2.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.2.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.2.1 +docker pull sameersbn/gitlab:14.2.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.2.1 +sameersbn/gitlab:14.2.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 4c90d2c80..6889e1fef 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.1 + image: sameersbn/gitlab:14.2.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 06ed540cb..be2757cc3 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.1 + image: sameersbn/gitlab:14.2.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 2dc6632d6..8110c391c 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.2.1 + image: sameersbn/gitlab:14.2.2 env: - name: TZ value: Asia/Kolkata From 63f42c6329400fe4eac3424eb3d220881db7e2ee Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Mon, 6 Sep 2021 20:25:40 +0200 Subject: [PATCH 109/522] upgrade GitLab CE to 14.2.3 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 62870f1d0..c4618cd17 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.2.2** +- gitlab: upgrade CE to v14.2.3 +- gitaly: upgrade to v14.2.3 + **14.2.2** - gitlab: upgrade CE to v14.2.2 - gitaly: upgrade to v14.2.2 diff --git a/Dockerfile b/Dockerfile index 2178de715..d1e4b4ad0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210827 -ARG VERSION=14.2.2 +ARG VERSION=14.2.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.17 \ GITLAB_SHELL_VERSION=13.19.1 \ GITLAB_PAGES_VERSION=1.42.0 \ - GITALY_SERVER_VERSION=14.2.2 \ + GITALY_SERVER_VERSION=14.2.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index dedd8e8f7..2b6e0fa34 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.2.2 +# sameersbn/gitlab:14.2.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.2.2 +docker pull sameersbn/gitlab:14.2.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.2 + sameersbn/gitlab:14.2.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.2 + sameersbn/gitlab:14.2.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:14.2.2 + sameersbn/gitlab:14.2.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:14.2.2 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.2.2 + sameersbn/gitlab:14.2.3 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.2.2 + sameersbn/gitlab:14.2.3 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.2 + sameersbn/gitlab:14.2.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.2 + sameersbn/gitlab:14.2.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.2.2 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.2.2 + sameersbn/gitlab:14.2.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.2.2 + sameersbn/gitlab:14.2.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.2.2 + sameersbn/gitlab:14.2.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.2.2 + sameersbn/gitlab:14.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:14.2.2 app:sanitize + sameersbn/gitlab:14.2.3 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.2 app:rake db:setup + sameersbn/gitlab:14.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:14.2.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.2.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.2.2 app:rake gitlab:env:info + sameersbn/gitlab:14.2.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.2.3 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.2.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.2.2 +docker pull sameersbn/gitlab:14.2.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.2.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.3 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.2.2 + image: sameersbn/gitlab:14.2.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index e4eccd4e6..0c2380a58 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.2.2 +14.2.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 4a9bd6270..cecab6680 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.2 + image: sameersbn/gitlab:14.2.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 85b2d0b62..a9caecd7d 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.2.2 + image: sameersbn/gitlab:14.2.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index d0a48f610..2ab3bdfb8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.2 + image: sameersbn/gitlab:14.2.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 9ecd4031f..b3457b31e 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.2.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.2.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.2.2 +docker pull sameersbn/gitlab:14.2.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.2.2 +sameersbn/gitlab:14.2.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 6889e1fef..3132dd146 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.2 + image: sameersbn/gitlab:14.2.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index be2757cc3..4d4737960 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.2 + image: sameersbn/gitlab:14.2.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 8110c391c..11be12160 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.2.2 + image: sameersbn/gitlab:14.2.3 env: - name: TZ value: Asia/Kolkata From e87e745d840659b1b749696bc7b4c5ad6fa77f8c Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 7 Sep 2021 17:26:02 +0200 Subject: [PATCH 110/522] Update Changelog.md --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index c4618cd17..ec6778a55 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,7 +3,7 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. -**14.2.2** +**14.2.3** - gitlab: upgrade CE to v14.2.3 - gitaly: upgrade to v14.2.3 From 5450cc4b7aedd39ac0ba34485fcc82497932a4b1 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 18 Sep 2021 07:08:56 +0200 Subject: [PATCH 111/522] upgrade GitLab CE to 14.2.4 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index ec6778a55..2e413df60 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.2.4** +- gitlab: upgrade CE to v14.2.4 +- gitaly: upgrade to v14.2.4 +- golang: upgrade to v1.17.1 + **14.2.3** - gitlab: upgrade CE to v14.2.3 - gitaly: upgrade to v14.2.3 diff --git a/Dockerfile b/Dockerfile index d1e4b4ad0..f6772d5fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210827 -ARG VERSION=14.2.3 +ARG VERSION=14.2.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ - GOLANG_VERSION=1.17 \ + GOLANG_VERSION=1.17.1 \ GITLAB_SHELL_VERSION=13.19.1 \ GITLAB_PAGES_VERSION=1.42.0 \ - GITALY_SERVER_VERSION=14.2.3 \ + GITALY_SERVER_VERSION=14.2.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 2b6e0fa34..b7003d22d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.2.3 +# sameersbn/gitlab:14.2.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.2.3 +docker pull sameersbn/gitlab:14.2.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.3 + sameersbn/gitlab:14.2.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.3 + sameersbn/gitlab:14.2.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:14.2.3 + sameersbn/gitlab:14.2.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:14.2.3 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.2.3 + sameersbn/gitlab:14.2.4 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.2.3 + sameersbn/gitlab:14.2.4 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.3 + sameersbn/gitlab:14.2.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.3 + sameersbn/gitlab:14.2.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.2.3 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.2.3 + sameersbn/gitlab:14.2.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.2.3 + sameersbn/gitlab:14.2.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.2.3 + sameersbn/gitlab:14.2.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.2.3 + sameersbn/gitlab:14.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:14.2.3 app:sanitize + sameersbn/gitlab:14.2.4 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.3 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.3 app:rake db:setup + sameersbn/gitlab:14.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:14.2.3 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.2.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.2.3 app:rake gitlab:env:info + sameersbn/gitlab:14.2.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.3 app:rake gitlab:import:repos + sameersbn/gitlab:14.2.4 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.3 app:rake gitlab:import:repos + sameersbn/gitlab:14.2.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.2.3 +docker pull sameersbn/gitlab:14.2.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.2.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.4 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.2.3 + image: sameersbn/gitlab:14.2.4 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 0c2380a58..0d51f0564 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.2.3 +14.2.4 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index cecab6680..f94fafe35 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.3 + image: sameersbn/gitlab:14.2.4 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index a9caecd7d..93895950d 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.2.3 + image: sameersbn/gitlab:14.2.4 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 2ab3bdfb8..942dced8d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.3 + image: sameersbn/gitlab:14.2.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index b3457b31e..26c89d90f 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.3 app:rake gitlab:backup:create + sameersbn/gitlab:14.2.4 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.3 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.2.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.2.3 +docker pull sameersbn/gitlab:14.2.4 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.2.3 +sameersbn/gitlab:14.2.4 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 3132dd146..f1ce83c56 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.3 + image: sameersbn/gitlab:14.2.4 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 4d4737960..d4bbc45d3 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.3 + image: sameersbn/gitlab:14.2.4 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 11be12160..278ebaad8 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.2.3 + image: sameersbn/gitlab:14.2.4 env: - name: TZ value: Asia/Kolkata From 6fd5c2d2d3dfac52578092a963882d827b1f93fe Mon Sep 17 00:00:00 2001 From: Alessio Date: Mon, 4 Oct 2021 14:21:38 +0200 Subject: [PATCH 112/522] Update Gitlab to 14.2.5 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 2e413df60..1b622584c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.2.5** +- gitlab: upgrade CE to v14.2.5 +- gitaly: upgrade to v14.2.5 +- gitlab-pages: upgrade to v1.45.0 + **14.2.4** - gitlab: upgrade CE to v14.2.4 - gitaly: upgrade to v14.2.4 diff --git a/Dockerfile b/Dockerfile index f6772d5fb..e1b12e058 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM ubuntu:focal-20210827 -ARG VERSION=14.2.4 +ARG VERSION=14.2.5 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.17.1 \ GITLAB_SHELL_VERSION=13.19.1 \ - GITLAB_PAGES_VERSION=1.42.0 \ - GITALY_SERVER_VERSION=14.2.4 \ + GITLAB_PAGES_VERSION=1.45.0 \ + GITALY_SERVER_VERSION=14.2.5 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index b7003d22d..19bceb27f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.2.4 +# sameersbn/gitlab:14.2.5 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.2.4 +docker pull sameersbn/gitlab:14.2.5 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.4 + sameersbn/gitlab:14.2.5 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.4 + sameersbn/gitlab:14.2.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:14.2.4 + sameersbn/gitlab:14.2.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:14.2.4 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.2.4 + sameersbn/gitlab:14.2.5 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.2.4 + sameersbn/gitlab:14.2.5 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.4 + sameersbn/gitlab:14.2.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.4 + sameersbn/gitlab:14.2.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.2.4 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.2.4 + sameersbn/gitlab:14.2.5 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.2.4 + sameersbn/gitlab:14.2.5 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.2.4 + sameersbn/gitlab:14.2.5 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.2.4 + sameersbn/gitlab:14.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:14.2.4 app:sanitize + sameersbn/gitlab:14.2.5 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.4 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.4 app:rake db:setup + sameersbn/gitlab:14.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:14.2.4 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.2.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.2.4 app:rake gitlab:env:info + sameersbn/gitlab:14.2.5 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.4 app:rake gitlab:import:repos + sameersbn/gitlab:14.2.5 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.4 app:rake gitlab:import:repos + sameersbn/gitlab:14.2.5 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.2.4 +docker pull sameersbn/gitlab:14.2.5 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.2.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.5 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.2.4 + image: sameersbn/gitlab:14.2.5 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 0d51f0564..56fe42e45 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.2.4 +14.2.5 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index f94fafe35..ff46b1491 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.4 + image: sameersbn/gitlab:14.2.5 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 93895950d..a1e4dcdee 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.2.4 + image: sameersbn/gitlab:14.2.5 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 942dced8d..13623bec6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.4 + image: sameersbn/gitlab:14.2.5 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 26c89d90f..268cbb120 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.4 app:rake gitlab:backup:create + sameersbn/gitlab:14.2.5 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.4 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.2.5 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.2.4 +docker pull sameersbn/gitlab:14.2.5 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.2.4 +sameersbn/gitlab:14.2.5 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index f1ce83c56..67791743f 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.4 + image: sameersbn/gitlab:14.2.5 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index d4bbc45d3..2e3091748 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.4 + image: sameersbn/gitlab:14.2.5 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 278ebaad8..476678966 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.2.4 + image: sameersbn/gitlab:14.2.5 env: - name: TZ value: Asia/Kolkata From b98e6904de645c06e9fd5337fd07e34689180c87 Mon Sep 17 00:00:00 2001 From: Alessio Date: Tue, 5 Oct 2021 19:18:00 +0200 Subject: [PATCH 113/522] Revert change to gitlab pages version --- Changelog.md | 1 - Dockerfile | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index 1b622584c..ed39caff1 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,7 +6,6 @@ https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list **14.2.5** - gitlab: upgrade CE to v14.2.5 - gitaly: upgrade to v14.2.5 -- gitlab-pages: upgrade to v1.45.0 **14.2.4** - gitlab: upgrade CE to v14.2.4 diff --git a/Dockerfile b/Dockerfile index e1b12e058..607a156e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7 \ GOLANG_VERSION=1.17.1 \ GITLAB_SHELL_VERSION=13.19.1 \ - GITLAB_PAGES_VERSION=1.45.0 \ + GITLAB_PAGES_VERSION=1.42.0 \ GITALY_SERVER_VERSION=14.2.5 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ From 173e5e25a38c7d229ea1f66240d058124b6687d4 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Wed, 15 Sep 2021 14:20:39 +0900 Subject: [PATCH 114/522] Install ruby from source (v2.4.2) --- Dockerfile | 8 +++----- assets/build/install.sh | 18 ++++++++++++++++-- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 607a156e3..914fc08d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,8 @@ FROM ubuntu:focal-20210827 ARG VERSION=14.2.5 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=2.7 \ + RUBY_VERSION=2.7.2 \ + RUBY_SOURCE_SHA256SUM="6e5706d0d4ee4e1e2f883db9d768586b4d06567debea353c796ec45e8321c3d4" \ GOLANG_VERSION=1.17.1 \ GITLAB_SHELL_VERSION=13.19.1 \ GITLAB_PAGES_VERSION=1.42.0 \ @@ -31,8 +32,6 @@ RUN apt-get update \ RUN set -ex && \ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \ && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu focal 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 focal 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 focal main" >> /etc/apt/sources.list \ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ @@ -46,7 +45,7 @@ RUN set -ex && \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ sudo supervisor logrotate locales curl \ nginx openssh-server postgresql-client-12 postgresql-contrib-12 redis-tools \ - git-core ruby${RUBY_VERSION} python3 python3-docutils nodejs yarn gettext-base graphicsmagick \ + git-core python3 python3-docutils nodejs yarn gettext-base graphicsmagick \ libpq5 zlib1g libyaml-0-2 libssl1.1 \ libgdbm6 libreadline8 libncurses5 libffi7 \ libxml2 libxslt1.1 libcurl4 libicu66 libre2-dev tzdata unzip libimage-exiftool-perl \ @@ -54,7 +53,6 @@ RUN set -ex && \ && 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 -v 2.1.4 \ && 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 32cfd21fe..4d1526524 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -18,7 +18,7 @@ PATH=${GOROOT}/bin:$PATH export GOROOT PATH BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \ - libc6-dev ruby${RUBY_VERSION}-dev \ + libc6-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 \ @@ -37,11 +37,25 @@ exec_as_git() { apt-get update DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y ${BUILD_DEPENDENCIES} +# build ruby from source +echo "Building ruby v${RUBY_VERSION} from source..." +PWD_ORG="$PWD" +mkdir /tmp/ruby && cd /tmp/ruby +curl --remote-name -Ss "https://cache.ruby-lang.org/pub/ruby/$%7BRUBY_VERSION%.*%7D/ruby-$%7BRUBY_VERSION%7D.tar.gz" +printf '%s ruby-%s.tar.gz' "${RUBY_SOURCE_SHA256SUM}" "${RUBY_VERSION}" | sha256sum -c - +tar xzf ruby-"${RUBY_VERSION}".tar.gz && cd ruby-"${RUBY_VERSION}" +./configure --disable-install-rdoc --enable-shared +make -j"$(nproc)" +make install +cd "$PWD_ORG" && rm -rf /tmp/ruby + +gem install bundler -N -v 2.1.4 + # 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 # only for simplicity. -paxctl -cvm "$(command -v ruby${RUBY_VERSION})" +paxctl -cvm "$(command -v ruby)" # https://en.wikibooks.org/wiki/Grsecurity/Application-specific_Settings#Node.js paxctl -cvm "$(command -v node)" From 729a00a3c9b7290dd422c9f3f9556c94a85dae4b Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Fri, 6 Aug 2021 11:11:48 +0900 Subject: [PATCH 115/522] remove runtime/config/gitlabhq/rack_attack.rb --- assets/runtime/config/gitlabhq/rack_attack.rb | 29 ------------------- assets/runtime/functions | 2 -- 2 files changed, 31 deletions(-) delete mode 100644 assets/runtime/config/gitlabhq/rack_attack.rb diff --git a/assets/runtime/config/gitlabhq/rack_attack.rb b/assets/runtime/config/gitlabhq/rack_attack.rb deleted file mode 100644 index 69052c029..000000000 --- a/assets/runtime/config/gitlabhq/rack_attack.rb +++ /dev/null @@ -1,29 +0,0 @@ -# 1. Rename this file to rack_attack.rb -# 2. Review the paths_to_be_protected and add any other path you need protecting -# -# If you change this file in a Merge Request, please also create a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests - -paths_to_be_protected = [ - "#{Rails.application.config.relative_url_root}/users/password", - "#{Rails.application.config.relative_url_root}/users/sign_in", - "#{Rails.application.config.relative_url_root}/api/#{API::API.version}/session.json", - "#{Rails.application.config.relative_url_root}/api/#{API::API.version}/session", - "#{Rails.application.config.relative_url_root}/users", - "#{Rails.application.config.relative_url_root}/users/confirmation", - "#{Rails.application.config.relative_url_root}/unsubscribes/", - "#{Rails.application.config.relative_url_root}/import/github/personal_access_token" - -] - -# Create one big regular expression that matches strings starting with any of -# the paths_to_be_protected. -paths_regex = Regexp.union(paths_to_be_protected.map { |path| /\A#{Regexp.escape(path)}/ }) -rack_attack_enabled = Gitlab.config.rack_attack.git_basic_auth['enabled'] - -unless Rails.env.test? || !rack_attack_enabled - Rack::Attack.throttle('protected paths', limit: 10, period: 60.seconds) do |req| - if req.post? && req.path =~ paths_regex - req.ip - end - end -end diff --git a/assets/runtime/functions b/assets/runtime/functions index c691ffe58..7dfe5d3e8 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -17,7 +17,6 @@ GITLAB_CONFIG="${GITLAB_INSTALL_DIR}/config/gitlab.yml" GITLAB_DATABASE_CONFIG="${GITLAB_INSTALL_DIR}/config/database.yml" GITLAB_PUMA_CONFIG="${GITLAB_INSTALL_DIR}/config/puma.rb" GITLAB_RELATIVE_URL_CONFIG="${GITLAB_INSTALL_DIR}/config/initializers/relative_url.rb" -GITLAB_RACK_ATTACK_CONFIG="${GITLAB_INSTALL_DIR}/config/initializers/rack_attack.rb" GITLAB_SMTP_CONFIG="${GITLAB_INSTALL_DIR}/config/initializers/smtp_settings.rb" GITLAB_RESQUE_CONFIG="${GITLAB_INSTALL_DIR}/config/resque.yml" GITLAB_SECRETS_CONFIG="${GITLAB_INSTALL_DIR}/config/secrets.yml" @@ -1647,7 +1646,6 @@ install_configuration_templates() { install_template ${GITLAB_USER}: gitlabhq/gitlab.yml ${GITLAB_CONFIG} 0640 install_template ${GITLAB_USER}: gitlabhq/database.yml ${GITLAB_DATABASE_CONFIG} 0640 install_template ${GITLAB_USER}: gitlabhq/puma.rb ${GITLAB_PUMA_CONFIG} 0644 - install_template ${GITLAB_USER}: gitlabhq/rack_attack.rb ${GITLAB_RACK_ATTACK_CONFIG} 0644 install_template ${GITLAB_USER}: gitlabhq/resque.yml ${GITLAB_RESQUE_CONFIG} 0640 install_template ${GITLAB_USER}: gitlabhq/secrets.yml ${GITLAB_SECRETS_CONFIG} 0600 install_template ${GITLAB_USER}: gitlab-shell/config.yml ${GITLAB_SHELL_CONFIG} 0640 From f8f2190826bc45d108c3b2d536f5e1d5fcc2eae6 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Tue, 5 Oct 2021 22:01:58 +0900 Subject: [PATCH 116/522] supress build time warnings - [git] set advice.detachHead=false - [bundle] use `bundle config set --local` instead of - `--deployment` - `--with` / `--without` arguments for `bundle install` --- assets/build/install.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index 32cfd21fe..9afa2fbdf 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -62,6 +62,7 @@ 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 +exec_as_git git config --global advice.detachedHead false # shallow clone gitlab-foss echo "Cloning gitlab-foss v.${GITLAB_VERSION}..." @@ -92,7 +93,9 @@ cd ${GITLAB_SHELL_INSTALL_DIR} exec_as_git cp -a config.yml.example config.yml echo "Compiling gitlab-shell golang executables..." -exec_as_git bundle install -j"$(nproc)" --deployment --with development test +exec_as_git bundle config set --local deployment 'true' +exec_as_git bundle config set --local with 'development test' +exec_as_git bundle install -j"$(nproc)" exec_as_git "PATH=$PATH" make verify setup # remove unused repositories directory created by gitlab-shell install @@ -149,7 +152,9 @@ 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 mysql aws +exec_as_git bundle config set --local deployment 'true' +exec_as_git bundle config set --local without 'development test mysql aws' +exec_as_git bundle install -j"$(nproc)" # make sure everything in ${GITLAB_HOME} is owned by ${GITLAB_USER} user chown -R ${GITLAB_USER}: ${GITLAB_HOME} From 47d17b6ffb601ad1fede759f3e5f3ffe75ac33d2 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sun, 10 Oct 2021 23:51:57 +0900 Subject: [PATCH 117/522] remove duplicated installation of `bundler` `bundler 2.1.4` is default gem of ruby >= 2.7.1 and installed during ruby installation so we don't need to install it explicitly. --- assets/build/install.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index 4d1526524..5180f20fe 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -49,8 +49,6 @@ make -j"$(nproc)" make install cd "$PWD_ORG" && rm -rf /tmp/ruby -gem install bundler -N -v 2.1.4 - # 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 67de4d269849446c0f3853f9e904926863b87c5a Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Wed, 15 Sep 2021 14:21:57 +0900 Subject: [PATCH 118/522] upgrade ruby to 2.7.4 (requirement of gitlab v14.3.x) --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 914fc08d1..f8404e3b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ FROM ubuntu:focal-20210827 ARG VERSION=14.2.5 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=2.7.2 \ - RUBY_SOURCE_SHA256SUM="6e5706d0d4ee4e1e2f883db9d768586b4d06567debea353c796ec45e8321c3d4" \ + RUBY_VERSION=2.7.4 \ + RUBY_SOURCE_SHA256SUM="3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b" \ GOLANG_VERSION=1.17.1 \ GITLAB_SHELL_VERSION=13.19.1 \ GITLAB_PAGES_VERSION=1.42.0 \ From c36fc173541cfe2c8c08884bf0802a52deb243af Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 19 Oct 2021 20:00:55 +0200 Subject: [PATCH 119/522] Add variable for the source url of ruby I think that defining a variable for the source of the Ruby tarball makes sense. --- assets/build/install.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index 5180f20fe..c5f5244f5 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -10,6 +10,8 @@ GITLAB_WORKHORSE_BUILD_DIR=${GITLAB_INSTALL_DIR}/workhorse GITLAB_PAGES_BUILD_DIR=/tmp/gitlab-pages GITLAB_GITALY_BUILD_DIR=/tmp/gitaly +RUBY_SRC_URL=https://cache.ruby-lang.org/pub/ruby/${RUBY_VERSION%.*}/ruby-${RUBY_VERSION}.tar.gz + GEM_CACHE_DIR="${GITLAB_BUILD_DIR}/cache" GOROOT=/tmp/go @@ -41,7 +43,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y ${BUIL echo "Building ruby v${RUBY_VERSION} from source..." PWD_ORG="$PWD" mkdir /tmp/ruby && cd /tmp/ruby -curl --remote-name -Ss "https://cache.ruby-lang.org/pub/ruby/$%7BRUBY_VERSION%.*%7D/ruby-$%7BRUBY_VERSION%7D.tar.gz" +curl --remote-name -Ss "${RUBY_SRC_URL}" printf '%s ruby-%s.tar.gz' "${RUBY_SOURCE_SHA256SUM}" "${RUBY_VERSION}" | sha256sum -c - tar xzf ruby-"${RUBY_VERSION}".tar.gz && cd ruby-"${RUBY_VERSION}" ./configure --disable-install-rdoc --enable-shared From 2a360ac874b3ffd2f814b0b07761acddd5d6a6da Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 22 Sep 2021 21:06:35 +0200 Subject: [PATCH 120/522] upgrade GitLab CE to 14.3.0 --- Changelog.md | 6 +++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 49 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index ed39caff1..1ab5cf5f2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG]( https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.3.0** +- gitlab: upgrade CE to v14.3.0 +- gitaly: upgrade to v14.3.0 +- gitlab-shell: v13.21.0 +- gitlab-pages: upgrade to v1.44.0 + **14.2.5** - gitlab: upgrade CE to v14.2.5 - gitaly: upgrade to v14.2.5 diff --git a/Dockerfile b/Dockerfile index f8404e3b7..2427fa4a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20210827 -ARG VERSION=14.2.5 +ARG VERSION=14.3.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.4 \ RUBY_SOURCE_SHA256SUM="3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b" \ GOLANG_VERSION=1.17.1 \ - GITLAB_SHELL_VERSION=13.19.1 \ - GITLAB_PAGES_VERSION=1.42.0 \ - GITALY_SERVER_VERSION=14.2.5 \ + GITLAB_SHELL_VERSION=13.21.0 \ + GITLAB_PAGES_VERSION=1.44.0 \ + GITALY_SERVER_VERSION=14.3.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 19bceb27f..b48ca76c6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.2.5 +# sameersbn/gitlab:14.3.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.2.5 +docker pull sameersbn/gitlab:14.3.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.5 + sameersbn/gitlab:14.3.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.5 + sameersbn/gitlab:14.3.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:14.2.5 + sameersbn/gitlab:14.3.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:14.2.5 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.2.5 + sameersbn/gitlab:14.3.0 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.2.5 + sameersbn/gitlab:14.3.0 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.5 + sameersbn/gitlab:14.3.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.2.5 + sameersbn/gitlab:14.3.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.2.5 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.2.5 + sameersbn/gitlab:14.3.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.2.5 + sameersbn/gitlab:14.3.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.2.5 + sameersbn/gitlab:14.3.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.2.5 + sameersbn/gitlab:14.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:14.2.5 app:sanitize + sameersbn/gitlab:14.3.0 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.5 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.5 app:rake db:setup + sameersbn/gitlab:14.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:14.2.5 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.2.5 app:rake gitlab:env:info + sameersbn/gitlab:14.3.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.5 app:rake gitlab:import:repos + sameersbn/gitlab:14.3.0 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.5 app:rake gitlab:import:repos + sameersbn/gitlab:14.3.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.2.5 +docker pull sameersbn/gitlab:14.3.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.2.5 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.3.0 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.2.5 + image: sameersbn/gitlab:14.3.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 56fe42e45..32f02f10e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.2.5 +14.3.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index ff46b1491..1f7ee20b4 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.5 + image: sameersbn/gitlab:14.3.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index a1e4dcdee..62460ccab 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.2.5 + image: sameersbn/gitlab:14.3.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 13623bec6..ac1499e41 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.5 + image: sameersbn/gitlab:14.3.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 268cbb120..03e337721 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.5 app:rake gitlab:backup:create + sameersbn/gitlab:14.3.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.5 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.2.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.3.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.2.5 +docker pull sameersbn/gitlab:14.3.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.2.5 +sameersbn/gitlab:14.3.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 67791743f..b0628aa04 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.5 + image: sameersbn/gitlab:14.3.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 2e3091748..065818d5d 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.2.5 + image: sameersbn/gitlab:14.3.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 476678966..12648928f 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.2.5 + image: sameersbn/gitlab:14.3.0 env: - name: TZ value: Asia/Kolkata From 3232a10fe4af5664b74220c15795731711133e6f Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 19 Oct 2021 21:41:12 +0200 Subject: [PATCH 121/522] Update base image, fix problems compiling gitlab-shell and complete changelog --- Changelog.md | 5 +++-- Dockerfile | 2 +- assets/build/install.sh | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Changelog.md b/Changelog.md index 1ab5cf5f2..e1d6e1ee8 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,13 +1,14 @@ # 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-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. **14.3.0** - gitlab: upgrade CE to v14.3.0 - gitaly: upgrade to v14.3.0 - gitlab-shell: v13.21.0 - gitlab-pages: upgrade to v1.44.0 +- ruby: compile ruby from source and use v2.7.4 +- ubuntu: upgrade to focal-20211006 **14.2.5** - gitlab: upgrade CE to v14.2.5 diff --git a/Dockerfile b/Dockerfile index 2427fa4a4..0b8d48636 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210827 +FROM ubuntu:focal-20211006 ARG VERSION=14.3.0 diff --git a/assets/build/install.sh b/assets/build/install.sh index d718f2099..406d7c85a 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -110,6 +110,7 @@ echo "Compiling gitlab-shell golang executables..." exec_as_git bundle config set --local deployment 'true' exec_as_git bundle config set --local with 'development test' exec_as_git bundle install -j"$(nproc)" +exec_as_git "${GOROOT}"/bin/go mod vendor exec_as_git "PATH=$PATH" make verify setup # remove unused repositories directory created by gitlab-shell install From 6c0888b669fbb8f661140c951d662f131a815ec3 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 19 Oct 2021 22:18:11 +0200 Subject: [PATCH 122/522] Add make target for gitlab-shell --- 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 406d7c85a..e6850bf21 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -111,7 +111,7 @@ exec_as_git bundle config set --local deployment 'true' exec_as_git bundle config set --local with 'development test' exec_as_git bundle install -j"$(nproc)" exec_as_git "${GOROOT}"/bin/go mod vendor -exec_as_git "PATH=$PATH" make verify setup +exec_as_git "PATH=$PATH" make fmt verify setup # remove unused repositories directory created by gitlab-shell install rm -rf ${GITLAB_HOME}/repositories From 7601cdf312fbb490fa3d36b68ee95c873f7ce1ad Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 19 Oct 2021 21:47:04 +0200 Subject: [PATCH 123/522] upgrade GitLab CE to 14.3.1 --- Changelog.md | 4 ++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index e1d6e1ee8..af96e220e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.3.1** +- gitlab: upgrade CE to v14.3.1 +- gitaly: upgrade to v14.3.1 + **14.3.0** - gitlab: upgrade CE to v14.3.0 - gitaly: upgrade to v14.3.0 diff --git a/Dockerfile b/Dockerfile index 0b8d48636..09481c767 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20211006 -ARG VERSION=14.3.0 +ARG VERSION=14.3.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.4 \ RUBY_SOURCE_SHA256SUM="3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b" \ - GOLANG_VERSION=1.17.1 \ + GOLANG_VERSION=1.17.2 \ GITLAB_SHELL_VERSION=13.21.0 \ GITLAB_PAGES_VERSION=1.44.0 \ - GITALY_SERVER_VERSION=14.3.0 \ + GITALY_SERVER_VERSION=14.3.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index b48ca76c6..dd6449d70 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.3.0 +# sameersbn/gitlab:14.3.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.3.0 +docker pull sameersbn/gitlab:14.3.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.3.0 + sameersbn/gitlab:14.3.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.3.0 + sameersbn/gitlab:14.3.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:14.3.0 + sameersbn/gitlab:14.3.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:14.3.0 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.3.0 + sameersbn/gitlab:14.3.1 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.3.0 + sameersbn/gitlab:14.3.1 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.3.0 + sameersbn/gitlab:14.3.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.3.0 + sameersbn/gitlab:14.3.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.3.0 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.3.0 + sameersbn/gitlab:14.3.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.3.0 + sameersbn/gitlab:14.3.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.3.0 + sameersbn/gitlab:14.3.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.3.0 + sameersbn/gitlab:14.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:14.3.0 app:sanitize + sameersbn/gitlab:14.3.1 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.0 app:rake db:setup + sameersbn/gitlab:14.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:14.3.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.3.0 app:rake gitlab:env:info + sameersbn/gitlab:14.3.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.3.1 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.3.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.3.0 +docker pull sameersbn/gitlab:14.3.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.3.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.3.1 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.3.0 + image: sameersbn/gitlab:14.3.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 32f02f10e..6dfe8b129 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.3.0 +14.3.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 1f7ee20b4..e49db454e 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.3.0 + image: sameersbn/gitlab:14.3.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 62460ccab..cb76edbb1 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.3.0 + image: sameersbn/gitlab:14.3.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index ac1499e41..6987f56fa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.3.0 + image: sameersbn/gitlab:14.3.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 03e337721..5c70238e2 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.3.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.3.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.3.0 +docker pull sameersbn/gitlab:14.3.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.3.0 +sameersbn/gitlab:14.3.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index b0628aa04..c2b42ff6f 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.3.0 + image: sameersbn/gitlab:14.3.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 065818d5d..2991e8099 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.3.0 + image: sameersbn/gitlab:14.3.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 12648928f..8ab0da8e9 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.3.0 + image: sameersbn/gitlab:14.3.1 env: - name: TZ value: Asia/Kolkata From d1bc9002e019c4a26547ee895172c8469463df98 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 21 Oct 2021 06:42:04 +0200 Subject: [PATCH 124/522] upgrade GitLab CE to 14.3.2 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index af96e220e..70fce9ff8 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.3.1** +- gitlab: upgrade CE to v14.3.2 +- gitaly: upgrade to v14.3.2 +- gitlab-shell: v13.21.1 + **14.3.1** - gitlab: upgrade CE to v14.3.1 - gitaly: upgrade to v14.3.1 diff --git a/Dockerfile b/Dockerfile index 09481c767..0e3af5e10 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20211006 -ARG VERSION=14.3.1 +ARG VERSION=14.3.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.4 \ RUBY_SOURCE_SHA256SUM="3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b" \ GOLANG_VERSION=1.17.2 \ - GITLAB_SHELL_VERSION=13.21.0 \ + GITLAB_SHELL_VERSION=13.21.1 \ GITLAB_PAGES_VERSION=1.44.0 \ - GITALY_SERVER_VERSION=14.3.1 \ + GITALY_SERVER_VERSION=14.3.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index dd6449d70..a815fd0dc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.3.1 +# sameersbn/gitlab:14.3.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.3.1 +docker pull sameersbn/gitlab:14.3.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.3.1 + sameersbn/gitlab:14.3.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.3.1 + sameersbn/gitlab:14.3.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:14.3.1 + sameersbn/gitlab:14.3.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:14.3.1 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.3.1 + sameersbn/gitlab:14.3.2 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.3.1 + sameersbn/gitlab:14.3.2 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.3.1 + sameersbn/gitlab:14.3.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.3.1 + sameersbn/gitlab:14.3.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.3.1 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.3.1 + sameersbn/gitlab:14.3.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.3.1 + sameersbn/gitlab:14.3.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.3.1 + sameersbn/gitlab:14.3.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.3.1 + sameersbn/gitlab:14.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:14.3.1 app:sanitize + sameersbn/gitlab:14.3.2 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.1 app:rake db:setup + sameersbn/gitlab:14.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:14.3.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.3.1 app:rake gitlab:env:info + sameersbn/gitlab:14.3.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.3.2 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.3.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.3.1 +docker pull sameersbn/gitlab:14.3.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.3.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.3.2 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.3.1 + image: sameersbn/gitlab:14.3.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 6dfe8b129..f84a42182 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.3.1 +14.3.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index e49db454e..463e21e21 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.3.1 + image: sameersbn/gitlab:14.3.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index cb76edbb1..b25ee58c7 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.3.1 + image: sameersbn/gitlab:14.3.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 6987f56fa..005a2cd3d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.3.1 + image: sameersbn/gitlab:14.3.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 5c70238e2..b8c52049e 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.3.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.3.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.3.1 +docker pull sameersbn/gitlab:14.3.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.3.1 +sameersbn/gitlab:14.3.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index c2b42ff6f..821e307d8 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.3.1 + image: sameersbn/gitlab:14.3.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 2991e8099..2aba3efce 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.3.1 + image: sameersbn/gitlab:14.3.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 8ab0da8e9..bfd0d67fd 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.3.1 + image: sameersbn/gitlab:14.3.2 env: - name: TZ value: Asia/Kolkata From 1e6a99f4b6e794f54cd85cdbcfeb4e270fed941e Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 21 Oct 2021 21:50:09 +0200 Subject: [PATCH 125/522] Fix incorrect version number --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 70fce9ff8..b0cd7b44e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,7 +2,7 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. -**14.3.1** +**14.3.2** - gitlab: upgrade CE to v14.3.2 - gitaly: upgrade to v14.3.2 - gitlab-shell: v13.21.1 From e8ba847300b872b4e0bc76b56f8fe8e81849e212 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 21 Oct 2021 21:44:26 +0200 Subject: [PATCH 126/522] Upgrade GitLab CE to 14.3.3 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index b0cd7b44e..6ccdeafd1 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.3.3** +- gitlab: upgrade CE to v14.3.3 +- gitaly: upgrade to v14.3.3 + **14.3.2** - gitlab: upgrade CE to v14.3.2 - gitaly: upgrade to v14.3.2 diff --git a/Dockerfile b/Dockerfile index 0e3af5e10..8479d7bf1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20211006 -ARG VERSION=14.3.2 +ARG VERSION=14.3.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.4 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.2 \ GITLAB_SHELL_VERSION=13.21.1 \ GITLAB_PAGES_VERSION=1.44.0 \ - GITALY_SERVER_VERSION=14.3.2 \ + GITALY_SERVER_VERSION=14.3.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index a815fd0dc..e77d12746 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.3.2 +# sameersbn/gitlab:14.3.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.3.2 +docker pull sameersbn/gitlab:14.3.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.3.2 + sameersbn/gitlab:14.3.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.3.2 + sameersbn/gitlab:14.3.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:14.3.2 + sameersbn/gitlab:14.3.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:14.3.2 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.3.2 + sameersbn/gitlab:14.3.3 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.3.2 + sameersbn/gitlab:14.3.3 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.3.2 + sameersbn/gitlab:14.3.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.3.2 + sameersbn/gitlab:14.3.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.3.2 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.3.2 + sameersbn/gitlab:14.3.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.3.2 + sameersbn/gitlab:14.3.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.3.2 + sameersbn/gitlab:14.3.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.3.2 + sameersbn/gitlab:14.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:14.3.2 app:sanitize + sameersbn/gitlab:14.3.3 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.2 app:rake db:setup + sameersbn/gitlab:14.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:14.3.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.3.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.3.2 app:rake gitlab:env:info + sameersbn/gitlab:14.3.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.3.3 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.3.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.3.2 +docker pull sameersbn/gitlab:14.3.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.3.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.3.3 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.3.2 + image: sameersbn/gitlab:14.3.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index f84a42182..839845e0b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.3.2 +14.3.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 463e21e21..2bdbdfaa0 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.3.2 + image: sameersbn/gitlab:14.3.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index b25ee58c7..e1e5ad818 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.3.2 + image: sameersbn/gitlab:14.3.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 005a2cd3d..cd3b0ad6a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.3.2 + image: sameersbn/gitlab:14.3.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index b8c52049e..af0bf9aef 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.3.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.3.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.3.2 +docker pull sameersbn/gitlab:14.3.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.3.2 +sameersbn/gitlab:14.3.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 821e307d8..69c829ecd 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.3.2 + image: sameersbn/gitlab:14.3.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 2aba3efce..e8d111f9c 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.3.2 + image: sameersbn/gitlab:14.3.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index bfd0d67fd..fba0544be 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.3.2 + image: sameersbn/gitlab:14.3.3 env: - name: TZ value: Asia/Kolkata From 4e92b3c3eb1380935d1aaf72e5cc31b2f3e07798 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 26 Oct 2021 16:53:06 +0200 Subject: [PATCH 127/522] Upgrade GitLab CE to 14.4.0 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 6ccdeafd1..630cc4dad 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.4.0** +- gitlab: upgrade CE to v14.4.0 +- gitaly: upgrade to v14.4.0 +- gitlab-pages: upgrade to v1.46.0 + **14.3.3** - gitlab: upgrade CE to v14.3.3 - gitaly: upgrade to v14.3.3 diff --git a/Dockerfile b/Dockerfile index 8479d7bf1..fd0591064 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20211006 -ARG VERSION=14.3.3 +ARG VERSION=14.4.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.4 \ RUBY_SOURCE_SHA256SUM="3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b" \ GOLANG_VERSION=1.17.2 \ GITLAB_SHELL_VERSION=13.21.1 \ - GITLAB_PAGES_VERSION=1.44.0 \ - GITALY_SERVER_VERSION=14.3.3 \ + GITLAB_PAGES_VERSION=1.46.0 \ + GITALY_SERVER_VERSION=14.4.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index e77d12746..98c2c6e2f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.3.3 +# sameersbn/gitlab:14.4.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.3.3 +docker pull sameersbn/gitlab:14.4.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.3.3 + sameersbn/gitlab:14.4.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.3.3 + sameersbn/gitlab:14.4.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:14.3.3 + sameersbn/gitlab:14.4.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:14.3.3 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.3.3 + sameersbn/gitlab:14.4.0 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.3.3 + sameersbn/gitlab:14.4.0 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.3.3 + sameersbn/gitlab:14.4.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.3.3 + sameersbn/gitlab:14.4.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.3.3 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.3.3 + sameersbn/gitlab:14.4.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.3.3 + sameersbn/gitlab:14.4.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.3.3 + sameersbn/gitlab:14.4.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.3.3 + sameersbn/gitlab:14.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:14.3.3 app:sanitize + sameersbn/gitlab:14.4.0 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.3 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.3 app:rake db:setup + sameersbn/gitlab:14.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:14.3.3 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.3.3 app:rake gitlab:env:info + sameersbn/gitlab:14.4.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.3 app:rake gitlab:import:repos + sameersbn/gitlab:14.4.0 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.3 app:rake gitlab:import:repos + sameersbn/gitlab:14.4.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.3.3 +docker pull sameersbn/gitlab:14.4.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.3.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.4.0 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.3.3 + image: sameersbn/gitlab:14.4.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 839845e0b..72f51351f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.3.3 +14.4.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 2bdbdfaa0..8cf7a8442 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.3.3 + image: sameersbn/gitlab:14.4.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index e1e5ad818..4460024c4 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.3.3 + image: sameersbn/gitlab:14.4.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index cd3b0ad6a..852a06923 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.3.3 + image: sameersbn/gitlab:14.4.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index af0bf9aef..0227627e1 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.3 app:rake gitlab:backup:create + sameersbn/gitlab:14.4.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.3 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.3.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.3.3 +docker pull sameersbn/gitlab:14.4.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.3.3 +sameersbn/gitlab:14.4.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 69c829ecd..b24706976 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.3.3 + image: sameersbn/gitlab:14.4.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index e8d111f9c..0f163e807 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.3.3 + image: sameersbn/gitlab:14.4.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index fba0544be..5f9f67abd 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.3.3 + image: sameersbn/gitlab:14.4.0 env: - name: TZ value: Asia/Kolkata From ef640356c05ded5ef5d1438e9f4ccec8e46b8579 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 29 Oct 2021 09:29:19 +0200 Subject: [PATCH 128/522] Upgrade GitLab CE to 14.4.1 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 630cc4dad..83bfd1aee 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.4.1** +- gitlab: upgrade CE to v14.4.1 +- gitaly: upgrade to v14.4.1 + **14.4.0** - gitlab: upgrade CE to v14.4.0 - gitaly: upgrade to v14.4.0 diff --git a/Dockerfile b/Dockerfile index fd0591064..379f3b3f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20211006 -ARG VERSION=14.4.0 +ARG VERSION=14.4.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.4 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.2 \ GITLAB_SHELL_VERSION=13.21.1 \ GITLAB_PAGES_VERSION=1.46.0 \ - GITALY_SERVER_VERSION=14.4.0 \ + GITALY_SERVER_VERSION=14.4.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 98c2c6e2f..393f07356 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.4.0 +# sameersbn/gitlab:14.4.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.4.0 +docker pull sameersbn/gitlab:14.4.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.0 + sameersbn/gitlab:14.4.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.0 + sameersbn/gitlab:14.4.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:14.4.0 + sameersbn/gitlab:14.4.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:14.4.0 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.4.0 + sameersbn/gitlab:14.4.1 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.4.0 + sameersbn/gitlab:14.4.1 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.0 + sameersbn/gitlab:14.4.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.0 + sameersbn/gitlab:14.4.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.4.0 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.4.0 + sameersbn/gitlab:14.4.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.4.0 + sameersbn/gitlab:14.4.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.4.0 + sameersbn/gitlab:14.4.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.4.0 + sameersbn/gitlab:14.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:14.4.0 app:sanitize + sameersbn/gitlab:14.4.1 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.0 app:rake db:setup + sameersbn/gitlab:14.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:14.4.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.4.0 app:rake gitlab:env:info + sameersbn/gitlab:14.4.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.4.1 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.4.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.4.0 +docker pull sameersbn/gitlab:14.4.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.4.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.4.1 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.4.0 + image: sameersbn/gitlab:14.4.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 72f51351f..a74a70e5d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.4.0 +14.4.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 8cf7a8442..8542b205f 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.0 + image: sameersbn/gitlab:14.4.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 4460024c4..7fa895f85 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.4.0 + image: sameersbn/gitlab:14.4.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 852a06923..5d82ea05c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.0 + image: sameersbn/gitlab:14.4.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 0227627e1..f143b0317 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.4.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.4.0 +docker pull sameersbn/gitlab:14.4.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.4.0 +sameersbn/gitlab:14.4.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index b24706976..88ca9466b 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.0 + image: sameersbn/gitlab:14.4.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 0f163e807..83a891405 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.0 + image: sameersbn/gitlab:14.4.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 5f9f67abd..770b7e4b0 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.4.0 + image: sameersbn/gitlab:14.4.1 env: - name: TZ value: Asia/Kolkata From 8dc849f8fc9f369e76afa5c2d88f4d853bab7bc8 Mon Sep 17 00:00:00 2001 From: "Drahos, Vojtech" Date: Tue, 16 Nov 2021 13:07:30 +0100 Subject: [PATCH 129/522] Upgrade GitLab 14.4.2, Redis 6.2.6 --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 4 +- docker-compose.swarm.yml | 4 +- docker-compose.yml | 4 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 4 +- docs/docker-compose-registry.yml | 4 +- kubernetes/gitlab-rc.yml | 2 +- kubernetes/redis-rc.yml | 2 +- 12 files changed, 52 insertions(+), 47 deletions(-) diff --git a/Changelog.md b/Changelog.md index 83bfd1aee..daea757e5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.4.2** +- gitlab: upgrade CE to v14.4.2 +- gitaly: upgrade to v14.4.2 +- redis: upgrade to v6.2.6 + **14.4.1** - gitlab: upgrade CE to v14.4.1 - gitaly: upgrade to v14.4.1 diff --git a/Dockerfile b/Dockerfile index 379f3b3f8..07ad7b86e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20211006 -ARG VERSION=14.4.1 +ARG VERSION=14.4.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.4 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.2 \ GITLAB_SHELL_VERSION=13.21.1 \ GITLAB_PAGES_VERSION=1.46.0 \ - GITALY_SERVER_VERSION=14.4.1 \ + GITALY_SERVER_VERSION=14.4.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 393f07356..713570efc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.4.1 +# sameersbn/gitlab:14.4.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.4.1 +docker pull sameersbn/gitlab:14.4.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.1 + sameersbn/gitlab:14.4.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.1 + sameersbn/gitlab:14.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:14.4.1 + sameersbn/gitlab:14.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:14.4.1 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.4.1 + sameersbn/gitlab:14.4.2 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.4.1 + sameersbn/gitlab:14.4.2 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.1 + sameersbn/gitlab:14.4.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.1 + sameersbn/gitlab:14.4.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.4.1 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.4.1 + sameersbn/gitlab:14.4.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.4.1 + sameersbn/gitlab:14.4.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.4.1 + sameersbn/gitlab:14.4.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.4.1 + sameersbn/gitlab:14.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:14.4.1 app:sanitize + sameersbn/gitlab:14.4.2 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.1 app:rake db:setup + sameersbn/gitlab:14.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:14.4.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.4.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.4.1 app:rake gitlab:env:info + sameersbn/gitlab:14.4.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.4.2 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.4.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.4.1 +docker pull sameersbn/gitlab:14.4.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.4.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.4.2 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.4.1 + image: sameersbn/gitlab:14.4.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index a74a70e5d..23b0b26d3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.4.1 +14.4.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 8542b205f..c7c515975 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: redis:5.0.9 + image: redis:6.2.6 command: - --loglevel warning volumes: @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.1 + image: sameersbn/gitlab:14.4.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 7fa895f85..ca4e5a270 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -1,7 +1,7 @@ version: '3.4' services: redis: - image: redis:5.0.9 + image: redis:6.2.6 command: - --loglevel warning volumes: @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.4.1 + image: sameersbn/gitlab:14.4.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 5d82ea05c..48d2a0bb0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2.3' services: redis: restart: always - image: redis:6.2 + image: redis:6.2.6 command: - --loglevel warning volumes: @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.1 + image: sameersbn/gitlab:14.4.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index f143b0317..4e0f6d789 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.4.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.4.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.4.1 +docker pull sameersbn/gitlab:14.4.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.4.1 +sameersbn/gitlab:14.4.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 88ca9466b..feb8bc631 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -3,7 +3,7 @@ version: '2' services: redis: restart: always - image: redis:5.0.9 + image: redis:6.2.6 command: - --loglevel warning volumes: @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.1 + image: sameersbn/gitlab:14.4.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 83a891405..b9a8f6e23 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -3,7 +3,7 @@ version: '2' services: redis: restart: always - image: redis:5.0.9 + image: redis:6.2.6 command: - --loglevel warning volumes: @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.1 + image: sameersbn/gitlab:14.4.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 770b7e4b0..c733b8d77 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.4.1 + image: sameersbn/gitlab:14.4.2 env: - name: TZ value: Asia/Kolkata diff --git a/kubernetes/redis-rc.yml b/kubernetes/redis-rc.yml index 96a6119f9..be3351246 100644 --- a/kubernetes/redis-rc.yml +++ b/kubernetes/redis-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: redis - image: redis:5.0.9 + image: redis:6.2.6 ports: - name: redis containerPort: 6379 From 189ada39705fd0cf53ef762ec29a0dd13371775a Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 7 Dec 2021 17:48:31 +0100 Subject: [PATCH 130/522] Upgrade GitLab CE to 14.4.3 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index daea757e5..2dcfd8bb6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.4.3** +- gitlab: upgrade CE to v14.4.3 +- gitaly: upgrade to v14.4.3 +- golang: upgrade to v1.17.4 + **14.4.2** - gitlab: upgrade CE to v14.4.2 - gitaly: upgrade to v14.4.2 diff --git a/Dockerfile b/Dockerfile index 07ad7b86e..e78a5aa0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20211006 -ARG VERSION=14.4.2 +ARG VERSION=14.4.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.4 \ RUBY_SOURCE_SHA256SUM="3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b" \ - GOLANG_VERSION=1.17.2 \ + GOLANG_VERSION=1.17.4 \ GITLAB_SHELL_VERSION=13.21.1 \ GITLAB_PAGES_VERSION=1.46.0 \ - GITALY_SERVER_VERSION=14.4.2 \ + GITALY_SERVER_VERSION=14.4.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 713570efc..11700b2e3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.4.2 +# sameersbn/gitlab:14.4.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.4.2 +docker pull sameersbn/gitlab:14.4.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.2 + sameersbn/gitlab:14.4.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.2 + sameersbn/gitlab:14.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:14.4.2 + sameersbn/gitlab:14.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:14.4.2 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.4.2 + sameersbn/gitlab:14.4.3 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.4.2 + sameersbn/gitlab:14.4.3 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.2 + sameersbn/gitlab:14.4.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.2 + sameersbn/gitlab:14.4.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.4.2 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.4.2 + sameersbn/gitlab:14.4.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.4.2 + sameersbn/gitlab:14.4.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.4.2 + sameersbn/gitlab:14.4.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.4.2 + sameersbn/gitlab:14.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:14.4.2 app:sanitize + sameersbn/gitlab:14.4.3 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.2 app:rake db:setup + sameersbn/gitlab:14.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:14.4.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.4.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.4.2 app:rake gitlab:env:info + sameersbn/gitlab:14.4.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.4.3 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.4.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.4.2 +docker pull sameersbn/gitlab:14.4.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.4.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.4.3 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.4.2 + image: sameersbn/gitlab:14.4.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 23b0b26d3..b6371d7b9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.4.2 +14.4.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index c7c515975..3fe0e799f 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.2 + image: sameersbn/gitlab:14.4.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index ca4e5a270..acdd3e602 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.4.2 + image: sameersbn/gitlab:14.4.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 48d2a0bb0..a875d5410 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.2 + image: sameersbn/gitlab:14.4.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 4e0f6d789..10fcd70bf 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.4.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.4.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.4.2 +docker pull sameersbn/gitlab:14.4.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.4.2 +sameersbn/gitlab:14.4.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index feb8bc631..b7400895a 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.2 + image: sameersbn/gitlab:14.4.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index b9a8f6e23..487e0d4d4 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.2 + image: sameersbn/gitlab:14.4.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index c733b8d77..abb8a142c 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.4.2 + image: sameersbn/gitlab:14.4.3 env: - name: TZ value: Asia/Kolkata From 82576f27d010f4caff4f26912aed3b137b6d74d7 Mon Sep 17 00:00:00 2001 From: sue445 Date: Fri, 6 Aug 2021 17:00:42 +0900 Subject: [PATCH 131/522] Fixed Pages config not being created when GITLAB_PAGES_ACCESS_CONTROL was disabled --- assets/runtime/functions | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index 7dfe5d3e8..70a2e8b75 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1847,11 +1847,21 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then else exec_as_git sed -i "/{{GITLAB_PAGES_ARTIFACTS_SERVER_URL}}/d" ${GITLAB_PAGES_CONFIG} fi +else + update_template ${GITLAB_PAGES_CONFIG} \ + GITLAB_INSTALL_DIR + + exec_as_git sed -i "/{{GITLAB_PAGES_ACCESS_CLIENT_ID}}/d" ${GITLAB_PAGES_CONFIG} + exec_as_git sed -i "/{{GITLAB_PAGES_ACCESS_CLIENT_SECRET}}/d" ${GITLAB_PAGES_CONFIG} + exec_as_git sed -i "/{{GITLAB_PAGES_ACCESS_REDIRECT_URI}}/d" ${GITLAB_PAGES_CONFIG} + exec_as_git sed -i "/{{GITLAB_PAGES_ACCESS_SECRET}}/d" ${GITLAB_PAGES_CONFIG} + exec_as_git sed -i "/{{GITLAB_PAGES_ACCESS_CONTROL_SERVER}}/d" ${GITLAB_PAGES_CONFIG} + exec_as_git sed -i "/{{GITLAB_PAGES_ARTIFACTS_SERVER_URL}}/d" ${GITLAB_PAGES_CONFIG} +fi cat >> /etc/supervisor/conf.d/gitlab-pages.conf <> /etc/supervisor/conf.d/gitlab-pages.conf < Date: Fri, 10 Dec 2021 06:36:17 +0900 Subject: [PATCH 132/522] fix: Stop all process before sending SIGTERM to supervisor. (#2422) Issue detail: https://github.com/sameersbn/docker-gitlab/issues/2421 --- entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/entrypoint.sh b/entrypoint.sh index 1d9bc107c..fbfc4915d 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -21,6 +21,7 @@ case ${1} in /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf & SUPERVISOR_PID=$! migrate_database + /usr/bin/supervisorctl stop all kill -15 $SUPERVISOR_PID if ps h -p $SUPERVISOR_PID > /dev/null ; then wait $SUPERVISOR_PID || true From 75a0595dfc098b63270d647a85c4e77ffe17af4b Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 10 Dec 2021 08:18:03 +0100 Subject: [PATCH 133/522] Revert "fix: Stop all process before sending SIGTERM to supervisor. (#2422)" This reverts commit 3778a7abb1ac7c603288735547821f6610da07be. --- entrypoint.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index fbfc4915d..1d9bc107c 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -21,7 +21,6 @@ case ${1} in /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf & SUPERVISOR_PID=$! migrate_database - /usr/bin/supervisorctl stop all kill -15 $SUPERVISOR_PID if ps h -p $SUPERVISOR_PID > /dev/null ; then wait $SUPERVISOR_PID || true From b392d71265b0c2d2e03cd5ce41015d32b3679624 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 7 Dec 2021 21:37:12 +0100 Subject: [PATCH 134/522] Upgrade GitLab CE to 14.4.4 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 2dcfd8bb6..6129d6dbf 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.4.4** +- gitlab: upgrade CE to v14.4.4 +- gitaly: upgrade to v14.4.4 + **14.4.3** - gitlab: upgrade CE to v14.4.3 - gitaly: upgrade to v14.4.3 diff --git a/Dockerfile b/Dockerfile index e78a5aa0f..7d57775b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20211006 -ARG VERSION=14.4.3 +ARG VERSION=14.4.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.4 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.4 \ GITLAB_SHELL_VERSION=13.21.1 \ GITLAB_PAGES_VERSION=1.46.0 \ - GITALY_SERVER_VERSION=14.4.3 \ + GITALY_SERVER_VERSION=14.4.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 11700b2e3..f44e49c61 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.4.3 +# sameersbn/gitlab:14.4.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.4.3 +docker pull sameersbn/gitlab:14.4.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.3 + sameersbn/gitlab:14.4.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.3 + sameersbn/gitlab:14.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:14.4.3 + sameersbn/gitlab:14.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:14.4.3 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.4.3 + sameersbn/gitlab:14.4.4 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.4.3 + sameersbn/gitlab:14.4.4 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.3 + sameersbn/gitlab:14.4.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.3 + sameersbn/gitlab:14.4.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.4.3 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.4.3 + sameersbn/gitlab:14.4.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.4.3 + sameersbn/gitlab:14.4.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.4.3 + sameersbn/gitlab:14.4.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.4.3 + sameersbn/gitlab:14.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:14.4.3 app:sanitize + sameersbn/gitlab:14.4.4 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.3 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.3 app:rake db:setup + sameersbn/gitlab:14.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:14.4.3 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.4.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.4.3 app:rake gitlab:env:info + sameersbn/gitlab:14.4.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.3 app:rake gitlab:import:repos + sameersbn/gitlab:14.4.4 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.3 app:rake gitlab:import:repos + sameersbn/gitlab:14.4.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.4.3 +docker pull sameersbn/gitlab:14.4.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.4.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.4.4 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.4.3 + image: sameersbn/gitlab:14.4.4 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index b6371d7b9..3e344c329 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.4.3 +14.4.4 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 3fe0e799f..b0b17008f 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.3 + image: sameersbn/gitlab:14.4.4 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index acdd3e602..38eaca40d 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.4.3 + image: sameersbn/gitlab:14.4.4 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index a875d5410..a814e93c2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.3 + image: sameersbn/gitlab:14.4.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 10fcd70bf..038a5fdf6 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.3 app:rake gitlab:backup:create + sameersbn/gitlab:14.4.4 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.3 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.4.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.4.3 +docker pull sameersbn/gitlab:14.4.4 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.4.3 +sameersbn/gitlab:14.4.4 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index b7400895a..d585fa5a4 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.3 + image: sameersbn/gitlab:14.4.4 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 487e0d4d4..75304d182 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.3 + image: sameersbn/gitlab:14.4.4 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index abb8a142c..1b5b64fc7 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.4.3 + image: sameersbn/gitlab:14.4.4 env: - name: TZ value: Asia/Kolkata From 1ff63bfaf731eab2ac9f3a275e98f7cf15bb23b6 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 8 Dec 2021 19:06:51 +0100 Subject: [PATCH 135/522] Upgrade ruby to v.2.7.5 --- Changelog.md | 1 + Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index 6129d6dbf..d5daa4019 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ This file only reflects the changes that are made in this image. Please refer to **14.4.4** - gitlab: upgrade CE to v14.4.4 - gitaly: upgrade to v14.4.4 +- ruby: upgrade to v2.7.5 **14.4.3** - gitlab: upgrade CE to v14.4.3 diff --git a/Dockerfile b/Dockerfile index 7d57775b4..2cdb0a4c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ FROM ubuntu:focal-20211006 ARG VERSION=14.4.4 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=2.7.4 \ - RUBY_SOURCE_SHA256SUM="3043099089608859fc8cce7f9fdccaa1f53a462457e3838ec3b25a7d609fbc5b" \ + RUBY_VERSION=2.7.5 \ + RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \ GOLANG_VERSION=1.17.4 \ GITLAB_SHELL_VERSION=13.21.1 \ GITLAB_PAGES_VERSION=1.46.0 \ From 48ad913ad8d20f15c267ad50bd877df10065f097 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 22 Dec 2021 09:17:50 +0100 Subject: [PATCH 136/522] Upgrade GitLab CE to 14.5.0 --- Changelog.md | 6 +++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 49 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index d5daa4019..49bad79b0 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.5.0** +- gitlab: upgrade CE to v14.5.0 +- gitaly: upgrade to v14.5.0 +- gitlab-pages: upgrade to v1.48.0 +- gitlab-shell: v13.22.0 + **14.4.4** - gitlab: upgrade CE to v14.4.4 - gitaly: upgrade to v14.4.4 diff --git a/Dockerfile b/Dockerfile index 2cdb0a4c8..81da50a1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20211006 -ARG VERSION=14.4.4 +ARG VERSION=14.5.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \ GOLANG_VERSION=1.17.4 \ - GITLAB_SHELL_VERSION=13.21.1 \ - GITLAB_PAGES_VERSION=1.46.0 \ - GITALY_SERVER_VERSION=14.4.4 \ + GITLAB_SHELL_VERSION=13.22.0 \ + GITLAB_PAGES_VERSION=1.48.0 \ + GITALY_SERVER_VERSION=14.5.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index f44e49c61..e1386ad6b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.4.4 +# sameersbn/gitlab:14.5.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.4.4 +docker pull sameersbn/gitlab:14.5.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.4 + sameersbn/gitlab:14.5.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.4 + sameersbn/gitlab:14.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:14.4.4 + sameersbn/gitlab:14.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:14.4.4 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.4.4 + sameersbn/gitlab:14.5.0 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.4.4 + sameersbn/gitlab:14.5.0 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.4 + sameersbn/gitlab:14.5.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.4.4 + sameersbn/gitlab:14.5.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.4.4 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.4.4 + sameersbn/gitlab:14.5.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.4.4 + sameersbn/gitlab:14.5.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.4.4 + sameersbn/gitlab:14.5.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.4.4 + sameersbn/gitlab:14.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:14.4.4 app:sanitize + sameersbn/gitlab:14.5.0 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.4 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.4 app:rake db:setup + sameersbn/gitlab:14.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:14.4.4 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.4.4 app:rake gitlab:env:info + sameersbn/gitlab:14.5.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.4 app:rake gitlab:import:repos + sameersbn/gitlab:14.5.0 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.4 app:rake gitlab:import:repos + sameersbn/gitlab:14.5.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.4.4 +docker pull sameersbn/gitlab:14.5.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.4.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.5.0 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.4.4 + image: sameersbn/gitlab:14.5.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 3e344c329..d18453764 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.4.4 +14.5.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index b0b17008f..4b8cb661e 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.4 + image: sameersbn/gitlab:14.5.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 38eaca40d..26ee1af79 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.4.4 + image: sameersbn/gitlab:14.5.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index a814e93c2..69a390c9a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.4 + image: sameersbn/gitlab:14.5.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 038a5fdf6..559537b45 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.4 app:rake gitlab:backup:create + sameersbn/gitlab:14.5.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.4 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.4.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.4.4 +docker pull sameersbn/gitlab:14.5.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.4.4 +sameersbn/gitlab:14.5.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index d585fa5a4..025120b7f 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.4 + image: sameersbn/gitlab:14.5.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 75304d182..0b250ad79 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.4.4 + image: sameersbn/gitlab:14.5.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 1b5b64fc7..74590421a 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.4.4 + image: sameersbn/gitlab:14.5.0 env: - name: TZ value: Asia/Kolkata From e83bb7e17a87c6d204e09563ad6fe4906502c1d9 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 22 Dec 2021 10:21:24 +0100 Subject: [PATCH 137/522] Rename/remove build patch for gitlab-foss - Expand if condition so that non-existent gitlab patches are not a problem --- assets/build/install.sh | 6 +++--- ...eature-checking-for-gitaly-on-a-fresh-install.patch.bak} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename assets/build/patches/{0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch => 0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch.bak} (100%) diff --git a/assets/build/install.sh b/assets/build/install.sh index e6850bf21..d8f48a531 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -82,9 +82,9 @@ exec_as_git git config --global advice.detachedHead false 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} -if [[ -d "${GITLAB_BUILD_DIR}/patches" ]]; then -echo "Applying patches for gitlab-foss..." -exec_as_git git -C ${GITLAB_INSTALL_DIR} apply --ignore-whitespace < ${GITLAB_BUILD_DIR}/patches/*.patch +if [[ -d "${GITLAB_BUILD_DIR}/patches" && -f "${GITLAB_BUILD_DIR}/patches/*.patch" ]]; then + echo "Applying patches for gitlab-foss..." + exec_as_git git -C ${GITLAB_INSTALL_DIR} apply --ignore-whitespace < ${GITLAB_BUILD_DIR}/patches/*.patch fi GITLAB_SHELL_VERSION=${GITLAB_SHELL_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_SHELL_VERSION)} diff --git a/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch b/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch.bak similarity index 100% rename from assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch rename to assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch.bak From ef0cc80838c08b61a4b91ed375760d1b5f0837d4 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 23 Dec 2021 10:34:45 +0100 Subject: [PATCH 138/522] Upgrade GitLab CE to 14.5.1 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 49bad79b0..007936783 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.5.1** +- gitlab: upgrade CE to v14.5.1 +- gitaly: upgrade to v14.5.1 +- gitlab-shell: v13.22.1 + **14.5.0** - gitlab: upgrade CE to v14.5.0 - gitaly: upgrade to v14.5.0 diff --git a/Dockerfile b/Dockerfile index 81da50a1f..d0637f860 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20211006 -ARG VERSION=14.5.0 +ARG VERSION=14.5.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \ GOLANG_VERSION=1.17.4 \ - GITLAB_SHELL_VERSION=13.22.0 \ + GITLAB_SHELL_VERSION=13.22.1 \ GITLAB_PAGES_VERSION=1.48.0 \ - GITALY_SERVER_VERSION=14.5.0 \ + GITALY_SERVER_VERSION=14.5.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index e1386ad6b..4febbadbd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.5.0 +# sameersbn/gitlab:14.5.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.5.0 +docker pull sameersbn/gitlab:14.5.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.5.0 + sameersbn/gitlab:14.5.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.5.0 + sameersbn/gitlab:14.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:14.5.0 + sameersbn/gitlab:14.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:14.5.0 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.5.0 + sameersbn/gitlab:14.5.1 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.5.0 + sameersbn/gitlab:14.5.1 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.5.0 + sameersbn/gitlab:14.5.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.5.0 + sameersbn/gitlab:14.5.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.5.0 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.5.0 + sameersbn/gitlab:14.5.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.5.0 + sameersbn/gitlab:14.5.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.5.0 + sameersbn/gitlab:14.5.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.5.0 + sameersbn/gitlab:14.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:14.5.0 app:sanitize + sameersbn/gitlab:14.5.1 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.0 app:rake db:setup + sameersbn/gitlab:14.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:14.5.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.5.0 app:rake gitlab:env:info + sameersbn/gitlab:14.5.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.5.1 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.5.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.5.0 +docker pull sameersbn/gitlab:14.5.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.5.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.5.1 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.5.0 + image: sameersbn/gitlab:14.5.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index d18453764..0ee136b34 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.5.0 +14.5.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 4b8cb661e..5b7762fc4 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.5.0 + image: sameersbn/gitlab:14.5.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 26ee1af79..2a38ae824 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.5.0 + image: sameersbn/gitlab:14.5.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 69a390c9a..5b86eaf92 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.5.0 + image: sameersbn/gitlab:14.5.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 559537b45..740a111a1 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.5.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.5.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.5.0 +docker pull sameersbn/gitlab:14.5.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.5.0 +sameersbn/gitlab:14.5.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 025120b7f..a4f53b646 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.5.0 + image: sameersbn/gitlab:14.5.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 0b250ad79..243497f0f 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.5.0 + image: sameersbn/gitlab:14.5.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 74590421a..28ec771ba 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.5.0 + image: sameersbn/gitlab:14.5.1 env: - name: TZ value: Asia/Kolkata From 4eec8cfc3b4a96999518a5ff66ae673e3521cb87 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 23 Dec 2021 11:23:33 +0100 Subject: [PATCH 139/522] Upgrade GitLab CE to 14.5.2 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 007936783..79dfeafff 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.5.2** +- gitlab: upgrade CE to v14.5.2 +- gitaly: upgrade to v14.5.2 +- golang: upgrade to v1.17.5 + **14.5.1** - gitlab: upgrade CE to v14.5.1 - gitaly: upgrade to v14.5.1 diff --git a/Dockerfile b/Dockerfile index d0637f860..a922ecab9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20211006 -ARG VERSION=14.5.1 +ARG VERSION=14.5.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \ - GOLANG_VERSION=1.17.4 \ + GOLANG_VERSION=1.17.5 \ GITLAB_SHELL_VERSION=13.22.1 \ GITLAB_PAGES_VERSION=1.48.0 \ - GITALY_SERVER_VERSION=14.5.1 \ + GITALY_SERVER_VERSION=14.5.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 4febbadbd..d150289ac 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.5.1 +# sameersbn/gitlab:14.5.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.5.1 +docker pull sameersbn/gitlab:14.5.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.5.1 + sameersbn/gitlab:14.5.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.5.1 + sameersbn/gitlab:14.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:14.5.1 + sameersbn/gitlab:14.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:14.5.1 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.5.1 + sameersbn/gitlab:14.5.2 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.5.1 + sameersbn/gitlab:14.5.2 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.5.1 + sameersbn/gitlab:14.5.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.5.1 + sameersbn/gitlab:14.5.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.5.1 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.5.1 + sameersbn/gitlab:14.5.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.5.1 + sameersbn/gitlab:14.5.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.5.1 + sameersbn/gitlab:14.5.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.5.1 + sameersbn/gitlab:14.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:14.5.1 app:sanitize + sameersbn/gitlab:14.5.2 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.1 app:rake db:setup + sameersbn/gitlab:14.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:14.5.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.5.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.5.1 app:rake gitlab:env:info + sameersbn/gitlab:14.5.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.5.2 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.5.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.5.1 +docker pull sameersbn/gitlab:14.5.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.5.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.5.2 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.5.1 + image: sameersbn/gitlab:14.5.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 0ee136b34..7cfd50ed7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.5.1 +14.5.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 5b7762fc4..dc2a342b8 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.5.1 + image: sameersbn/gitlab:14.5.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 2a38ae824..b72c3482f 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.5.1 + image: sameersbn/gitlab:14.5.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 5b86eaf92..680d43084 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.5.1 + image: sameersbn/gitlab:14.5.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 740a111a1..869bfbff3 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.5.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.5.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.5.1 +docker pull sameersbn/gitlab:14.5.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.5.1 +sameersbn/gitlab:14.5.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index a4f53b646..d6cd4e3b9 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.5.1 + image: sameersbn/gitlab:14.5.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 243497f0f..de95836ce 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.5.1 + image: sameersbn/gitlab:14.5.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 28ec771ba..0b339b867 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.5.1 + image: sameersbn/gitlab:14.5.2 env: - name: TZ value: Asia/Kolkata From 3df755b8f16441e7878876ed4502b5f74b628bb0 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 24 Dec 2021 12:27:03 +0100 Subject: [PATCH 140/522] Upgrade GitLab CE to 14.6.0 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 79dfeafff..fd72ec0cd 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.6.0** +- gitlab: upgrade CE to v14.6.0 +- gitaly: upgrade to v14.6.0 +- gitlab-pages: upgrade to v1.49.0 + **14.5.2** - gitlab: upgrade CE to v14.5.2 - gitaly: upgrade to v14.5.2 diff --git a/Dockerfile b/Dockerfile index a922ecab9..2eec8d0fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20211006 -ARG VERSION=14.5.2 +ARG VERSION=14.6.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \ GOLANG_VERSION=1.17.5 \ GITLAB_SHELL_VERSION=13.22.1 \ - GITLAB_PAGES_VERSION=1.48.0 \ - GITALY_SERVER_VERSION=14.5.2 \ + GITLAB_PAGES_VERSION=1.49.0 \ + GITALY_SERVER_VERSION=14.6.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index d150289ac..73dda6ab0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.5.2 +# sameersbn/gitlab:14.6.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.5.2 +docker pull sameersbn/gitlab:14.6.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.5.2 + sameersbn/gitlab:14.6.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.5.2 + sameersbn/gitlab:14.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:14.5.2 + sameersbn/gitlab:14.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:14.5.2 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.5.2 + sameersbn/gitlab:14.6.0 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.5.2 + sameersbn/gitlab:14.6.0 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.5.2 + sameersbn/gitlab:14.6.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.5.2 + sameersbn/gitlab:14.6.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.5.2 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.5.2 + sameersbn/gitlab:14.6.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.5.2 + sameersbn/gitlab:14.6.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.5.2 + sameersbn/gitlab:14.6.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.5.2 + sameersbn/gitlab:14.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:14.5.2 app:sanitize + sameersbn/gitlab:14.6.0 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.2 app:rake db:setup + sameersbn/gitlab:14.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:14.5.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.5.2 app:rake gitlab:env:info + sameersbn/gitlab:14.6.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.6.0 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.6.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.5.2 +docker pull sameersbn/gitlab:14.6.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.5.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.6.0 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.5.2 + image: sameersbn/gitlab:14.6.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 7cfd50ed7..df249f48e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.5.2 +14.6.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index dc2a342b8..8fd1bbc8b 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.5.2 + image: sameersbn/gitlab:14.6.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index b72c3482f..4e152183a 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.5.2 + image: sameersbn/gitlab:14.6.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 680d43084..e65df7b60 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.5.2 + image: sameersbn/gitlab:14.6.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 869bfbff3..de8a12474 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.6.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.5.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.6.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.5.2 +docker pull sameersbn/gitlab:14.6.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.5.2 +sameersbn/gitlab:14.6.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index d6cd4e3b9..d3e1257c6 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.5.2 + image: sameersbn/gitlab:14.6.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index de95836ce..689c8edd4 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.5.2 + image: sameersbn/gitlab:14.6.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 0b339b867..4214563a4 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.5.2 + image: sameersbn/gitlab:14.6.0 env: - name: TZ value: Asia/Kolkata From d4ede13e3888b7a3186af7ba1e3e06b175fd97be Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 29 Dec 2021 22:03:57 +0100 Subject: [PATCH 141/522] Use new syntax for 'config/database.yml' --- assets/runtime/config/gitlabhq/database.yml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/assets/runtime/config/gitlabhq/database.yml b/assets/runtime/config/gitlabhq/database.yml index 6ff2dbc83..0423a57c4 100644 --- a/assets/runtime/config/gitlabhq/database.yml +++ b/assets/runtime/config/gitlabhq/database.yml @@ -1,14 +1,15 @@ # -# PRODUCTION +# PRODUCTION (here: non-decomposed database) # production: - adapter: postgresql - encoding: {{DB_ENCODING}} - database: {{DB_NAME}} - host: {{DB_HOST}} - port: {{DB_PORT}} - username: {{DB_USER}} - password: "{{DB_PASS}}" - pool: {{DB_POOL}} - prepared_statements: {{DB_PREPARED_STATEMENTS}} + main: + adapter: postgresql + encoding: {{DB_ENCODING}} + database: {{DB_NAME}} + host: {{DB_HOST}} + port: {{DB_PORT}} + username: {{DB_USER}} + password: "{{DB_PASS}}" + pool: {{DB_POOL}} + prepared_statements: {{DB_PREPARED_STATEMENTS}} From 36330f536607636fd3ce69418cdd6d926daefd98 Mon Sep 17 00:00:00 2001 From: Paolo Mainardi Date: Mon, 3 Jan 2022 16:32:16 +0100 Subject: [PATCH 142/522] Support actioncable --- assets/runtime/config/gitlabhq/cable.yml | 14 ++++++++++++++ assets/runtime/functions | 13 +++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 assets/runtime/config/gitlabhq/cable.yml diff --git a/assets/runtime/config/gitlabhq/cable.yml b/assets/runtime/config/gitlabhq/cable.yml new file mode 100644 index 000000000..dd454cb8e --- /dev/null +++ b/assets/runtime/config/gitlabhq/cable.yml @@ -0,0 +1,14 @@ +# This is a template taken from here: +# https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/cable.yml.example +development: + adapter: redis + url: redis://localhost:6379 + channel_prefix: gitlab_development +test: + adapter: redis + url: redis://localhost:6379 + channel_prefix: gitlab_test +production: + adapter: redis + url: redis://{{REDIS_HOST}}:{{REDIS_PORT}}/{{REDIS_DB_NUMBER}} + channel_prefix: gitlab_production diff --git a/assets/runtime/functions b/assets/runtime/functions index 70a2e8b75..870b46ace 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -19,6 +19,7 @@ GITLAB_PUMA_CONFIG="${GITLAB_INSTALL_DIR}/config/puma.rb" GITLAB_RELATIVE_URL_CONFIG="${GITLAB_INSTALL_DIR}/config/initializers/relative_url.rb" GITLAB_SMTP_CONFIG="${GITLAB_INSTALL_DIR}/config/initializers/smtp_settings.rb" GITLAB_RESQUE_CONFIG="${GITLAB_INSTALL_DIR}/config/resque.yml" +GITLAB_ACTIONCABLE_CONFIG="${GITLAB_INSTALL_DIR}/config/cable.yml" GITLAB_SECRETS_CONFIG="${GITLAB_INSTALL_DIR}/config/secrets.yml" GITLAB_ROBOTS_CONFIG="${GITLAB_INSTALL_DIR}/public/robots.txt" GITLAB_SHELL_CONFIG="${GITLAB_SHELL_INSTALL_DIR}/config.yml" @@ -232,6 +233,17 @@ gitlab_configure_redis() { REDIS_DB_NUMBER } +gitlab_configure_actioncable() { + echo -n "Configuring gitlab::actioncable" + + gitlab_finalize_redis_parameters + gitlab_check_redis_connection + + update_template ${GITLAB_ACTIONCABLE_CONFIG} \ + REDIS_HOST \ + REDIS_PORT +} + gitlab_configure_gitaly() { echo "Configuring gitlab::gitaly..." update_template ${GITLAB_GITALY_CONFIG} \ @@ -1743,6 +1755,7 @@ configure_gitlab() { gitlab_configure_database gitlab_configure_redis + gitlab_configure_actioncable gitlab_configure_secrets gitlab_configure_sidekiq gitlab_configure_gitaly From 0a24da2cfe9d1da3031e6c95a96bcb96e8b00811 Mon Sep 17 00:00:00 2001 From: Paolo Mainardi Date: Mon, 3 Jan 2022 16:54:08 +0100 Subject: [PATCH 143/522] Copy cable.yml template file --- assets/runtime/functions | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/runtime/functions b/assets/runtime/functions index 870b46ace..27c1c3ca3 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1661,6 +1661,7 @@ install_configuration_templates() { install_template ${GITLAB_USER}: gitlabhq/resque.yml ${GITLAB_RESQUE_CONFIG} 0640 install_template ${GITLAB_USER}: gitlabhq/secrets.yml ${GITLAB_SECRETS_CONFIG} 0600 install_template ${GITLAB_USER}: gitlab-shell/config.yml ${GITLAB_SHELL_CONFIG} 0640 + install_template ${GITLAB_USER}: gitlabhq/cable.yml ${GITLAB_ACTIONCABLE_CONFIG} 0640 if [[ -n ${GITLAB_RELATIVE_URL_ROOT} ]]; then install_template ${GITLAB_USER}: gitlabhq/relative_url.rb ${GITLAB_RELATIVE_URL_CONFIG} 0644 From 09e76bb2e7d4c805bfc2cb70cb1b0ca89cd60216 Mon Sep 17 00:00:00 2001 From: Paolo Mainardi Date: Mon, 3 Jan 2022 18:28:10 +0100 Subject: [PATCH 144/522] Missing redis db number --- assets/runtime/functions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index 27c1c3ca3..5a74bae83 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -241,7 +241,8 @@ gitlab_configure_actioncable() { update_template ${GITLAB_ACTIONCABLE_CONFIG} \ REDIS_HOST \ - REDIS_PORT + REDIS_PORT \ + REDIS_DB_NUMBER } gitlab_configure_gitaly() { From de716d0a2815bcdf24ffd4ad6e5926a71c5b451c Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 5 Jan 2022 18:14:09 +0100 Subject: [PATCH 145/522] Upgrade GitLab CE to 14.6.1 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index fd72ec0cd..a32e2392b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.6.1** +- gitlab: upgrade CE to v14.6.1 +- gitaly: upgrade to v14.6.1 + **14.6.0** - gitlab: upgrade CE to v14.6.0 - gitaly: upgrade to v14.6.0 diff --git a/Dockerfile b/Dockerfile index 2eec8d0fe..88fd8cb30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20211006 -ARG VERSION=14.6.0 +ARG VERSION=14.6.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.5 \ GITLAB_SHELL_VERSION=13.22.1 \ GITLAB_PAGES_VERSION=1.49.0 \ - GITALY_SERVER_VERSION=14.6.0 \ + GITALY_SERVER_VERSION=14.6.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 73dda6ab0..d591244c4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.6.0 +# sameersbn/gitlab:14.6.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.6.0 +docker pull sameersbn/gitlab:14.6.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.6.0 + sameersbn/gitlab:14.6.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.6.0 + sameersbn/gitlab:14.6.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:14.6.0 + sameersbn/gitlab:14.6.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:14.6.0 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.6.0 + sameersbn/gitlab:14.6.1 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.6.0 + sameersbn/gitlab:14.6.1 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.6.0 + sameersbn/gitlab:14.6.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.6.0 + sameersbn/gitlab:14.6.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.6.0 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.6.0 + sameersbn/gitlab:14.6.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.6.0 + sameersbn/gitlab:14.6.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.6.0 + sameersbn/gitlab:14.6.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.6.0 + sameersbn/gitlab:14.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:14.6.0 app:sanitize + sameersbn/gitlab:14.6.1 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.0 app:rake db:setup + sameersbn/gitlab:14.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:14.6.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.6.0 app:rake gitlab:env:info + sameersbn/gitlab:14.6.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.6.1 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.6.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.6.0 +docker pull sameersbn/gitlab:14.6.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.6.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.6.1 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.6.0 + image: sameersbn/gitlab:14.6.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index df249f48e..e4ce12fcf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.6.0 +14.6.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 8fd1bbc8b..e3243821c 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.6.0 + image: sameersbn/gitlab:14.6.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 4e152183a..bc8305526 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.6.0 + image: sameersbn/gitlab:14.6.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index e65df7b60..dea410372 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.6.0 + image: sameersbn/gitlab:14.6.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index de8a12474..b3b6cf8b0 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.6.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.6.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.6.0 +docker pull sameersbn/gitlab:14.6.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.6.0 +sameersbn/gitlab:14.6.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index d3e1257c6..f5b5ba8d1 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.6.0 + image: sameersbn/gitlab:14.6.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 689c8edd4..9224b9f93 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.6.0 + image: sameersbn/gitlab:14.6.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 4214563a4..4c21f6970 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.6.0 + image: sameersbn/gitlab:14.6.1 env: - name: TZ value: Asia/Kolkata From e5dc6e6067f04d5107a528edbc792de07cb9c5ea Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 12 Jan 2022 21:50:04 +0100 Subject: [PATCH 146/522] Upgrade GitLab CE to 14.6.2 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index a32e2392b..6b61bd9b1 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.6.2** +- gitlab: upgrade CE to v14.6.2 +- gitaly: upgrade to v14.6.2 +- golang: upgrade to v1.17.6 + **14.6.1** - gitlab: upgrade CE to v14.6.1 - gitaly: upgrade to v14.6.1 diff --git a/Dockerfile b/Dockerfile index 88fd8cb30..046ed2b8a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20211006 -ARG VERSION=14.6.1 +ARG VERSION=14.6.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \ - GOLANG_VERSION=1.17.5 \ + GOLANG_VERSION=1.17.6 \ GITLAB_SHELL_VERSION=13.22.1 \ GITLAB_PAGES_VERSION=1.49.0 \ - GITALY_SERVER_VERSION=14.6.1 \ + GITALY_SERVER_VERSION=14.6.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index d591244c4..17fb6a2ab 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.6.1 +# sameersbn/gitlab:14.6.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.6.1 +docker pull sameersbn/gitlab:14.6.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.6.1 + sameersbn/gitlab:14.6.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.6.1 + sameersbn/gitlab:14.6.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:14.6.1 + sameersbn/gitlab:14.6.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:14.6.1 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.6.1 + sameersbn/gitlab:14.6.2 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.6.1 + sameersbn/gitlab:14.6.2 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.6.1 + sameersbn/gitlab:14.6.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.6.1 + sameersbn/gitlab:14.6.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.6.1 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.6.1 + sameersbn/gitlab:14.6.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.6.1 + sameersbn/gitlab:14.6.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.6.1 + sameersbn/gitlab:14.6.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.6.1 + sameersbn/gitlab:14.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:14.6.1 app:sanitize + sameersbn/gitlab:14.6.2 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.1 app:rake db:setup + sameersbn/gitlab:14.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:14.6.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.6.1 app:rake gitlab:env:info + sameersbn/gitlab:14.6.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.6.2 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.6.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.6.1 +docker pull sameersbn/gitlab:14.6.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.6.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.6.2 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.6.1 + image: sameersbn/gitlab:14.6.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index e4ce12fcf..1487d806c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.6.1 +14.6.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index e3243821c..2c84114e6 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.6.1 + image: sameersbn/gitlab:14.6.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index bc8305526..4c8601715 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.6.1 + image: sameersbn/gitlab:14.6.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index dea410372..ba4ddc355 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.6.1 + image: sameersbn/gitlab:14.6.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index b3b6cf8b0..991d0b502 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.6.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.6.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.6.1 +docker pull sameersbn/gitlab:14.6.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.6.1 +sameersbn/gitlab:14.6.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index f5b5ba8d1..5b1293159 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.6.1 + image: sameersbn/gitlab:14.6.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 9224b9f93..c8ecd11ab 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.6.1 + image: sameersbn/gitlab:14.6.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 4c21f6970..47de53203 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.6.1 + image: sameersbn/gitlab:14.6.2 env: - name: TZ value: Asia/Kolkata From d26bba3bdd5d912c9b5263734923f63e9210c82e Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 15 Jan 2022 09:38:53 +0100 Subject: [PATCH 147/522] Upgrade ubuntu base image --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 6b61bd9b1..5f56a7f8c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ This file only reflects the changes that are made in this image. Please refer to - gitlab: upgrade CE to v14.6.2 - gitaly: upgrade to v14.6.2 - golang: upgrade to v1.17.6 +- ubuntu: upgrade to focal-20220105 **14.6.1** - gitlab: upgrade CE to v14.6.1 diff --git a/Dockerfile b/Dockerfile index 046ed2b8a..fe6aead53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20211006 +FROM ubuntu:focal-focal-20220105 ARG VERSION=14.6.2 From b4c1955800161484f55bf630613c353b520bdf18 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 15 Jan 2022 09:45:39 +0100 Subject: [PATCH 148/522] Fix incorrect image tag --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fe6aead53..e4ff58213 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-focal-20220105 +FROM ubuntu:focal-20220105 ARG VERSION=14.6.2 From 5339ce5a8e5afa1534a17fe9fef6488c24e70b1c Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 20 Jan 2022 05:40:33 +0100 Subject: [PATCH 149/522] Upgrade GitLab CE to 14.6.3 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 5f56a7f8c..d2f2e7321 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.6.3** +- gitlab: upgrade CE to v14.6.3 +- gitaly: upgrade to v14.6.3 + **14.6.2** - gitlab: upgrade CE to v14.6.2 - gitaly: upgrade to v14.6.2 diff --git a/Dockerfile b/Dockerfile index e4ff58213..014ae0bc5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220105 -ARG VERSION=14.6.2 +ARG VERSION=14.6.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.6 \ GITLAB_SHELL_VERSION=13.22.1 \ GITLAB_PAGES_VERSION=1.49.0 \ - GITALY_SERVER_VERSION=14.6.2 \ + GITALY_SERVER_VERSION=14.6.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 17fb6a2ab..142a4be1a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.6.2 +# sameersbn/gitlab:14.6.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.6.2 +docker pull sameersbn/gitlab:14.6.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.6.2 + sameersbn/gitlab:14.6.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.6.2 + sameersbn/gitlab:14.6.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:14.6.2 + sameersbn/gitlab:14.6.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:14.6.2 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.6.2 + sameersbn/gitlab:14.6.3 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.6.2 + sameersbn/gitlab:14.6.3 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.6.2 + sameersbn/gitlab:14.6.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.6.2 + sameersbn/gitlab:14.6.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.6.2 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.6.2 + sameersbn/gitlab:14.6.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.6.2 + sameersbn/gitlab:14.6.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.6.2 + sameersbn/gitlab:14.6.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.6.2 + sameersbn/gitlab:14.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:14.6.2 app:sanitize + sameersbn/gitlab:14.6.3 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.2 app:rake db:setup + sameersbn/gitlab:14.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:14.6.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.6.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.6.2 app:rake gitlab:env:info + sameersbn/gitlab:14.6.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.6.3 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.6.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.6.2 +docker pull sameersbn/gitlab:14.6.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.6.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.6.3 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.6.2 + image: sameersbn/gitlab:14.6.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 1487d806c..d164342cf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.6.2 +14.6.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 2c84114e6..1a5b49322 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.6.2 + image: sameersbn/gitlab:14.6.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 4c8601715..8bb9f8935 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.6.2 + image: sameersbn/gitlab:14.6.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index ba4ddc355..87f902d32 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.6.2 + image: sameersbn/gitlab:14.6.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 991d0b502..6b92e8424 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.6.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.6.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.6.2 +docker pull sameersbn/gitlab:14.6.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.6.2 +sameersbn/gitlab:14.6.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 5b1293159..685c06e15 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.6.2 + image: sameersbn/gitlab:14.6.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index c8ecd11ab..34cd52ba4 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.6.2 + image: sameersbn/gitlab:14.6.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 47de53203..7b535860a 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.6.2 + image: sameersbn/gitlab:14.6.3 env: - name: TZ value: Asia/Kolkata From 54b279014485a4cea79ac7254210a6dd16b8b434 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Mon, 24 Jan 2022 16:20:43 +0100 Subject: [PATCH 150/522] Upgrade GitLab CE to 14.7.0 --- Changelog.md | 6 +++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 49 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index d2f2e7321..80dc5574c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.7.0** +- gitlab: upgrade CE to v14.7.0 +- gitaly: upgrade to v14.7.0 +- gitlab-shell: v13.22.2 +- gitlab-pages: upgrade to v1.51.0 + **14.6.3** - gitlab: upgrade CE to v14.6.3 - gitaly: upgrade to v14.6.3 diff --git a/Dockerfile b/Dockerfile index 014ae0bc5..b1fbba6f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20220105 -ARG VERSION=14.6.3 +ARG VERSION=14.7.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \ GOLANG_VERSION=1.17.6 \ - GITLAB_SHELL_VERSION=13.22.1 \ - GITLAB_PAGES_VERSION=1.49.0 \ - GITALY_SERVER_VERSION=14.6.3 \ + GITLAB_SHELL_VERSION=13.22.2 \ + GITLAB_PAGES_VERSION=1.51.0 \ + GITALY_SERVER_VERSION=14.7.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 142a4be1a..ddd8e63c9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.6.3 +# sameersbn/gitlab:14.7.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.6.3 +docker pull sameersbn/gitlab:14.7.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.6.3 + sameersbn/gitlab:14.7.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.6.3 + sameersbn/gitlab:14.7.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:14.6.3 + sameersbn/gitlab:14.7.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:14.6.3 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.6.3 + sameersbn/gitlab:14.7.0 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.6.3 + sameersbn/gitlab:14.7.0 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.6.3 + sameersbn/gitlab:14.7.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.6.3 + sameersbn/gitlab:14.7.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.6.3 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.6.3 + sameersbn/gitlab:14.7.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.6.3 + sameersbn/gitlab:14.7.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.6.3 + sameersbn/gitlab:14.7.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.6.3 + sameersbn/gitlab:14.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:14.6.3 app:sanitize + sameersbn/gitlab:14.7.0 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.3 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.3 app:rake db:setup + sameersbn/gitlab:14.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:14.6.3 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.6.3 app:rake gitlab:env:info + sameersbn/gitlab:14.7.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.3 app:rake gitlab:import:repos + sameersbn/gitlab:14.7.0 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.3 app:rake gitlab:import:repos + sameersbn/gitlab:14.7.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.6.3 +docker pull sameersbn/gitlab:14.7.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.6.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.7.0 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.6.3 + image: sameersbn/gitlab:14.7.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index d164342cf..654afc8e1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.6.3 +14.7.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 1a5b49322..a50d47259 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.6.3 + image: sameersbn/gitlab:14.7.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 8bb9f8935..97a209e1c 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.6.3 + image: sameersbn/gitlab:14.7.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 87f902d32..a9292edda 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.6.3 + image: sameersbn/gitlab:14.7.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 6b92e8424..e1a5e811b 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.3 app:rake gitlab:backup:create + sameersbn/gitlab:14.7.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.3 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.6.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.7.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.6.3 +docker pull sameersbn/gitlab:14.7.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.6.3 +sameersbn/gitlab:14.7.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 685c06e15..c3b26b0b8 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.6.3 + image: sameersbn/gitlab:14.7.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 34cd52ba4..e26aba08d 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.6.3 + image: sameersbn/gitlab:14.7.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 7b535860a..4db0488eb 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.6.3 + image: sameersbn/gitlab:14.7.0 env: - name: TZ value: Asia/Kolkata From af9bfee78fa4faa2c36f2fe117307aa640879e3e Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sat, 22 Jan 2022 13:54:38 +0900 Subject: [PATCH 151/522] add patch to change SSH_ALGORITHMS_PATH To enable ssh host key info in help page --- assets/build/install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/build/install.sh b/assets/build/install.sh index d8f48a531..4161b52da 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -158,6 +158,9 @@ exec_as_git sed -i "/headers\['Strict-Transport-Security'\]/d" ${GITLAB_INSTALL_ # revert `rake gitlab:setup` changes from gitlabhq/gitlabhq@a54af831bae023770bf9b2633cc45ec0d5f5a66a exec_as_git sed -i 's/db:reset/db:setup/' ${GITLAB_INSTALL_DIR}/lib/tasks/gitlab/setup.rake +# change SSH_ALGORITHM_PATH - we have moved host keys in ${GITLAB_DATA_DIR}/ssh/ to persist them +exec_as_git sed -i "s:/etc/ssh/:/${GITLAB_DATA_DIR}/ssh/:g" ${GITLAB_INSTALL_DIR}/app/models/instance_configuration.rb + cd ${GITLAB_INSTALL_DIR} # install gems, use local cache if available From f1a97e1be25db41117df6a8a9dedc77990fdbe98 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Mon, 3 Jan 2022 15:35:15 +0900 Subject: [PATCH 152/522] add prometheus_multiproc_dir environment variable to avoid 500 error on admin/metric page see #2387 --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 014ae0bc5..82734b296 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,6 +62,8 @@ COPY assets/runtime/ ${GITLAB_RUNTIME_DIR}/ COPY entrypoint.sh /sbin/entrypoint.sh RUN chmod 755 /sbin/entrypoint.sh +ENV prometheus_multiproc_dir="/dev/shm" + ARG BUILD_DATE ARG VCS_REF From 2448c6aada2888bc0439cbe6e158525f605ca662 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Fri, 28 Jan 2022 02:12:35 +0900 Subject: [PATCH 153/522] add terraform/packages dir to initialize_datadir() Also add them to sanitize_datadir() Note that the backup will fail if these directories do not exist with each feature enabled. --- assets/runtime/functions | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/assets/runtime/functions b/assets/runtime/functions index 5a74bae83..8d1ca5ecc 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1501,6 +1501,13 @@ initialize_datadir() { chmod u+rwX ${GITLAB_LFS_OBJECTS_DIR} chown ${GITLAB_USER}: ${GITLAB_LFS_OBJECTS_DIR} + # create terraform_state directory + # TODO : parametarize path and replace with it (e.g. GITLAB_TERRAFORM_STATE_STORAGE_PATH) - see sameersbn/gitlab#2438 + # TODO : wrap with "if [[ _ENABLED == true ]]" condition + mkdir -p ${GITLAB_SHARED_DIR}/terraform_state + chmod u+rwX ${GITLAB_SHARED_DIR}/terraform_state + chown ${GITLAB_USER}: ${GITLAB_SHARED_DIR}/terraform_state + # create registry dir if [[ ${GITLAB_REGISTRY_ENABLED} == true ]]; then mkdir -p ${GITLAB_REGISTRY_DIR} @@ -1508,6 +1515,13 @@ initialize_datadir() { chown ${GITLAB_USER}: ${GITLAB_REGISTRY_DIR} fi + # create packages directory + if [[ ${GITLAB_PACKAGES_ENABLED} == true ]]; then + mkdir -p ${GITLAB_PACKAGES_DIR} + chmod u+rwX ${GITLAB_PACKAGES_DIR} + chown ${GILTAB_USER}: ${GITLAB_PACKAGES_DIR} + fi + # create the backups directory mkdir -p ${GITLAB_BACKUP_DIR} if [[ ${GITLAB_BACKUP_DIR_CHOWN} == true ]]; then @@ -1574,11 +1588,21 @@ sanitize_datadir() { chmod -R u+rwX ${GITLAB_LFS_OBJECTS_DIR} chown -R ${GITLAB_USER}: ${GITLAB_LFS_OBJECTS_DIR} + # create terraform_state directory + # TODO : wrap with "if [[ _ENABLED ]]" condition + chmod u+rwX ${GITLAB_SHARED_DIR}/terraform_state + chown ${GITLAB_USER}: ${GITLAB_SHARED_DIR}/terraform_state + if [[ ${GITLAB_REGISTRY_ENABLED} == true ]]; then chmod -R u+rwX ${GITLAB_REGISTRY_DIR} chown -R ${GITLAB_USER}: ${GITLAB_REGISTRY_DIR} fi + if [[ ${GITLAB_PACKAGES_ENABLED} ]]; then + chmod u+rwX ${GITLAB_PACKAGES_DIR} + chown ${GILTAB_USER}: ${GITLAB_PACKAGES_DIR} + fi + find ${GITLAB_DATA_DIR}/uploads -type f -exec chmod 0644 {} \; find ${GITLAB_DATA_DIR}/uploads -type d -not -path ${GITLAB_DATA_DIR}/uploads -exec chmod 0755 {} \; chmod 0700 ${GITLAB_DATA_DIR}/uploads/ From d16c94f961d458891e871fc78fe465a07c252895 Mon Sep 17 00:00:00 2001 From: Olivier Mueller Date: Fri, 4 Feb 2022 13:56:59 +0100 Subject: [PATCH 154/522] Upgrade GitLab CE to 14.7.1 - https://about.gitlab.com/releases/2022/02/03/security-release-gitlab-14-7-1-released/ --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 80dc5574c..2a09834d0 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.7.1** +- gitlab: upgrade CE to v14.7.1 +- gitaly: upgrade to v14.7.1 + **14.7.0** - gitlab: upgrade CE to v14.7.0 - gitaly: upgrade to v14.7.0 diff --git a/Dockerfile b/Dockerfile index 7ad21cb90..a7b5e58e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220105 -ARG VERSION=14.7.0 +ARG VERSION=14.7.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.6 \ GITLAB_SHELL_VERSION=13.22.2 \ GITLAB_PAGES_VERSION=1.51.0 \ - GITALY_SERVER_VERSION=14.7.0 \ + GITALY_SERVER_VERSION=14.7.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index ddd8e63c9..3007f695a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.7.0 +# sameersbn/gitlab:14.7.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.7.0 +docker pull sameersbn/gitlab:14.7.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.7.0 + sameersbn/gitlab:14.7.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.7.0 + sameersbn/gitlab:14.7.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:14.7.0 + sameersbn/gitlab:14.7.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:14.7.0 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.7.0 + sameersbn/gitlab:14.7.1 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.7.0 + sameersbn/gitlab:14.7.1 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.7.0 + sameersbn/gitlab:14.7.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.7.0 + sameersbn/gitlab:14.7.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.7.0 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.7.0 + sameersbn/gitlab:14.7.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.7.0 + sameersbn/gitlab:14.7.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.7.0 + sameersbn/gitlab:14.7.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.7.0 + sameersbn/gitlab:14.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:14.7.0 app:sanitize + sameersbn/gitlab:14.7.1 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.0 app:rake db:setup + sameersbn/gitlab:14.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:14.7.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.7.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.7.0 app:rake gitlab:env:info + sameersbn/gitlab:14.7.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.7.1 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.7.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.7.0 +docker pull sameersbn/gitlab:14.7.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.7.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.7.1 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.7.0 + image: sameersbn/gitlab:14.7.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 654afc8e1..a984c5e3f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.7.0 +14.7.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index a50d47259..663b814a8 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.7.0 + image: sameersbn/gitlab:14.7.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 97a209e1c..3d2e92f99 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.7.0 + image: sameersbn/gitlab:14.7.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index a9292edda..e6ee353b9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.7.0 + image: sameersbn/gitlab:14.7.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index e1a5e811b..619632b7e 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.7.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.7.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.7.0 +docker pull sameersbn/gitlab:14.7.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.7.0 +sameersbn/gitlab:14.7.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index c3b26b0b8..7aee04e32 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.7.0 + image: sameersbn/gitlab:14.7.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index e26aba08d..1acd24351 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.7.0 + image: sameersbn/gitlab:14.7.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 4db0488eb..73cf7d46d 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.7.0 + image: sameersbn/gitlab:14.7.1 env: - name: TZ value: Asia/Kolkata From 73a47c40b651401ac385295fa8e4628ea719d96e Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 10 Feb 2022 18:16:28 +0100 Subject: [PATCH 155/522] Upgrade GitLab CE to 14.7.2 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 2a09834d0..1e211ad21 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.7.2** +- gitlab: upgrade CE to v14.7.2 +- gitaly: upgrade to v14.7.2 +- ubuntu: upgrade to focal-20220113 + **14.7.1** - gitlab: upgrade CE to v14.7.1 - gitaly: upgrade to v14.7.1 diff --git a/Dockerfile b/Dockerfile index a7b5e58e3..ebcaae924 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:focal-20220105 +FROM ubuntu:focal-20220113 -ARG VERSION=14.7.1 +ARG VERSION=14.7.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.6 \ GITLAB_SHELL_VERSION=13.22.2 \ GITLAB_PAGES_VERSION=1.51.0 \ - GITALY_SERVER_VERSION=14.7.1 \ + GITALY_SERVER_VERSION=14.7.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 3007f695a..2d73dcf8c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.7.1 +# sameersbn/gitlab:14.7.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.7.1 +docker pull sameersbn/gitlab:14.7.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.7.1 + sameersbn/gitlab:14.7.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.7.1 + sameersbn/gitlab:14.7.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:14.7.1 + sameersbn/gitlab:14.7.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:14.7.1 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.7.1 + sameersbn/gitlab:14.7.2 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.7.1 + sameersbn/gitlab:14.7.2 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.7.1 + sameersbn/gitlab:14.7.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.7.1 + sameersbn/gitlab:14.7.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.7.1 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.7.1 + sameersbn/gitlab:14.7.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.7.1 + sameersbn/gitlab:14.7.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.7.1 + sameersbn/gitlab:14.7.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.7.1 + sameersbn/gitlab:14.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:14.7.1 app:sanitize + sameersbn/gitlab:14.7.2 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.1 app:rake db:setup + sameersbn/gitlab:14.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:14.7.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.7.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.7.1 app:rake gitlab:env:info + sameersbn/gitlab:14.7.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.7.2 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.7.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.7.1 +docker pull sameersbn/gitlab:14.7.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.7.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.7.2 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.7.1 + image: sameersbn/gitlab:14.7.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index a984c5e3f..a19d5f0f0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.7.1 +14.7.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 663b814a8..f7a014624 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.7.1 + image: sameersbn/gitlab:14.7.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 3d2e92f99..2fe91f01c 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.7.1 + image: sameersbn/gitlab:14.7.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index e6ee353b9..0df130e2f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.7.1 + image: sameersbn/gitlab:14.7.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 619632b7e..c6328c499 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.7.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.7.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.7.1 +docker pull sameersbn/gitlab:14.7.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.7.1 +sameersbn/gitlab:14.7.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 7aee04e32..6c90c6fa2 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.7.1 + image: sameersbn/gitlab:14.7.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 1acd24351..ac392b8d3 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.7.1 + image: sameersbn/gitlab:14.7.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 73cf7d46d..2667d8865 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.7.1 + image: sameersbn/gitlab:14.7.2 env: - name: TZ value: Asia/Kolkata From e5fddf1ae6455811758a2f081c5bda65184fb053 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 17 Feb 2022 08:14:52 +0100 Subject: [PATCH 156/522] Upgrade GitLab CE to 14.7.3 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 1e211ad21..3f80a50d8 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.7.3** +- gitlab: upgrade CE to v14.7.2 +- gitaly: upgrade to v14.7.2 +- golang: upgrade to v1.17.7 + **14.7.2** - gitlab: upgrade CE to v14.7.2 - gitaly: upgrade to v14.7.2 diff --git a/Dockerfile b/Dockerfile index ebcaae924..977bd4fb6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20220113 -ARG VERSION=14.7.2 +ARG VERSION=14.7.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \ - GOLANG_VERSION=1.17.6 \ + GOLANG_VERSION=1.17.7 \ GITLAB_SHELL_VERSION=13.22.2 \ GITLAB_PAGES_VERSION=1.51.0 \ - GITALY_SERVER_VERSION=14.7.2 \ + GITALY_SERVER_VERSION=14.7.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 2d73dcf8c..c17434210 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.7.2 +# sameersbn/gitlab:14.7.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.7.2 +docker pull sameersbn/gitlab:14.7.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.7.2 + sameersbn/gitlab:14.7.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.7.2 + sameersbn/gitlab:14.7.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:14.7.2 + sameersbn/gitlab:14.7.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:14.7.2 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.7.2 + sameersbn/gitlab:14.7.3 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.7.2 + sameersbn/gitlab:14.7.3 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.7.2 + sameersbn/gitlab:14.7.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.7.2 + sameersbn/gitlab:14.7.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.7.2 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.7.2 + sameersbn/gitlab:14.7.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.7.2 + sameersbn/gitlab:14.7.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.7.2 + sameersbn/gitlab:14.7.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.7.2 + sameersbn/gitlab:14.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:14.7.2 app:sanitize + sameersbn/gitlab:14.7.3 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.2 app:rake db:setup + sameersbn/gitlab:14.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:14.7.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.7.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.7.2 app:rake gitlab:env:info + sameersbn/gitlab:14.7.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.7.3 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.7.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.7.2 +docker pull sameersbn/gitlab:14.7.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.7.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.7.3 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.7.2 + image: sameersbn/gitlab:14.7.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index a19d5f0f0..e8f593125 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.7.2 +14.7.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index f7a014624..9ebda0432 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.7.2 + image: sameersbn/gitlab:14.7.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 2fe91f01c..2bbff08ef 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.7.2 + image: sameersbn/gitlab:14.7.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 0df130e2f..7b514c2c7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.7.2 + image: sameersbn/gitlab:14.7.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index c6328c499..9203357b8 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.7.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.7.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.7.2 +docker pull sameersbn/gitlab:14.7.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.7.2 +sameersbn/gitlab:14.7.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 6c90c6fa2..a456c905d 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.7.2 + image: sameersbn/gitlab:14.7.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index ac392b8d3..95b15e4db 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.7.2 + image: sameersbn/gitlab:14.7.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 2667d8865..a498ef417 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.7.2 + image: sameersbn/gitlab:14.7.3 env: - name: TZ value: Asia/Kolkata From 4943e1ffc0e5cc6a22f77cdcabbee04ec1b7c9af Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sat, 19 Feb 2022 14:02:16 +0900 Subject: [PATCH 157/522] replace non-break space with normal space especially, rails warns when "non-break space" found in configuration file (such as cable.yml) --- assets/runtime/config/gitlabhq/cable.yml | 2 +- assets/runtime/env-defaults | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/runtime/config/gitlabhq/cable.yml b/assets/runtime/config/gitlabhq/cable.yml index dd454cb8e..d36e74fe1 100644 --- a/assets/runtime/config/gitlabhq/cable.yml +++ b/assets/runtime/config/gitlabhq/cable.yml @@ -1,5 +1,5 @@ # This is a template taken from here: -# https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/cable.yml.example +# https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/cable.yml.example development: adapter: redis url: redis://localhost:6379 diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 7dac47c09..8015ec1cb 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -295,7 +295,7 @@ 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=${GCS_BACKUPS:-false} GCS_BACKUP_ACCESS_KEY_ID=${GCS_BACKUP_ACCESS_KEY_ID} GCS_BACKUP_SECRET_ACCESS_KEY=${GCS_BACKUP_SECRET_ACCESS_KEY} From 98daf7b467e5c4eea12e6b1c4dc2ddb615216f5b Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 20 Feb 2022 20:38:09 +0100 Subject: [PATCH 158/522] Fix incorrect version numbers --- Changelog.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index 3f80a50d8..8b484972f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,8 +3,8 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. **14.7.3** -- gitlab: upgrade CE to v14.7.2 -- gitaly: upgrade to v14.7.2 +- gitlab: upgrade CE to v14.7.3 +- gitaly: upgrade to v14.7.3 - golang: upgrade to v1.17.7 **14.7.2** From ae00397a915df6b695cc5e9150c3e7be42d32002 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 23 Feb 2022 19:30:39 +0100 Subject: [PATCH 159/522] Upgrade GitLab CE to 14.8.0 --- Changelog.md | 6 +++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 49 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 8b484972f..3f650033e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.8.0** +- gitlab: upgrade CE to v14.8.0 +- gitaly: upgrade to v14.8.0 +- gitlab-pages: upgrade to v1.54.0 +- - gitlab-shell: v13.24.2 + **14.7.3** - gitlab: upgrade CE to v14.7.3 - gitaly: upgrade to v14.7.3 diff --git a/Dockerfile b/Dockerfile index 977bd4fb6..2a1171c31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20220113 -ARG VERSION=14.7.3 +ARG VERSION=14.8.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \ GOLANG_VERSION=1.17.7 \ - GITLAB_SHELL_VERSION=13.22.2 \ - GITLAB_PAGES_VERSION=1.51.0 \ - GITALY_SERVER_VERSION=14.7.3 \ + GITLAB_SHELL_VERSION=13.23.2 \ + GITLAB_PAGES_VERSION=1.54.0 \ + GITALY_SERVER_VERSION=14.8.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index c17434210..90d1f12cc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.7.3 +# sameersbn/gitlab:14.8.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.7.3 +docker pull sameersbn/gitlab:14.8.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.7.3 + sameersbn/gitlab:14.8.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.7.3 + sameersbn/gitlab:14.8.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:14.7.3 + sameersbn/gitlab:14.8.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:14.7.3 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.7.3 + sameersbn/gitlab:14.8.0 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.7.3 + sameersbn/gitlab:14.8.0 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.7.3 + sameersbn/gitlab:14.8.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.7.3 + sameersbn/gitlab:14.8.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.7.3 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.7.3 + sameersbn/gitlab:14.8.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.7.3 + sameersbn/gitlab:14.8.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.7.3 + sameersbn/gitlab:14.8.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.7.3 + sameersbn/gitlab:14.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:14.7.3 app:sanitize + sameersbn/gitlab:14.8.0 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.3 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.3 app:rake db:setup + sameersbn/gitlab:14.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:14.7.3 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.7.3 app:rake gitlab:env:info + sameersbn/gitlab:14.8.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.3 app:rake gitlab:import:repos + sameersbn/gitlab:14.8.0 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.3 app:rake gitlab:import:repos + sameersbn/gitlab:14.8.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.7.3 +docker pull sameersbn/gitlab:14.8.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.7.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.8.0 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.7.3 + image: sameersbn/gitlab:14.8.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index e8f593125..9306ff90b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.7.3 +14.8.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 9ebda0432..6a2ad36d8 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.7.3 + image: sameersbn/gitlab:14.8.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 2bbff08ef..e55c9480b 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.7.3 + image: sameersbn/gitlab:14.8.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 7b514c2c7..d87f47a30 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.7.3 + image: sameersbn/gitlab:14.8.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 9203357b8..4fde1c7fe 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.3 app:rake gitlab:backup:create + sameersbn/gitlab:14.8.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.3 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.7.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.8.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.7.3 +docker pull sameersbn/gitlab:14.8.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.7.3 +sameersbn/gitlab:14.8.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index a456c905d..68113fd0a 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.7.3 + image: sameersbn/gitlab:14.8.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 95b15e4db..deff78dd3 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.7.3 + image: sameersbn/gitlab:14.8.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index a498ef417..98d3347fc 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.7.3 + image: sameersbn/gitlab:14.8.0 env: - name: TZ value: Asia/Kolkata From 341b0ab04346da92fad1baf58e63b04c2af92eec Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 23 Feb 2022 21:08:26 +0100 Subject: [PATCH 160/522] Fix incorrect informations --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 3f650033e..fa87b41fd 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,7 +6,7 @@ This file only reflects the changes that are made in this image. Please refer to - gitlab: upgrade CE to v14.8.0 - gitaly: upgrade to v14.8.0 - gitlab-pages: upgrade to v1.54.0 -- - gitlab-shell: v13.24.2 +- gitlab-shell: v13.23.2 **14.7.3** - gitlab: upgrade CE to v14.7.3 From f89a0be917442dd3b92e414f4ecffb33bbdf8c7a Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 23 Feb 2022 21:07:31 +0100 Subject: [PATCH 161/522] Upgrade GitLab CE to 14.8.1 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index fa87b41fd..f451e476f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.8.1** +- gitlab: upgrade CE to v14.8.1 +- gitaly: upgrade to v14.8.1 + **14.8.0** - gitlab: upgrade CE to v14.8.0 - gitaly: upgrade to v14.8.0 diff --git a/Dockerfile b/Dockerfile index 2a1171c31..5b5b005d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220113 -ARG VERSION=14.8.0 +ARG VERSION=14.8.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.7 \ GITLAB_SHELL_VERSION=13.23.2 \ GITLAB_PAGES_VERSION=1.54.0 \ - GITALY_SERVER_VERSION=14.8.0 \ + GITALY_SERVER_VERSION=14.8.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 90d1f12cc..c1b7aa920 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.8.0 +# sameersbn/gitlab:14.8.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.8.0 +docker pull sameersbn/gitlab:14.8.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.0 + sameersbn/gitlab:14.8.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.0 + sameersbn/gitlab:14.8.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:14.8.0 + sameersbn/gitlab:14.8.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:14.8.0 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.8.0 + sameersbn/gitlab:14.8.1 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.8.0 + sameersbn/gitlab:14.8.1 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.0 + sameersbn/gitlab:14.8.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.0 + sameersbn/gitlab:14.8.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.8.0 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.8.0 + sameersbn/gitlab:14.8.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.8.0 + sameersbn/gitlab:14.8.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.8.0 + sameersbn/gitlab:14.8.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.8.0 + sameersbn/gitlab:14.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:14.8.0 app:sanitize + sameersbn/gitlab:14.8.1 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.0 app:rake db:setup + sameersbn/gitlab:14.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:14.8.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.8.0 app:rake gitlab:env:info + sameersbn/gitlab:14.8.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.8.1 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.8.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.8.0 +docker pull sameersbn/gitlab:14.8.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.8.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.8.1 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.8.0 + image: sameersbn/gitlab:14.8.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 9306ff90b..6ebe0c0b0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.8.0 +14.8.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 6a2ad36d8..1314e0967 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.0 + image: sameersbn/gitlab:14.8.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index e55c9480b..515df134d 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.8.0 + image: sameersbn/gitlab:14.8.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index d87f47a30..b51b27c08 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.0 + image: sameersbn/gitlab:14.8.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 4fde1c7fe..6bc5e4c0d 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.8.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.8.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.8.0 +docker pull sameersbn/gitlab:14.8.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.8.0 +sameersbn/gitlab:14.8.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 68113fd0a..23edd50ab 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.0 + image: sameersbn/gitlab:14.8.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index deff78dd3..489820a51 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.0 + image: sameersbn/gitlab:14.8.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 98d3347fc..c2fd96721 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.8.0 + image: sameersbn/gitlab:14.8.1 env: - name: TZ value: Asia/Kolkata From 5b230647a51d6994e3ae0f89c283556c10e4dcf7 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 26 Feb 2022 09:13:41 +0100 Subject: [PATCH 162/522] Upgrade GitLab CE to 14.8.2 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index f451e476f..242661029 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.8.2** +- gitlab: upgrade CE to v14.8.2 +- gitaly: upgrade to v14.8.2 + **14.8.1** - gitlab: upgrade CE to v14.8.1 - gitaly: upgrade to v14.8.1 diff --git a/Dockerfile b/Dockerfile index 5b5b005d4..e3f5e1130 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220113 -ARG VERSION=14.8.1 +ARG VERSION=14.8.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.7 \ GITLAB_SHELL_VERSION=13.23.2 \ GITLAB_PAGES_VERSION=1.54.0 \ - GITALY_SERVER_VERSION=14.8.1 \ + GITALY_SERVER_VERSION=14.8.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index c1b7aa920..c994ae4f2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.8.1 +# sameersbn/gitlab:14.8.2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.8.1 +docker pull sameersbn/gitlab:14.8.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.1 + sameersbn/gitlab:14.8.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.1 + sameersbn/gitlab:14.8.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:14.8.1 + sameersbn/gitlab:14.8.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:14.8.1 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.8.1 + sameersbn/gitlab:14.8.2 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.8.1 + sameersbn/gitlab:14.8.2 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.1 + sameersbn/gitlab:14.8.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.1 + sameersbn/gitlab:14.8.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.8.1 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.8.1 + sameersbn/gitlab:14.8.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.8.1 + sameersbn/gitlab:14.8.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.8.1 + sameersbn/gitlab:14.8.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.8.1 + sameersbn/gitlab:14.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:14.8.1 app:sanitize + sameersbn/gitlab:14.8.2 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.1 app:rake db:setup + sameersbn/gitlab:14.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:14.8.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.8.1 app:rake gitlab:env:info + sameersbn/gitlab:14.8.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.8.2 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.8.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.8.1 +docker pull sameersbn/gitlab:14.8.2 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.8.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.8.2 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.8.1 + image: sameersbn/gitlab:14.8.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 6ebe0c0b0..9843c3ced 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.8.1 +14.8.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 1314e0967..b7eb2a818 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.1 + image: sameersbn/gitlab:14.8.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 515df134d..395aaa1e7 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.8.1 + image: sameersbn/gitlab:14.8.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index b51b27c08..fc3732b7a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.1 + image: sameersbn/gitlab:14.8.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 6bc5e4c0d..93285e27e 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.8.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.8.1 +docker pull sameersbn/gitlab:14.8.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.8.1 +sameersbn/gitlab:14.8.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 23edd50ab..e68990c1e 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.1 + image: sameersbn/gitlab:14.8.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 489820a51..c96f5cdf5 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.1 + image: sameersbn/gitlab:14.8.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index c2fd96721..2f6bb5099 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.8.1 + image: sameersbn/gitlab:14.8.2 env: - name: TZ value: Asia/Kolkata From a9b4feb77be54a18706131f7de222fb94220abf8 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Fri, 4 Mar 2022 22:49:12 +0900 Subject: [PATCH 163/522] add NGINX_CUSTOM_GITLAB_SERVER_CONFIG --- README.md | 1 + assets/runtime/config/nginx/gitlab | 1 + assets/runtime/config/nginx/gitlab-ssl | 2 ++ assets/runtime/env-defaults | 1 + assets/runtime/functions | 3 ++- 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c994ae4f2..ead2ef2a6 100644 --- a/README.md +++ b/README.md @@ -1001,6 +1001,7 @@ Below is the complete list of available options that can be used to customize yo | `NGINX_X_FORWARDED_PROTO` | Advanced configuration option for the `proxy_set_header X-Forwarded-Proto` setting in the gitlab nginx vHost configuration. Defaults to `https` when `GITLAB_HTTPS` is `true`, else defaults to `$scheme`. | | `NGINX_REAL_IP_RECURSIVE` | set to `on` if docker container runs behind a reverse proxy,you may not want the IP address of the proxy to show up as the client address. `off` by default. | | `NGINX_REAL_IP_TRUSTED_ADDRESSES` | You can have NGINX look for a different address to use by adding your reverse proxy to the `NGINX_REAL_IP_TRUSTED_ADDRESSES`. Currently only a single entry is permitted. No defaults. | +| `NGINX_CUSTOM_GITLAB_SERVER_CONFIG` | Advanced configuration option. You can add custom configuration for nginx as you like (e.g. custom location proxy). This is similar to setting `nginx['custom_gitlab_server_config']` to `gitlab.rb` for gitlab-omnibus. No defaults. | | `REDIS_HOST` | The hostname of the redis server. Defaults to `localhost` | | `REDIS_PORT` | The connection port of the redis server. Defaults to `6379`. | | `REDIS_DB_NUMBER` | The redis database number. Defaults to '0'. | diff --git a/assets/runtime/config/nginx/gitlab b/assets/runtime/config/nginx/gitlab index b08c8bff4..c2e22a297 100644 --- a/assets/runtime/config/nginx/gitlab +++ b/assets/runtime/config/nginx/gitlab @@ -94,4 +94,5 @@ server { internal; } + {{NGINX_CUSTOM_GITLAB_SERVER_CONFIG}} } diff --git a/assets/runtime/config/nginx/gitlab-ssl b/assets/runtime/config/nginx/gitlab-ssl index 7e7be7bfc..893232b72 100644 --- a/assets/runtime/config/nginx/gitlab-ssl +++ b/assets/runtime/config/nginx/gitlab-ssl @@ -139,4 +139,6 @@ server { root {{GITLAB_INSTALL_DIR}}/public; internal; } + + {{NGINX_CUSTOM_GITLAB_SERVER_CONFIG}} } diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 8015ec1cb..661219a32 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -312,6 +312,7 @@ case ${GITLAB_HTTPS} in true) NGINX_X_FORWARDED_PROTO=${NGINX_X_FORWARDED_PROTO:-https} ;; *) NGINX_X_FORWARDED_PROTO=${NGINX_X_FORWARDED_PROTO:-\$scheme} ;; esac +NGINX_CUSTOM_GITLAB_SERVER_CONFIG=${NGINX_CUSTOM_GITLAB_SERVER_CONFIG:-} ## MAIL DELIVERY SMTP_DOMAIN=${SMTP_DOMAIN:-www.gmail.com} diff --git a/assets/runtime/functions b/assets/runtime/functions index 8d1ca5ecc..b42936df0 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1329,7 +1329,8 @@ nginx_configure_gitlab() { GITLAB_PORT \ NGINX_PROXY_BUFFERING \ NGINX_ACCEL_BUFFERING \ - NGINX_X_FORWARDED_PROTO + NGINX_X_FORWARDED_PROTO \ + NGINX_CUSTOM_GITLAB_SERVER_CONFIG nginx_configure_gitlab_ssl nginx_configure_gitlab_hsts From b8c49be9f4e5dbc563665caf6d58f58592dc8db4 Mon Sep 17 00:00:00 2001 From: Olivier Mueller Date: Tue, 22 Mar 2022 20:35:35 +0100 Subject: [PATCH 164/522] Upgrade GitLab CE to 14.8.4 - https://about.gitlab.com/releases/2022/03/16/gitlab-14-8-4-released/ --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 242661029..58080ee08 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.8.4** +- gitlab: upgrade CE to v14.8.4 +- gitaly: upgrade to v14.8.4 + **14.8.2** - gitlab: upgrade CE to v14.8.2 - gitaly: upgrade to v14.8.2 diff --git a/Dockerfile b/Dockerfile index e3f5e1130..93f888584 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220113 -ARG VERSION=14.8.2 +ARG VERSION=14.8.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.7 \ GITLAB_SHELL_VERSION=13.23.2 \ GITLAB_PAGES_VERSION=1.54.0 \ - GITALY_SERVER_VERSION=14.8.2 \ + GITALY_SERVER_VERSION=14.8.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index c994ae4f2..2557a605e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.8.2 +# sameersbn/gitlab:14.8.4 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.8.2 +docker pull sameersbn/gitlab:14.8.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.2 + sameersbn/gitlab:14.8.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.2 + sameersbn/gitlab:14.8.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:14.8.2 + sameersbn/gitlab:14.8.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:14.8.2 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.8.2 + sameersbn/gitlab:14.8.4 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.8.2 + sameersbn/gitlab:14.8.4 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.2 + sameersbn/gitlab:14.8.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.2 + sameersbn/gitlab:14.8.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.8.2 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.8.2 + sameersbn/gitlab:14.8.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.8.2 + sameersbn/gitlab:14.8.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.8.2 + sameersbn/gitlab:14.8.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.8.2 + sameersbn/gitlab:14.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:14.8.2 app:sanitize + sameersbn/gitlab:14.8.4 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.2 app:rake db:setup + sameersbn/gitlab:14.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:14.8.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.8.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.8.2 app:rake gitlab:env:info + sameersbn/gitlab:14.8.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.8.4 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.8.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.8.2 +docker pull sameersbn/gitlab:14.8.4 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.8.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.8.4 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.8.2 + image: sameersbn/gitlab:14.8.4 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 9843c3ced..5ccaa66f2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.8.2 +14.8.4 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index b7eb2a818..9a1e556da 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.2 + image: sameersbn/gitlab:14.8.4 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 395aaa1e7..81114751d 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.8.2 + image: sameersbn/gitlab:14.8.4 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index fc3732b7a..9c331fd8d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.2 + image: sameersbn/gitlab:14.8.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 93285e27e..44f3ae7bc 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.8.4 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.8.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.8.2 +docker pull sameersbn/gitlab:14.8.4 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.8.2 +sameersbn/gitlab:14.8.4 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index e68990c1e..f80a673cc 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.2 + image: sameersbn/gitlab:14.8.4 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index c96f5cdf5..03d6ea580 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.2 + image: sameersbn/gitlab:14.8.4 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 2f6bb5099..37a5959d4 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.8.2 + image: sameersbn/gitlab:14.8.4 env: - name: TZ value: Asia/Kolkata From 19fbe602e72da3b4de2dedc898a3109fcad8719e Mon Sep 17 00:00:00 2001 From: Olivier Mueller Date: Tue, 22 Mar 2022 20:52:03 +0100 Subject: [PATCH 165/522] Upgrade GitLab CE to 14.9.0 - https://about.gitlab.com/releases/2022/03/22/gitlab-14-9-released/ --- Changelog.md | 7 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 51 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index 58080ee08..ea71d8bb5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.9.0** +- gitlab: upgrade CE to v14.9.0 - https://about.gitlab.com/releases/2022/03/22/gitlab-14-9-released/ +- gitaly: upgrade to v14.9.0 +- gitlab-pages: upgrade to v1.56.0 +- gitlab-shell: upgrade to v13.24.1 +- ubuntu: upgrade to focal-20220316 + **14.8.4** - gitlab: upgrade CE to v14.8.4 - gitaly: upgrade to v14.8.4 diff --git a/Dockerfile b/Dockerfile index 93f888584..f6012ccf9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20220113 +FROM ubuntu:focal-20220316 -ARG VERSION=14.8.4 +ARG VERSION=14.9.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \ GOLANG_VERSION=1.17.7 \ - GITLAB_SHELL_VERSION=13.23.2 \ - GITLAB_PAGES_VERSION=1.54.0 \ - GITALY_SERVER_VERSION=14.8.4 \ + GITLAB_SHELL_VERSION=13.24.1 \ + GITLAB_PAGES_VERSION=1.56.0 \ + GITALY_SERVER_VERSION=14.9.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 2557a605e..60e13ba96 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.8.4 +# sameersbn/gitlab:14.9.0 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.8.4 +docker pull sameersbn/gitlab:14.9.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.4 + sameersbn/gitlab:14.9.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.4 + sameersbn/gitlab:14.9.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:14.8.4 + sameersbn/gitlab:14.9.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:14.8.4 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.8.4 + sameersbn/gitlab:14.9.0 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.8.4 + sameersbn/gitlab:14.9.0 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.4 + sameersbn/gitlab:14.9.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.4 + sameersbn/gitlab:14.9.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.8.4 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.8.4 + sameersbn/gitlab:14.9.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.8.4 + sameersbn/gitlab:14.9.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.8.4 + sameersbn/gitlab:14.9.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.8.4 + sameersbn/gitlab:14.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:14.8.4 app:sanitize + sameersbn/gitlab:14.9.0 app:sanitize ``` ### Piwik @@ -1204,7 +1204,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.4 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1239,14 +1239,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.4 app:rake db:setup + sameersbn/gitlab:14.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:14.8.4 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1305,7 +1305,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:14.8.4 app:rake gitlab:env:info + sameersbn/gitlab:14.9.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.4 app:rake gitlab:import:repos + sameersbn/gitlab:14.9.0 app:rake gitlab:import:repos ``` Or @@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.4 app:rake gitlab:import:repos + sameersbn/gitlab:14.9.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.8.4 +docker pull sameersbn/gitlab:14.9.0 ``` - **Step 2**: Stop and remove the currently running image @@ -1404,7 +1404,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:14.8.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.9.0 ``` ## Shell Access @@ -1442,7 +1442,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.8.4 + image: sameersbn/gitlab:14.9.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 5ccaa66f2..44a5e718d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.8.4 +14.9.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 9a1e556da..f289444e1 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.4 + image: sameersbn/gitlab:14.9.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 81114751d..6b37776a0 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.8.4 + image: sameersbn/gitlab:14.9.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 9c331fd8d..d554c96a9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.4 + image: sameersbn/gitlab:14.9.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 44f3ae7bc..ea06c51f6 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.4 app:rake gitlab:backup:create + sameersbn/gitlab:14.9.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.4 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.9.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.8.4 +docker pull sameersbn/gitlab:14.9.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.8.4 +sameersbn/gitlab:14.9.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index f80a673cc..2c026fa48 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.4 + image: sameersbn/gitlab:14.9.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 03d6ea580..f88eaf9c2 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.4 + image: sameersbn/gitlab:14.9.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 37a5959d4..2401ab826 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.8.4 + image: sameersbn/gitlab:14.9.0 env: - name: TZ value: Asia/Kolkata From 3ab737d21807f59ce470f28e79065ce59dbe39c2 Mon Sep 17 00:00:00 2001 From: Olivier Mueller Date: Wed, 23 Mar 2022 13:02:14 +0100 Subject: [PATCH 166/522] Fix suggested by Kazunori Kimura --- assets/build/install.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index 4161b52da..a41ead05e 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -110,8 +110,7 @@ echo "Compiling gitlab-shell golang executables..." exec_as_git bundle config set --local deployment 'true' exec_as_git bundle config set --local with 'development test' exec_as_git bundle install -j"$(nproc)" -exec_as_git "${GOROOT}"/bin/go mod vendor -exec_as_git "PATH=$PATH" make fmt verify setup +exec_as_git "PATH=$PATH" make verify setup # remove unused repositories directory created by gitlab-shell install rm -rf ${GITLAB_HOME}/repositories From 16e273e88f6082074f2c044374f3b584fff722cf Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 24 Mar 2022 08:11:17 +0100 Subject: [PATCH 167/522] Upgrade GitLab CE to 14.8.3 --- Changelog.md | 5 +++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 242661029..afc49cda6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.8.3** +- gitlab: upgrade CE to v14.8.3 +- gitaly: upgrade to v14.8.3 +- ubuntu: upgrade to focal-20220316 + **14.8.2** - gitlab: upgrade CE to v14.8.2 - gitaly: upgrade to v14.8.2 diff --git a/Dockerfile b/Dockerfile index e3f5e1130..f2398014b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20220113 +FROM ubuntu:focal-20220316 -ARG VERSION=14.8.2 +ARG VERSION=14.8.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \ - GOLANG_VERSION=1.17.7 \ + GOLANG_VERSION=1.17.8 \ GITLAB_SHELL_VERSION=13.23.2 \ GITLAB_PAGES_VERSION=1.54.0 \ - GITALY_SERVER_VERSION=14.8.2 \ + GITALY_SERVER_VERSION=14.8.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index ead2ef2a6..c3cc23dd3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.8.2 +# sameersbn/gitlab:14.8.3 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.8.2 +docker pull sameersbn/gitlab:14.8.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.2 + sameersbn/gitlab:14.8.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.2 + sameersbn/gitlab:14.8.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:14.8.2 + sameersbn/gitlab:14.8.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:14.8.2 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.8.2 + sameersbn/gitlab:14.8.3 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.8.2 + sameersbn/gitlab:14.8.3 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.2 + sameersbn/gitlab:14.8.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.8.2 + sameersbn/gitlab:14.8.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.8.2 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.8.2 + sameersbn/gitlab:14.8.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.8.2 + sameersbn/gitlab:14.8.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.8.2 + sameersbn/gitlab:14.8.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.8.2 + sameersbn/gitlab:14.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:14.8.2 app:sanitize + sameersbn/gitlab:14.8.3 app:sanitize ``` ### Piwik @@ -1205,7 +1205,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1240,14 +1240,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.2 app:rake db:setup + sameersbn/gitlab:14.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:14.8.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1256,7 +1256,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.8.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1306,7 +1306,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:14.8.2 app:rake gitlab:env:info + sameersbn/gitlab:14.8.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1319,7 +1319,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.8.3 app:rake gitlab:import:repos ``` Or @@ -1350,7 +1350,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.8.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1374,12 +1374,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.8.2 +docker pull sameersbn/gitlab:14.8.3 ``` - **Step 2**: Stop and remove the currently running image @@ -1405,7 +1405,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:14.8.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.8.3 ``` ## Shell Access @@ -1443,7 +1443,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.8.2 + image: sameersbn/gitlab:14.8.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 9843c3ced..b4a009fc3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.8.2 +14.8.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index b7eb2a818..e07456ce2 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.2 + image: sameersbn/gitlab:14.8.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 395aaa1e7..e35878f85 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.8.2 + image: sameersbn/gitlab:14.8.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index fc3732b7a..e3089ca10 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.2 + image: sameersbn/gitlab:14.8.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 93285e27e..6f665424e 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.8.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.8.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.8.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.8.2 +docker pull sameersbn/gitlab:14.8.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.8.2 +sameersbn/gitlab:14.8.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index e68990c1e..4c22f789f 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.2 + image: sameersbn/gitlab:14.8.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index c96f5cdf5..a53a3752f 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.8.2 + image: sameersbn/gitlab:14.8.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 2f6bb5099..d5fcaf7a9 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.8.2 + image: sameersbn/gitlab:14.8.3 env: - name: TZ value: Asia/Kolkata From 28d5a2ec94f3c8b066a4c16ded408ef28c7e5941 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 24 Mar 2022 09:59:51 +0100 Subject: [PATCH 168/522] Update Changelog.md --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index afc49cda6..4ded05835 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ This file only reflects the changes that are made in this image. Please refer to **14.8.3** - gitlab: upgrade CE to v14.8.3 - gitaly: upgrade to v14.8.3 +- golang: upgrade to v1.17.8 - ubuntu: upgrade to focal-20220316 **14.8.2** From 918f259ef3bee9678d25755f02d00d550db84884 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 24 Mar 2022 12:39:34 +0100 Subject: [PATCH 169/522] Remove information about base image This base image has been changed by introducing another release. --- Changelog.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index 0000c59c4..7b8b85514 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,11 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. **14.9.0** -- gitlab: upgrade CE to v14.9.0 - https://about.gitlab.com/releases/2022/03/22/gitlab-14-9-released/ +- gitlab: upgrade CE to v14.9.0 - gitaly: upgrade to v14.9.0 - gitlab-pages: upgrade to v1.56.0 - gitlab-shell: upgrade to v13.24.1 -- ubuntu: upgrade to focal-20220316 **14.8.4** - gitlab: upgrade CE to v14.8.4 From cedaa8e5686ebbfe387161762f2d7e3dd2cc6f89 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 24 Mar 2022 20:21:18 +0100 Subject: [PATCH 170/522] Downgrade version of GitLab-Shell Downgrade version of GitLab-Shell to be inline with upstream. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 507526ab5..4959ab77e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \ GOLANG_VERSION=1.17.8 \ - GITLAB_SHELL_VERSION=13.24.1 \ + GITLAB_SHELL_VERSION=13.24.0 \ GITLAB_PAGES_VERSION=1.56.0 \ GITALY_SERVER_VERSION=14.9.0 \ GITLAB_USER="git" \ From f8b24509ee57daadf1cf6cd57d6d4ab62fd42a3d Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 24 Mar 2022 20:22:26 +0100 Subject: [PATCH 171/522] Update Changelog to account for downgrade of GitLab-Shell --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 7b8b85514..8343f32ef 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,7 +6,7 @@ This file only reflects the changes that are made in this image. Please refer to - gitlab: upgrade CE to v14.9.0 - gitaly: upgrade to v14.9.0 - gitlab-pages: upgrade to v1.56.0 -- gitlab-shell: upgrade to v13.24.1 +- gitlab-shell: upgrade to v13.24.0 **14.8.4** - gitlab: upgrade CE to v14.8.4 From cdf54d4c314853cbf06fc8bf4df04bb2f88b7284 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 24 Mar 2022 22:12:15 +0100 Subject: [PATCH 172/522] Upgrade GitLab CE to 14.9.1 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 8343f32ef..02d26e8b9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.9.1** +- gitlab: upgrade CE to v14.9.1 +- gitaly: upgrade to v14.9.1 + **14.9.0** - gitlab: upgrade CE to v14.9.0 - gitaly: upgrade to v14.9.0 diff --git a/Dockerfile b/Dockerfile index 4959ab77e..63b4fa7b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220316 -ARG VERSION=14.9.0 +ARG VERSION=14.9.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.8 \ GITLAB_SHELL_VERSION=13.24.0 \ GITLAB_PAGES_VERSION=1.56.0 \ - GITALY_SERVER_VERSION=14.9.0 \ + GITALY_SERVER_VERSION=14.9.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index ae084ea9e..e6a7dd79c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com") -# sameersbn/gitlab:14.9.0 +# sameersbn/gitlab:14.9.1 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.9.0 +docker pull sameersbn/gitlab:14.9.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.9.0 + sameersbn/gitlab:14.9.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.9.0 + sameersbn/gitlab:14.9.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:14.9.0 + sameersbn/gitlab:14.9.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:14.9.0 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.9.0 + sameersbn/gitlab:14.9.1 ``` ### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.9.0 + sameersbn/gitlab:14.9.1 ``` ### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.9.0 + sameersbn/gitlab:14.9.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.9.0 + sameersbn/gitlab:14.9.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.9.0 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.9.0 + sameersbn/gitlab:14.9.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.9.0 + sameersbn/gitlab:14.9.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.9.0 + sameersbn/gitlab:14.9.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -759,14 +759,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:14.9.0 + sameersbn/gitlab:14.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:14.9.0 app:sanitize + sameersbn/gitlab:14.9.1 app:sanitize ``` ### Piwik @@ -1205,7 +1205,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -1240,14 +1240,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.0 app:rake db:setup + sameersbn/gitlab:14.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:14.9.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -1256,7 +1256,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -1306,7 +1306,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:14.9.0 app:rake gitlab:env:info + sameersbn/gitlab:14.9.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -1319,7 +1319,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.9.1 app:rake gitlab:import:repos ``` Or @@ -1350,7 +1350,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.9.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -1374,12 +1374,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.9.0 +docker pull sameersbn/gitlab:14.9.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1405,7 +1405,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:14.9.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.9.1 ``` ## Shell Access @@ -1443,7 +1443,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.9.0 + image: sameersbn/gitlab:14.9.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 44a5e718d..e1bac7955 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.9.0 +14.9.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index f289444e1..909d19a70 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.9.0 + image: sameersbn/gitlab:14.9.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 6b37776a0..5b1015d57 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.9.0 + image: sameersbn/gitlab:14.9.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index d554c96a9..d64f7f270 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.9.0 + image: sameersbn/gitlab:14.9.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ea06c51f6..5392409ca 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.9.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.9.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.9.0 +docker pull sameersbn/gitlab:14.9.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.9.0 +sameersbn/gitlab:14.9.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 2c026fa48..dbcce41da 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.9.0 + image: sameersbn/gitlab:14.9.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index f88eaf9c2..f3acf4fbc 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.9.0 + image: sameersbn/gitlab:14.9.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 2401ab826..c3276b888 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.9.0 + image: sameersbn/gitlab:14.9.1 env: - name: TZ value: Asia/Kolkata From e91d9b5f7cd502015cc13ac26e2ee0aa74e23800 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sat, 5 Mar 2022 22:10:05 +0900 Subject: [PATCH 173/522] support GITLAB_ISSUE_CLOSING_PATTERN --- 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 ae084ea9e..a17125992 100644 --- a/README.md +++ b/README.md @@ -807,6 +807,7 @@ Below is the complete list of available options that can be used to customize yo | `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_ISSUE_CLOSING_PATTERN` | Issue closing pattern regex. See [GitLab's documentation](https://docs.gitlab.com/ee/administration/issue_closing_pattern.html) for more detail. Defaults to ` \b((?:[Cc]los(?:e[sd]?|ing)|\b[Ff]ix(?:e[sd]|ing)?|\b[Rr]esolv(?:e[sd]?|ing)|\b[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+) ` . | | `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`. | diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index c5dd61269..8b6deb602 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -138,7 +138,7 @@ production: &base # This happens when the commit is pushed or merged into the default branch of a project. # When not specified the default issue_closing_pattern as specified below will be used. # Tip: you can test your closing pattern at http://rubular.com. - # issue_closing_pattern: '\b((?:[Cc]los(?:e[sd]?|ing)|\b[Ff]ix(?:e[sd]|ing)?|\b[Rr]esolv(?:e[sd]?|ing)|\b[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)' + issue_closing_pattern: '{{GITLAB_ISSUE_CLOSING_PATTERN}}' ## Default project features settings default_projects_features: diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 661219a32..603d4bbc3 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -82,6 +82,7 @@ GITLAB_UNICORN_MEMORY_MAX=${GITLAB_UNICORN_MEMORY_MAX:-1342177280} ## GITLAB_TIMEZONE=${GITLAB_TIMEZONE:-UTC} GITLAB_SIGNUP_ENABLED=${GITLAB_SIGNUP_ENABLED:-true} +GITLAB_ISSUE_CLOSING_PATTERN=${GITLAB_ISSUE_CLOSING_PATTERN:-'\b((?:[Cc]los(?:e[sd]?|ing)|\b[Ff]ix(?:e[sd]|ing)?|\b[Rr]esolv(?:e[sd]?|ing)|\b[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+)'} GITLAB_PROJECTS_LIMIT=${GITLAB_PROJECTS_LIMIT:-100} GITLAB_USERNAME_CHANGE=${GITLAB_USERNAME_CHANGE:-true} GITLAB_CREATE_GROUP=${GITLAB_CREATE_GROUP:-true} diff --git a/assets/runtime/functions b/assets/runtime/functions index b42936df0..1124848af 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1778,7 +1778,8 @@ configure_gitlab() { GITLAB_PROJECTS_LIMIT \ GITLAB_USERNAME_CHANGE \ GITLAB_DEFAULT_THEME \ - GITLAB_CREATE_GROUP + GITLAB_CREATE_GROUP \ + GITLAB_ISSUE_CLOSING_PATTERN gitlab_configure_database gitlab_configure_redis From 7a9723364c17d552dc1145eb31e97f2232a2ac32 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sat, 5 Mar 2022 22:50:42 +0900 Subject: [PATCH 174/522] [skip ci] extract configuration parameter table - extract parameter table into header and description style - trim trailing whitespace in README (at least parameters section) --- README.md | 1921 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 1535 insertions(+), 386 deletions(-) diff --git a/README.md b/README.md index ae084ea9e..7942a4b70 100644 --- a/README.md +++ b/README.md @@ -785,392 +785,1541 @@ These options should contain something like: Below is the complete list of available options that can be used to customize your gitlab installation. -| Parameter | Description | -|-----------|-------------| -| `DEBUG` | Set this to `true` to enable entrypoint debugging. | -| `TZ` | Set the container timezone. Defaults to `UTC`. Values are expected to be in Canonical format. Example: `Europe/Amsterdam` See the list of [acceptable values](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones). For configuring the timezone of gitlab see variable `GITLAB_TIMEZONE`. | -| `GITLAB_HOST` | The hostname of the GitLab server. Defaults to `localhost` | -| `GITLAB_CI_HOST` | If you are migrating from GitLab CI use this parameter to configure the redirection to the GitLab service so that your existing runners continue to work without any changes. No defaults. | -| `GITLAB_PORT` | The port of the GitLab server. This value indicates the public port on which the GitLab application will be accessible on the network and appropriately configures GitLab to generate the correct urls. It does not affect the port on which the internal nginx server will be listening on. Defaults to `443` if `GITLAB_HTTPS=true`, else defaults to `80`. | -| `GITLAB_SECRETS_DB_KEY_BASE` | Encryption key for GitLab CI secret variables, as well as import credentials, in the database. Ensure that your key is at least 32 characters long and that you don't lose it. You can generate one using `pwgen -Bsv1 64`. If you are migrating from GitLab CI, you need to set this value to the value of `GITLAB_CI_SECRETS_DB_KEY_BASE`. No defaults. | -| `GITLAB_SECRETS_SECRET_KEY_BASE` | Encryption key for session secrets. Ensure that your key is at least 64 characters long and that you don't lose it. This secret can be rotated with minimal impact - the main effect is that previously-sent password reset emails will no longer work. You can generate one using `pwgen -Bsv1 64`. No defaults. | -| `GITLAB_SECRETS_OTP_KEY_BASE` | Encryption key for OTP related stuff with GitLab. Ensure that your key is at least 64 characters long and that you don't lose it. **If you lose or change this secret, 2FA will stop working for all users.** You can generate one using `pwgen -Bsv1 64`. No defaults. | -| `GITLAB_TIMEZONE` | Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`. See the list of [acceptable values](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html). For settings the container timezone which will effect cron, see variable `TZ` | -| `GITLAB_ROOT_PASSWORD` | The password for the root user on firstrun. Defaults to `5iveL!fe`. GitLab requires this to be at least **8 characters long**. | -| `GITLAB_ROOT_EMAIL` | The email for the root user on firstrun. Defaults to `admin@example.com` | -| `GITLAB_EMAIL` | The email address for the GitLab server. Defaults to value of `SMTP_USER`, else defaults to `example@example.com`. | -| `GITLAB_EMAIL_DISPLAY_NAME` | The name displayed in emails sent out by the GitLab mailer. Defaults to `GitLab`. | -| `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`. | -| `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`. | -| `GITLAB_PROJECTS_ISSUES` | Set if *issues* feature should be enabled by default for new projects. Defaults to `true`. | -| `GITLAB_PROJECTS_MERGE_REQUESTS` | Set if *merge requests* feature should be enabled by default for new projects. Defaults to `true`. | -| `GITLAB_PROJECTS_WIKI` | Set if *wiki* feature should be enabled by default for new projects. Defaults to `true`. | -| `GITLAB_PROJECTS_SNIPPETS` | Set if *snippets* feature should be enabled by default for new projects. Defaults to `false`. | -| `GITLAB_PROJECTS_BUILDS` | Set if *builds* feature should be enabled by default for new projects. Defaults to `true`. | -| `GITLAB_PROJECTS_CONTAINER_REGISTRY` | Set if *container_registry* feature should be enabled by default for new projects. Defaults to `true`. | -| `GITLAB_SHELL_CUSTOM_HOOKS_DIR` | Global custom hooks directory. Defaults to `/home/git/gitlab-shell/hooks`. | -| `GITLAB_WEBHOOK_TIMEOUT` | Sets the timeout for webhooks. Defaults to `10` seconds. | -| `GITLAB_NOTIFY_ON_BROKEN_BUILDS` | Enable or disable broken build notification emails. Defaults to `true` | -| `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_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` | -| `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`| -| `AWS_REGION`| AWS Region. Defaults to `us-east-1` | -| `AWS_HOST`| Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`. Defaults to `s3.amazon.com`| -| `AWS_ENDPOINT`| AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil`| -| `AWS_PATH_STYLE`| Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` | -| `AWS_SIGNATURE_VERSION`| AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `4` | -| `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. (`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 `$AWS_REGION` | -| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` | -| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` | -| `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 `$AWS_PATH_STYLE` | -| `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` | AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION` | -| `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 `'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` | -| `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. (`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 `$AWS_REGION` | -| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` | -| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` | -| `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 `AWS_PATH_STYLE` | -| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` | AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION` | -| `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_PACKAGES_ENABLED` | Enable/Disable Pakages support. Defaults to `true`. | -| `GITLAB_PACKAGES_DIR` | Directory to store the packages data. Defaults to `$GITLAB_SHARED_DIR/packages` | -| `GITLAB_PACKAGES_OBJECT_STORE_ENABLED` | Enables Object Store for Packages that will be remote stored. Defaults to `false` | -| `GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY` | Bucket name to store the packages. Defaults to `packages` | -| `GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD` | Set to true to enable direct upload of Packages without the need of local shared storage. Defaults to `false` | -| `GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD` | Temporary option to limit automatic upload. Defaults to `false` | -| `GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD` | Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` | -| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER` | Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) | -| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` | AWS Access Key ID for the Bucket. Defaults to `$AWS_ACCESS_KEY_ID` | -| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` | AWS Secret Access Key. Defaults to `$AWS_SECRET_ACCESS_KEY` | -| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION` | AWS Region. Defaults to `$AWS_REGION` | -| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` | -| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` | -| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` | Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE` | -| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT`| -| `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL`| -| `GITLAB_PACKAGES_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. (`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 `$AWS_REGION` | -| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST` | Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` | -| `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` | AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` | -| `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 `AWS_PATH_STYLE` | -| `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` | AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION` | -| `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 | -| `GITLAB_BACKUP_EXPIRY` | Configure how long (in seconds) to keep backups before they are deleted. By default when automated backups are disabled backups are kept forever (0 seconds), else the backups expire in 7 days (604800 seconds). | -| `GITLAB_BACKUP_PG_SCHEMA` | Specify the PostgreSQL schema for the backups. No defaults, which means that all schemas will be backed up. see #524 | -| `GITLAB_BACKUP_ARCHIVE_PERMISSIONS` | Sets the permissions of the backup archives. Defaults to `0600`. [See](http://doc.gitlab.com/ce/raketasks/backup_restore.html#backup-archive-permissions) | -| `GITLAB_BACKUP_TIME` | Set a time for the automatic backups in `HH:MM` format. Defaults to `04:00`. | -| `GITLAB_BACKUP_SKIP` | Specified sections are skipped by the backups. Defaults to empty, i.e. `lfs,uploads`. [See](http://doc.gitlab.com/ce/raketasks/backup_restore.html#create-a-backup-of-the-gitlab-system) | -| `GITLAB_SSH_HOST` | The ssh host. Defaults to **GITLAB_HOST**. | -| `GITLAB_SSH_LISTEN_PORT` | The ssh port for SSHD to listen on. Defaults to `22` | -| `GITLAB_SSH_MAXSTARTUPS` | The ssh "MaxStartups" parameter, defaults to `10:30:60`. | -| `GITLAB_SSH_PORT` | The ssh port number. Defaults to `$GITLAB_SSH_LISTEN_PORT`. | -| `GITLAB_RELATIVE_URL_ROOT` | The relative url of the GitLab server, e.g. `/git`. No default. | -| `GITLAB_TRUSTED_PROXIES` | Add IP address reverse proxy to trusted proxy list, otherwise users will appear signed in from that address. Currently only a single entry is permitted. No defaults. | -| `GITLAB_REGISTRY_ENABLED` | Enables the GitLab Container Registry. Defaults to `false`. | -| `GITLAB_REGISTRY_HOST` | Sets the GitLab Registry Host. Defaults to `registry.example.com` | -| `GITLAB_REGISTRY_PORT` | Sets the GitLab Registry Port. Defaults to `443`. | -| `GITLAB_REGISTRY_API_URL` | Sets the GitLab Registry API URL. Defaults to `http://localhost:5000` | -| `GITLAB_REGISTRY_KEY_PATH` | Sets the GitLab Registry Key Path. Defaults to `config/registry.key` | -| `GITLAB_REGISTRY_DIR` | Directory to store the container images will be shared with registry. Defaults to `$GITLAB_SHARED_DIR/registry` | -| `GITLAB_REGISTRY_ISSUER` | Sets the GitLab Registry Issuer. Defaults to `gitlab-issuer`. | -| `GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES` | Set to `true` to generate SSL internal Registry keys. Used to communicate between a Docker Registry and GitLab. It will generate a self-signed certificate key at the location given by `$GITLAB_REGISTRY_KEY_PATH`, e.g. `/certs/registry.key`. And will generate the certificate file at the same location, with the same name, but changing the extension from `key` to `crt`, e.g. `/certs/registry.crt` | -| `GITLAB_PAGES_ENABLED` | Enables the GitLab Pages. Defaults to `false`. | -| `GITLAB_PAGES_DOMAIN` | Sets the GitLab Pages Domain. Defaults to `example.com` | -| `GITLAB_PAGES_DIR` | Sets GitLab Pages directory where all pages will be stored. Defaults to `$GITLAB_SHARED_DIR/pages` | -| `GITLAB_PAGES_PORT`| Sets GitLab Pages Port that will be used in NGINX. Defaults to `80` | -| `GITLAB_PAGES_HTTPS` | Sets GitLab Pages to HTTPS and the gitlab-pages-ssl config will be used. Defaults to `false` | -| `GITLAB_PAGES_ARTIFACTS_SERVER` | Set to `true` to enable pages artifactsserver, enabled by default. | -| `GITLAB_PAGES_ARTIFACTS_SERVER_URL` | If `GITLAB_PAGES_ARTIFACTS_SERVER` is enabled, set to API endpoint for GitLab Pages (e.g. `https://example.com/api/v4`). No 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_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/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. | -| `GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL` | Time between sampling of unicorn socket metrics, in seconds, defaults to `10` | -| `GITLAB_MONITORING_IP_WHITELIST` | IP whitelist to access monitoring endpoints, defaults to `0.0.0.0/8` | -| `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED` | Set to `true` to enable the sidekiq exporter, enabled by default. | -| `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS` | Sidekiq exporter address, defaults to `0.0.0.0` | -| `GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT` | Sidekiq exporter port, defaults to `3807` | -| `GITLAB_CONTENT_SECURITY_POLICY_ENABLED` | Set to `true` to enable [Content Security Policy](https://guides.rubyonrails.org/security.html#content-security-policy), enabled by default. | -| `GITLAB_CONTENT_SECURITY_POLICY_REPORT_ONLY` | Set to `true` to set `Content-Security-Policy-Report-Only` header, disabled by default | -| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_BASE_URI` | The value of the `base-uri` directive in the `Content-Security-Policy` header | -| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CHILD_SRC` | The value of the `child-src` directive in the `Content-Security-Policy` header | -| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CONNECT_SRC` | The value of the `connect-src` directive in the `Content-Security-Policy` header. Default to `'self' http://localhost:* ws://localhost:* wss://localhost:*` | -| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_DEFAULT_SRC` | The value of the `default-src` directive in the `Content-Security-Policy` header. Default to `'self'` | -| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FONT_SRC` | The value of the `font-src` directive in the `Content-Security-Policy` header | -| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FORM_ACTION` | The value of the `form-action` directive in the `Content-Security-Policy` header | -| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_ANCESTORS` | The value of the `frame-ancestors` directive in the `Content-Security-Policy` header. Default to `'self'` | -| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_SRC` | The value of the `frame-src` directive in the `Content-Security-Policy` header. Default to `'self' https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://content.googleapis.com https://content-compute.googleapis.com https://content-cloudbilling.googleapis.com https://content-cloudresourcemanager.googleapis.com` | -| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_IMG_SRC` | The value of the `img-src` directive in the `Content-Security-Policy` header. Default to `* data: blob:` | -| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MANIFEST_SRC` | The value of the `manifest-src` directive in the `Content-Security-Policy` header | -| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MEDIA_SRC` | The value of the `media-src` directive in the `Content-Security-Policy` header | -| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_OBJECT_SRC` | The value of the `object-src` directive in the `Content-Security-Policy` header. Default to `'none'` | -| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC` | The value of the `script-src` directive in the `Content-Security-Policy` header. Default to `'self' 'unsafe-eval' http://localhost:* https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://www.gstatic.com/recaptcha/ https://apis.google.com` | -| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC` | The value of the `style-src` directive in the `Content-Security-Policy` header. Default to `'self' 'unsafe-inline'` | -| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC` | The value of the `worker-src` directive in the `Content-Security-Policy` header. Default to `'self' blob:` | -| `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI` | The value of the `report-uri` directive in the `Content-Security-Policy` header | -| `SSL_SELF_SIGNED` | Set to `true` when using self signed ssl certificates. `false` by default. | -| `SSL_CERTIFICATE_PATH` | Location of the ssl certificate. Defaults to `/home/git/data/certs/gitlab.crt` | -| `SSL_KEY_PATH` | Location of the ssl private key. Defaults to `/home/git/data/certs/gitlab.key` | -| `SSL_DHPARAM_PATH` | Location of the dhparam file. Defaults to `/home/git/data/certs/dhparam.pem` | -| `SSL_VERIFY_CLIENT` | Enable verification of client certificates using the `SSL_CA_CERTIFICATES_PATH` file or setting this variable to `on`. Defaults to `off` | -| `SSL_CA_CERTIFICATES_PATH` | List of SSL certificates to trust. Defaults to `/home/git/data/certs/ca.crt`. | -| `SSL_REGISTRY_KEY_PATH` | Location of the ssl private key for gitlab container registry. Defaults to `/home/git/data/certs/registry.key` | -| `SSL_REGISTRY_CERT_PATH` | Location of the ssl certificate for the gitlab container registry. Defaults to `/home/git/data/certs/registry.crt` | -| `SSL_PAGES_KEY_PATH` | Location of the ssl private key for gitlab pages. Defaults to `/home/git/data/certs/pages.key` | -| `SSL_PAGES_CERT_PATH` | Location of the ssl certificate for the gitlab pages. Defaults to `/home/git/data/certs/pages.crt` | -| `SSL_CIPHERS` | List of supported SSL ciphers: Defaults to `ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4` | -| `SSL_PROTOCOLS` | List of supported SSL protocols: Defaults to `TLSv1 TLSv1.1 TLSv1.2 TLSv1.3` | -| `SSL_PAGES_CIPHERS` | List of supported SSL ciphers for the gitlab pages: Defaults to `SSL_CIPHERS` | -| `SSL_PAGES_PROTOCOLS` | List of supported SSL protocols for the gitlab pages: Defaults to `SSL_PROTOCOLS` | -| `SSL_REGISTRY_CIPHERS` | List of supported SSL ciphers for gitlab container registry: Defaults to `SSL_CIPHERS` | -| `SSL_REGISTRY_PROTOCOLS` | List of supported SSL protocols for gitlab container registry: Defaults to `SSL_PROTOCOLS` | -| `NGINX_WORKERS` | The number of nginx workers to start. Defaults to `1`. | -| `NGINX_SERVER_NAMES_HASH_BUCKET_SIZE` | Sets the bucket size for the server names hash tables. This is needed when you have long server_names or your an error message from nginx like *nginx: [emerg] could not build server_names_hash, you should increase server_names_hash_bucket_size:..*. It should be only increment by a power of 2. Defaults to `32`. | -| `NGINX_HSTS_ENABLED` | Advanced configuration option for turning off the HSTS configuration. Applicable only when SSL is in use. Defaults to `true`. See [#138](https://github.com/sameersbn/docker-gitlab/issues/138) for use case scenario. | -| `NGINX_HSTS_MAXAGE` | Advanced configuration option for setting the HSTS max-age in the gitlab nginx vHost configuration. Applicable only when SSL is in use. Defaults to `31536000`. | -| `NGINX_PROXY_BUFFERING` | Enable `proxy_buffering`. Defaults to `off`. | -| `NGINX_ACCEL_BUFFERING` | Enable `X-Accel-Buffering` header. Default to `no` | -| `NGINX_X_FORWARDED_PROTO` | Advanced configuration option for the `proxy_set_header X-Forwarded-Proto` setting in the gitlab nginx vHost configuration. Defaults to `https` when `GITLAB_HTTPS` is `true`, else defaults to `$scheme`. | -| `NGINX_REAL_IP_RECURSIVE` | set to `on` if docker container runs behind a reverse proxy,you may not want the IP address of the proxy to show up as the client address. `off` by default. | -| `NGINX_REAL_IP_TRUSTED_ADDRESSES` | You can have NGINX look for a different address to use by adding your reverse proxy to the `NGINX_REAL_IP_TRUSTED_ADDRESSES`. Currently only a single entry is permitted. No defaults. | -| `NGINX_CUSTOM_GITLAB_SERVER_CONFIG` | Advanced configuration option. You can add custom configuration for nginx as you like (e.g. custom location proxy). This is similar to setting `nginx['custom_gitlab_server_config']` to `gitlab.rb` for gitlab-omnibus. No defaults. | -| `REDIS_HOST` | The hostname of the redis server. Defaults to `localhost` | -| `REDIS_PORT` | The connection port of the redis server. Defaults to `6379`. | -| `REDIS_DB_NUMBER` | The redis database number. Defaults to '0'. | -| `PUMA_WORKERS` | The number of puma workers to start. Defaults to `3`. | -| `PUMA_TIMEOUT` | Sets the timeout of puma worker processes. Defaults to `60` seconds. | -| `PUMA_THREADS_MIN` | The number of puma minimum threads. Defaults to `1`. | -| `PUMA_THREADS_MAX` | The number of puma maximum threads. Defaults to `16`. | -| `PUMA_PER_WORKER_MAX_MEMORY_MB` | Maximum memory size of per puma worker process. Defaults to `1024`. | -| `PUMA_MASTER_MAX_MEMORY_MB` | Maximum memory size of puma master process. Defaults to `800`. | -| `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 `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`. | -| `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 | -| `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`. | -| `SMTP_PORT` | SMTP server port. Defaults to `587`. | -| `SMTP_USER` | SMTP username. | -| `SMTP_PASS` | SMTP password. | -| `SMTP_STARTTLS` | Enable STARTTLS. Defaults to `true`. | -| `SMTP_TLS` | Enable SSL/TLS. Defaults to `false`. | -| `SMTP_OPENSSL_VERIFY_MODE` | SMTP openssl verification mode. Accepted values are `none`, `peer`, `client_once` and `fail_if_no_peer_cert`. Defaults to `none`. | -| `SMTP_AUTHENTICATION` | Specify the SMTP authentication method. Defaults to `login` if `SMTP_USER` is set. | -| `SMTP_CA_ENABLED` | Enable custom CA certificates for SMTP email configuration. Defaults to `false`. | -| `SMTP_CA_PATH` | Specify the `ca_path` parameter for SMTP email configuration. Defaults to `/home/git/data/certs`. | -| `SMTP_CA_FILE` | Specify the `ca_file` parameter for SMTP email configuration. Defaults to `/home/git/data/certs/ca.crt`. | -| `IMAP_ENABLED` | Enable mail delivery via IMAP. Defaults to `true` if `IMAP_USER` is defined, else defaults to `false`. | -| `IMAP_HOST` | IMAP server host. Defaults to `imap.gmail.com`. | -| `IMAP_PORT` | IMAP server port. Defaults to `993`. | -| `IMAP_USER` | IMAP username. | -| `IMAP_PASS` | IMAP password. | -| `IMAP_SSL` | Enable SSL. Defaults to `true`. | -| `IMAP_STARTTLS` | Enable STARTSSL. Defaults to `false`. | -| `IMAP_MAILBOX` | The name of the mailbox where incoming mail will end up. Defaults to `inbox`. | -| `LDAP_ENABLED` | Enable LDAP. Defaults to `false` | -| `LDAP_LABEL` | Label to show on login tab for LDAP server. Defaults to 'LDAP' | -| `LDAP_HOST` | LDAP Host | -| `LDAP_PORT` | LDAP Port. Defaults to `389` | -| `LDAP_UID` | LDAP UID. Defaults to `sAMAccountName` | -| `LDAP_METHOD` | LDAP method, Possible values are `simple_tls`, `start_tls` and `plain`. Defaults to `plain` | -| `LDAP_VERIFY_SSL` | LDAP verify ssl certificate for installations that are using `LDAP_METHOD: 'simple_tls'` or `LDAP_METHOD: 'start_tls'`. Defaults to `true` | -| `LDAP_CA_FILE` | Specifies the path to a file containing a PEM-format CA certificate. Defaults to `` | -| `LDAP_SSL_VERSION` | Specifies the SSL version for OpenSSL to use, if the OpenSSL default is not appropriate. Example: 'TLSv1_1'. Defaults to `` | -| `LDAP_BIND_DN` | No default. | -| `LDAP_PASS` | LDAP password | -| `LDAP_TIMEOUT` | Timeout, in seconds, for LDAP queries. Defaults to `10`. | -| `LDAP_ACTIVE_DIRECTORY` | Specifies if LDAP server is Active Directory LDAP server. If your LDAP server is not AD, set this to `false`. Defaults to `true`, | -| `LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN` | If enabled, GitLab will ignore everything after the first '@' in the LDAP username submitted by the user on login. Defaults to `false` if `LDAP_UID` is `userPrincipalName`, else `true`. | -| `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` | -| `LDAP_PREVENT_LDAP_SIGN_IN` | Set to `true` to [Disable LDAP web sign in](https://docs.gitlab.com/ce/administration/auth/ldap/#disable-ldap-web-sign-in), 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. | -| `OAUTH_BLOCK_AUTO_CREATED_USERS` | Locks down those users until they have been cleared by the admin. Defaults to `true`. | -| `OAUTH_AUTO_LINK_LDAP_USER` | Look up new users in LDAP servers. If a match is found (same uid), automatically link the omniauth identity with the LDAP account. Defaults to `false`. | -| `OAUTH_AUTO_LINK_SAML_USER` | Allow users with existing accounts to login and auto link their account via SAML login, without having to do a manual login first and manually add SAML. Defaults to `false`. | -| `OAUTH_AUTO_LINK_USER` | Allow users with existing accounts to login and auto link their account via the defined Omniauth providers login, without having to do a manual login first and manually connect their chosen provider. Defaults to `[]`. | -| `OAUTH_EXTERNAL_PROVIDERS` | Comma separated list if oauth providers to disallow access to `internal` projects. Users creating accounts via these providers will have access internal projects. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default. | -| `OAUTH_CAS3_LABEL` | The "Sign in with" button label. Defaults to "cas3". | -| `OAUTH_CAS3_SERVER` | CAS3 server URL. No defaults. | -| `OAUTH_CAS3_DISABLE_SSL_VERIFICATION` | Disable CAS3 SSL verification. Defaults to `false`. | -| `OAUTH_CAS3_LOGIN_URL` | CAS3 login URL. Defaults to `/cas/login` | -| `OAUTH_CAS3_VALIDATE_URL` | CAS3 validation URL. Defaults to `/cas/p3/serviceValidate` | -| `OAUTH_CAS3_LOGOUT_URL` | CAS3 logout URL. Defaults to `/cas/logout` | -| `OAUTH_GOOGLE_API_KEY` | Google App Client ID. No defaults. | -| `OAUTH_GOOGLE_APP_SECRET` | Google App Client Secret. No defaults. | -| `OAUTH_GOOGLE_RESTRICT_DOMAIN` | List of Google App restricted domains. Value is comma separated list of single quoted groups. Example: `'exemple.com','exemple2.com'`. No defaults. | -| `OAUTH_FACEBOOK_API_KEY` | Facebook App API key. No defaults. | -| `OAUTH_FACEBOOK_APP_SECRET` | Facebook App API secret. No defaults. | -| `OAUTH_TWITTER_API_KEY` | Twitter App API key. No defaults. | -| `OAUTH_TWITTER_APP_SECRET` | Twitter App API secret. No defaults. | -| `OAUTH_AUTHENTIQ_CLIENT_ID` | authentiq Client ID. No defaults. | -| `OAUTH_AUTHENTIQ_CLIENT_SECRET` | authentiq Client secret. No defaults. | -| `OAUTH_AUTHENTIQ_SCOPE` | Scope of Authentiq Application Defaults to `'aq:name email~rs address aq:push'`| -| `OAUTH_AUTHENTIQ_REDIRECT_URI` | Callback URL for Authentiq. No defaults. | -| `OAUTH_GITHUB_API_KEY` | GitHub App Client ID. No defaults. | -| `OAUTH_GITHUB_APP_SECRET` | GitHub App Client secret. No defaults. | -| `OAUTH_GITHUB_URL` | Url to the GitHub Enterprise server. Defaults to https://github.com | -| `OAUTH_GITHUB_VERIFY_SSL` | Enable SSL verification while communicating with the GitHub server. Defaults to `true`. | -| `OAUTH_GITLAB_API_KEY` | GitLab App Client ID. No defaults. | -| `OAUTH_GITLAB_APP_SECRET` | GitLab App Client secret. No defaults. | -| `OAUTH_BITBUCKET_API_KEY` | BitBucket App Client ID. No defaults. | -| `OAUTH_BITBUCKET_APP_SECRET` | BitBucket App Client secret. No defaults. | -| `OAUTH_BITBUCKET_URL` | Bitbucket URL. Defaults: https://bitbucket.org/ | -| `OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL` | The URL at which the SAML assertion should be received. When `GITLAB_HTTPS=true`, defaults to `https://${GITLAB_HOST}/users/auth/saml/callback` else defaults to `http://${GITLAB_HOST}/users/auth/saml/callback`. | -| `OAUTH_SAML_IDP_CERT_FINGERPRINT` | The SHA1 fingerprint of the certificate. No Defaults. | -| `OAUTH_SAML_IDP_SSO_TARGET_URL` | The URL to which the authentication request should be sent. No defaults. | -| `OAUTH_SAML_ISSUER` | The name of your application. When `GITLAB_HTTPS=true`, defaults to `https://${GITLAB_HOST}` else defaults to `http://${GITLAB_HOST}`. | -| `OAUTH_SAML_LABEL` | The "Sign in with" button label. Defaults to "Our SAML Provider". | -| `OAUTH_SAML_NAME_IDENTIFIER_FORMAT` | Describes the format of the username required by GitLab, Defaults to `urn:oasis:names:tc:SAML:2.0:nameid-format:transient` | -| `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. | -| `OAUTH_CROWD_SERVER_URL` | Crowd server url. No defaults. | -| `OAUTH_CROWD_APP_NAME` | Crowd server application name. No defaults. | -| `OAUTH_CROWD_APP_PASSWORD` | Crowd server application password. No defaults. | -| `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. | -| `OAUTH2_GENERIC_APP_ID` | Your OAuth2 App ID. No defaults. | -| `OAUTH2_GENERIC_APP_SECRET` | Your OAuth2 App Secret. No defaults. | -| `OAUTH2_GENERIC_CLIENT_SITE` | The OAuth2 generic client site. No defaults | -| `OAUTH2_GENERIC_CLIENT_USER_INFO_URL` | The OAuth2 generic client user info url. No defaults | -| `OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL` | The OAuth2 generic client authorize url. No defaults | -| `OAUTH2_GENERIC_CLIENT_TOKEN_URL` | The OAuth2 generic client token url. No defaults| -| `OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT` | The OAuth2 generic client end session endpoint. No defaults | -| `OAUTH2_GENERIC_ID_PATH` | The OAuth2 generic id path. No defaults | -| `OAUTH2_GENERIC_USER_UID` | The OAuth2 generic user id path. No defaults | -| `OAUTH2_GENERIC_USER_NAME` | The OAuth2 generic user name. No defaults | -| `OAUTH2_GENERIC_USER_EMAIL` | The OAuth2 generic user email. No defaults | -| `OAUTH2_GENERIC_NAME` | The name of your OAuth2 provider. No defaults | -| `GITLAB_GRAVATAR_ENABLED` | Enables gravatar integration. Defaults to `true`. | -| `GITLAB_GRAVATAR_HTTP_URL` | Sets a custom gravatar url. Defaults to `http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon`. This can be used for [Libravatar integration](http://doc.gitlab.com/ce/customization/libravatar.html). | -| `GITLAB_GRAVATAR_HTTPS_URL` | Same as above, but for https. Defaults to `https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon`. | -| `USERMAP_UID` | Sets the uid for user `git` to the specified uid. Defaults to `1000`. | -| `USERMAP_GID` | Sets the gid for group `git` to the specified gid. Defaults to `USERMAP_UID` if defined, else defaults to `1000`. | -| `GOOGLE_ANALYTICS_ID` | Google Analytics ID. No defaults. | -| `PIWIK_URL` | Sets the Piwik URL. No defaults. | -| `PIWIK_SITE_ID` | Sets the Piwik site ID. No defaults. | -| `AWS_BACKUPS` | Enables automatic uploads to an Amazon S3 instance. Defaults to `false`. | -| `AWS_BACKUP_REGION` | AWS region. No defaults. | -| `AWS_BACKUP_ENDPOINT` | AWS endpoint. No defaults. | -| `AWS_BACKUP_ACCESS_KEY_ID` | AWS access key id. No defaults. | -| `AWS_BACKUP_SECRET_ACCESS_KEY` | AWS secret access key. No defaults. | -| `AWS_BACKUP_BUCKET` | AWS bucket for backup uploads. No defaults. | -| `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 | -| `GCS_BACKUP_BUCKET` | GCS bucket for backup uploads. No defaults | -| `GITLAB_ROBOTS_PATH` | Location of custom `robots.txt`. Uses GitLab's default `robots.txt` configuration by default. See [www.robotstxt.org](http://www.robotstxt.org) for examples. | -| `RACK_ATTACK_ENABLED` | Enable/disable rack middleware for blocking & throttling abusive requests Defaults to `true`. | -| `RACK_ATTACK_WHITELIST` | Always allow requests from whitelisted host. Defaults to `127.0.0.1` | -| `RACK_ATTACK_MAXRETRY` | Number of failed auth attempts before which an IP should be banned. Defaults to `10` | -| `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`. | +#### `DEBUG` + +Set this to `true` to enable entrypoint debugging. + +#### `TZ` + +Set the container timezone. Defaults to `UTC`. Values are expected to be in Canonical format. Example: `Europe/Amsterdam` See the list of [acceptable values](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones). For configuring the timezone of gitlab see variable `GITLAB_TIMEZONE`. + +#### `GITLAB_HOST` + +The hostname of the GitLab server. Defaults to `localhost` + +#### `GITLAB_CI_HOST` + +If you are migrating from GitLab CI use this parameter to configure the redirection to the GitLab service so that your existing runners continue to work without any changes. No defaults. + +#### `GITLAB_PORT` + +The port of the GitLab server. This value indicates the public port on which the GitLab application will be accessible on the network and appropriately configures GitLab to generate the correct urls. It does not affect the port on which the internal nginx server will be listening on. Defaults to `443` if `GITLAB_HTTPS=true`, else defaults to `80`. + +#### `GITLAB_SECRETS_DB_KEY_BASE` + +Encryption key for GitLab CI secret variables, as well as import credentials, in the database. Ensure that your key is at least 32 characters long and that you don't lose it. You can generate one using `pwgen -Bsv1 64`. If you are migrating from GitLab CI, you need to set this value to the value of `GITLAB_CI_SECRETS_DB_KEY_BASE`. No defaults. + +#### `GITLAB_SECRETS_SECRET_KEY_BASE` + +Encryption key for session secrets. Ensure that your key is at least 64 characters long and that you don't lose it. This secret can be rotated with minimal impact - the main effect is that previously-sent password reset emails will no longer work. You can generate one using `pwgen -Bsv1 64`. No defaults. + +#### `GITLAB_SECRETS_OTP_KEY_BASE` + + Encryption key for OTP related stuff with GitLab. Ensure that your key is at least 64 characters long and that you don't lose it. **If you lose or change this secret, 2FA will stop working for all users.** You can generate one using `pwgen -Bsv1 64`. No defaults. + +#### `GITLAB_TIMEZONE` + +Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`. See the list of [acceptable values](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html). For settings the container timezone which will effect cron, see variable `TZ` + +#### `GITLAB_ROOT_PASSWORD` + +The password for the root user on firstrun. Defaults to `5iveL!fe`. GitLab requires this to be at least **8 characters long**. + +#### `GITLAB_ROOT_EMAIL` + +The email for the root user on firstrun. Defaults to `admin@example.com` + +#### `GITLAB_EMAIL` + +The email address for the GitLab server. Defaults to value of `SMTP_USER`, else defaults to `example@example.com`. + +#### `GITLAB_EMAIL_DISPLAY_NAME` + +The name displayed in emails sent out by the GitLab mailer. Defaults to `GitLab`. + +#### `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`. + +#### `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`. + +#### `GITLAB_PROJECTS_ISSUES` + +Set if *issues* feature should be enabled by default for new projects. Defaults to `true`. + +#### `GITLAB_PROJECTS_MERGE_REQUESTS` + +Set if *merge requests* feature should be enabled by default for new projects. Defaults to `true`. + +#### `GITLAB_PROJECTS_WIKI` + +Set if *wiki* feature should be enabled by default for new projects. Defaults to `true`. + +#### `GITLAB_PROJECTS_SNIPPETS` + +Set if *snippets* feature should be enabled by default for new projects. Defaults to `false`. + +#### `GITLAB_PROJECTS_BUILDS` + +Set if *builds* feature should be enabled by default for new projects. Defaults to `true`. + +#### `GITLAB_PROJECTS_CONTAINER_REGISTRY` + +Set if *container_registry* feature should be enabled by default for new projects. Defaults to `true`. + +#### `GITLAB_SHELL_CUSTOM_HOOKS_DIR` + +Global custom hooks directory. Defaults to `/home/git/gitlab-shell/hooks`. + +#### `GITLAB_WEBHOOK_TIMEOUT` + +Sets the timeout for webhooks. Defaults to `10` seconds. + +#### `GITLAB_NOTIFY_ON_BROKEN_BUILDS` + +Enable or disable broken build notification emails. Defaults to `true` + +#### `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_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` + +#### `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` + +#### `AWS_REGION` + +AWS Region. Defaults to `us-east-1` + +#### `AWS_HOST` + +Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`. Defaults to `s3.amazon.com` + +#### `AWS_ENDPOINT` + +AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil` + +#### `AWS_PATH_STYLE` + +Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` + +#### `AWS_SIGNATURE_VERSION` + +AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `4` + +#### `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. (`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 `$AWS_REGION` + +#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST` + +Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` + +#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` + +AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` + +#### `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 `$AWS_PATH_STYLE` + +#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` + +AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION` + +#### `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 `'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` + +#### `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. (`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 `$AWS_REGION` + +#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST` + +Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` + +#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` + +AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` + +#### `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 `AWS_PATH_STYLE` + +#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` + +AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION` + +#### `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_PACKAGES_ENABLED` + +Enable/Disable Pakages support. Defaults to `true`. + +#### `GITLAB_PACKAGES_DIR` + +Directory to store the packages data. Defaults to `$GITLAB_SHARED_DIR/packages` + +#### `GITLAB_PACKAGES_OBJECT_STORE_ENABLED` + +Enables Object Store for Packages that will be remote stored. Defaults to `false` + +#### `GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY` + +Bucket name to store the packages. Defaults to `packages` + +#### `GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD` + +Set to true to enable direct upload of Packages without the need of local shared storage. Defaults to `false` + +#### `GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD` + +Temporary option to limit automatic upload. Defaults to `false` + +#### `GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD` + +Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` + +#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER` + +Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) + +#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` + +AWS Access Key ID for the Bucket. Defaults to `$AWS_ACCESS_KEY_ID` + +#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` + +AWS Secret Access Key. Defaults to `$AWS_SECRET_ACCESS_KEY` + +#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION` + +AWS Region. Defaults to `$AWS_REGION` + +#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST` + +Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` + +#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` + +AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` + +#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` + +Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE` + +#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT` + +Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT` + +#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL` + +Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL` + +#### `GITLAB_PACKAGES_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. (`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 `$AWS_REGION` + +#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST` + +Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` + +#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` + +AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` + +#### `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 `AWS_PATH_STYLE` + +#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` + +AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION` + +#### `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 + +#### `GITLAB_BACKUP_EXPIRY` + +Configure how long (in seconds) to keep backups before they are deleted. By default when automated backups are disabled backups are kept forever (0 seconds), else the backups expire in 7 days (604800 seconds). + +#### `GITLAB_BACKUP_PG_SCHEMA` + +Specify the PostgreSQL schema for the backups. No defaults, which means that all schemas will be backed up. see #524 + +#### `GITLAB_BACKUP_ARCHIVE_PERMISSIONS` + +Sets the permissions of the backup archives. Defaults to `0600`. [See](http://doc.gitlab.com/ce/raketasks/backup_restore.html#backup-archive-permissions) + +#### `GITLAB_BACKUP_TIME` + +Set a time for the automatic backups in `HH:MM` format. Defaults to `04:00`. + +#### `GITLAB_BACKUP_SKIP` + +Specified sections are skipped by the backups. Defaults to empty, i.e. `lfs,uploads`. [See](http://doc.gitlab.com/ce/raketasks/backup_restore.html#create-a-backup-of-the-gitlab-system) + +#### `GITLAB_SSH_HOST` + +The ssh host. Defaults to **GITLAB_HOST**. + +#### `GITLAB_SSH_LISTEN_PORT` + +The ssh port for SSHD to listen on. Defaults to `22` + +#### `GITLAB_SSH_MAXSTARTUPS` + +The ssh "MaxStartups" parameter, defaults to `10:30:60`. + +#### `GITLAB_SSH_PORT` + +The ssh port number. Defaults to `$GITLAB_SSH_LISTEN_PORT`. + +#### `GITLAB_RELATIVE_URL_ROOT` + +The relative url of the GitLab server, e.g. `/git`. No default. + +#### `GITLAB_TRUSTED_PROXIES` + +Add IP address reverse proxy to trusted proxy list, otherwise users will appear signed in from that address. Currently only a single entry is permitted. No defaults. + +#### `GITLAB_REGISTRY_ENABLED` + +Enables the GitLab Container Registry. Defaults to `false`. + +#### `GITLAB_REGISTRY_HOST` + +Sets the GitLab Registry Host. Defaults to `registry.example.com` + +#### `GITLAB_REGISTRY_PORT` + +Sets the GitLab Registry Port. Defaults to `443`. + +#### `GITLAB_REGISTRY_API_URL` + +Sets the GitLab Registry API URL. Defaults to `http://localhost:5000` + +#### `GITLAB_REGISTRY_KEY_PATH` + +Sets the GitLab Registry Key Path. Defaults to `config/registry.key` + +#### `GITLAB_REGISTRY_DIR` + +Directory to store the container images will be shared with registry. Defaults to `$GITLAB_SHARED_DIR/registry` + +#### `GITLAB_REGISTRY_ISSUER` + +Sets the GitLab Registry Issuer. Defaults to `gitlab-issuer`. + +#### `GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES` + +Set to `true` to generate SSL internal Registry keys. Used to communicate between a Docker Registry and GitLab. It will generate a self-signed certificate key at the location given by `$GITLAB_REGISTRY_KEY_PATH`, e.g. `/certs/registry.key`. And will generate the certificate file at the same location, with the same name, but changing the extension from `key` to `crt`, e.g. `/certs/registry.crt` + +#### `GITLAB_PAGES_ENABLED` + +Enables the GitLab Pages. Defaults to `false`. + +#### `GITLAB_PAGES_DOMAIN` + +Sets the GitLab Pages Domain. Defaults to `example.com` + +#### `GITLAB_PAGES_DIR` + +Sets GitLab Pages directory where all pages will be stored. Defaults to `$GITLAB_SHARED_DIR/pages` + +#### `GITLAB_PAGES_PORT` + +Sets GitLab Pages Port that will be used in NGINX. Defaults to `80` + +#### `GITLAB_PAGES_HTTPS` + +Sets GitLab Pages to HTTPS and the gitlab-pages-ssl config will be used. Defaults to `false` + +#### `GITLAB_PAGES_ARTIFACTS_SERVER` + +Set to `true` to enable pages artifactsserver, enabled by default. + +#### `GITLAB_PAGES_ARTIFACTS_SERVER_URL` + +If `GITLAB_PAGES_ARTIFACTS_SERVER` is enabled, set to API endpoint for GitLab Pages (e.g. `https://example.com/api/v4`). No 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_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/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. + +#### `GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL` + +Time between sampling of unicorn socket metrics, in seconds, defaults to `10` + +#### `GITLAB_MONITORING_IP_WHITELIST` + +IP whitelist to access monitoring endpoints, defaults to `0.0.0.0/8` + +#### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED` + +Set to `true` to enable the sidekiq exporter, enabled by default. + +#### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS` + +Sidekiq exporter address, defaults to `0.0.0.0` + +#### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT` + +Sidekiq exporter port, defaults to `3807` + +#### `GITLAB_CONTENT_SECURITY_POLICY_ENABLED` + +Set to `true` to enable [Content Security Policy](https://guides.rubyonrails.org/security.html#content-security-policy), enabled by default. + +#### `GITLAB_CONTENT_SECURITY_POLICY_REPORT_ONLY` + +Set to `true` to set `Content-Security-Policy-Report-Only` header, disabled by default + +#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_BASE_URI` + +The value of the `base-uri` directive in the `Content-Security-Policy` header + +#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CHILD_SRC` + +The value of the `child-src` directive in the `Content-Security-Policy` header + +#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CONNECT_SRC` + +The value of the `connect-src` directive in the `Content-Security-Policy` header. Default to `'self' http://localhost:* ws://localhost:* wss://localhost:*` + +#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_DEFAULT_SRC` + +The value of the `default-src` directive in the `Content-Security-Policy` header. Default to `'self'` + +#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FONT_SRC` + +The value of the `font-src` directive in the `Content-Security-Policy` header + +#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FORM_ACTION` + +The value of the `form-action` directive in the `Content-Security-Policy` header + +#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_ANCESTORS` + +The value of the `frame-ancestors` directive in the `Content-Security-Policy` header. Default to `'self'` + +#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_SRC` + +The value of the `frame-src` directive in the `Content-Security-Policy` header. Default to `'self' https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://content.googleapis.com https://content-compute.googleapis.com https://content-cloudbilling.googleapis.com https://content-cloudresourcemanager.googleapis.com` + +#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_IMG_SRC` + +The value of the `img-src` directive in the `Content-Security-Policy` header. Default to `* data: blob:` + +#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MANIFEST_SRC` + +The value of the `manifest-src` directive in the `Content-Security-Policy` header + +#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MEDIA_SRC` + +The value of the `media-src` directive in the `Content-Security-Policy` header + +#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_OBJECT_SRC` + +The value of the `object-src` directive in the `Content-Security-Policy` header. Default to `'none'` + +#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC` + +The value of the `script-src` directive in the `Content-Security-Policy` header. Default to `'self' 'unsafe-eval' http://localhost:* https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://www.gstatic.com/recaptcha/ https://apis.google.com` + +#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC` + +The value of the `style-src` directive in the `Content-Security-Policy` header. Default to `'self' 'unsafe-inline'` + +#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC` + +The value of the `worker-src` directive in the `Content-Security-Policy` header. Default to `'self' blob:` + +#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI` + +The value of the `report-uri` directive in the `Content-Security-Policy` header + +#### `SSL_SELF_SIGNED` + +Set to `true` when using self signed ssl certificates. `false` by default. + +#### `SSL_CERTIFICATE_PATH` + +Location of the ssl certificate. Defaults to `/home/git/data/certs/gitlab.crt` + +#### `SSL_KEY_PATH` + +Location of the ssl private key. Defaults to `/home/git/data/certs/gitlab.key` + +#### `SSL_DHPARAM_PATH` + +Location of the dhparam file. Defaults to `/home/git/data/certs/dhparam.pem` + +#### `SSL_VERIFY_CLIENT` + +Enable verification of client certificates using the `SSL_CA_CERTIFICATES_PATH` file or setting this variable to `on`. Defaults to `off` + +#### `SSL_CA_CERTIFICATES_PATH` + +List of SSL certificates to trust. Defaults to `/home/git/data/certs/ca.crt`. + +#### `SSL_REGISTRY_KEY_PATH` + +Location of the ssl private key for gitlab container registry. Defaults to `/home/git/data/certs/registry.key` + +#### `SSL_REGISTRY_CERT_PATH` + +Location of the ssl certificate for the gitlab container registry. Defaults to `/home/git/data/certs/registry.crt` + +#### `SSL_PAGES_KEY_PATH` + +Location of the ssl private key for gitlab pages. Defaults to `/home/git/data/certs/pages.key` + +#### `SSL_PAGES_CERT_PATH` + +Location of the ssl certificate for the gitlab pages. Defaults to `/home/git/data/certs/pages.crt` + +#### `SSL_CIPHERS` + +List of supported SSL ciphers: Defaults to `ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4` + +#### `SSL_PROTOCOLS` + +List of supported SSL protocols: Defaults to `TLSv1 TLSv1.1 TLSv1.2 TLSv1.3` + +#### `SSL_PAGES_CIPHERS` + +List of supported SSL ciphers for the gitlab pages: Defaults to `SSL_CIPHERS` + +#### `SSL_PAGES_PROTOCOLS` + +List of supported SSL protocols for the gitlab pages: Defaults to `SSL_PROTOCOLS` + +#### `SSL_REGISTRY_CIPHERS` + +List of supported SSL ciphers for gitlab container registry: Defaults to `SSL_CIPHERS` + +#### `SSL_REGISTRY_PROTOCOLS` + +List of supported SSL protocols for gitlab container registry: Defaults to `SSL_PROTOCOLS` + +#### `NGINX_WORKERS` + +The number of nginx workers to start. Defaults to `1`. + +#### `NGINX_SERVER_NAMES_HASH_BUCKET_SIZE` + +Sets the bucket size for the server names hash tables. This is needed when you have long server_names or your an error message from nginx like *nginx: [emerg] could not build server_names_hash, you should increase server_names_hash_bucket_size:..*. It should be only increment by a power of 2. Defaults to `32`. + +#### `NGINX_HSTS_ENABLED` + +Advanced configuration option for turning off the HSTS configuration. Applicable only when SSL is in use. Defaults to `true`. See [#138](https://github.com/sameersbn/docker-gitlab/issues/138) for use case scenario. + +#### `NGINX_HSTS_MAXAGE` + +Advanced configuration option for setting the HSTS max-age in the gitlab nginx vHost configuration. Applicable only when SSL is in use. Defaults to `31536000`. + +#### `NGINX_PROXY_BUFFERING` + +Enable `proxy_buffering`. Defaults to `off`. + +#### `NGINX_ACCEL_BUFFERING` + +Enable `X-Accel-Buffering` header. Default to `no` + +#### `NGINX_X_FORWARDED_PROTO` + +Advanced configuration option for the `proxy_set_header X-Forwarded-Proto` setting in the gitlab nginx vHost configuration. Defaults to `https` when `GITLAB_HTTPS` is `true`, else defaults to `$scheme`. + +#### `NGINX_REAL_IP_RECURSIVE` + +set to `on` if docker container runs behind a reverse proxy,you may not want the IP address of the proxy to show up as the client address. `off` by default. + +#### `NGINX_REAL_IP_TRUSTED_ADDRESSES` + +You can have NGINX look for a different address to use by adding your reverse proxy to the `NGINX_REAL_IP_TRUSTED_ADDRESSES`. Currently only a single entry is permitted. No defaults. + +#### `NGINX_CUSTOM_GITLAB_SERVER_CONFIG` + +Advanced configuration option. You can add custom configuration for nginx as you like (e.g. custom location proxy). This is similar to setting `nginx['custom_gitlab_server_config']` to `gitlab.rb` for gitlab-omnibus. No defaults. + +#### `REDIS_HOST` + +The hostname of the redis server. Defaults to `localhost` + +#### `REDIS_PORT` + +The connection port of the redis server. Defaults to `6379`. + +#### `REDIS_DB_NUMBER` + +The redis database number. Defaults to '0'. + +#### `PUMA_WORKERS` + +The number of puma workers to start. Defaults to `3`. + +#### `PUMA_TIMEOUT` + +Sets the timeout of puma worker processes. Defaults to `60` seconds. + +#### `PUMA_THREADS_MIN` + +The number of puma minimum threads. Defaults to `1`. + +#### `PUMA_THREADS_MAX` + +The number of puma maximum threads. Defaults to `16`. + +#### `PUMA_PER_WORKER_MAX_MEMORY_MB` + +Maximum memory size of per puma worker process. Defaults to `1024`. + +#### `PUMA_MASTER_MAX_MEMORY_MB` + +Maximum memory size of puma master process. Defaults to `800`. + +#### `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 `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`. + +#### `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 + +#### `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`. + +#### `SMTP_PORT` + +SMTP server port. Defaults to `587`. + +#### `SMTP_USER` + +SMTP username. + +#### `SMTP_PASS` + +SMTP password. + +#### `SMTP_STARTTLS` + +Enable STARTTLS. Defaults to `true`. + +#### `SMTP_TLS` + +Enable SSL/TLS. Defaults to `false`. + +#### `SMTP_OPENSSL_VERIFY_MODE` + +SMTP openssl verification mode. Accepted values are `none`, `peer`, `client_once` and `fail_if_no_peer_cert`. Defaults to `none`. + +#### `SMTP_AUTHENTICATION` + +Specify the SMTP authentication method. Defaults to `login` if `SMTP_USER` is set. + +#### `SMTP_CA_ENABLED` + +Enable custom CA certificates for SMTP email configuration. Defaults to `false`. + +#### `SMTP_CA_PATH` + +Specify the `ca_path` parameter for SMTP email configuration. Defaults to `/home/git/data/certs`. + +#### `SMTP_CA_FILE` + +Specify the `ca_file` parameter for SMTP email configuration. Defaults to `/home/git/data/certs/ca.crt`. + +#### `IMAP_ENABLED` + +Enable mail delivery via IMAP. Defaults to `true` if `IMAP_USER` is defined, else defaults to `false`. + +#### `IMAP_HOST` + +IMAP server host. Defaults to `imap.gmail.com`. + +#### `IMAP_PORT` + +IMAP server port. Defaults to `993`. + +#### `IMAP_USER` + +IMAP username. + +#### `IMAP_PASS` + +IMAP password. + +#### `IMAP_SSL` + +Enable SSL. Defaults to `true`. + +#### `IMAP_STARTTLS` + +Enable STARTSSL. Defaults to `false`. + +#### `IMAP_MAILBOX` + +The name of the mailbox where incoming mail will end up. Defaults to `inbox`. + +#### `LDAP_ENABLED` + +Enable LDAP. Defaults to `false` + +#### `LDAP_LABEL` + +Label to show on login tab for LDAP server. Defaults to 'LDAP' + +#### `LDAP_HOST` + +LDAP Host + +#### `LDAP_PORT` + +LDAP Port. Defaults to `389` + +#### `LDAP_UID` + +LDAP UID. Defaults to `sAMAccountName` + +#### `LDAP_METHOD` + +LDAP method, Possible values are `simple_tls`, `start_tls` and `plain`. Defaults to `plain` + +#### `LDAP_VERIFY_SSL` + +LDAP verify ssl certificate for installations that are using `LDAP_METHOD: 'simple_tls'` or `LDAP_METHOD: 'start_tls'`. Defaults to `true` + +#### `LDAP_CA_FILE` + +Specifies the path to a file containing a PEM-format CA certificate. Defaults to `` + +#### `LDAP_SSL_VERSION` + +Specifies the SSL version for OpenSSL to use, if the OpenSSL default is not appropriate. Example: 'TLSv1_1'. Defaults to `` + +#### `LDAP_BIND_DN` + +No default. + +#### `LDAP_PASS` + +LDAP password + +#### `LDAP_TIMEOUT` + +Timeout, in seconds, for LDAP queries. Defaults to `10`. + +#### `LDAP_ACTIVE_DIRECTORY` + +Specifies if LDAP server is Active Directory LDAP server. If your LDAP server is not AD, set this to `false`. Defaults to `true`, + +#### `LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN` + +If enabled, GitLab will ignore everything after the first '@' in the LDAP username submitted by the user on login. Defaults to `false` if `LDAP_UID` is `userPrincipalName`, else `true`. + +#### `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` + +#### `LDAP_PREVENT_LDAP_SIGN_IN` + +Set to `true` to [Disable LDAP web sign in](https://docs.gitlab.com/ce/administration/auth/ldap/#disable-ldap-web-sign-in), 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. + +#### `OAUTH_BLOCK_AUTO_CREATED_USERS` + +Locks down those users until they have been cleared by the admin. Defaults to `true`. + +#### `OAUTH_AUTO_LINK_LDAP_USER` + +Look up new users in LDAP servers. If a match is found (same uid), automatically link the omniauth identity with the LDAP account. Defaults to `false`. + +#### `OAUTH_AUTO_LINK_SAML_USER` + +Allow users with existing accounts to login and auto link their account via SAML login, without having to do a manual login first and manually add SAML. Defaults to `false`. + +#### `OAUTH_AUTO_LINK_USER` + +Allow users with existing accounts to login and auto link their account via the defined Omniauth providers login, without having to do a manual login first and manually connect their chosen provider. Defaults to `[]`. + +#### `OAUTH_EXTERNAL_PROVIDERS` + +Comma separated list if oauth providers to disallow access to `internal` projects. Users creating accounts via these providers will have access internal projects. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default. + +#### `OAUTH_CAS3_LABEL` + +The "Sign in with" button label. Defaults to "cas3". + +#### `OAUTH_CAS3_SERVER` + +CAS3 server URL. No defaults. + +#### `OAUTH_CAS3_DISABLE_SSL_VERIFICATION` + +Disable CAS3 SSL verification. Defaults to `false`. + +#### `OAUTH_CAS3_LOGIN_URL` + +CAS3 login URL. Defaults to `/cas/login` + +#### `OAUTH_CAS3_VALIDATE_URL` + +CAS3 validation URL. Defaults to `/cas/p3/serviceValidate` + +#### `OAUTH_CAS3_LOGOUT_URL` + +CAS3 logout URL. Defaults to `/cas/logout` + +#### `OAUTH_GOOGLE_API_KEY` + +Google App Client ID. No defaults. + +#### `OAUTH_GOOGLE_APP_SECRET` + +Google App Client Secret. No defaults. + +#### `OAUTH_GOOGLE_RESTRICT_DOMAIN` + +List of Google App restricted domains. Value is comma separated list of single quoted groups. Example: `'exemple.com','exemple2.com'`. No defaults. + +#### `OAUTH_FACEBOOK_API_KEY` + +Facebook App API key. No defaults. + +#### `OAUTH_FACEBOOK_APP_SECRET` + +Facebook App API secret. No defaults. + +#### `OAUTH_TWITTER_API_KEY` + +Twitter App API key. No defaults. + +#### `OAUTH_TWITTER_APP_SECRET` + +Twitter App API secret. No defaults. + +#### `OAUTH_AUTHENTIQ_CLIENT_ID` + +authentiq Client ID. No defaults. + +#### `OAUTH_AUTHENTIQ_CLIENT_SECRET` + +authentiq Client secret. No defaults. + +#### `OAUTH_AUTHENTIQ_SCOPE` + +Scope of Authentiq Application Defaults to `'aq:name email~rs address aq:push'` + +#### `OAUTH_AUTHENTIQ_REDIRECT_URI` + + Callback URL for Authentiq. No defaults. + +#### `OAUTH_GITHUB_API_KEY` + +GitHub App Client ID. No defaults. + +#### `OAUTH_GITHUB_APP_SECRET` + +GitHub App Client secret. No defaults. + +#### `OAUTH_GITHUB_URL` + +Url to the GitHub Enterprise server. Defaults to https://github.com + +#### `OAUTH_GITHUB_VERIFY_SSL` + +Enable SSL verification while communicating with the GitHub server. Defaults to `true`. + +#### `OAUTH_GITLAB_API_KEY` + +GitLab App Client ID. No defaults. + +#### `OAUTH_GITLAB_APP_SECRET` + +GitLab App Client secret. No defaults. + +#### `OAUTH_BITBUCKET_API_KEY` + +BitBucket App Client ID. No defaults. + +#### `OAUTH_BITBUCKET_APP_SECRET` + +BitBucket App Client secret. No defaults. + +#### `OAUTH_BITBUCKET_URL` + +Bitbucket URL. Defaults: https://bitbucket.org/ + +#### `OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL` + +The URL at which the SAML assertion should be received. When `GITLAB_HTTPS=true`, defaults to `https://${GITLAB_HOST}/users/auth/saml/callback` else defaults to `http://${GITLAB_HOST}/users/auth/saml/callback`. + +#### `OAUTH_SAML_IDP_CERT_FINGERPRINT` + +The SHA1 fingerprint of the certificate. No Defaults. + +#### `OAUTH_SAML_IDP_SSO_TARGET_URL` + +The URL to which the authentication request should be sent. No defaults. + +#### `OAUTH_SAML_ISSUER` + +The name of your application. When `GITLAB_HTTPS=true`, defaults to `https://${GITLAB_HOST}` else defaults to `http://${GITLAB_HOST}`. + +#### `OAUTH_SAML_LABEL` + +The "Sign in with" button label. Defaults to "Our SAML Provider". + +#### `OAUTH_SAML_NAME_IDENTIFIER_FORMAT` + +Describes the format of the username required by GitLab, Defaults to `urn:oasis:names:tc:SAML:2.0:nameid-format:transient` + +#### `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. + +#### `OAUTH_CROWD_SERVER_URL` + +Crowd server url. No defaults. + +#### `OAUTH_CROWD_APP_NAME` + +Crowd server application name. No defaults. + +#### `OAUTH_CROWD_APP_PASSWORD` + +Crowd server application password. No defaults. + +#### `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. + +#### `OAUTH2_GENERIC_APP_ID` + +Your OAuth2 App ID. No defaults. + +#### `OAUTH2_GENERIC_APP_SECRET` + +Your OAuth2 App Secret. No defaults. + +#### `OAUTH2_GENERIC_CLIENT_SITE` + +The OAuth2 generic client site. No defaults + +#### `OAUTH2_GENERIC_CLIENT_USER_INFO_URL` + +The OAuth2 generic client user info url. No defaults + +#### `OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL` + +The OAuth2 generic client authorize url. No defaults + +#### `OAUTH2_GENERIC_CLIENT_TOKEN_URL` + +The OAuth2 generic client token url. No defaults + +#### `OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT` + +The OAuth2 generic client end session endpoint. No defaults + +#### `OAUTH2_GENERIC_ID_PATH` + +The OAuth2 generic id path. No defaults + +#### `OAUTH2_GENERIC_USER_UID` + +The OAuth2 generic user id path. No defaults + +#### `OAUTH2_GENERIC_USER_NAME` + +The OAuth2 generic user name. No defaults + +#### `OAUTH2_GENERIC_USER_EMAIL` + +The OAuth2 generic user email. No defaults + +#### `OAUTH2_GENERIC_NAME` + +The name of your OAuth2 provider. No defaults + +#### `GITLAB_GRAVATAR_ENABLED` + +Enables gravatar integration. Defaults to `true`. + +#### `GITLAB_GRAVATAR_HTTP_URL` + +Sets a custom gravatar url. Defaults to `http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon`. This can be used for [Libravatar integration](http://doc.gitlab.com/ce/customization/libravatar.html). + +#### `GITLAB_GRAVATAR_HTTPS_URL` + +Same as above, but for https. Defaults to `https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon`. + +#### `USERMAP_UID` + +Sets the uid for user `git` to the specified uid. Defaults to `1000`. + +#### `USERMAP_GID` + +Sets the gid for group `git` to the specified gid. Defaults to `USERMAP_UID` if defined, else defaults to `1000`. + +#### `GOOGLE_ANALYTICS_ID` + +Google Analytics ID. No defaults. + +#### `PIWIK_URL` + +Sets the Piwik URL. No defaults. + +#### `PIWIK_SITE_ID` + +Sets the Piwik site ID. No defaults. + +#### `AWS_BACKUPS` + +Enables automatic uploads to an Amazon S3 instance. Defaults to `false`. + +#### `AWS_BACKUP_REGION` + +AWS region. No defaults. + +#### `AWS_BACKUP_ENDPOINT` + +AWS endpoint. No defaults. + +#### `AWS_BACKUP_ACCESS_KEY_ID` + +AWS access key id. No defaults. + +#### `AWS_BACKUP_SECRET_ACCESS_KEY` + +AWS secret access key. No defaults. + +#### `AWS_BACKUP_BUCKET` + +AWS bucket for backup uploads. No defaults. + +#### `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 + +#### `GCS_BACKUP_BUCKET` + +GCS bucket for backup uploads. No defaults + +#### `GITLAB_ROBOTS_PATH` + +Location of custom `robots.txt`. Uses GitLab's default `robots.txt` configuration by default. See [www.robotstxt.org](http://www.robotstxt.org) for examples. + +#### `RACK_ATTACK_ENABLED` + +Enable/disable rack middleware for blocking & throttling abusive requests Defaults to `true`. + +#### `RACK_ATTACK_WHITELIST` + +Always allow requests from whitelisted host. Defaults to `127.0.0.1` + +#### `RACK_ATTACK_MAXRETRY` + +Number of failed auth attempts before which an IP should be banned. Defaults to `10` + +#### `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 From 3857899f877698f7d17816f05c1635a1bed46310 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sat, 5 Mar 2022 23:07:34 +0900 Subject: [PATCH 175/522] [skip ci] remove duplicated config parameter description --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 7942a4b70..0eaa01874 100644 --- a/README.md +++ b/README.md @@ -1269,10 +1269,6 @@ AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE` -#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` - -AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION` - #### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT` Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT` @@ -1739,7 +1735,7 @@ Enable mail delivery via SMTP. Defaults to `true` if `SMTP_USER` is defined, els #### `SMTP_DOMAIN` -SMTP domain. Defaults to` www.gmail.com` +SMTP domain. Defaults to `www.gmail.com` #### `SMTP_HOST` From 9145c48390ec1dae5b61b5d72cabb040b9d4cb9a Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 27 Mar 2022 11:02:35 +0200 Subject: [PATCH 176/522] Add circle-ci badge and lint readme --- README.md | 63 +++++++++++++++++++++++++------------------------------ 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index fc292d355..9e164895c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -[![](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:14.9.1 +[![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) + - [Introduction](#introduction) - [Changelog](Changelog.md) - [Contributing](#contributing) @@ -199,7 +199,7 @@ docker run --name gitlab -d \ *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* -__NOTE__: Please allow a couple of minutes for the GitLab application to start. +**NOTE**: Please allow a couple of minutes for the GitLab application to start. Point your browser to `http://localhost:10080` and set a password for the `root` user account. @@ -213,7 +213,7 @@ You should now have the GitLab application up and ready for testing. If you want GitLab is a code hosting software and as such you don't want to lose your code when the docker container is stopped/deleted. To avoid losing any data, you should mount a volume at, -* `/home/git/data` +- `/home/git/data` *Note: that if you are using the `docker-compose` approach, you must "inpect" the volumes (```docker volume inpect```) to check the mounted path.* @@ -313,10 +313,10 @@ docker run --name gitlab -d --link gitlab-postgresql:postgresql \ 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: - - [postgres](https://hub.docker.com/_/postgres/) - - [sameersbn/postgresql](https://quay.io/repository/sameersbn/postgresql/) - - [orchardup/postgresql](https://hub.docker.com/r/orchardup/postgresql/) - - [paintedfox/postgresql](https://hub.docker.com/r/paintedfox/postgresql/) +- [postgres](https://hub.docker.com/_/postgres/) +- [sameersbn/postgresql](https://quay.io/repository/sameersbn/postgresql/) +- [orchardup/postgresql](https://hub.docker.com/r/orchardup/postgresql/) +- [paintedfox/postgresql](https://hub.docker.com/r/paintedfox/postgresql/) #### Upgrading PostgreSQL @@ -419,6 +419,7 @@ Access to the gitlab application can be secured using SSL so as to prevent unaut Jump to the [Using HTTPS with a load balancer](#using-https-with-a-load-balancer) section if you are using a load balancer such as hipache, haproxy or nginx. To secure your application via SSL you basically need two things: + - **Private key (.key)** - **SSL certificate (.crt)** @@ -470,7 +471,6 @@ In case use of docker-compose ... look for "< user >_gitlab-data" and copy the "certs" directory into the "Mountpoint" - ```bash mkdir -p /srv/docker/gitlab/gitlab/certs cp gitlab.key /srv/docker/gitlab/gitlab/certs/ @@ -593,7 +593,7 @@ Refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/omniaut #### CAS3 -To enable the CAS OmniAuth provider you must register your application with your CAS instance. This requires the service URL GitLab will supply to CAS. It should be something like: https://git.example.com:443/users/auth/cas3/callback?url. By default handling for SLO is enabled, you only need to configure CAS for backchannel logout. +To enable the CAS OmniAuth provider you must register your application with your CAS instance. This requires the service URL GitLab will supply to CAS. It should be something like: `https://git.example.com:443/users/auth/cas3/callback?url`. By default handling for SLO is enabled, you only need to configure CAS for backchannel logout. For example, if your cas server url is `https://sso.example.com`, then adding `--env 'OAUTH_CAS3_SERVER=https://sso.example.com'` to the docker run command enables support for CAS3 OAuth. Please refer to [Available Configuration Parameters](#available-configuration-parameters) for additional CAS3 configuration parameters. @@ -709,14 +709,14 @@ Gitlab pages access control requires additional configuration before activating 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 +- 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. @@ -741,7 +741,6 @@ Add to following environment variables to your Gitlab Container. 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. @@ -777,12 +776,10 @@ 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)* - Below is the complete list of available options that can be used to customize your gitlab installation. #### `DEBUG` @@ -2023,7 +2020,7 @@ GitHub App Client secret. No defaults. #### `OAUTH_GITHUB_URL` -Url to the GitHub Enterprise server. Defaults to https://github.com +Url to the GitHub Enterprise server. Defaults to `https://github.com` #### `OAUTH_GITHUB_VERIFY_SSL` @@ -2047,7 +2044,7 @@ BitBucket App Client secret. No defaults. #### `OAUTH_BITBUCKET_URL` -Bitbucket URL. Defaults: https://bitbucket.org/ +Bitbucket URL. Defaults: `https://bitbucket.org/` #### `OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL` @@ -2415,7 +2412,6 @@ docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available b docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.10.0 # Choose to restore from 1515629493 ``` - ## Host Key Backups (ssh) SSH keys are not backed up in the normal gitlab backup process. You @@ -2477,7 +2473,7 @@ Or docker exec -it gitlab sudo -HEu git bundle exec rake gitlab:import:repos RAILS_ENV=production ``` -For a complete list of available rake tasks please refer https://github.com/gitlabhq/gitlabhq/tree/master/doc/raketasks or the help section of your gitlab installation. +For a complete list of available rake tasks please refer or the help section of your gitlab installation. *P.S. Please avoid running the rake tasks for backup and restore operations on a running gitlab instance.* @@ -2513,7 +2509,7 @@ Usage when using `docker-compose` can also be found there. > > Since GitLab release `8.6.0` PostgreSQL users should enable `pg_trgm` extension on the GitLab database. Refer to GitLab's [Postgresql Requirements](http://doc.gitlab.com/ce/install/requirements.html#postgresql-requirements) for more information > -> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:12-20200524` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: https://github.com/sameersbn/docker-gitlab/blob/master/docker-compose.yml#L8). +> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:12-20200524` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: ). > > As of version 13.7.0, the required PostgreSQL is version 12.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql). @@ -2550,7 +2546,6 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are - **Step 4**: Start the image > **Note**: Since GitLab `8.0.0` you need to provide the `GITLAB_SECRETS_DB_KEY_BASE` parameter while starting the image. - > **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 @@ -2609,10 +2604,10 @@ docker inspect --format "{{json .State.Health }}" $(docker-compose ps -q gitlab) # References -* https://github.com/gitlabhq/gitlabhq -* https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/installation.md -* http://wiki.nginx.org/HttpSslModule -* https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html -* https://github.com/gitlabhq/gitlab-recipes/blob/master/web-server/nginx/gitlab-ssl -* https://github.com/jpetazzo/nsenter -* https://jpetazzo.github.io/2014/03/23/lxc-attach-nsinit-nsenter-docker-0-9/ +- +- +- +- +- +- +- From c191f74d7a69c54fa27282209377ac0e52e686e3 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 27 Mar 2022 11:05:23 +0200 Subject: [PATCH 177/522] Fix Multiple top-level headings in document --- README.md | 902 +++++++++++++++++++++++++++--------------------------- 1 file changed, 451 insertions(+), 451 deletions(-) diff --git a/README.md b/README.md index 9e164895c..cd8347326 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ - [Deploy in Docker Swarm mode, with HTTPS handled by Traefik proxy and Docker Registry](docs/docker-swarm-traefik-registry.md) - [References](#references) -# Introduction +## Introduction Dockerfile to build a [GitLab](https://about.gitlab.com/) image for the [Docker](https://www.docker.com/products/docker-engine) opensource container platform. @@ -76,7 +76,7 @@ GitLab CE is set up in the Docker image using the [install from source](https:// 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 +## Contributing If you find this image useful here's how you can help: @@ -84,14 +84,14 @@ If you find this image useful here's how you can help: - Be a part of the community and help resolve [Issues](https://github.com/sameersbn/docker-gitlab/issues) - Support the development of this image with a [donation](http://www.damagehead.com/donate/) -# Team +## Team - Niclas Mietz ([solidnerd](https://github.com/solidnerd)) - Sameer Naik ([sameersbn](https://github.com/sameersbn)) See [Contributors](../../graphs/contributors) for the complete list developers that have contributed to this project. -# Issues +## Issues Docker is a relatively new project and is active being developed and tested by a thriving community of developers and testers and every release of docker features many enhancements and bugfixes. @@ -116,11 +116,11 @@ In your issue report please make sure you provide the following information: - Output of the `docker info` command - The `docker run` command you used to run the image (mask out the sensitive bits). -# Prerequisites +## Prerequisites Your docker host needs to have 1GB or more of available RAM to run GitLab. Please refer to the GitLab [hardware requirements](https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/requirements.md#hardware-requirements) documentation for additional information. -# Installation +## Installation Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. @@ -140,7 +140,7 @@ Alternatively you can build the image locally. docker build -t sameersbn/gitlab github.com/sameersbn/docker-gitlab ``` -# Quick Start +## Quick Start The quickest way to get started is using [docker-compose](https://docs.docker.com/compose/). @@ -207,9 +207,9 @@ You should now have the GitLab application up and ready for testing. If you want *The rest of the document will use the docker command line. You can quite simply adapt your configuration into a `docker-compose.yml` file if you wish to do so.* -# Configuration +## Configuration -## Data Store +### Data Store GitLab is a code hosting software and as such you don't want to lose your code when the docker container is stopped/deleted. To avoid losing any data, you should mount a volume at, @@ -232,17 +232,17 @@ docker run --name gitlab -d \ sameersbn/gitlab:14.9.1 ``` -## Database +### Database GitLab uses a database backend to store its data. You can configure this image to use PostgreSQL. *Note: GitLab requieres PostgreSQL now. So use an older image < 12.1 or migrate to PostgresSQL* -### PostgreSQL +#### PostgreSQL *NOTE:* version 13.7.0 and later requires PostgreSQL version 12.x -#### External PostgreSQL Server +##### External PostgreSQL Server The image also supports using an external PostgreSQL Server. This is also controlled via environment variables. @@ -267,7 +267,7 @@ docker run --name gitlab -d \ sameersbn/gitlab:14.9.1 ``` -#### Linking to PostgreSQL Container +##### Linking to PostgreSQL Container 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. @@ -318,7 +318,7 @@ 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/) -#### Upgrading PostgreSQL +##### Upgrading PostgreSQL When this Gitlab image upgrades its dependency on specific version of PostgreSQL you will need to make sure to use corresponding version of PostgreSQL. @@ -330,15 +330,15 @@ Following project provides Docker image that handles migration of PostgreSQL dat After migration of the data, verify that other PostgreSQL configuration files in its data folder are copied over as well. One such file is `pg_hba.conf`, it will need to be copied from old version data folder into new version data folder. -## Redis +### Redis GitLab uses the redis server for its key-value data store. The redis server connection details can be specified using environment variables. -### Internal Redis Server +#### Internal Redis Server The internal redis server has been removed from the image. Please use a [linked redis](#linking-to-redis-container) container or specify a [external redis](#external-redis-server) connection. -### External Redis Server +#### External Redis Server The image can be configured to use an external redis server. The configuration should be specified using environment variables while starting the GitLab image. @@ -350,7 +350,7 @@ docker run --name gitlab -it --rm \ sameersbn/gitlab:14.9.1 ``` -### Linking to Redis Container +#### Linking to Redis Container You can link this image with a redis container to satisfy gitlab's redis requirement. The alias of the redis server container should be set to **redisio** while linking with the gitlab image. @@ -377,7 +377,7 @@ docker run --name gitlab -d --link gitlab-redis:redisio \ sameersbn/gitlab:14.9.1 ``` -### Mail +#### Mail The mail configuration should be specified using environment variables while starting the GitLab image. The configuration defaults to using gmail to send emails and requires the specification of a valid username and password to login to the gmail servers. @@ -392,7 +392,7 @@ docker run --name gitlab -d \ Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. -#### Reply by email +##### Reply by email Since version `8.0.0` GitLab adds support for commenting on issues by replying to emails. @@ -412,7 +412,7 @@ docker run --name gitlab -d \ Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. -### SSL +#### SSL Access to the gitlab application can be secured using SSL so as to prevent unauthorized access to the data in your repositories. While a CA certified SSL certificate allows for verification of trust via the CA, a self signed certificate can also provide an equal level of trust verification as long as each client takes some additional steps to verify the identity of your website. I will provide instructions on achieving this towards the end of this section. @@ -425,7 +425,7 @@ To secure your application via SSL you basically need two things: When using CA certified certificates, these files are provided to you by the CA. When using self-signed certificates you need to generate these files yourself. Skip to [Strengthening the server security](#strengthening-the-server-security) section if you are armed with CA certified SSL certificates. -#### Generation of a Self Signed Certificate +##### Generation of a Self Signed Certificate Generation of a self-signed SSL certificate involves a simple 3-step procedure: @@ -449,7 +449,7 @@ openssl x509 -req -days 3650 -in gitlab.csr -signkey gitlab.key -out gitlab.crt Congratulations! You now have a self-signed SSL certificate valid for 10 years. -#### Strengthening the server security +##### Strengthening the server security This section provides you with instructions to [strengthen your server security](https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html). To achieve this we need to generate stronger DHE parameters. @@ -457,7 +457,7 @@ This section provides you with instructions to [strengthen your server security] openssl dhparam -out dhparam.pem 2048 ``` -#### Installation of the SSL Certificates +##### Installation of the SSL Certificates Out of the four files generated above, we need to install the `gitlab.key`, `gitlab.crt` and `dhparam.pem` files at the gitlab server. The CSR file is not needed, but do make sure you safely backup the file (in case you ever need it again). @@ -481,7 +481,7 @@ chmod 400 /srv/docker/gitlab/gitlab/certs/gitlab.key Great! we are now just one step away from having our application secured. -#### Enabling HTTPS support +##### Enabling HTTPS support HTTPS support can be enabled by setting the `GITLAB_HTTPS` option to `true`. Additionally, when using self-signed SSL certificates you need to the set `SSL_SELF_SIGNED` option to `true` as well. Assuming we are using self-signed certificates @@ -496,7 +496,7 @@ docker run --name gitlab -d \ 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. -#### Configuring HSTS +##### Configuring HSTS HSTS if supported by the browsers makes sure that your users will only reach your sever via HTTPS. When the user comes for the first time it sees a header from the server which states for how long from now this site should only be reachable via HTTPS - that's the HSTS max-age value. @@ -512,7 +512,7 @@ docker run --name gitlab -d \ If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. -#### Using HTTPS with a load balancer +##### Using HTTPS with a load balancer Load balancers like nginx/haproxy/hipache talk to backend applications over plain http and as such the installation of ssl keys and certificates are not required and should **NOT** be installed in the container. The SSL configuration has to instead be done at the load balancer. @@ -539,7 +539,7 @@ In case GitLab responds to any kind of POST request (login, OAUTH, changing sett `proxy_set_header X-Forwarded-Ssl on;` (nginx format) -#### Establishing trust with your server +##### Establishing trust with your server This section deals will self-signed ssl certificates. If you are using CA certified certificates, your done. @@ -558,7 +558,7 @@ You can do the same at the web browser. Instructions for installing the root cer There you have it, that's all there is to it. -#### Installing Trusted SSL Server Certificates +##### Installing Trusted SSL Server Certificates If your GitLab CI server is using self-signed SSL certificates then you should make sure the GitLab CI server certificate is trusted on the GitLab server for them to be able to talk to each other. @@ -568,7 +568,7 @@ Copy the `ca.crt` file into the certs directory on the [datastore](#data-store). By default, our own server certificate [gitlab.crt](#generation-of-self-signed-certificate) is added to the trusted certificates list. -### Deploy to a subdirectory (relative url root) +#### Deploy to a subdirectory (relative url root) By default GitLab expects that your application is running at the root (eg. /). This section explains how to run your application inside a directory. @@ -585,19 +585,19 @@ GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/g **Note**: *The `GITLAB_RELATIVE_URL_ROOT` parameter should always begin with a slash and* **SHOULD NOT** *have any trailing slashes.* -### OmniAuth Integration +#### OmniAuth Integration GitLab leverages OmniAuth to allow users to sign in using Twitter, GitHub, and other popular services. Configuring OmniAuth does not prevent standard GitLab authentication or LDAP (if configured) from continuing to work. Users can choose to sign in using any of the configured mechanisms. Refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/omniauth.html) for additional information. -#### CAS3 +##### CAS3 To enable the CAS OmniAuth provider you must register your application with your CAS instance. This requires the service URL GitLab will supply to CAS. It should be something like: `https://git.example.com:443/users/auth/cas3/callback?url`. By default handling for SLO is enabled, you only need to configure CAS for backchannel logout. For example, if your cas server url is `https://sso.example.com`, then adding `--env 'OAUTH_CAS3_SERVER=https://sso.example.com'` to the docker run command enables support for CAS3 OAuth. Please refer to [Available Configuration Parameters](#available-configuration-parameters) for additional CAS3 configuration parameters. -#### Authentiq +##### Authentiq To enable the Authentiq OmniAuth provider for passwordless authentication you must register an application with [Authentiq](https://www.authentiq.com/). Please refer to the GitLab [documentation](https://docs.gitlab.com/ce/administration/auth/authentiq.html) for the procedure to generate the client ID and secret key with Authentiq. @@ -607,7 +607,7 @@ For example, if your API key is `xxx` and the API secret key is `yyy`, then addi You may want to specify `OAUTH_AUTHENTIQ_REDIRECT_URI` as well. The OAuth scope can be altered as well with `OAUTH_AUTHENTIQ_SCOPE` (defaults to `'aq:name email~rs address aq:push'`). -#### Google +##### Google To enable the Google OAuth2 OmniAuth provider you must register your application with Google. Google will generate a client ID and secret key for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/google.html) for the procedure to generate the client ID and secret key with google. @@ -617,7 +617,7 @@ For example, if your client ID is `xxx.apps.googleusercontent.com` and client se You can also restrict logins to a single domain by adding `--env "OAUTH_GOOGLE_RESTRICT_DOMAIN='example.com'"`. -#### Facebook +##### Facebook To enable the Facebook OAuth2 OmniAuth provider you must register your application with Facebook. Facebook will generate a API key and secret for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/facebook.html) for the procedure to generate the API key and secret. @@ -625,7 +625,7 @@ Once you have the API key and secret generated, configure them using the `OAUTH_ For example, if your API key is `xxx` and the API secret key is `yyy`, then adding `--env 'OAUTH_FACEBOOK_API_KEY=xxx' --env 'OAUTH_FACEBOOK_APP_SECRET=yyy'` to the docker run command enables support for Facebook OAuth. -#### Twitter +##### Twitter To enable the Twitter OAuth2 OmniAuth provider you must register your application with Twitter. Twitter will generate a API key and secret for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/twitter.html) for the procedure to generate the API key and secret with twitter. @@ -633,7 +633,7 @@ Once you have the API key and secret generated, configure them using the `OAUTH_ For example, if your API key is `xxx` and the API secret key is `yyy`, then adding `--env 'OAUTH_TWITTER_API_KEY=xxx' --env 'OAUTH_TWITTER_APP_SECRET=yyy'` to the docker run command enables support for Twitter OAuth. -#### GitHub +##### GitHub To enable the GitHub OAuth2 OmniAuth provider you must register your application with GitHub. GitHub will generate a Client ID and secret for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/github.html) for the procedure to generate the Client ID and secret with github. @@ -643,7 +643,7 @@ For example, if your Client ID is `xxx` and the Client secret is `yyy`, then add Users of GitHub Enterprise may want to specify `OAUTH_GITHUB_URL` and `OAUTH_GITHUB_VERIFY_SSL` as well. -#### GitLab +##### GitLab To enable the GitLab OAuth2 OmniAuth provider you must register your application with GitLab. GitLab will generate a Client ID and secret for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/gitlab.html) for the procedure to generate the Client ID and secret with GitLab. @@ -651,7 +651,7 @@ Once you have the Client ID and secret generated, configure them using the `OAUT For example, if your Client ID is `xxx` and the Client secret is `yyy`, then adding `--env 'OAUTH_GITLAB_API_KEY=xxx' --env 'OAUTH_GITLAB_APP_SECRET=yyy'` to the docker run command enables support for GitLab OAuth. -#### BitBucket +##### BitBucket To enable the BitBucket OAuth2 OmniAuth provider you must register your application with BitBucket. BitBucket will generate a Client ID and secret for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/bitbucket.html) for the procedure to generate the Client ID and secret with BitBucket. @@ -659,7 +659,7 @@ Once you have the Client ID and secret generated, configure them using the `OAUT For example, if your Client ID is `xxx` and the Client secret is `yyy`, then adding `--env 'OAUTH_BITBUCKET_API_KEY=xxx' --env 'OAUTH_BITBUCKET_APP_SECRET=yyy'` to the docker run command enables support for BitBucket OAuth. -#### SAML +##### SAML GitLab can be configured to act as a SAML 2.0 Service Provider (SP). This allows GitLab to consume assertions from a SAML 2.0 Identity Provider (IdP) such as Microsoft ADFS to authenticate users. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/saml.html). @@ -669,19 +669,19 @@ You can also override the default "Sign in with" button label with `OAUTH_SAML_L Please refer to [Available Configuration Parameters](#available-configuration-parameters) for the default configurations of these parameters. -#### Crowd +##### Crowd To enable the Crowd server OAuth2 OmniAuth provider you must register your application with Crowd server. Configure GitLab to enable access the Crowd server by specifying the `OAUTH_CROWD_SERVER_URL`, `OAUTH_CROWD_APP_NAME` and `OAUTH_CROWD_APP_PASSWORD` environment variables. -#### Auth0 +##### Auth0 To enable the Auth0 OmniAuth provider you must register your application with [auth0](https://auth0.com/). Configure the following environment variables `OAUTH_AUTH0_CLIENT_ID`, `OAUTH_AUTH0_CLIENT_SECRET` and `OAUTH_AUTH0_DOMAIN` to complete the integration. -#### Microsoft Azure +##### Microsoft Azure To enable the Microsoft Azure OAuth2 OmniAuth provider you must register your application with Azure. Azure will generate a Client ID, Client secret and Tenant ID for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/azure.html) for the procedure. @@ -689,7 +689,7 @@ 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. -#### Generic OAuth2 +##### Generic OAuth2 To enable the Generic OAuth2 provider, you must register your application with your provider. You also need to confirm OAuth2 provider app's ID and secret, the client options and the user's response structure. @@ -697,11 +697,11 @@ As an example this code has been tested with Keycloak, with the following variab See [GitLab documentation](https://docs.gitlab.com/ee/integration/oauth2_generic.html#sign-into-gitlab-with-almost-any-oauth2-provider) and [Omniauth-oauth2-generic documentation](https://gitlab.com/satorix/omniauth-oauth2-generic) for more details. -### Gitlab Pages +#### 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 +#### 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. @@ -741,7 +741,7 @@ Add to following environment variables to your Gitlab Container. 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 +#### 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. @@ -749,7 +749,7 @@ If you are using the [docker-redmine](https://github.com/sameersbn/docker-redmin By using the above option the `/home/git/data/repositories` directory will be accessible by the redmine container and now you can add your git repository path to your redmine project. If, for example, in your gitlab server you have a project named `opensource/gitlab`, the bare repository will be accessible at `/home/git/data/repositories/opensource/gitlab.git` in the redmine container. -### Host UID / GID Mapping +#### Host UID / GID Mapping Per default the container is configured to run gitlab as user and group `git` with `uid` and `gid` `1000`. The host possibly uses this ids for different purposes leading to unfavorable effects. From the host it appears as if the mounted data volumes are owned by the host's user/group `1000`. @@ -768,7 +768,7 @@ docker run --name gitlab -d [OPTIONS] \ sameersbn/gitlab:14.9.1 app:sanitize ``` -### Piwik +#### Piwik If you want to monitor your gitlab instance with [Piwik](http://piwik.org/), there are two options to setup: `PIWIK_URL` and `PIWIK_SITE_ID`. These options should contain something like: @@ -776,1549 +776,1549 @@ These options should contain something like: - `PIWIK_URL=piwik.example.org` - `PIWIK_SITE_ID=42` -### Available Configuration Parameters +#### 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)* Below is the complete list of available options that can be used to customize your gitlab installation. -#### `DEBUG` +##### `DEBUG` Set this to `true` to enable entrypoint debugging. -#### `TZ` +##### `TZ` Set the container timezone. Defaults to `UTC`. Values are expected to be in Canonical format. Example: `Europe/Amsterdam` See the list of [acceptable values](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones). For configuring the timezone of gitlab see variable `GITLAB_TIMEZONE`. -#### `GITLAB_HOST` +##### `GITLAB_HOST` The hostname of the GitLab server. Defaults to `localhost` -#### `GITLAB_CI_HOST` +##### `GITLAB_CI_HOST` If you are migrating from GitLab CI use this parameter to configure the redirection to the GitLab service so that your existing runners continue to work without any changes. No defaults. -#### `GITLAB_PORT` +##### `GITLAB_PORT` The port of the GitLab server. This value indicates the public port on which the GitLab application will be accessible on the network and appropriately configures GitLab to generate the correct urls. It does not affect the port on which the internal nginx server will be listening on. Defaults to `443` if `GITLAB_HTTPS=true`, else defaults to `80`. -#### `GITLAB_SECRETS_DB_KEY_BASE` +##### `GITLAB_SECRETS_DB_KEY_BASE` Encryption key for GitLab CI secret variables, as well as import credentials, in the database. Ensure that your key is at least 32 characters long and that you don't lose it. You can generate one using `pwgen -Bsv1 64`. If you are migrating from GitLab CI, you need to set this value to the value of `GITLAB_CI_SECRETS_DB_KEY_BASE`. No defaults. -#### `GITLAB_SECRETS_SECRET_KEY_BASE` +##### `GITLAB_SECRETS_SECRET_KEY_BASE` Encryption key for session secrets. Ensure that your key is at least 64 characters long and that you don't lose it. This secret can be rotated with minimal impact - the main effect is that previously-sent password reset emails will no longer work. You can generate one using `pwgen -Bsv1 64`. No defaults. -#### `GITLAB_SECRETS_OTP_KEY_BASE` +##### `GITLAB_SECRETS_OTP_KEY_BASE` Encryption key for OTP related stuff with GitLab. Ensure that your key is at least 64 characters long and that you don't lose it. **If you lose or change this secret, 2FA will stop working for all users.** You can generate one using `pwgen -Bsv1 64`. No defaults. -#### `GITLAB_TIMEZONE` +##### `GITLAB_TIMEZONE` Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`. See the list of [acceptable values](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html). For settings the container timezone which will effect cron, see variable `TZ` -#### `GITLAB_ROOT_PASSWORD` +##### `GITLAB_ROOT_PASSWORD` The password for the root user on firstrun. Defaults to `5iveL!fe`. GitLab requires this to be at least **8 characters long**. -#### `GITLAB_ROOT_EMAIL` +##### `GITLAB_ROOT_EMAIL` The email for the root user on firstrun. Defaults to `admin@example.com` -#### `GITLAB_EMAIL` +##### `GITLAB_EMAIL` The email address for the GitLab server. Defaults to value of `SMTP_USER`, else defaults to `example@example.com`. -#### `GITLAB_EMAIL_DISPLAY_NAME` +##### `GITLAB_EMAIL_DISPLAY_NAME` The name displayed in emails sent out by the GitLab mailer. Defaults to `GitLab`. -#### `GITLAB_EMAIL_REPLY_TO` +##### `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` +##### `GITLAB_EMAIL_SUBJECT_SUFFIX` The e-mail subject suffix used in e-mails sent by GitLab. No defaults. -#### `GITLAB_EMAIL_ENABLED` +##### `GITLAB_EMAIL_ENABLED` Enable or disable gitlab mailer. Defaults to the `SMTP_ENABLED` configuration. -#### `GITLAB_EMAIL_SMIME_ENABLE` +##### `GITLAB_EMAIL_SMIME_ENABLE` Enable or disable email S/MIME signing. Defaults is `false`. -#### `GITLAB_EMAIL_SMIME_KEY_FILE` +##### `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` +##### `GITLAB_EMAIL_SMIME_CERT_FILE` Specifies the path to a S/MIME public certificate key in PEM format. Defaults to ``. -#### `GITLAB_DEFAULT_THEME` +##### `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_ISSUE_CLOSING_PATTERN` +##### `GITLAB_ISSUE_CLOSING_PATTERN` Issue closing pattern regex. See [GitLab's documentation](https://docs.gitlab.com/ee/administration/issue_closing_pattern.html) for more detail. Defaults to ` \b((?:[Cc]los(?:e[sd]?|ing)|\b[Ff]ix(?:e[sd]|ing)?|\b[Rr]esolv(?:e[sd]?|ing)|\b[Ii]mplement(?:s|ed|ing)?)(:?) +(?:(?:issues? +)?%{issue_ref}(?:(?:, *| +and +)?)|([A-Z][A-Z0-9_]+-\d+))+) ` . -#### `GITLAB_INCOMING_EMAIL_ADDRESS` +##### `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` +##### `GITLAB_INCOMING_EMAIL_ENABLED` Enable or disable gitlab reply by email feature. Defaults to the value of `IMAP_ENABLED`. -#### `GITLAB_SIGNUP_ENABLED` +##### `GITLAB_SIGNUP_ENABLED` Enable or disable user signups (first run only). Default is `true`. -#### `GITLAB_IMPERSONATION_ENABLED` +##### `GITLAB_IMPERSONATION_ENABLED` Enable or disable impersonation. Defaults to `true`. -#### `GITLAB_PROJECTS_LIMIT` +##### `GITLAB_PROJECTS_LIMIT` Set default projects limit. Defaults to `100`. -#### `GITLAB_USERNAME_CHANGE` +##### `GITLAB_USERNAME_CHANGE` Enable or disable ability for users to change their username. Defaults to `true`. -#### `GITLAB_CREATE_GROUP` +##### `GITLAB_CREATE_GROUP` Enable or disable ability for users to create groups. Defaults to `true`. -#### `GITLAB_PROJECTS_ISSUES` +##### `GITLAB_PROJECTS_ISSUES` Set if *issues* feature should be enabled by default for new projects. Defaults to `true`. -#### `GITLAB_PROJECTS_MERGE_REQUESTS` +##### `GITLAB_PROJECTS_MERGE_REQUESTS` Set if *merge requests* feature should be enabled by default for new projects. Defaults to `true`. -#### `GITLAB_PROJECTS_WIKI` +##### `GITLAB_PROJECTS_WIKI` Set if *wiki* feature should be enabled by default for new projects. Defaults to `true`. -#### `GITLAB_PROJECTS_SNIPPETS` +##### `GITLAB_PROJECTS_SNIPPETS` Set if *snippets* feature should be enabled by default for new projects. Defaults to `false`. -#### `GITLAB_PROJECTS_BUILDS` +##### `GITLAB_PROJECTS_BUILDS` Set if *builds* feature should be enabled by default for new projects. Defaults to `true`. -#### `GITLAB_PROJECTS_CONTAINER_REGISTRY` +##### `GITLAB_PROJECTS_CONTAINER_REGISTRY` Set if *container_registry* feature should be enabled by default for new projects. Defaults to `true`. -#### `GITLAB_SHELL_CUSTOM_HOOKS_DIR` +##### `GITLAB_SHELL_CUSTOM_HOOKS_DIR` Global custom hooks directory. Defaults to `/home/git/gitlab-shell/hooks`. -#### `GITLAB_WEBHOOK_TIMEOUT` +##### `GITLAB_WEBHOOK_TIMEOUT` Sets the timeout for webhooks. Defaults to `10` seconds. -#### `GITLAB_NOTIFY_ON_BROKEN_BUILDS` +##### `GITLAB_NOTIFY_ON_BROKEN_BUILDS` Enable or disable broken build notification emails. Defaults to `true` -#### `GITLAB_NOTIFY_PUSHER` +##### `GITLAB_NOTIFY_PUSHER` Add pusher to recipients list of broken build notification emails. Defaults to `false` -#### `GITLAB_REPOS_DIR` +##### `GITLAB_REPOS_DIR` The git repositories folder in the container. Defaults to `/home/git/data/repositories` -#### `GITLAB_BACKUP_DIR` +##### `GITLAB_BACKUP_DIR` The backup folder in the container. Defaults to `/home/git/data/backups` -#### `GITLAB_BACKUP_DIR_CHOWN` +##### `GITLAB_BACKUP_DIR_CHOWN` Optionally change ownership of backup files on start-up. Defaults to `true` -#### `GITLAB_BACKUP_DIR_GROUP` +##### `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` +##### `GITLAB_BUILDS_DIR` The build traces directory. Defaults to `/home/git/data/builds` -#### `GITLAB_DOWNLOADS_DIR` +##### `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` +##### `GITLAB_SHARED_DIR` The directory to store the build artifacts. Defaults to `/home/git/data/shared` -#### `GITLAB_ARTIFACTS_ENABLED` +##### `GITLAB_ARTIFACTS_ENABLED` Enable/Disable GitLab artifacts support. Defaults to `true`. -#### `GITLAB_ARTIFACTS_DIR` +##### `GITLAB_ARTIFACTS_DIR` Directory to store the artifacts. Defaults to `$GITLAB_SHARED_DIR/artifacts` -#### `AWS_ACCESS_KEY_ID` +##### `AWS_ACCESS_KEY_ID` Default AWS access key to be used for object store. Defaults to `AWS_ACCESS_KEY_ID` -#### `AWS_SECRET_ACCESS_KEY` +##### `AWS_SECRET_ACCESS_KEY` Default AWS access key to be used for object store. Defaults to `AWS_SECRET_ACCESS_KEY` -#### `AWS_REGION` +##### `AWS_REGION` AWS Region. Defaults to `us-east-1` -#### `AWS_HOST` +##### `AWS_HOST` Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST`. Defaults to `s3.amazon.com` -#### `AWS_ENDPOINT` +##### `AWS_ENDPOINT` AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `nil` -#### `AWS_PATH_STYLE` +##### `AWS_PATH_STYLE` Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `true` -#### `AWS_SIGNATURE_VERSION` +##### `AWS_SIGNATURE_VERSION` AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `4` -#### `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT` +##### `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT` Default Google project to use for Object Store. -#### `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL` +##### `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` +##### `GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` Default Google key file Defaults to `/gcs/key.json` -#### `GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` +##### `GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` Default object store connection provider. Defaults to `AWS` -#### `GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED` +##### `GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED` Enables Object Store for Artifacts that will be remote stored. Defaults to `false` -#### `GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY` +##### `GITLAB_ARTIFACTS_OBJECT_STORE_REMOTE_DIRECTORY` Bucket name to store the artifacts. Defaults to `artifacts` -#### `GITLAB_ARTIFACTS_OBJECT_STORE_DIRECT_UPLOAD` +##### `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` +##### `GITLAB_ARTIFACTS_OBJECT_STORE_BACKGROUND_UPLOAD` Temporary option to limit automatic upload. Defaults to `false` -#### `GITLAB_ARTIFACTS_OBJECT_STORE_PROXY_DOWNLOAD` +##### `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` +##### `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` +##### `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` +##### `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` +##### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_REGION` AWS Region. Defaults to `$AWS_REGION` -#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST` +##### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_HOST` Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` -#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` +##### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` -#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` +##### `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 `$AWS_PATH_STYLE` -#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` +##### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION` -#### `GITLAB_ARTIFACTS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT` +##### `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` +##### `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` +##### `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` +##### `GITLAB_PIPELINE_SCHEDULE_WORKER_CRON` Cron notation for the GitLab pipeline schedule worker. Defaults to `'19 * * * *'` -#### `GITLAB_LFS_ENABLED` +##### `GITLAB_LFS_ENABLED` Enable/Disable Git LFS support. Defaults to `true`. -#### `GITLAB_LFS_OBJECTS_DIR` +##### `GITLAB_LFS_OBJECTS_DIR` Directory to store the lfs-objects. Defaults to `$GITLAB_SHARED_DIR/lfs-objects` -#### `GITLAB_LFS_OBJECT_STORE_ENABLED` +##### `GITLAB_LFS_OBJECT_STORE_ENABLED` Enables Object Store for LFS that will be remote stored. Defaults to `false` -#### `GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY` +##### `GITLAB_LFS_OBJECT_STORE_REMOTE_DIRECTORY` Bucket name to store the LFS. Defaults to `lfs-object` -#### `GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD` +##### `GITLAB_LFS_OBJECT_STORE_BACKGROUND_UPLOAD` Temporary option to limit automatic upload. Defaults to `false` -#### `GITLAB_LFS_OBJECT_STORE_PROXY_DOWNLOAD` +##### `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` +##### `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` +##### `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` +##### `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` +##### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_REGION` AWS Region. Defaults to `$AWS_REGION` -#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST` +##### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_HOST` Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` -#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` +##### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` -#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` +##### `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 `AWS_PATH_STYLE` -#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` +##### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` AWS signature version to use. 2 or 4 are valid options. Digital Ocean Spaces and other providers may need 2. Defaults to `$AWS_SIGNATURE_VERSION` -#### `GITLAB_LFS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT` +##### `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` +##### `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` +##### `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_PACKAGES_ENABLED` +##### `GITLAB_PACKAGES_ENABLED` Enable/Disable Pakages support. Defaults to `true`. -#### `GITLAB_PACKAGES_DIR` +##### `GITLAB_PACKAGES_DIR` Directory to store the packages data. Defaults to `$GITLAB_SHARED_DIR/packages` -#### `GITLAB_PACKAGES_OBJECT_STORE_ENABLED` +##### `GITLAB_PACKAGES_OBJECT_STORE_ENABLED` Enables Object Store for Packages that will be remote stored. Defaults to `false` -#### `GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY` +##### `GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY` Bucket name to store the packages. Defaults to `packages` -#### `GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD` +##### `GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD` Set to true to enable direct upload of Packages without the need of local shared storage. Defaults to `false` -#### `GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD` +##### `GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD` Temporary option to limit automatic upload. Defaults to `false` -#### `GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD` +##### `GITLAB_PACKAGES_OBJECT_STORE_PROXY_DOWNLOAD` Passthrough all downloads via GitLab instead of using Redirects to Object Storage. Defaults to `false` -#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER` +##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_PROVIDER` Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) -#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` +##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` AWS Access Key ID for the Bucket. Defaults to `$AWS_ACCESS_KEY_ID` -#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` +##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` AWS Secret Access Key. Defaults to `$AWS_SECRET_ACCESS_KEY` -#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION` +##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_REGION` AWS Region. Defaults to `$AWS_REGION` -#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST` +##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_HOST` Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` -#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` +##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` -#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` +##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE` -#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT` +##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT` Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT` -#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL` +##### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL` Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL` -#### `GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` +##### `GITLAB_PACKAGES_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` +##### `GITLAB_UPLOADS_STORAGE_PATH` The location where uploads objects are stored. Defaults to `$GITLAB_SHARED_DIR/public`. -#### `GITLAB_UPLOADS_BASE_DIR` +##### `GITLAB_UPLOADS_BASE_DIR` Mapping for the `GITLAB_UPLOADS_STORAGE_PATH`. Defaults to `uploads/-/system` -#### `GITLAB_UPLOADS_OBJECT_STORE_ENABLED` +##### `GITLAB_UPLOADS_OBJECT_STORE_ENABLED` Enables Object Store for UPLOADS that will be remote stored. Defaults to `false` -#### `GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY` +##### `GITLAB_UPLOADS_OBJECT_STORE_REMOTE_DIRECTORY` Bucket name to store the UPLOADS. Defaults to `uploads` -#### `GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD` +##### `GITLAB_UPLOADS_OBJECT_STORE_BACKGROUND_UPLOAD` Temporary option to limit automatic upload. Defaults to `false` -#### `GITLAB_UPLOADS_OBJECT_STORE_PROXY_DOWNLOAD` +##### `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` +##### `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` +##### `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` +##### `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` +##### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_REGION` AWS Region. Defaults to `$AWS_REGION` -#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST` +##### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_HOST` Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` -#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` +##### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` -#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` +##### `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 `AWS_PATH_STYLE` -#### `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT` +##### `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` +##### `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` +##### `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` +##### `GITLAB_MATTERMOST_ENABLED` Enable/Disable GitLab Mattermost for *Add Mattermost button*. Defaults to `false`. -#### `GITLAB_MATTERMOST_URL` +##### `GITLAB_MATTERMOST_URL` Sets Mattermost URL. Defaults to `https://mattermost.example.com`. -#### `GITLAB_BACKUP_SCHEDULE` +##### `GITLAB_BACKUP_SCHEDULE` Setup cron job to automatic backups. Possible values `disable`, `daily`, `weekly` or `monthly`. Disabled by default -#### `GITLAB_BACKUP_EXPIRY` +##### `GITLAB_BACKUP_EXPIRY` Configure how long (in seconds) to keep backups before they are deleted. By default when automated backups are disabled backups are kept forever (0 seconds), else the backups expire in 7 days (604800 seconds). -#### `GITLAB_BACKUP_PG_SCHEMA` +##### `GITLAB_BACKUP_PG_SCHEMA` Specify the PostgreSQL schema for the backups. No defaults, which means that all schemas will be backed up. see #524 -#### `GITLAB_BACKUP_ARCHIVE_PERMISSIONS` +##### `GITLAB_BACKUP_ARCHIVE_PERMISSIONS` Sets the permissions of the backup archives. Defaults to `0600`. [See](http://doc.gitlab.com/ce/raketasks/backup_restore.html#backup-archive-permissions) -#### `GITLAB_BACKUP_TIME` +##### `GITLAB_BACKUP_TIME` Set a time for the automatic backups in `HH:MM` format. Defaults to `04:00`. -#### `GITLAB_BACKUP_SKIP` +##### `GITLAB_BACKUP_SKIP` Specified sections are skipped by the backups. Defaults to empty, i.e. `lfs,uploads`. [See](http://doc.gitlab.com/ce/raketasks/backup_restore.html#create-a-backup-of-the-gitlab-system) -#### `GITLAB_SSH_HOST` +##### `GITLAB_SSH_HOST` The ssh host. Defaults to **GITLAB_HOST**. -#### `GITLAB_SSH_LISTEN_PORT` +##### `GITLAB_SSH_LISTEN_PORT` The ssh port for SSHD to listen on. Defaults to `22` -#### `GITLAB_SSH_MAXSTARTUPS` +##### `GITLAB_SSH_MAXSTARTUPS` The ssh "MaxStartups" parameter, defaults to `10:30:60`. -#### `GITLAB_SSH_PORT` +##### `GITLAB_SSH_PORT` The ssh port number. Defaults to `$GITLAB_SSH_LISTEN_PORT`. -#### `GITLAB_RELATIVE_URL_ROOT` +##### `GITLAB_RELATIVE_URL_ROOT` The relative url of the GitLab server, e.g. `/git`. No default. -#### `GITLAB_TRUSTED_PROXIES` +##### `GITLAB_TRUSTED_PROXIES` Add IP address reverse proxy to trusted proxy list, otherwise users will appear signed in from that address. Currently only a single entry is permitted. No defaults. -#### `GITLAB_REGISTRY_ENABLED` +##### `GITLAB_REGISTRY_ENABLED` Enables the GitLab Container Registry. Defaults to `false`. -#### `GITLAB_REGISTRY_HOST` +##### `GITLAB_REGISTRY_HOST` Sets the GitLab Registry Host. Defaults to `registry.example.com` -#### `GITLAB_REGISTRY_PORT` +##### `GITLAB_REGISTRY_PORT` Sets the GitLab Registry Port. Defaults to `443`. -#### `GITLAB_REGISTRY_API_URL` +##### `GITLAB_REGISTRY_API_URL` Sets the GitLab Registry API URL. Defaults to `http://localhost:5000` -#### `GITLAB_REGISTRY_KEY_PATH` +##### `GITLAB_REGISTRY_KEY_PATH` Sets the GitLab Registry Key Path. Defaults to `config/registry.key` -#### `GITLAB_REGISTRY_DIR` +##### `GITLAB_REGISTRY_DIR` Directory to store the container images will be shared with registry. Defaults to `$GITLAB_SHARED_DIR/registry` -#### `GITLAB_REGISTRY_ISSUER` +##### `GITLAB_REGISTRY_ISSUER` Sets the GitLab Registry Issuer. Defaults to `gitlab-issuer`. -#### `GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES` +##### `GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES` Set to `true` to generate SSL internal Registry keys. Used to communicate between a Docker Registry and GitLab. It will generate a self-signed certificate key at the location given by `$GITLAB_REGISTRY_KEY_PATH`, e.g. `/certs/registry.key`. And will generate the certificate file at the same location, with the same name, but changing the extension from `key` to `crt`, e.g. `/certs/registry.crt` -#### `GITLAB_PAGES_ENABLED` +##### `GITLAB_PAGES_ENABLED` Enables the GitLab Pages. Defaults to `false`. -#### `GITLAB_PAGES_DOMAIN` +##### `GITLAB_PAGES_DOMAIN` Sets the GitLab Pages Domain. Defaults to `example.com` -#### `GITLAB_PAGES_DIR` +##### `GITLAB_PAGES_DIR` Sets GitLab Pages directory where all pages will be stored. Defaults to `$GITLAB_SHARED_DIR/pages` -#### `GITLAB_PAGES_PORT` +##### `GITLAB_PAGES_PORT` Sets GitLab Pages Port that will be used in NGINX. Defaults to `80` -#### `GITLAB_PAGES_HTTPS` +##### `GITLAB_PAGES_HTTPS` Sets GitLab Pages to HTTPS and the gitlab-pages-ssl config will be used. Defaults to `false` -#### `GITLAB_PAGES_ARTIFACTS_SERVER` +##### `GITLAB_PAGES_ARTIFACTS_SERVER` Set to `true` to enable pages artifactsserver, enabled by default. -#### `GITLAB_PAGES_ARTIFACTS_SERVER_URL` +##### `GITLAB_PAGES_ARTIFACTS_SERVER_URL` If `GITLAB_PAGES_ARTIFACTS_SERVER` is enabled, set to API endpoint for GitLab Pages (e.g. `https://example.com/api/v4`). No default. -#### `GITLAB_PAGES_EXTERNAL_HTTP` +##### `GITLAB_PAGES_EXTERNAL_HTTP` Sets GitLab Pages external http to receive request on an independen port. Disabled by default -#### `GITLAB_PAGES_EXTERNAL_HTTPS` +##### `GITLAB_PAGES_EXTERNAL_HTTPS` Sets GitLab Pages external https to receive request on an independen port. Disabled by default -#### `GITLAB_PAGES_ACCESS_CONTROL` +##### `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` +##### `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` +##### `GITLAB_PAGES_ACCESS_SECRET` Secret Hash, minimal 32 characters, if omitted, it will be auto generated. -#### `GITLAB_PAGES_ACCESS_CONTROL_SERVER` +##### `GITLAB_PAGES_ACCESS_CONTROL_SERVER` Gitlab instance URI, example: `https://gitlab.example.io` -#### `GITLAB_PAGES_ACCESS_CLIENT_ID` +##### `GITLAB_PAGES_ACCESS_CLIENT_ID` Client ID from earlier generated OAuth application -#### `GITLAB_PAGES_ACCESS_CLIENT_SECRET` +##### `GITLAB_PAGES_ACCESS_CLIENT_SECRET` Client Secret from earlier genereated OAuth application -#### `GITLAB_PAGES_ACCESS_REDIRECT_URI` +##### `GITLAB_PAGES_ACCESS_REDIRECT_URI` Redirect URI, non existing pages domain to redirect to pages daemon, `https://projects.example.io/auth` -#### `GITLAB_HTTPS` +##### `GITLAB_HTTPS` Set to `true` to enable https support, disabled by default. -#### `GITALY_CLIENT_PATH` +##### `GITALY_CLIENT_PATH` Set default path for gitaly. defaults to `/home/git/gitaly` -#### `GITALY_TOKEN` +##### `GITALY_TOKEN` Set a gitaly token, blank by default. -#### `GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL` +##### `GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL` Time between sampling of unicorn socket metrics, in seconds, defaults to `10` -#### `GITLAB_MONITORING_IP_WHITELIST` +##### `GITLAB_MONITORING_IP_WHITELIST` IP whitelist to access monitoring endpoints, defaults to `0.0.0.0/8` -#### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED` +##### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED` Set to `true` to enable the sidekiq exporter, enabled by default. -#### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS` +##### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ADDRESS` Sidekiq exporter address, defaults to `0.0.0.0` -#### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT` +##### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_PORT` Sidekiq exporter port, defaults to `3807` -#### `GITLAB_CONTENT_SECURITY_POLICY_ENABLED` +##### `GITLAB_CONTENT_SECURITY_POLICY_ENABLED` Set to `true` to enable [Content Security Policy](https://guides.rubyonrails.org/security.html#content-security-policy), enabled by default. -#### `GITLAB_CONTENT_SECURITY_POLICY_REPORT_ONLY` +##### `GITLAB_CONTENT_SECURITY_POLICY_REPORT_ONLY` Set to `true` to set `Content-Security-Policy-Report-Only` header, disabled by default -#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_BASE_URI` +##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_BASE_URI` The value of the `base-uri` directive in the `Content-Security-Policy` header -#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CHILD_SRC` +##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CHILD_SRC` The value of the `child-src` directive in the `Content-Security-Policy` header -#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CONNECT_SRC` +##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_CONNECT_SRC` The value of the `connect-src` directive in the `Content-Security-Policy` header. Default to `'self' http://localhost:* ws://localhost:* wss://localhost:*` -#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_DEFAULT_SRC` +##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_DEFAULT_SRC` The value of the `default-src` directive in the `Content-Security-Policy` header. Default to `'self'` -#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FONT_SRC` +##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FONT_SRC` The value of the `font-src` directive in the `Content-Security-Policy` header -#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FORM_ACTION` +##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FORM_ACTION` The value of the `form-action` directive in the `Content-Security-Policy` header -#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_ANCESTORS` +##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_ANCESTORS` The value of the `frame-ancestors` directive in the `Content-Security-Policy` header. Default to `'self'` -#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_SRC` +##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_FRAME_SRC` The value of the `frame-src` directive in the `Content-Security-Policy` header. Default to `'self' https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://content.googleapis.com https://content-compute.googleapis.com https://content-cloudbilling.googleapis.com https://content-cloudresourcemanager.googleapis.com` -#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_IMG_SRC` +##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_IMG_SRC` The value of the `img-src` directive in the `Content-Security-Policy` header. Default to `* data: blob:` -#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MANIFEST_SRC` +##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MANIFEST_SRC` The value of the `manifest-src` directive in the `Content-Security-Policy` header -#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MEDIA_SRC` +##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_MEDIA_SRC` The value of the `media-src` directive in the `Content-Security-Policy` header -#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_OBJECT_SRC` +##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_OBJECT_SRC` The value of the `object-src` directive in the `Content-Security-Policy` header. Default to `'none'` -#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC` +##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC` The value of the `script-src` directive in the `Content-Security-Policy` header. Default to `'self' 'unsafe-eval' http://localhost:* https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://www.gstatic.com/recaptcha/ https://apis.google.com` -#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC` +##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC` The value of the `style-src` directive in the `Content-Security-Policy` header. Default to `'self' 'unsafe-inline'` -#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC` +##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC` The value of the `worker-src` directive in the `Content-Security-Policy` header. Default to `'self' blob:` -#### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI` +##### `GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI` The value of the `report-uri` directive in the `Content-Security-Policy` header -#### `SSL_SELF_SIGNED` +##### `SSL_SELF_SIGNED` Set to `true` when using self signed ssl certificates. `false` by default. -#### `SSL_CERTIFICATE_PATH` +##### `SSL_CERTIFICATE_PATH` Location of the ssl certificate. Defaults to `/home/git/data/certs/gitlab.crt` -#### `SSL_KEY_PATH` +##### `SSL_KEY_PATH` Location of the ssl private key. Defaults to `/home/git/data/certs/gitlab.key` -#### `SSL_DHPARAM_PATH` +##### `SSL_DHPARAM_PATH` Location of the dhparam file. Defaults to `/home/git/data/certs/dhparam.pem` -#### `SSL_VERIFY_CLIENT` +##### `SSL_VERIFY_CLIENT` Enable verification of client certificates using the `SSL_CA_CERTIFICATES_PATH` file or setting this variable to `on`. Defaults to `off` -#### `SSL_CA_CERTIFICATES_PATH` +##### `SSL_CA_CERTIFICATES_PATH` List of SSL certificates to trust. Defaults to `/home/git/data/certs/ca.crt`. -#### `SSL_REGISTRY_KEY_PATH` +##### `SSL_REGISTRY_KEY_PATH` Location of the ssl private key for gitlab container registry. Defaults to `/home/git/data/certs/registry.key` -#### `SSL_REGISTRY_CERT_PATH` +##### `SSL_REGISTRY_CERT_PATH` Location of the ssl certificate for the gitlab container registry. Defaults to `/home/git/data/certs/registry.crt` -#### `SSL_PAGES_KEY_PATH` +##### `SSL_PAGES_KEY_PATH` Location of the ssl private key for gitlab pages. Defaults to `/home/git/data/certs/pages.key` -#### `SSL_PAGES_CERT_PATH` +##### `SSL_PAGES_CERT_PATH` Location of the ssl certificate for the gitlab pages. Defaults to `/home/git/data/certs/pages.crt` -#### `SSL_CIPHERS` +##### `SSL_CIPHERS` List of supported SSL ciphers: Defaults to `ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4` -#### `SSL_PROTOCOLS` +##### `SSL_PROTOCOLS` List of supported SSL protocols: Defaults to `TLSv1 TLSv1.1 TLSv1.2 TLSv1.3` -#### `SSL_PAGES_CIPHERS` +##### `SSL_PAGES_CIPHERS` List of supported SSL ciphers for the gitlab pages: Defaults to `SSL_CIPHERS` -#### `SSL_PAGES_PROTOCOLS` +##### `SSL_PAGES_PROTOCOLS` List of supported SSL protocols for the gitlab pages: Defaults to `SSL_PROTOCOLS` -#### `SSL_REGISTRY_CIPHERS` +##### `SSL_REGISTRY_CIPHERS` List of supported SSL ciphers for gitlab container registry: Defaults to `SSL_CIPHERS` -#### `SSL_REGISTRY_PROTOCOLS` +##### `SSL_REGISTRY_PROTOCOLS` List of supported SSL protocols for gitlab container registry: Defaults to `SSL_PROTOCOLS` -#### `NGINX_WORKERS` +##### `NGINX_WORKERS` The number of nginx workers to start. Defaults to `1`. -#### `NGINX_SERVER_NAMES_HASH_BUCKET_SIZE` +##### `NGINX_SERVER_NAMES_HASH_BUCKET_SIZE` Sets the bucket size for the server names hash tables. This is needed when you have long server_names or your an error message from nginx like *nginx: [emerg] could not build server_names_hash, you should increase server_names_hash_bucket_size:..*. It should be only increment by a power of 2. Defaults to `32`. -#### `NGINX_HSTS_ENABLED` +##### `NGINX_HSTS_ENABLED` Advanced configuration option for turning off the HSTS configuration. Applicable only when SSL is in use. Defaults to `true`. See [#138](https://github.com/sameersbn/docker-gitlab/issues/138) for use case scenario. -#### `NGINX_HSTS_MAXAGE` +##### `NGINX_HSTS_MAXAGE` Advanced configuration option for setting the HSTS max-age in the gitlab nginx vHost configuration. Applicable only when SSL is in use. Defaults to `31536000`. -#### `NGINX_PROXY_BUFFERING` +##### `NGINX_PROXY_BUFFERING` Enable `proxy_buffering`. Defaults to `off`. -#### `NGINX_ACCEL_BUFFERING` +##### `NGINX_ACCEL_BUFFERING` Enable `X-Accel-Buffering` header. Default to `no` -#### `NGINX_X_FORWARDED_PROTO` +##### `NGINX_X_FORWARDED_PROTO` Advanced configuration option for the `proxy_set_header X-Forwarded-Proto` setting in the gitlab nginx vHost configuration. Defaults to `https` when `GITLAB_HTTPS` is `true`, else defaults to `$scheme`. -#### `NGINX_REAL_IP_RECURSIVE` +##### `NGINX_REAL_IP_RECURSIVE` set to `on` if docker container runs behind a reverse proxy,you may not want the IP address of the proxy to show up as the client address. `off` by default. -#### `NGINX_REAL_IP_TRUSTED_ADDRESSES` +##### `NGINX_REAL_IP_TRUSTED_ADDRESSES` You can have NGINX look for a different address to use by adding your reverse proxy to the `NGINX_REAL_IP_TRUSTED_ADDRESSES`. Currently only a single entry is permitted. No defaults. -#### `NGINX_CUSTOM_GITLAB_SERVER_CONFIG` +##### `NGINX_CUSTOM_GITLAB_SERVER_CONFIG` Advanced configuration option. You can add custom configuration for nginx as you like (e.g. custom location proxy). This is similar to setting `nginx['custom_gitlab_server_config']` to `gitlab.rb` for gitlab-omnibus. No defaults. -#### `REDIS_HOST` +##### `REDIS_HOST` The hostname of the redis server. Defaults to `localhost` -#### `REDIS_PORT` +##### `REDIS_PORT` The connection port of the redis server. Defaults to `6379`. -#### `REDIS_DB_NUMBER` +##### `REDIS_DB_NUMBER` The redis database number. Defaults to '0'. -#### `PUMA_WORKERS` +##### `PUMA_WORKERS` The number of puma workers to start. Defaults to `3`. -#### `PUMA_TIMEOUT` +##### `PUMA_TIMEOUT` Sets the timeout of puma worker processes. Defaults to `60` seconds. -#### `PUMA_THREADS_MIN` +##### `PUMA_THREADS_MIN` The number of puma minimum threads. Defaults to `1`. -#### `PUMA_THREADS_MAX` +##### `PUMA_THREADS_MAX` The number of puma maximum threads. Defaults to `16`. -#### `PUMA_PER_WORKER_MAX_MEMORY_MB` +##### `PUMA_PER_WORKER_MAX_MEMORY_MB` Maximum memory size of per puma worker process. Defaults to `1024`. -#### `PUMA_MASTER_MAX_MEMORY_MB` +##### `PUMA_MASTER_MAX_MEMORY_MB` Maximum memory size of puma master process. Defaults to `800`. -#### `SIDEKIQ_CONCURRENCY` +##### `SIDEKIQ_CONCURRENCY` The number of concurrent sidekiq jobs to run. Defaults to `25` -#### `SIDEKIQ_SHUTDOWN_TIMEOUT` +##### `SIDEKIQ_SHUTDOWN_TIMEOUT` Timeout for sidekiq shutdown. Defaults to `4` -#### `SIDEKIQ_MEMORY_KILLER_MAX_RSS` +##### `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` +##### `GITLAB_SIDEKIQ_LOG_FORMAT` Sidekiq log format that will be used. Defaults to `json` -#### `DB_ADAPTER` +##### `DB_ADAPTER` The database type. Currently only postgresql is supported. Over 12.1 postgres force. Possible values: `postgresql`. Defaults to `postgresql`. -#### `DB_ENCODING` +##### `DB_ENCODING` The database encoding. For `DB_ADAPTER` values `postresql` this parameter defaults and `utf8` respectively. -#### `DB_HOST` +##### `DB_HOST` The database server hostname. Defaults to `localhost`. -#### `DB_PORT` +##### `DB_PORT` The database server port. Defaults to `5432` for postgresql. -#### `DB_NAME` +##### `DB_NAME` The database database name. Defaults to `gitlabhq_production` -#### `DB_USER` +##### `DB_USER` The database database user. Defaults to `root` -#### `DB_PASS` +##### `DB_PASS` The database database password. Defaults to no password -#### `DB_POOL` +##### `DB_POOL` The database database connection pool count. Defaults to `10`. -#### `DB_PREPARED_STATEMENTS` +##### `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` +##### `SMTP_ENABLED` Enable mail delivery via SMTP. Defaults to `true` if `SMTP_USER` is defined, else defaults to `false`. -#### `SMTP_DOMAIN` +##### `SMTP_DOMAIN` SMTP domain. Defaults to `www.gmail.com` -#### `SMTP_HOST` +##### `SMTP_HOST` SMTP server host. Defaults to `smtp.gmail.com`. -#### `SMTP_PORT` +##### `SMTP_PORT` SMTP server port. Defaults to `587`. -#### `SMTP_USER` +##### `SMTP_USER` SMTP username. -#### `SMTP_PASS` +##### `SMTP_PASS` SMTP password. -#### `SMTP_STARTTLS` +##### `SMTP_STARTTLS` Enable STARTTLS. Defaults to `true`. -#### `SMTP_TLS` +##### `SMTP_TLS` Enable SSL/TLS. Defaults to `false`. -#### `SMTP_OPENSSL_VERIFY_MODE` +##### `SMTP_OPENSSL_VERIFY_MODE` SMTP openssl verification mode. Accepted values are `none`, `peer`, `client_once` and `fail_if_no_peer_cert`. Defaults to `none`. -#### `SMTP_AUTHENTICATION` +##### `SMTP_AUTHENTICATION` Specify the SMTP authentication method. Defaults to `login` if `SMTP_USER` is set. -#### `SMTP_CA_ENABLED` +##### `SMTP_CA_ENABLED` Enable custom CA certificates for SMTP email configuration. Defaults to `false`. -#### `SMTP_CA_PATH` +##### `SMTP_CA_PATH` Specify the `ca_path` parameter for SMTP email configuration. Defaults to `/home/git/data/certs`. -#### `SMTP_CA_FILE` +##### `SMTP_CA_FILE` Specify the `ca_file` parameter for SMTP email configuration. Defaults to `/home/git/data/certs/ca.crt`. -#### `IMAP_ENABLED` +##### `IMAP_ENABLED` Enable mail delivery via IMAP. Defaults to `true` if `IMAP_USER` is defined, else defaults to `false`. -#### `IMAP_HOST` +##### `IMAP_HOST` IMAP server host. Defaults to `imap.gmail.com`. -#### `IMAP_PORT` +##### `IMAP_PORT` IMAP server port. Defaults to `993`. -#### `IMAP_USER` +##### `IMAP_USER` IMAP username. -#### `IMAP_PASS` +##### `IMAP_PASS` IMAP password. -#### `IMAP_SSL` +##### `IMAP_SSL` Enable SSL. Defaults to `true`. -#### `IMAP_STARTTLS` +##### `IMAP_STARTTLS` Enable STARTSSL. Defaults to `false`. -#### `IMAP_MAILBOX` +##### `IMAP_MAILBOX` The name of the mailbox where incoming mail will end up. Defaults to `inbox`. -#### `LDAP_ENABLED` +##### `LDAP_ENABLED` Enable LDAP. Defaults to `false` -#### `LDAP_LABEL` +##### `LDAP_LABEL` Label to show on login tab for LDAP server. Defaults to 'LDAP' -#### `LDAP_HOST` +##### `LDAP_HOST` LDAP Host -#### `LDAP_PORT` +##### `LDAP_PORT` LDAP Port. Defaults to `389` -#### `LDAP_UID` +##### `LDAP_UID` LDAP UID. Defaults to `sAMAccountName` -#### `LDAP_METHOD` +##### `LDAP_METHOD` LDAP method, Possible values are `simple_tls`, `start_tls` and `plain`. Defaults to `plain` -#### `LDAP_VERIFY_SSL` +##### `LDAP_VERIFY_SSL` LDAP verify ssl certificate for installations that are using `LDAP_METHOD: 'simple_tls'` or `LDAP_METHOD: 'start_tls'`. Defaults to `true` -#### `LDAP_CA_FILE` +##### `LDAP_CA_FILE` Specifies the path to a file containing a PEM-format CA certificate. Defaults to `` -#### `LDAP_SSL_VERSION` +##### `LDAP_SSL_VERSION` Specifies the SSL version for OpenSSL to use, if the OpenSSL default is not appropriate. Example: 'TLSv1_1'. Defaults to `` -#### `LDAP_BIND_DN` +##### `LDAP_BIND_DN` No default. -#### `LDAP_PASS` +##### `LDAP_PASS` LDAP password -#### `LDAP_TIMEOUT` +##### `LDAP_TIMEOUT` Timeout, in seconds, for LDAP queries. Defaults to `10`. -#### `LDAP_ACTIVE_DIRECTORY` +##### `LDAP_ACTIVE_DIRECTORY` Specifies if LDAP server is Active Directory LDAP server. If your LDAP server is not AD, set this to `false`. Defaults to `true`, -#### `LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN` +##### `LDAP_ALLOW_USERNAME_OR_EMAIL_LOGIN` If enabled, GitLab will ignore everything after the first '@' in the LDAP username submitted by the user on login. Defaults to `false` if `LDAP_UID` is `userPrincipalName`, else `true`. -#### `LDAP_BLOCK_AUTO_CREATED_USERS` +##### `LDAP_BLOCK_AUTO_CREATED_USERS` Locks down those users until they have been cleared by the admin. Defaults to `false`. -#### `LDAP_BASE` +##### `LDAP_BASE` Base where we can search for users. No default. -#### `LDAP_USER_FILTER` +##### `LDAP_USER_FILTER` Filter LDAP users. No default. -#### `LDAP_USER_ATTRIBUTE_USERNAME` +##### `LDAP_USER_ATTRIBUTE_USERNAME` Attribute fields for the identification of a user. Default to `['uid', 'userid', 'sAMAccountName']` -#### `LDAP_USER_ATTRIBUTE_MAIL` +##### `LDAP_USER_ATTRIBUTE_MAIL` Attribute fields for the shown mail address. Default to `['mail', 'email', 'userPrincipalName']` -#### `LDAP_USER_ATTRIBUTE_NAME` +##### `LDAP_USER_ATTRIBUTE_NAME` Attribute field for the used username of a user. Default to `cn`. -#### `LDAP_USER_ATTRIBUTE_FIRSTNAME` +##### `LDAP_USER_ATTRIBUTE_FIRSTNAME` Attribute field for the forename of a user. Default to `givenName` -#### `LDAP_USER_ATTRIBUTE_LASTNAME` +##### `LDAP_USER_ATTRIBUTE_LASTNAME` Attribute field for the surname of a user. Default to `sn` -#### `LDAP_LOWERCASE_USERNAMES` +##### `LDAP_LOWERCASE_USERNAMES` GitLab will lower case the username for the LDAP Server. Defaults to `false` -#### `LDAP_PREVENT_LDAP_SIGN_IN` +##### `LDAP_PREVENT_LDAP_SIGN_IN` Set to `true` to [Disable LDAP web sign in](https://docs.gitlab.com/ce/administration/auth/ldap/#disable-ldap-web-sign-in), defaults to `false` -#### `OAUTH_ENABLED` +##### `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` +##### `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` +##### `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. -#### `OAUTH_BLOCK_AUTO_CREATED_USERS` +##### `OAUTH_BLOCK_AUTO_CREATED_USERS` Locks down those users until they have been cleared by the admin. Defaults to `true`. -#### `OAUTH_AUTO_LINK_LDAP_USER` +##### `OAUTH_AUTO_LINK_LDAP_USER` Look up new users in LDAP servers. If a match is found (same uid), automatically link the omniauth identity with the LDAP account. Defaults to `false`. -#### `OAUTH_AUTO_LINK_SAML_USER` +##### `OAUTH_AUTO_LINK_SAML_USER` Allow users with existing accounts to login and auto link their account via SAML login, without having to do a manual login first and manually add SAML. Defaults to `false`. -#### `OAUTH_AUTO_LINK_USER` +##### `OAUTH_AUTO_LINK_USER` Allow users with existing accounts to login and auto link their account via the defined Omniauth providers login, without having to do a manual login first and manually connect their chosen provider. Defaults to `[]`. -#### `OAUTH_EXTERNAL_PROVIDERS` +##### `OAUTH_EXTERNAL_PROVIDERS` Comma separated list if oauth providers to disallow access to `internal` projects. Users creating accounts via these providers will have access internal projects. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default. -#### `OAUTH_CAS3_LABEL` +##### `OAUTH_CAS3_LABEL` The "Sign in with" button label. Defaults to "cas3". -#### `OAUTH_CAS3_SERVER` +##### `OAUTH_CAS3_SERVER` CAS3 server URL. No defaults. -#### `OAUTH_CAS3_DISABLE_SSL_VERIFICATION` +##### `OAUTH_CAS3_DISABLE_SSL_VERIFICATION` Disable CAS3 SSL verification. Defaults to `false`. -#### `OAUTH_CAS3_LOGIN_URL` +##### `OAUTH_CAS3_LOGIN_URL` CAS3 login URL. Defaults to `/cas/login` -#### `OAUTH_CAS3_VALIDATE_URL` +##### `OAUTH_CAS3_VALIDATE_URL` CAS3 validation URL. Defaults to `/cas/p3/serviceValidate` -#### `OAUTH_CAS3_LOGOUT_URL` +##### `OAUTH_CAS3_LOGOUT_URL` CAS3 logout URL. Defaults to `/cas/logout` -#### `OAUTH_GOOGLE_API_KEY` +##### `OAUTH_GOOGLE_API_KEY` Google App Client ID. No defaults. -#### `OAUTH_GOOGLE_APP_SECRET` +##### `OAUTH_GOOGLE_APP_SECRET` Google App Client Secret. No defaults. -#### `OAUTH_GOOGLE_RESTRICT_DOMAIN` +##### `OAUTH_GOOGLE_RESTRICT_DOMAIN` List of Google App restricted domains. Value is comma separated list of single quoted groups. Example: `'exemple.com','exemple2.com'`. No defaults. -#### `OAUTH_FACEBOOK_API_KEY` +##### `OAUTH_FACEBOOK_API_KEY` Facebook App API key. No defaults. -#### `OAUTH_FACEBOOK_APP_SECRET` +##### `OAUTH_FACEBOOK_APP_SECRET` Facebook App API secret. No defaults. -#### `OAUTH_TWITTER_API_KEY` +##### `OAUTH_TWITTER_API_KEY` Twitter App API key. No defaults. -#### `OAUTH_TWITTER_APP_SECRET` +##### `OAUTH_TWITTER_APP_SECRET` Twitter App API secret. No defaults. -#### `OAUTH_AUTHENTIQ_CLIENT_ID` +##### `OAUTH_AUTHENTIQ_CLIENT_ID` authentiq Client ID. No defaults. -#### `OAUTH_AUTHENTIQ_CLIENT_SECRET` +##### `OAUTH_AUTHENTIQ_CLIENT_SECRET` authentiq Client secret. No defaults. -#### `OAUTH_AUTHENTIQ_SCOPE` +##### `OAUTH_AUTHENTIQ_SCOPE` Scope of Authentiq Application Defaults to `'aq:name email~rs address aq:push'` -#### `OAUTH_AUTHENTIQ_REDIRECT_URI` +##### `OAUTH_AUTHENTIQ_REDIRECT_URI` Callback URL for Authentiq. No defaults. -#### `OAUTH_GITHUB_API_KEY` +##### `OAUTH_GITHUB_API_KEY` GitHub App Client ID. No defaults. -#### `OAUTH_GITHUB_APP_SECRET` +##### `OAUTH_GITHUB_APP_SECRET` GitHub App Client secret. No defaults. -#### `OAUTH_GITHUB_URL` +##### `OAUTH_GITHUB_URL` Url to the GitHub Enterprise server. Defaults to `https://github.com` -#### `OAUTH_GITHUB_VERIFY_SSL` +##### `OAUTH_GITHUB_VERIFY_SSL` Enable SSL verification while communicating with the GitHub server. Defaults to `true`. -#### `OAUTH_GITLAB_API_KEY` +##### `OAUTH_GITLAB_API_KEY` GitLab App Client ID. No defaults. -#### `OAUTH_GITLAB_APP_SECRET` +##### `OAUTH_GITLAB_APP_SECRET` GitLab App Client secret. No defaults. -#### `OAUTH_BITBUCKET_API_KEY` +##### `OAUTH_BITBUCKET_API_KEY` BitBucket App Client ID. No defaults. -#### `OAUTH_BITBUCKET_APP_SECRET` +##### `OAUTH_BITBUCKET_APP_SECRET` BitBucket App Client secret. No defaults. -#### `OAUTH_BITBUCKET_URL` +##### `OAUTH_BITBUCKET_URL` Bitbucket URL. Defaults: `https://bitbucket.org/` -#### `OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL` +##### `OAUTH_SAML_ASSERTION_CONSUMER_SERVICE_URL` The URL at which the SAML assertion should be received. When `GITLAB_HTTPS=true`, defaults to `https://${GITLAB_HOST}/users/auth/saml/callback` else defaults to `http://${GITLAB_HOST}/users/auth/saml/callback`. -#### `OAUTH_SAML_IDP_CERT_FINGERPRINT` +##### `OAUTH_SAML_IDP_CERT_FINGERPRINT` The SHA1 fingerprint of the certificate. No Defaults. -#### `OAUTH_SAML_IDP_SSO_TARGET_URL` +##### `OAUTH_SAML_IDP_SSO_TARGET_URL` The URL to which the authentication request should be sent. No defaults. -#### `OAUTH_SAML_ISSUER` +##### `OAUTH_SAML_ISSUER` The name of your application. When `GITLAB_HTTPS=true`, defaults to `https://${GITLAB_HOST}` else defaults to `http://${GITLAB_HOST}`. -#### `OAUTH_SAML_LABEL` +##### `OAUTH_SAML_LABEL` The "Sign in with" button label. Defaults to "Our SAML Provider". -#### `OAUTH_SAML_NAME_IDENTIFIER_FORMAT` +##### `OAUTH_SAML_NAME_IDENTIFIER_FORMAT` Describes the format of the username required by GitLab, Defaults to `urn:oasis:names:tc:SAML:2.0:nameid-format:transient` -#### `OAUTH_SAML_GROUPS_ATTRIBUTE` +##### `OAUTH_SAML_GROUPS_ATTRIBUTE` Map groups attribute in a SAMLResponse to external groups. No defaults. -#### `OAUTH_SAML_EXTERNAL_GROUPS` +##### `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` +##### `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` +##### `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` +##### `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` +##### `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` +##### `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. -#### `OAUTH_CROWD_SERVER_URL` +##### `OAUTH_CROWD_SERVER_URL` Crowd server url. No defaults. -#### `OAUTH_CROWD_APP_NAME` +##### `OAUTH_CROWD_APP_NAME` Crowd server application name. No defaults. -#### `OAUTH_CROWD_APP_PASSWORD` +##### `OAUTH_CROWD_APP_PASSWORD` Crowd server application password. No defaults. -#### `OAUTH_AUTH0_CLIENT_ID` +##### `OAUTH_AUTH0_CLIENT_ID` Auth0 Client ID. No defaults. -#### `OAUTH_AUTH0_CLIENT_SECRET` +##### `OAUTH_AUTH0_CLIENT_SECRET` Auth0 Client secret. No defaults. -#### `OAUTH_AUTH0_DOMAIN` +##### `OAUTH_AUTH0_DOMAIN` Auth0 Domain. No defaults. -#### `OAUTH_AUTH0_SCOPE` +##### `OAUTH_AUTH0_SCOPE` Auth0 Scope. Defaults to `openid profile email`. -#### `OAUTH_AZURE_API_KEY` +##### `OAUTH_AZURE_API_KEY` Azure Client ID. No defaults. -#### `OAUTH_AZURE_API_SECRET` +##### `OAUTH_AZURE_API_SECRET` Azure Client secret. No defaults. -#### `OAUTH_AZURE_TENANT_ID` +##### `OAUTH_AZURE_TENANT_ID` Azure Tenant ID. No defaults. -#### `OAUTH2_GENERIC_APP_ID` +##### `OAUTH2_GENERIC_APP_ID` Your OAuth2 App ID. No defaults. -#### `OAUTH2_GENERIC_APP_SECRET` +##### `OAUTH2_GENERIC_APP_SECRET` Your OAuth2 App Secret. No defaults. -#### `OAUTH2_GENERIC_CLIENT_SITE` +##### `OAUTH2_GENERIC_CLIENT_SITE` The OAuth2 generic client site. No defaults -#### `OAUTH2_GENERIC_CLIENT_USER_INFO_URL` +##### `OAUTH2_GENERIC_CLIENT_USER_INFO_URL` The OAuth2 generic client user info url. No defaults -#### `OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL` +##### `OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL` The OAuth2 generic client authorize url. No defaults -#### `OAUTH2_GENERIC_CLIENT_TOKEN_URL` +##### `OAUTH2_GENERIC_CLIENT_TOKEN_URL` The OAuth2 generic client token url. No defaults -#### `OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT` +##### `OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT` The OAuth2 generic client end session endpoint. No defaults -#### `OAUTH2_GENERIC_ID_PATH` +##### `OAUTH2_GENERIC_ID_PATH` The OAuth2 generic id path. No defaults -#### `OAUTH2_GENERIC_USER_UID` +##### `OAUTH2_GENERIC_USER_UID` The OAuth2 generic user id path. No defaults -#### `OAUTH2_GENERIC_USER_NAME` +##### `OAUTH2_GENERIC_USER_NAME` The OAuth2 generic user name. No defaults -#### `OAUTH2_GENERIC_USER_EMAIL` +##### `OAUTH2_GENERIC_USER_EMAIL` The OAuth2 generic user email. No defaults -#### `OAUTH2_GENERIC_NAME` +##### `OAUTH2_GENERIC_NAME` The name of your OAuth2 provider. No defaults -#### `GITLAB_GRAVATAR_ENABLED` +##### `GITLAB_GRAVATAR_ENABLED` Enables gravatar integration. Defaults to `true`. -#### `GITLAB_GRAVATAR_HTTP_URL` +##### `GITLAB_GRAVATAR_HTTP_URL` Sets a custom gravatar url. Defaults to `http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon`. This can be used for [Libravatar integration](http://doc.gitlab.com/ce/customization/libravatar.html). -#### `GITLAB_GRAVATAR_HTTPS_URL` +##### `GITLAB_GRAVATAR_HTTPS_URL` Same as above, but for https. Defaults to `https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon`. -#### `USERMAP_UID` +##### `USERMAP_UID` Sets the uid for user `git` to the specified uid. Defaults to `1000`. -#### `USERMAP_GID` +##### `USERMAP_GID` Sets the gid for group `git` to the specified gid. Defaults to `USERMAP_UID` if defined, else defaults to `1000`. -#### `GOOGLE_ANALYTICS_ID` +##### `GOOGLE_ANALYTICS_ID` Google Analytics ID. No defaults. -#### `PIWIK_URL` +##### `PIWIK_URL` Sets the Piwik URL. No defaults. -#### `PIWIK_SITE_ID` +##### `PIWIK_SITE_ID` Sets the Piwik site ID. No defaults. -#### `AWS_BACKUPS` +##### `AWS_BACKUPS` Enables automatic uploads to an Amazon S3 instance. Defaults to `false`. -#### `AWS_BACKUP_REGION` +##### `AWS_BACKUP_REGION` AWS region. No defaults. -#### `AWS_BACKUP_ENDPOINT` +##### `AWS_BACKUP_ENDPOINT` AWS endpoint. No defaults. -#### `AWS_BACKUP_ACCESS_KEY_ID` +##### `AWS_BACKUP_ACCESS_KEY_ID` AWS access key id. No defaults. -#### `AWS_BACKUP_SECRET_ACCESS_KEY` +##### `AWS_BACKUP_SECRET_ACCESS_KEY` AWS secret access key. No defaults. -#### `AWS_BACKUP_BUCKET` +##### `AWS_BACKUP_BUCKET` AWS bucket for backup uploads. No defaults. -#### `AWS_BACKUP_MULTIPART_CHUNK_SIZE` +##### `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` +##### `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` +##### `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` +##### `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` +##### `GCS_BACKUPS` Enables automatic uploads to an Google Cloud Storage (GCS) instance. Defaults to `false`. -#### `GCS_BACKUP_ACCESS_KEY_ID` +##### `GCS_BACKUP_ACCESS_KEY_ID` GCS access key id. No defaults -#### `GCS_BACKUP_SECRET_ACCESS_KEY` +##### `GCS_BACKUP_SECRET_ACCESS_KEY` GCS secret access key. No defaults -#### `GCS_BACKUP_BUCKET` +##### `GCS_BACKUP_BUCKET` GCS bucket for backup uploads. No defaults -#### `GITLAB_ROBOTS_PATH` +##### `GITLAB_ROBOTS_PATH` Location of custom `robots.txt`. Uses GitLab's default `robots.txt` configuration by default. See [www.robotstxt.org](http://www.robotstxt.org) for examples. -#### `RACK_ATTACK_ENABLED` +##### `RACK_ATTACK_ENABLED` Enable/disable rack middleware for blocking & throttling abusive requests Defaults to `true`. -#### `RACK_ATTACK_WHITELIST` +##### `RACK_ATTACK_WHITELIST` Always allow requests from whitelisted host. Defaults to `127.0.0.1` -#### `RACK_ATTACK_MAXRETRY` +##### `RACK_ATTACK_MAXRETRY` Number of failed auth attempts before which an IP should be banned. Defaults to `10` -#### `RACK_ATTACK_FINDTIME` +##### `RACK_ATTACK_FINDTIME` Number of seconds before resetting the per IP auth attempt counter. Defaults to `60`. -#### `RACK_ATTACK_BANTIME` +##### `RACK_ATTACK_BANTIME` Number of seconds an IP should be banned after too many auth attempts. Defaults to `3600`. -#### `GITLAB_WORKHORSE_TIMEOUT` +##### `GITLAB_WORKHORSE_TIMEOUT` Timeout for gitlab workhorse http proxy. Defaults to `5m0s`. -#### `SENTRY_ENABLED` +##### `SENTRY_ENABLED` Enables Error Reporting and Logging with Sentry. Defaults to `false`. -#### `SENTRY_DSN` +##### `SENTRY_DSN` Sentry DSN. No defaults. -#### `SENTRY_CLIENTSIDE_DSN` +##### `SENTRY_CLIENTSIDE_DSN` Sentry clientside DSN. No defaults. -#### `SENTRY_ENVIRONMENT` +##### `SENTRY_ENVIRONMENT` Sentry environment. Defaults to `production`. -### Docker secrets and configs +#### 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. @@ -2335,9 +2335,9 @@ keys [`gitlab-configs`](contrib/docker-swarm/docker-compose.yml#L158) and If you're not using one of these files, then don't include its entry in the docker-compose file. -# Maintenance +## Maintenance -## Creating backups +### Creating backups GitLab defines a rake task to take a backup of your gitlab installation. The backup consists of all git repositories, uploaded files and as you might expect, the sql database. @@ -2371,7 +2371,7 @@ Afterwards you can bring your Instance back with the following command: docker-compose up -d ``` -## Restoring Backups +### Restoring Backups GitLab also defines a rake task to restore a backup. @@ -2412,13 +2412,13 @@ docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available b docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.10.0 # Choose to restore from 1515629493 ``` -## Host Key Backups (ssh) +### Host Key Backups (ssh) SSH keys are not backed up in the normal gitlab backup process. You will need to backup the `ssh/` directory in the data volume by hand and you will want to restore it prior to doing a gitlab restore. -## Automated Backups +### Automated Backups The image can be configured to automatically take backups `daily`, `weekly` or `monthly` using the `GITLAB_BACKUP_SCHEDULE` configuration option. @@ -2426,7 +2426,7 @@ Daily backups are created at `GITLAB_BACKUP_TIME` which defaults to `04:00` ever By default, when automated backups are enabled, backups are held for a period of 7 days. While when automated backups are disabled, the backups are held for an infinite period of time. This behavior can be configured via the `GITLAB_BACKUP_EXPIRY` option. -### Amazon Web Services (AWS) Remote Backups +#### Amazon Web Services (AWS) Remote Backups The image can be configured to automatically upload the backups to an AWS S3 bucket. To enable automatic AWS backups first add `--env 'AWS_BACKUPS=true'` to the docker run command. In addition `AWS_BACKUP_REGION` and `AWS_BACKUP_BUCKET` must be properly configured to point to the desired AWS location. Finally an IAM user must be configured with appropriate access permission and their AWS keys exposed through `AWS_BACKUP_ACCESS_KEY_ID` and `AWS_BACKUP_SECRET_ACCESS_KEY`. @@ -2436,7 +2436,7 @@ For remote backup to selfhosted s3 compatible storage, use `AWS_BACKUP_ENDPOINT` AWS uploads are performed alongside normal backups, both through the appropriate `app:rake` command and when an automatic backup is performed. -### Google Cloud Storage (GCS) Remote Backups +#### Google Cloud Storage (GCS) Remote Backups The image can be configured to automatically upload the backups to an Google Cloud Storage bucket. To enable automatic GCS backups first add `--env 'GCS_BACKUPS=true'` to the docker run command. In addition `GCS_BACKUP_BUCKET` must be properly configured to point to the desired GCS location. Finally a couple of `Interoperable storage access keys` user must be created and their keys exposed through `GCS_BACKUP_ACCESS_KEY_ID` and `GCS_BACKUP_SECRET_ACCESS_KEY`. @@ -2445,7 +2445,7 @@ More details about the Cloud storage interoperability properties can found on [ GCS uploads are performed alongside normal backups, both through the appropriate `app:rake` command and when an automatic backup is performed. -## Rake Tasks +### Rake Tasks The `app:rake` command allows you to run gitlab rake tasks. To run a rake task simply specify the task to be executed to the `app:rake` command. For example, if you want to gather information about GitLab and the system it runs on. @@ -2480,16 +2480,16 @@ For a complete list of available rake tasks please refer **Important Notice** > @@ -2552,7 +2552,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.9.1 ``` -## Shell Access +### Shell Access For debugging and maintenance purposes you may want access the containers shell. If you are using docker version `1.3.0` or higher you can access a running containers shell using `docker exec` command. @@ -2560,7 +2560,7 @@ For debugging and maintenance purposes you may want access the containers shell. docker exec -it gitlab bash ``` -# Monitoring +## Monitoring You can monitor your GitLab instance status as described in the [official documentation](https://docs.gitlab.com/ee/user/admin_area/monitoring/health_check.html), for example: @@ -2578,7 +2578,7 @@ On success, the endpoint will return a `200` HTTP status code, and a response li To do that you will need to set the environment variable `GITLAB_MONITORING_IP_WHITELIST` to allow your IP or subnet to make requests to your GitLab instance. -## Health Check +### Health Check You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com/compose/compose-file/compose-file-v2/#healthcheck) configuration to make periodic checks: @@ -2602,7 +2602,7 @@ Then you will be able to consult the healthcheck log by executing: docker inspect --format "{{json .State.Health }}" $(docker-compose ps -q gitlab) | jq ``` -# References +## References - - From b0b39d965e4deeab0080d7caccdc9ea041865c41 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 27 Mar 2022 11:14:33 +0200 Subject: [PATCH 178/522] Fix emphasis used instead of headings --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index cd8347326..cf4409f07 100644 --- a/README.md +++ b/README.md @@ -236,7 +236,7 @@ docker run --name gitlab -d \ GitLab uses a database backend to store its data. You can configure this image to use PostgreSQL. -*Note: GitLab requieres PostgreSQL now. So use an older image < 12.1 or migrate to PostgresSQL* +*Note:* GitLab requieres PostgreSQL now. So use an older image < 12.1 or migrate to PostgresSQL #### PostgreSQL @@ -256,7 +256,7 @@ Additionally since GitLab `8.6.0` the `pg_trgm` extension should also be loaded We are now ready to start the GitLab application. -*Assuming that the PostgreSQL server host is 192.168.1.100* +*Note:* The following applies assuming that the PostgreSQL server host is `192.168.1.100`. ```bash docker run --name gitlab -d \ @@ -342,7 +342,7 @@ The internal redis server has been removed from the image. Please use a [linked The image can be configured to use an external redis server. The configuration should be specified using environment variables while starting the GitLab image. -*Assuming that the redis server host is 192.168.1.100* +*Note:* The following applies assuming that the redis server host is `192.168.1.100`. ```bash docker run --name gitlab -it --rm \ From def7ef5fea0685efcc4ecd08456a91e09bbcf485 Mon Sep 17 00:00:00 2001 From: AlpsTsui Date: Sat, 26 Feb 2022 11:13:19 +0800 Subject: [PATCH 179/522] Fix: HealthCheck Script will Fail if the ENV GITLAB_HTTPS set True --- assets/runtime/functions | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index 8d1ca5ecc..2b841e0bc 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1641,9 +1641,13 @@ update_ssh_listen_port() { generate_healthcheck_script() { # configure healthcheck script ## https://docs.gitlab.com/ee/user/admin_area/monitoring/health_check.html + local HEALTHCHECK_PROTOCOL="http" + if [[ "${GITLAB_HTTPS}" == true ]]; then + HEALTHCHECK_PROTOCOL="${HEALTHCHECK_PROTOCOL}s" + fi cat > /usr/local/sbin/healthcheck < Date: Thu, 31 Mar 2022 19:40:23 +0200 Subject: [PATCH 180/522] Upgrade GitLab CE to 14.9.2 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 02d26e8b9..39b452ae7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.9.2** +- gitlab: upgrade CE to v14.9.2 +- gitaly: upgrade to v14.9.2 +- gitlab-pages: upgrade to v1.56.1 + **14.9.1** - gitlab: upgrade CE to v14.9.1 - gitaly: upgrade to v14.9.1 diff --git a/Dockerfile b/Dockerfile index 63b4fa7b5..b5ef2b31e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20220316 -ARG VERSION=14.9.1 +ARG VERSION=14.9.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \ GOLANG_VERSION=1.17.8 \ GITLAB_SHELL_VERSION=13.24.0 \ - GITLAB_PAGES_VERSION=1.56.0 \ - GITALY_SERVER_VERSION=14.9.1 \ + GITLAB_PAGES_VERSION=1.56.1 \ + GITALY_SERVER_VERSION=14.9.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index cf4409f07..b73943378 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:14.9.1 +# sameersbn/gitlab:14.9.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.9.1 +docker pull sameersbn/gitlab:14.9.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.9.1 + sameersbn/gitlab:14.9.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.9.1 + sameersbn/gitlab:14.9.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:14.9.1 + sameersbn/gitlab:14.9.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:14.9.1 + sameersbn/gitlab:14.9.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.9.1 + sameersbn/gitlab:14.9.2 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.9.1 + sameersbn/gitlab:14.9.2 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.9.1 + sameersbn/gitlab:14.9.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.9.1 + sameersbn/gitlab:14.9.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.9.1 + sameersbn/gitlab:14.9.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. @@ -507,7 +507,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:14.9.1 + sameersbn/gitlab:14.9.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.9.1 + sameersbn/gitlab:14.9.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.9.1 + sameersbn/gitlab:14.9.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:14.9.1 + sameersbn/gitlab:14.9.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:14.9.1 app:sanitize + sameersbn/gitlab:14.9.2 app:sanitize ``` #### Piwik @@ -2351,7 +2351,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.9.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. @@ -2386,14 +2386,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.1 app:rake db:setup + sameersbn/gitlab:14.9.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:14.9.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.9.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. @@ -2402,7 +2402,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2451,7 +2451,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:14.9.1 app:rake gitlab:env:info + sameersbn/gitlab:14.9.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2464,7 +2464,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.9.2 app:rake gitlab:import:repos ``` Or @@ -2495,7 +2495,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.9.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2519,12 +2519,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.9.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:14.9.1 +docker pull sameersbn/gitlab:14.9.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2549,7 +2549,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:14.9.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.9.2 ``` ### Shell Access @@ -2587,7 +2587,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.9.1 + image: sameersbn/gitlab:14.9.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index e1bac7955..0a73f9bb0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.9.1 +14.9.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 909d19a70..c5f377260 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.9.1 + image: sameersbn/gitlab:14.9.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 5b1015d57..ebc00a6dd 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.9.1 + image: sameersbn/gitlab:14.9.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index d64f7f270..f7e061b43 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.9.1 + image: sameersbn/gitlab:14.9.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 5392409ca..36fd9d5c7 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.9.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.9.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.9.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.9.1 +docker pull sameersbn/gitlab:14.9.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.9.1 +sameersbn/gitlab:14.9.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index dbcce41da..fff7a7431 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.9.1 + image: sameersbn/gitlab:14.9.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index f3acf4fbc..57ab80f72 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.9.1 + image: sameersbn/gitlab:14.9.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index c3276b888..dad8f4a4a 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.9.1 + image: sameersbn/gitlab:14.9.2 env: - name: TZ value: Asia/Kolkata From 86a329086a9bf29937da7dc87e8e376b89c28352 Mon Sep 17 00:00:00 2001 From: Poppo Date: Fri, 8 Apr 2022 17:10:45 +0200 Subject: [PATCH 181/522] refs https://github.com/sameersbn/docker-gitlab/issues/2538: Fix Variables for UPLOADS in GCP --- assets/runtime/config/gitlabhq/gitlab.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 8b6deb602..08f828f4a 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -314,9 +314,9 @@ production: &base 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}} + google_project: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}} + google_client_email: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}} + google_json_key_location: {{GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}} #end-uploads-gcs ## Packages (maven repository, npm registry, etc...) From 4752be956c9513f31381c196fef748eeba25f903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20J=C3=B3zsa?= Date: Mon, 11 Apr 2022 12:13:09 +0200 Subject: [PATCH 182/522] Allow to configure terraform state feature --- README.md | 56 +++++++++++++++++++++++ assets/runtime/config/gitlabhq/gitlab.yml | 31 ++++++++----- assets/runtime/env-defaults | 22 +++++++++ assets/runtime/functions | 42 +++++++++++++++++ 4 files changed, 139 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index b73943378..9d4305cbe 100644 --- a/README.md +++ b/README.md @@ -1218,6 +1218,62 @@ Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIE Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION` (`/gcs/key.json`) +##### `GITLAB_TERRAFORM_STATE_ENABLED` + +Enable/Disable Terraform State support. Defaults to `true`. + +##### `GITLAB_TERRAFORM_STATE_STORAGE_PATH` + +Directory to store the terraform state data. Defaults to `$GITLAB_SHARED_DIR/terraform_state` + +##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED` + +Enables Object Store for Terraform state that will be remote stored. Defaults to `false` + +##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_REMOTE_DIRECTORY` + +Bucket name to store the Terraform state. Defaults to `terraform_state` + +##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER` + +Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) + +##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` + +AWS Access Key ID for the Bucket. Defaults to `$AWS_ACCESS_KEY_ID` + +##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY` + +AWS Secret Access Key. Defaults to `$AWS_SECRET_ACCESS_KEY` + +##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_REGION` + +AWS Region. Defaults to `$AWS_REGION` + +##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_HOST` + +Configure this for an compatible AWS host like minio. Defaults to `$AWS_HOST` + +##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` + +AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` + +##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` + +Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `AWS_PATH_STYLE` + +##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT` + +Google project. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT` + +##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL` + +Google service account. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL` + +##### `GITLAB_TERRAFORM_STATE_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`. diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 8b6deb602..291ff0c71 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -371,21 +371,28 @@ production: &base ## Terraform state terraform_state: - enabled: true + enabled: {{GITLAB_TERRAFORM_STATE_ENABLED}} # The location where Terraform state files are stored (default: shared/terraform_state). - # storage_path: shared/terraform_state + storage_path: {{GITLAB_TERRAFORM_STATE_STORAGE_PATH}} object_store: - enabled: false - remote_directory: terraform_state # The bucket name + enabled: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED}} + remote_directory: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_REMOTE_DIRECTORY}} # The bucket name connection: - provider: AWS - aws_access_key_id: AWS_ACCESS_KEY_ID - aws_secret_access_key: AWS_SECRET_ACCESS_KEY - region: us-east-1 - # host: 'localhost' # default: s3.amazonaws.com - # endpoint: 'http://127.0.0.1:9000/' # default: nil - # aws_signature_version: 4 # For creation of signed URLs. Set to 2 if provider does not support v4. - # path_style: true # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' + provider: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER}} + #start-terraform_state-aws + aws_access_key_id: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID}} + aws_secret_access_key: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY}} + region: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_REGION}} + host: '{{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_HOST}}' # default: s3.amazonaws.com + endpoint: '{{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ENDPOINT}}' # default: nil + aws_signature_version: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION}} # For creation of signed URLs. Set to 2 if provider does not support v4. + path_style: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE}} # Use 'host/bucket_name/object' instead of 'bucket_name.host/object' + #end-terraform_state-aws + #start-terraform_state-gcs + google_project: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}} + google_client_email: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}} + google_json_key_location: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}} + #end-terraform_state-aws ## GitLab Pages pages: diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 603d4bbc3..f2d25e6ac 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -171,6 +171,28 @@ GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_PACKAGES_OBJECT_ GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL} GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB_PACKAGES_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION} +## TERRAFORM STATE +GITLAB_TERRAFORM_STATE_ENABLED=${GITLAB_TERRAFORM_STATE_ENABLED:-true} +GITLAB_TERRAFORM_STATE_STORAGE_PATH="${GITLAB_TERRAFORM_STATE_STORAGE_PATH:-$GITLAB_SHARED_DIR/terraform_state}" + +GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED:-false} +GITLAB_TERRAFORM_STATE_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY:-terraform_state} +GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER:-$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER} + +# TERRAFORM STATE:AWS +GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID:-$AWS_ACCESS_KEY_ID} +GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY:-$AWS_SECRET_ACCESS_KEY} +GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_REGION=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_REGION:-$AWS_REGION} +GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_HOST=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_HOST:-$AWS_HOST} +GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ENDPOINT=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ENDPOINT:-$AWS_ENDPOINT} +GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE:-$AWS_PATH_STYLE} +GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION:-$AWS_SIGNATURE_VERSION} + +# TERRAFORM STATE:Google +GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT} +GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL:-$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL} +GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB_TERRAFORM_STATE_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 * * * *"} diff --git a/assets/runtime/functions b/assets/runtime/functions index e15f504f5..b67fd248c 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1068,6 +1068,47 @@ gitlab_configure_packages() { GITLAB_PACKAGES_DIR } +gitlab_configure_terraform_state() { + if [[ ${GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED} == true ]]; then + echo "Configuring gitlab::terraform_state:object_store" + + if [[ "${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER}" == "Google" ]]; then + echo " -> Google TERRAFORM STATE provider selected removing aws config" + exec_as_git sed -i "/#start-terraform_state-aws/,/#end-terraform_state-aws/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#start-terraform_state-gcs/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#end-terraform_state-gcs/d" ${GITLAB_CONFIG} + fi + if [[ "${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER}" == "AWS" ]]; then + echo " -> AWS TERRAFORM STATE provider selected removing Google config" + exec_as_git sed -i "/#start-terraform_state-gcs/,/#end-terraform_state-gcs/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#start-terraform_state-aws/d" ${GITLAB_CONFIG} + exec_as_git sed -i "/#end-terraform_state-aws/d" ${GITLAB_CONFIG} + fi + + update_template ${GITLAB_CONFIG} \ + GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED \ + GITLAB_TERRAFORM_STATE_OBJECT_STORE_REMOTE_DIRECTORY \ + GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER \ + GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \ + GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_SECRET_ACCESS_KEY \ + GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_REGION \ + GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_HOST \ + GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ENDPOINT \ + GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE \ + GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION \ + GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT \ + GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL \ + GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION + else + exec_as_git sed -i -e "/storage_path: {{GITLAB_TERRAFORM_STATE_STORAGE_PATH}}/{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::terraform_state..." + update_template ${GITLAB_CONFIG} \ + GITLAB_TERRAFORM_STATE_ENABLED \ + GITLAB_TERRAFORM_STATE_STORAGE_PATH +} + gitlab_configure_lfs() { if [[ ${GITLAB_LFS_OBJECT_STORE_ENABLED} == true ]]; then echo "Configuring gitlab::lfs:object_store" @@ -1801,6 +1842,7 @@ configure_gitlab() { gitlab_configure_ci gitlab_configure_artifacts gitlab_configure_packages + gitlab_configure_terraform_state gitlab_configure_lfs gitlab_configure_uploads gitlab_configure_mattermost From 7374743a0faf2fcbb76ae15cd44fb3f2bf060250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20J=C3=B3zsa?= Date: Mon, 11 Apr 2022 11:36:15 +0200 Subject: [PATCH 183/522] fix wrong footer comment of GCS related terraform state configuration --- 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 291ff0c71..cdcb966d2 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -392,7 +392,7 @@ production: &base google_project: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_PROJECT}} google_client_email: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_CLIENT_EMAIL}} google_json_key_location: {{GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION}} - #end-terraform_state-aws + #end-terraform_state-gcs ## GitLab Pages pages: From 82e88ff0ad12186f594791db58d23eb68211567f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20J=C3=B3zsa?= Date: Mon, 11 Apr 2022 11:50:32 +0200 Subject: [PATCH 184/522] create terraform state directory based on new configuration variables during datadir initialization #2501 --- assets/runtime/functions | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index b67fd248c..e57c03b82 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1544,11 +1544,11 @@ initialize_datadir() { chown ${GITLAB_USER}: ${GITLAB_LFS_OBJECTS_DIR} # create terraform_state directory - # TODO : parametarize path and replace with it (e.g. GITLAB_TERRAFORM_STATE_STORAGE_PATH) - see sameersbn/gitlab#2438 - # TODO : wrap with "if [[ _ENABLED == true ]]" condition - mkdir -p ${GITLAB_SHARED_DIR}/terraform_state - chmod u+rwX ${GITLAB_SHARED_DIR}/terraform_state - chown ${GITLAB_USER}: ${GITLAB_SHARED_DIR}/terraform_state + if [[ ${GITLAB_TERRAFORM_STATE_ENABLED} == true ]]; then + mkdir -p ${GITLAB_TERRAFORM_STATE_STORAGE_PATH} + chmod u+rwX ${GITLAB_TERRAFORM_STATE_STORAGE_PATH} + chown ${GITLAB_USER}: ${GITLAB_TERRAFORM_STATE_STORAGE_PATH} + fi # create registry dir if [[ ${GITLAB_REGISTRY_ENABLED} == true ]]; then From 9826fdb9cacd909150d0e98d64042965e8cd47a8 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Wed, 13 Apr 2022 17:45:13 +0900 Subject: [PATCH 185/522] Upgrade Gitlab CE to 14.9.3 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 39b452ae7..602d6c536 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.9.3** +- gitlab: upgrade CE to v14.9.3 +- gitaly: upgrade to v14.9.3 +- ubuntu: upgrade to focal-20220404 + **14.9.2** - gitlab: upgrade CE to v14.9.2 - gitaly: upgrade to v14.9.2 diff --git a/Dockerfile b/Dockerfile index b5ef2b31e..5c7cb5d30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:focal-20220316 +FROM ubuntu:focal-20220404 -ARG VERSION=14.9.2 +ARG VERSION=14.9.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.8 \ GITLAB_SHELL_VERSION=13.24.0 \ GITLAB_PAGES_VERSION=1.56.1 \ - GITALY_SERVER_VERSION=14.9.2 \ + GITALY_SERVER_VERSION=14.9.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index b73943378..1242e0f2c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:14.9.2 +# sameersbn/gitlab:14.9.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.9.2 +docker pull sameersbn/gitlab:14.9.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.9.2 + sameersbn/gitlab:14.9.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.9.2 + sameersbn/gitlab:14.9.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:14.9.2 + sameersbn/gitlab:14.9.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:14.9.2 + sameersbn/gitlab:14.9.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.9.2 + sameersbn/gitlab:14.9.3 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.9.2 + sameersbn/gitlab:14.9.3 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.9.2 + sameersbn/gitlab:14.9.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.9.2 + sameersbn/gitlab:14.9.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.9.2 + sameersbn/gitlab:14.9.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. @@ -507,7 +507,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:14.9.2 + sameersbn/gitlab:14.9.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.9.2 + sameersbn/gitlab:14.9.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.9.2 + sameersbn/gitlab:14.9.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:14.9.2 + sameersbn/gitlab:14.9.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:14.9.2 app:sanitize + sameersbn/gitlab:14.9.3 app:sanitize ``` #### Piwik @@ -2351,7 +2351,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.9.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. @@ -2386,14 +2386,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.2 app:rake db:setup + sameersbn/gitlab:14.9.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:14.9.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.9.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. @@ -2402,7 +2402,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.9.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2451,7 +2451,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:14.9.2 app:rake gitlab:env:info + sameersbn/gitlab:14.9.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2464,7 +2464,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.9.3 app:rake gitlab:import:repos ``` Or @@ -2495,7 +2495,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.9.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2519,12 +2519,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.9.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:14.9.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:14.9.2 +docker pull sameersbn/gitlab:14.9.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2549,7 +2549,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:14.9.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.9.3 ``` ### Shell Access @@ -2587,7 +2587,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.9.2 + image: sameersbn/gitlab:14.9.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 0a73f9bb0..a27b97d18 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.9.2 +14.9.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index c5f377260..9bd6d332d 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.9.2 + image: sameersbn/gitlab:14.9.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index ebc00a6dd..421d9bf30 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.9.2 + image: sameersbn/gitlab:14.9.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index f7e061b43..c0b9fb5af 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.9.2 + image: sameersbn/gitlab:14.9.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 36fd9d5c7..ba6571f65 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.9.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.9.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.9.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.9.2 +docker pull sameersbn/gitlab:14.9.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.9.2 +sameersbn/gitlab:14.9.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index fff7a7431..a7bd29ea3 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.9.2 + image: sameersbn/gitlab:14.9.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 57ab80f72..1cf5482ba 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.9.2 + image: sameersbn/gitlab:14.9.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index dad8f4a4a..f64f63f78 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.9.2 + image: sameersbn/gitlab:14.9.3 env: - name: TZ value: Asia/Kolkata From 464cd644d6cbfd47a6a6252efd3845049f8f0426 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Tue, 22 Mar 2022 15:56:27 +0900 Subject: [PATCH 186/522] set bundler version based on gitlab's Gemfile.lock bundler used in gitlab is upgraded from 2.1.4 to 2.3.6 See more detail on : https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79251 first contained tag : v14.8.0 --- assets/build/install.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/build/install.sh b/assets/build/install.sh index a41ead05e..f09b207db 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -90,6 +90,10 @@ fi GITLAB_SHELL_VERSION=${GITLAB_SHELL_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_SHELL_VERSION)} GITLAB_PAGES_VERSION=${GITLAB_PAGES_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_PAGES_VERSION)} +# install bundler: use version specified in Gemfile.lock +BUNDLER_VERSION="$(grep "BUNDLED WITH" ${GITLAB_INSTALL_DIR}/Gemfile.lock -A 1 | grep -v "BUNDLED WITH" | tr -d "[:space:]")" +gem install bundler:"${BUNDLER_VERSION}" + # 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}/ From 5caa10b5637152ad9489b483d6bd54e0fdf6a969 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 13 Apr 2022 19:18:49 +0200 Subject: [PATCH 187/522] Upgrade go to v1.17.9 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 602d6c536..c046dde84 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ This file only reflects the changes that are made in this image. Please refer to **14.9.3** - gitlab: upgrade CE to v14.9.3 - gitaly: upgrade to v14.9.3 +- golang: upgrade to v1.17.9 - ubuntu: upgrade to focal-20220404 **14.9.2** diff --git a/Dockerfile b/Dockerfile index 5c7cb5d30..6fc8b4f10 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG VERSION=14.9.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.5 \ RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \ - GOLANG_VERSION=1.17.8 \ + GOLANG_VERSION=1.17.9 \ GITLAB_SHELL_VERSION=13.24.0 \ GITLAB_PAGES_VERSION=1.56.1 \ GITALY_SERVER_VERSION=14.9.3 \ From db40f05dd30ae2602be612fff15b616fe6b2fc07 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 13 Apr 2022 19:20:02 +0200 Subject: [PATCH 188/522] Upgrade ruby to v.2.7.6 --- Changelog.md | 1 + Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index c046dde84..c5d795768 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ This file only reflects the changes that are made in this image. Please refer to - gitlab: upgrade CE to v14.9.3 - gitaly: upgrade to v14.9.3 - golang: upgrade to v1.17.9 +- ruby: upgrade to v2.7.6 - ubuntu: upgrade to focal-20220404 **14.9.2** diff --git a/Dockerfile b/Dockerfile index 6fc8b4f10..098e513cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ FROM ubuntu:focal-20220404 ARG VERSION=14.9.3 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=2.7.5 \ - RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \ + RUBY_VERSION=2.7.6 \ + RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \ GOLANG_VERSION=1.17.9 \ GITLAB_SHELL_VERSION=13.24.0 \ GITLAB_PAGES_VERSION=1.56.1 \ From 950bb3d657b79c2196f27215854b31e399442a95 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 22 Apr 2022 15:09:58 +0200 Subject: [PATCH 189/522] Update README.md Add proposed changes (see #2438). --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9d4305cbe..0dcc57a85 100644 --- a/README.md +++ b/README.md @@ -1132,7 +1132,7 @@ AWS Endpoint like `http://127.0.0.1:9000`. Defaults to `$AWS_ENDPOINT` ##### `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 `AWS_PATH_STYLE` +Changes AWS Path Style to 'host/bucket_name/object' instead of 'bucket_name.host/object'. Defaults to `$AWS_PATH_STYLE` ##### `GITLAB_LFS_OBJECT_STORE_CONNECTION_AWS_SIGNATURE_VERSION` @@ -1236,7 +1236,7 @@ Bucket name to store the Terraform state. Defaults to `terraform_state` ##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER` -Connection Provider for the Object Store. (`AWS` or `Google`) Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER` (`AWS`) +Connection Provider for the Object Store (AWS or Google). Defaults to $GITLAB_OBJECT_STORE_CONNECTION_PROVIDER (i.e. AWS). ##### `GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID` From ac1c5a032da639b0211c7399dab9b17396c489f3 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 23 Apr 2022 15:55:26 +0200 Subject: [PATCH 190/522] Upgrade GitLab CE to 14.10.0 --- Changelog.md | 9 ++++- Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 51 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index c5d795768..18b7358d8 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,13 @@ # 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-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in +GitLab. + +**14.10.0** +- gitlab: upgrade CE to v14.10.0 +- gitaly: upgrade to v14.10.0 +- gitlab-shell: upgrade to v13.25.1 +- ubuntu: upgrade to focal-20220415 **14.9.3** - gitlab: upgrade CE to v14.9.3 diff --git a/Dockerfile b/Dockerfile index 098e513cd..ffb6b4e07 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20220404 +FROM ubuntu:focal-20220415 -ARG VERSION=14.9.3 +ARG VERSION=14.10.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \ GOLANG_VERSION=1.17.9 \ - GITLAB_SHELL_VERSION=13.24.0 \ + GITLAB_SHELL_VERSION=13.25.1 \ GITLAB_PAGES_VERSION=1.56.1 \ - GITALY_SERVER_VERSION=14.9.3 \ + GITALY_SERVER_VERSION=14.10.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 70809050a..a79588bed 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:14.9.3 +# sameersbn/gitlab:14.10.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.9.3 +docker pull sameersbn/gitlab:14.10.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.9.3 + sameersbn/gitlab:14.10.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.9.3 + sameersbn/gitlab:14.10.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:14.9.3 + sameersbn/gitlab:14.10.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:14.9.3 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.9.3 + sameersbn/gitlab:14.10.0 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.9.3 + sameersbn/gitlab:14.10.0 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.9.3 + sameersbn/gitlab:14.10.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.9.3 + sameersbn/gitlab:14.10.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.9.3 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.9.3 + sameersbn/gitlab:14.10.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.9.3 + sameersbn/gitlab:14.10.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.9.3 + sameersbn/gitlab:14.10.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:14.9.3 + sameersbn/gitlab:14.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:14.9.3 app:sanitize + sameersbn/gitlab:14.10.0 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.3 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.3 app:rake db:setup + sameersbn/gitlab:14.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:14.9.3 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:14.9.3 app:rake gitlab:env:info + sameersbn/gitlab:14.10.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.3 app:rake gitlab:import:repos + sameersbn/gitlab:14.10.0 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.3 app:rake gitlab:import:repos + sameersbn/gitlab:14.10.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.9.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:14.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:14.9.3 +docker pull sameersbn/gitlab:14.10.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:14.9.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.10.0 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.9.3 + image: sameersbn/gitlab:14.10.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index a27b97d18..6242bb49d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.9.3 +14.10.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 9bd6d332d..53d899180 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.9.3 + image: sameersbn/gitlab:14.10.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 421d9bf30..ef922c8ab 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.9.3 + image: sameersbn/gitlab:14.10.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index c0b9fb5af..632587f0e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.9.3 + image: sameersbn/gitlab:14.10.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ba6571f65..d25479f5d 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.3 app:rake gitlab:backup:create + sameersbn/gitlab:14.10.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.3 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.9.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.10.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.9.3 +docker pull sameersbn/gitlab:14.10.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.9.3 +sameersbn/gitlab:14.10.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index a7bd29ea3..62cd6a59d 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.9.3 + image: sameersbn/gitlab:14.10.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 1cf5482ba..8780d5e00 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.9.3 + image: sameersbn/gitlab:14.10.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index f64f63f78..590a74519 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.9.3 + image: sameersbn/gitlab:14.10.0 env: - name: TZ value: Asia/Kolkata From c8d32e09b035b69604e4f50d6913d6b921a9b01a Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 23 Apr 2022 16:45:19 +0200 Subject: [PATCH 191/522] Upgrade nodejs to 16.x --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ffb6b4e07..d9c535e8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ RUN set -ex && \ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ && echo 'deb http://apt.postgresql.org/pub/repos/apt/ focal-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_12.x focal main' > /etc/apt/sources.list.d/nodesource.list \ + && echo 'deb https://deb.nodesource.com/node_16.x focal 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 \ From 21b459216bd06f8c8eaa6d3c8a64ef46e76322b4 Mon Sep 17 00:00:00 2001 From: Paolo Mainardi Date: Fri, 29 Apr 2022 17:19:36 +0200 Subject: [PATCH 192/522] refs #2549: Install git from gitaly --- Dockerfile | 3 ++- assets/build/install.sh | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d9c535e8d..b3b9c4db8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,10 +45,11 @@ RUN set -ex && \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ sudo supervisor logrotate locales curl \ nginx openssh-server postgresql-client-12 postgresql-contrib-12 redis-tools \ - git-core python3 python3-docutils nodejs yarn gettext-base graphicsmagick \ + python3 python3-docutils nodejs yarn gettext-base graphicsmagick \ libpq5 zlib1g libyaml-0-2 libssl1.1 \ libgdbm6 libreadline8 libncurses5 libffi7 \ libxml2 libxslt1.1 libcurl4 libicu66 libre2-dev tzdata unzip libimage-exiftool-perl \ + libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev libpcre2-dev build-essential git-core \ libmagic1 \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ diff --git a/assets/build/install.sh b/assets/build/install.sh index f09b207db..e2ab048e4 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -92,7 +92,7 @@ GITLAB_PAGES_VERSION=${GITLAB_PAGES_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_ # install bundler: use version specified in Gemfile.lock BUNDLER_VERSION="$(grep "BUNDLED WITH" ${GITLAB_INSTALL_DIR}/Gemfile.lock -A 1 | grep -v "BUNDLED WITH" | tr -d "[:space:]")" -gem install bundler:"${BUNDLER_VERSION}" +gem install bundler:"${BUNDLER_VERSION}" # download golang echo "Downloading Go ${GOLANG_VERSION}..." @@ -148,6 +148,10 @@ cp -a ${GITLAB_GITALY_BUILD_DIR}/config.toml.example ${GITLAB_GITALY_INSTALL_DIR rm -rf ${GITLAB_GITALY_INSTALL_DIR}/ruby/vendor/bundle/ruby/**/cache chown -R ${GITLAB_USER}: ${GITLAB_GITALY_INSTALL_DIR} +# install git bundled with gitaly. +make -C ${GITLAB_GITALY_BUILD_DIR} git GIT_PREFIX=/usr/local +apt remove -y git-core + # clean up rm -rf ${GITLAB_GITALY_BUILD_DIR} @@ -456,4 +460,4 @@ rm -rf /var/lib/apt/lists/* # clean up caches rm -rf ${GITLAB_HOME}/.cache ${GITLAB_HOME}/.bundle ${GITLAB_HOME}/go rm -rf /root/.cache /root/.bundle ${GITLAB_HOME}/gitlab/node_modules -rm -r /tmp/* +rm -r /tmp/* From a02abdce2d3ff11ca62d0733dd4c346a3e0a4d72 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 3 May 2022 17:58:58 +0200 Subject: [PATCH 193/522] Address inconsistencies when using git (packaged with gitaly). --- Dockerfile | 2 +- assets/build/install.sh | 2 +- assets/runtime/config/gitlabhq/gitlab.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b3b9c4db8..49cb5929d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,7 +49,7 @@ RUN set -ex && \ libpq5 zlib1g libyaml-0-2 libssl1.1 \ libgdbm6 libreadline8 libncurses5 libffi7 \ libxml2 libxslt1.1 libcurl4 libicu66 libre2-dev tzdata unzip libimage-exiftool-perl \ - libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev libpcre2-dev build-essential git-core \ + libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev libpcre2-dev build-essential \ libmagic1 \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ diff --git a/assets/build/install.sh b/assets/build/install.sh index e2ab048e4..c414596b4 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -24,7 +24,7 @@ BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \ 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" + gettext libkrb5-dev git-core" ## Execute a command as GITLAB_USER exec_as_git() { diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index fb6b791c4..a0c478918 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -1147,7 +1147,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: - bin_path: /usr/bin/git + bin_path: /usr/local/bin/git ## ActionCable settings action_cable: From 889d9c36bf257f7953e6cbffc53ba54ef715df94 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 3 May 2022 19:14:18 +0200 Subject: [PATCH 194/522] collective deletion of packages --- assets/build/install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index c414596b4..08f71dc8a 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -150,7 +150,6 @@ chown -R ${GITLAB_USER}: ${GITLAB_GITALY_INSTALL_DIR} # install git bundled with gitaly. make -C ${GITLAB_GITALY_BUILD_DIR} git GIT_PREFIX=/usr/local -apt remove -y git-core # clean up rm -rf ${GITLAB_GITALY_BUILD_DIR} From 64e6256012e5c9b5742db626b4c0256b22132ba4 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 3 May 2022 19:36:22 +0200 Subject: [PATCH 195/522] transfer build packages from Dockerfile to install.sh --- Dockerfile | 1 - assets/build/install.sh | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 49cb5929d..e000739cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,7 +49,6 @@ RUN set -ex && \ libpq5 zlib1g libyaml-0-2 libssl1.1 \ libgdbm6 libreadline8 libncurses5 libffi7 \ libxml2 libxslt1.1 libcurl4 libicu66 libre2-dev tzdata unzip libimage-exiftool-perl \ - libcurl4-openssl-dev libexpat1-dev gettext libz-dev libssl-dev libpcre2-dev build-essential \ libmagic1 \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ diff --git a/assets/build/install.sh b/assets/build/install.sh index 08f71dc8a..8faacef55 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -24,7 +24,8 @@ BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \ 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 git-core" + gettext libkrb5-dev \ + libexpat1-dev libz-dev libpcre2-dev build-essential git-core" ## Execute a command as GITLAB_USER exec_as_git() { From 3b65ac4eed4ef205a3a105c62365f404a8a1e3f2 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 3 May 2022 21:31:03 +0200 Subject: [PATCH 196/522] Upgrade GitLab CE to 14.10.1 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 18b7358d8..5ea54441f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.10.1** +- gitlab: upgrade CE to v14.10.1 +- gitaly: upgrade to v14.10.1 +- ubuntu: upgrade to focal-20220426 + **14.10.0** - gitlab: upgrade CE to v14.10.0 - gitaly: upgrade to v14.10.0 diff --git a/Dockerfile b/Dockerfile index e000739cd..0dc7c5b0b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:focal-20220415 +FROM ubuntu:focal-20220426 -ARG VERSION=14.10.0 +ARG VERSION=14.10.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.9 \ GITLAB_SHELL_VERSION=13.25.1 \ GITLAB_PAGES_VERSION=1.56.1 \ - GITALY_SERVER_VERSION=14.10.0 \ + GITALY_SERVER_VERSION=14.10.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index a79588bed..8222c0286 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:14.10.0 +# sameersbn/gitlab:14.10.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.10.0 +docker pull sameersbn/gitlab:14.10.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.10.0 + sameersbn/gitlab:14.10.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.10.0 + sameersbn/gitlab:14.10.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:14.10.0 + sameersbn/gitlab:14.10.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:14.10.0 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.10.0 + sameersbn/gitlab:14.10.1 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.10.0 + sameersbn/gitlab:14.10.1 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.10.0 + sameersbn/gitlab:14.10.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.10.0 + sameersbn/gitlab:14.10.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.10.0 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.10.0 + sameersbn/gitlab:14.10.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.10.0 + sameersbn/gitlab:14.10.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.10.0 + sameersbn/gitlab:14.10.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:14.10.0 + sameersbn/gitlab:14.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:14.10.0 app:sanitize + sameersbn/gitlab:14.10.1 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.0 app:rake db:setup + sameersbn/gitlab:14.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:14.10.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:14.10.0 app:rake gitlab:env:info + sameersbn/gitlab:14.10.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.10.1 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.0 app:rake gitlab:import:repos + sameersbn/gitlab:14.10.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.10.0 +docker pull sameersbn/gitlab:14.10.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:14.10.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.10.1 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.10.0 + image: sameersbn/gitlab:14.10.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 6242bb49d..05bf2c699 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.10.0 +14.10.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 53d899180..b41d8adfb 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.10.0 + image: sameersbn/gitlab:14.10.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index ef922c8ab..1ae13575d 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.10.0 + image: sameersbn/gitlab:14.10.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 632587f0e..c0e61d1c4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.10.0 + image: sameersbn/gitlab:14.10.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index d25479f5d..7c24d7bba 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.0 app:rake gitlab:backup:create + sameersbn/gitlab:14.10.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.0 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.10.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.10.0 +docker pull sameersbn/gitlab:14.10.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.10.0 +sameersbn/gitlab:14.10.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 62cd6a59d..272b1fc91 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.10.0 + image: sameersbn/gitlab:14.10.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 8780d5e00..fe35a31fa 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.10.0 + image: sameersbn/gitlab:14.10.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 590a74519..266df69bf 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.10.0 + image: sameersbn/gitlab:14.10.1 env: - name: TZ value: Asia/Kolkata From a6ce664f2196e655b0d86e2d9f9567d5acd13169 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 5 May 2022 19:35:21 +0200 Subject: [PATCH 197/522] Upgrade GitLab CE to 14.10.2 --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 5ea54441f..d8a13d794 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,11 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.10.2** +- gitlab: upgrade CE to v14.10.2 +- gitaly: upgrade to v14.10.2 +- ubuntu: upgrade to focal-20220426 + **14.10.1** - gitlab: upgrade CE to v14.10.1 - gitaly: upgrade to v14.10.1 diff --git a/Dockerfile b/Dockerfile index 0dc7c5b0b..e223e7e81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220426 -ARG VERSION=14.10.1 +ARG VERSION=14.10.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.9 \ GITLAB_SHELL_VERSION=13.25.1 \ GITLAB_PAGES_VERSION=1.56.1 \ - GITALY_SERVER_VERSION=14.10.1 \ + GITALY_SERVER_VERSION=14.10.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 8222c0286..d2f059a4a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:14.10.1 +# sameersbn/gitlab:14.10.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.10.1 +docker pull sameersbn/gitlab:14.10.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.10.1 + sameersbn/gitlab:14.10.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.10.1 + sameersbn/gitlab:14.10.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:14.10.1 + sameersbn/gitlab:14.10.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:14.10.1 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.10.1 + sameersbn/gitlab:14.10.2 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.10.1 + sameersbn/gitlab:14.10.2 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.10.1 + sameersbn/gitlab:14.10.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.10.1 + sameersbn/gitlab:14.10.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.10.1 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.10.1 + sameersbn/gitlab:14.10.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.10.1 + sameersbn/gitlab:14.10.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.10.1 + sameersbn/gitlab:14.10.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:14.10.1 + sameersbn/gitlab:14.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:14.10.1 app:sanitize + sameersbn/gitlab:14.10.2 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.1 app:rake db:setup + sameersbn/gitlab:14.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:14.10.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.10.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:14.10.1 app:rake gitlab:env:info + sameersbn/gitlab:14.10.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.10.2 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.1 app:rake gitlab:import:repos + sameersbn/gitlab:14.10.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.10.1 +docker pull sameersbn/gitlab:14.10.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:14.10.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.10.2 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.10.1 + image: sameersbn/gitlab:14.10.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 05bf2c699..d971a451e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.10.1 +14.10.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index b41d8adfb..f9a5ccfb8 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.10.1 + image: sameersbn/gitlab:14.10.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 1ae13575d..226480924 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.10.1 + image: sameersbn/gitlab:14.10.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index c0e61d1c4..d7500f6e2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.10.1 + image: sameersbn/gitlab:14.10.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 7c24d7bba..86e70cf91 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.1 app:rake gitlab:backup:create + sameersbn/gitlab:14.10.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.1 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.10.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.10.1 +docker pull sameersbn/gitlab:14.10.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.10.1 +sameersbn/gitlab:14.10.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 272b1fc91..5cb48921b 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.10.1 + image: sameersbn/gitlab:14.10.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index fe35a31fa..7c47e73fa 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.10.1 + image: sameersbn/gitlab:14.10.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 266df69bf..5394617e3 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.10.1 + image: sameersbn/gitlab:14.10.2 env: - name: TZ value: Asia/Kolkata From 0badf7cdd7bc95e79b3b5548c0eb445662c03031 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 5 May 2022 19:53:52 +0200 Subject: [PATCH 198/522] Use git instead of git-core --- 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 8faacef55..f34537d83 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -25,7 +25,7 @@ BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \ libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \ libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev \ gettext libkrb5-dev \ - libexpat1-dev libz-dev libpcre2-dev build-essential git-core" + libexpat1-dev libz-dev libpcre2-dev build-essential git" ## Execute a command as GITLAB_USER exec_as_git() { From 944a638a2825392b240f7e2008aece74e56ab203 Mon Sep 17 00:00:00 2001 From: haroldsamuels87 <103807989+haroldsamuels87@users.noreply.github.com> Date: Thu, 12 May 2022 18:13:55 +0430 Subject: [PATCH 199/522] fixed a typo took me 5 HOURS to find this tiny little typo. --- assets/runtime/functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index e57c03b82..b9cbfdc0a 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1561,7 +1561,7 @@ initialize_datadir() { if [[ ${GITLAB_PACKAGES_ENABLED} == true ]]; then mkdir -p ${GITLAB_PACKAGES_DIR} chmod u+rwX ${GITLAB_PACKAGES_DIR} - chown ${GILTAB_USER}: ${GITLAB_PACKAGES_DIR} + chown ${GITLAB_USER}: ${GITLAB_PACKAGES_DIR} fi # create the backups directory @@ -1642,7 +1642,7 @@ sanitize_datadir() { if [[ ${GITLAB_PACKAGES_ENABLED} ]]; then chmod u+rwX ${GITLAB_PACKAGES_DIR} - chown ${GILTAB_USER}: ${GITLAB_PACKAGES_DIR} + chown ${GITLAB_USER}: ${GITLAB_PACKAGES_DIR} fi find ${GITLAB_DATA_DIR}/uploads -type f -exec chmod 0644 {} \; From e119dad3620090ae8fbb958165c02d5cdee8d389 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 19 May 2022 19:25:39 +0200 Subject: [PATCH 200/522] Update docker orb --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f3cead2d0..d6ddc8f14 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 orbs: shellcheck: circleci/shellcheck@1.3.16 - docker: circleci/docker@1.0.1 + docker: circleci/docker@2.1.1 go: circleci/go@1.1.1 commands: From e95cf008e361b6a79dceb8434491869fcbe5dee2 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 19 May 2022 19:27:03 +0200 Subject: [PATCH 201/522] Update shellcheck orb --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d6ddc8f14..21b07b58a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 orbs: - shellcheck: circleci/shellcheck@1.3.16 + shellcheck: circleci/shellcheck@3.1.1 docker: circleci/docker@2.1.1 go: circleci/go@1.1.1 From 8294651b1f62b9a964ad19100e5f5cee2ba0914b Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 19 May 2022 19:27:21 +0200 Subject: [PATCH 202/522] Update go orb --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 21b07b58a..fb58d089c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 orbs: shellcheck: circleci/shellcheck@3.1.1 docker: circleci/docker@2.1.1 - go: circleci/go@1.1.1 + go: circleci/go@1.7.1 commands: docker-build: From 602c36907cd1ffadf0115e0e4cbd5e18338a8b3d Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 19 May 2022 19:37:07 +0200 Subject: [PATCH 203/522] Fix unexpected argument(s): ignore --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fb58d089c..6018c6c05 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -285,7 +285,7 @@ workflows: jobs: - shellcheck/check: name: shellcheck - ignore: SC2086,SC2181 + exclude: SC2086,SC2181 filters: tags: only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/ From b17ef31fb238e1b1f515247078e9a07cf1b1d48d Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 19 May 2022 19:51:20 +0200 Subject: [PATCH 204/522] Activate external_sources for shellcheck in CI --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6018c6c05..d2e2676f6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -286,6 +286,7 @@ workflows: - shellcheck/check: name: shellcheck exclude: SC2086,SC2181 + external_sources: true filters: tags: only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$/ From 817f40ac2d0d5adee7aa7cab67b5d37a1ca64ab1 Mon Sep 17 00:00:00 2001 From: Paolo Mainardi Date: Mon, 23 May 2022 11:12:44 +0200 Subject: [PATCH 205/522] Upgrade to 14.10.3 --- Changelog.md | 6 ++- Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index d8a13d794..a2163194c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,8 +1,12 @@ # 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-foss/blob/master/CHANGELOG.md) for the list of changes in +This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**14.10.3** +- gitlab: upgrade CE to v14.10.3 +- gitaly: upgrade to v14.10.3 + **14.10.2** - gitlab: upgrade CE to v14.10.2 - gitaly: upgrade to v14.10.2 diff --git a/Dockerfile b/Dockerfile index e223e7e81..0e34972cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220426 -ARG VERSION=14.10.2 +ARG VERSION=14.10.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.9 \ GITLAB_SHELL_VERSION=13.25.1 \ GITLAB_PAGES_VERSION=1.56.1 \ - GITALY_SERVER_VERSION=14.10.2 \ + GITALY_SERVER_VERSION=14.10.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index d2f059a4a..2e4b95c79 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:14.10.2 +# sameersbn/gitlab:14.10.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.10.2 +docker pull sameersbn/gitlab:14.10.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.10.2 + sameersbn/gitlab:14.10.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.10.2 + sameersbn/gitlab:14.10.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:14.10.2 + sameersbn/gitlab:14.10.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:14.10.2 + sameersbn/gitlab:14.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.10.2 + sameersbn/gitlab:14.10.3 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.10.2 + sameersbn/gitlab:14.10.3 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.10.2 + sameersbn/gitlab:14.10.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.10.2 + sameersbn/gitlab:14.10.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.10.2 + sameersbn/gitlab:14.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. @@ -507,7 +507,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:14.10.2 + sameersbn/gitlab:14.10.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.10.2 + sameersbn/gitlab:14.10.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.10.2 + sameersbn/gitlab:14.10.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:14.10.2 + sameersbn/gitlab:14.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:14.10.2 app:sanitize + sameersbn/gitlab:14.10.3 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.2 app:rake db:setup + sameersbn/gitlab:14.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:14.10.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:14.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:14.10.2 app:rake gitlab:env:info + sameersbn/gitlab:14.10.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.10.3 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.2 app:rake gitlab:import:repos + sameersbn/gitlab:14.10.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:14.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:14.10.2 +docker pull sameersbn/gitlab:14.10.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:14.10.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.10.3 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.10.2 + image: sameersbn/gitlab:14.10.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index d971a451e..77d734108 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.10.2 +14.10.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index f9a5ccfb8..c8d7bcbc5 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.10.2 + image: sameersbn/gitlab:14.10.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 226480924..d01717cdc 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.10.2 + image: sameersbn/gitlab:14.10.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index d7500f6e2..c145f0be4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.10.2 + image: sameersbn/gitlab:14.10.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 86e70cf91..202fb3e2b 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.2 app:rake gitlab:backup:create + sameersbn/gitlab:14.10.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.2 app:rake gitlab:backup:restore + sameersbn/gitlab:14.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:14.10.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.10.2 +docker pull sameersbn/gitlab:14.10.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.10.2 +sameersbn/gitlab:14.10.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 5cb48921b..b927493a7 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.10.2 + image: sameersbn/gitlab:14.10.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 7c47e73fa..f42ea2674 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.10.2 + image: sameersbn/gitlab:14.10.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 5394617e3..0a96206b6 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.10.2 + image: sameersbn/gitlab:14.10.3 env: - name: TZ value: Asia/Kolkata From 1212255dc422ab0ebd6d6c448c5e90b73356b091 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 24 May 2022 16:01:33 +0200 Subject: [PATCH 206/522] Upgrade GitLab CE to 15.0.0 --- Changelog.md | 10 ++++- Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 46 deletions(-) diff --git a/Changelog.md b/Changelog.md index a2163194c..8784e4cd5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,7 +1,13 @@ # 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-foss/blob/master/CHANGELOG.md) for the list of changes in -GitLab. +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. + +**15.0.0** +- gitlab: upgrade CE to v15.0.0 +- gitaly: upgrade to v15.0.0 +- golang: upgrade to v1.17.10 +- gitlab-shell: upgrade to v14.3.0 +- gitlab-pages: upgrade to v1.58.0 **14.10.3** - gitlab: upgrade CE to v14.10.3 diff --git a/Dockerfile b/Dockerfile index 0e34972cc..82d1a7e9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20220426 -ARG VERSION=14.10.3 +ARG VERSION=15.0.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \ - GOLANG_VERSION=1.17.9 \ - GITLAB_SHELL_VERSION=13.25.1 \ - GITLAB_PAGES_VERSION=1.56.1 \ - GITALY_SERVER_VERSION=14.10.3 \ + GOLANG_VERSION=1.17.10 \ + GITLAB_SHELL_VERSION=14.3.0 \ + GITLAB_PAGES_VERSION=1.58.0 \ + GITALY_SERVER_VERSION=15.0.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 2e4b95c79..a769e53a6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:14.10.3 +# sameersbn/gitlab:15.0.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:14.10.3 +docker pull sameersbn/gitlab:15.0.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.10.3 + sameersbn/gitlab:15.0.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.10.3 + sameersbn/gitlab:15.0.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:14.10.3 + sameersbn/gitlab:15.0.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:14.10.3 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:14.10.3 + sameersbn/gitlab:15.0.0 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:14.10.3 + sameersbn/gitlab:15.0.0 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.10.3 + sameersbn/gitlab:15.0.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:14.10.3 + sameersbn/gitlab:15.0.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:14.10.3 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:14.10.3 + sameersbn/gitlab:15.0.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:14.10.3 + sameersbn/gitlab:15.0.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:14.10.3 + sameersbn/gitlab:15.0.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:14.10.3 + sameersbn/gitlab:15.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:14.10.3 app:sanitize + sameersbn/gitlab:15.0.0 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.3 app:rake db:setup + sameersbn/gitlab:15.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:14.10.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:14.10.3 app:rake gitlab:env:info + sameersbn/gitlab:15.0.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.0.0 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.0.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:14.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:15.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:14.10.3 +docker pull sameersbn/gitlab:15.0.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:14.10.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.0.0 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:14.10.3 + image: sameersbn/gitlab:15.0.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 77d734108..94188a748 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.10.3 +15.0.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index c8d7bcbc5..22780eb5b 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.10.3 + image: sameersbn/gitlab:15.0.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index d01717cdc..06b75b66f 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:14.10.3 + image: sameersbn/gitlab:15.0.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index c145f0be4..4e95bf0e9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.10.3 + image: sameersbn/gitlab:15.0.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 202fb3e2b..3758da92a 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.0.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:14.10.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.0.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:14.10.3 +docker pull sameersbn/gitlab:15.0.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:14.10.3 +sameersbn/gitlab:15.0.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index b927493a7..55ecccb07 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.10.3 + image: sameersbn/gitlab:15.0.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index f42ea2674..913d3af9c 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:14.10.3 + image: sameersbn/gitlab:15.0.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 0a96206b6..739a86a02 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:14.10.3 + image: sameersbn/gitlab:15.0.0 env: - name: TZ value: Asia/Kolkata From 0f6c07c99cc8620845a7e56db757ebba9c97a705 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 2 Jun 2022 20:22:57 +0200 Subject: [PATCH 207/522] Upgrade GitLab CE to 15.0.1 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 8784e4cd5..1422bef43 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.0.1** +- gitlab: upgrade CE to v15.0.1 +- gitaly: upgrade to v15.0.1 +- golang: upgrade to v1.17.11 + **15.0.0** - gitlab: upgrade CE to v15.0.0 - gitaly: upgrade to v15.0.0 diff --git a/Dockerfile b/Dockerfile index 82d1a7e9b..00038ebd6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20220426 -ARG VERSION=15.0.0 +ARG VERSION=15.0.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \ - GOLANG_VERSION=1.17.10 \ + GOLANG_VERSION=1.17.11 \ GITLAB_SHELL_VERSION=14.3.0 \ GITLAB_PAGES_VERSION=1.58.0 \ - GITALY_SERVER_VERSION=15.0.0 \ + GITALY_SERVER_VERSION=15.0.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index a769e53a6..dd169f2ca 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.0.0 +# sameersbn/gitlab:15.0.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.0.0 +docker pull sameersbn/gitlab:15.0.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.0.0 + sameersbn/gitlab:15.0.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.0.0 + sameersbn/gitlab:15.0.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:15.0.0 + sameersbn/gitlab:15.0.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:15.0.0 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.0.0 + sameersbn/gitlab:15.0.1 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.0.0 + sameersbn/gitlab:15.0.1 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.0.0 + sameersbn/gitlab:15.0.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.0.0 + sameersbn/gitlab:15.0.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.0.0 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.0.0 + sameersbn/gitlab:15.0.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.0.0 + sameersbn/gitlab:15.0.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.0.0 + sameersbn/gitlab:15.0.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:15.0.0 + sameersbn/gitlab:15.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:15.0.0 app:sanitize + sameersbn/gitlab:15.0.1 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.0 app:rake db:setup + sameersbn/gitlab:15.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:15.0.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:15.0.0 app:rake gitlab:env:info + sameersbn/gitlab:15.0.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.0.1 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.0.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.0.0 +docker pull sameersbn/gitlab:15.0.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:15.0.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.0.1 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.0.0 + image: sameersbn/gitlab:15.0.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 94188a748..2bbd2b4b4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.0.0 +15.0.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 22780eb5b..d0de26971 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.0.0 + image: sameersbn/gitlab:15.0.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 06b75b66f..ee996ca29 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.0.0 + image: sameersbn/gitlab:15.0.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 4e95bf0e9..a8dc986d5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.0.0 + image: sameersbn/gitlab:15.0.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 3758da92a..3076cf40d 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.0.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.0.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.0.0 +docker pull sameersbn/gitlab:15.0.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.0.0 +sameersbn/gitlab:15.0.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 55ecccb07..296e9ac1e 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.0.0 + image: sameersbn/gitlab:15.0.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 913d3af9c..b57ea8f56 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.0.0 + image: sameersbn/gitlab:15.0.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 739a86a02..2872037f9 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.0.0 + image: sameersbn/gitlab:15.0.1 env: - name: TZ value: Asia/Kolkata From 2e8ba4f3d3860d04fa3a1d613cda1470889f8c29 Mon Sep 17 00:00:00 2001 From: ian zhang Date: Sun, 5 Jun 2022 16:56:59 +0800 Subject: [PATCH 208/522] Update docker command for sample poostgresql As the default postgresql version had been upgraded as version 12, the sample command should be updating too, otherwise, we will meet permission issue during first execution. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a769e53a6..373d66e2a 100644 --- a/README.md +++ b/README.md @@ -170,7 +170,7 @@ Step 1. Launch a postgresql container docker run --name gitlab-postgresql -d \ --env 'DB_NAME=gitlabhq_production' \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ - --env 'DB_EXTENSION=pg_trgm' \ + --env 'DB_EXTENSION=pg_trgm,btree_gist' \ --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \ sameersbn/postgresql:12-20200524 ``` From 96d7a25acf3dbd63a32533128511b0faccd0c259 Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Wed, 8 Jun 2022 16:57:44 +0100 Subject: [PATCH 209/522] Update Dockerfile Update to V15.0.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 00038ebd6..b73a47ca2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220426 -ARG VERSION=15.0.1 +ARG VERSION=15.0.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ From 22fb05567a7f3bd0f9cdad26212ecb51e68233bc Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 11 Jun 2022 13:32:21 +0200 Subject: [PATCH 210/522] Completing PR for GitLab CE Upgrade --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 1422bef43..a7b87d0c5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.0.2** +- gitlab: upgrade CE to v15.0.2 +- gitaly: upgrade to v15.0.2 +- ubuntu: upgrade to focal-20220531 + **15.0.1** - gitlab: upgrade CE to v15.0.1 - gitaly: upgrade to v15.0.1 diff --git a/Dockerfile b/Dockerfile index b73a47ca2..60d14d183 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20220426 +FROM ubuntu:focal-20220531 ARG VERSION=15.0.2 @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.11 \ GITLAB_SHELL_VERSION=14.3.0 \ GITLAB_PAGES_VERSION=1.58.0 \ - GITALY_SERVER_VERSION=15.0.1 \ + GITALY_SERVER_VERSION=15.0.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 07b486e5b..c54292aef 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.0.1 +# sameersbn/gitlab:15.0.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.0.1 +docker pull sameersbn/gitlab:15.0.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.0.1 + sameersbn/gitlab:15.0.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.0.1 + sameersbn/gitlab:15.0.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:15.0.1 + sameersbn/gitlab:15.0.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:15.0.1 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.0.1 + sameersbn/gitlab:15.0.2 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.0.1 + sameersbn/gitlab:15.0.2 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.0.1 + sameersbn/gitlab:15.0.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.0.1 + sameersbn/gitlab:15.0.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.0.1 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.0.1 + sameersbn/gitlab:15.0.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.0.1 + sameersbn/gitlab:15.0.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.0.1 + sameersbn/gitlab:15.0.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:15.0.1 + sameersbn/gitlab:15.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:15.0.1 app:sanitize + sameersbn/gitlab:15.0.2 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.1 app:rake db:setup + sameersbn/gitlab:15.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:15.0.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:15.0.1 app:rake gitlab:env:info + sameersbn/gitlab:15.0.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.0.2 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.0.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.0.1 +docker pull sameersbn/gitlab:15.0.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:15.0.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.0.2 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.0.1 + image: sameersbn/gitlab:15.0.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 2bbd2b4b4..7c626aa69 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.0.1 +15.0.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index d0de26971..7c1a23c5f 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.0.1 + image: sameersbn/gitlab:15.0.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index ee996ca29..4ab4b32d9 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.0.1 + image: sameersbn/gitlab:15.0.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index a8dc986d5..f36b01845 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.0.1 + image: sameersbn/gitlab:15.0.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 3076cf40d..551fe5b87 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.0.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.0.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.0.1 +docker pull sameersbn/gitlab:15.0.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.0.1 +sameersbn/gitlab:15.0.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 296e9ac1e..fcad91dc0 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.0.1 + image: sameersbn/gitlab:15.0.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index b57ea8f56..2822bfac9 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.0.1 + image: sameersbn/gitlab:15.0.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 2872037f9..3168beaad 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.0.1 + image: sameersbn/gitlab:15.0.2 env: - name: TZ value: Asia/Kolkata From 17a26ab1ea827fa689363b1b33196a86414edb7e Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 12 Jun 2022 09:34:05 +0200 Subject: [PATCH 211/522] Temporary modification of the release notes --- scripts/release-notes.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh index bd49f28e1..f84c2ba23 100755 --- a/scripts/release-notes.sh +++ b/scripts/release-notes.sh @@ -34,6 +34,12 @@ ${NOTABLE_CHANGES} For installation and usage instructions please refer to the [README](https://github.com/sameersbn/docker-gitlab/blob/${RELEASE}/README.md) +## Important notes + +Please note that this version does not yet include any rework as a consequence of the major release and possibly some functions in our implementation might not be usable yet or only to a limited extent. + +You are kindly invited to provide contributions. + ## Contributing If you find this image useful here's how you can help: From 646bf6e836876b6b3eb190c808ed54ae7f1123d5 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 17 Jun 2022 20:33:49 +0200 Subject: [PATCH 212/522] Upgrade GitLab CE to 15.0.3 --- Changelog.md | 4 ++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index a7b87d0c5..1ebc8bbd9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**15.0.3** +- gitlab: upgrade CE to v15.0.3 +- gitaly: upgrade to v15.0.3 + **15.0.2** - gitlab: upgrade CE to v15.0.2 - gitaly: upgrade to v15.0.2 diff --git a/Dockerfile b/Dockerfile index 60d14d183..48064b423 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220531 -ARG VERSION=15.0.2 +ARG VERSION=15.0.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.11 \ GITLAB_SHELL_VERSION=14.3.0 \ GITLAB_PAGES_VERSION=1.58.0 \ - GITALY_SERVER_VERSION=15.0.2 \ + GITALY_SERVER_VERSION=15.0.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index c54292aef..019a220fe 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.0.2 +# sameersbn/gitlab:15.0.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.0.2 +docker pull sameersbn/gitlab:15.0.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.0.2 + sameersbn/gitlab:15.0.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.0.2 + sameersbn/gitlab:15.0.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:15.0.2 + sameersbn/gitlab:15.0.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:15.0.2 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.0.2 + sameersbn/gitlab:15.0.3 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.0.2 + sameersbn/gitlab:15.0.3 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.0.2 + sameersbn/gitlab:15.0.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.0.2 + sameersbn/gitlab:15.0.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.0.2 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.0.2 + sameersbn/gitlab:15.0.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.0.2 + sameersbn/gitlab:15.0.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.0.2 + sameersbn/gitlab:15.0.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:15.0.2 + sameersbn/gitlab:15.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:15.0.2 app:sanitize + sameersbn/gitlab:15.0.3 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.2 app:rake db:setup + sameersbn/gitlab:15.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:15.0.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.0.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:15.0.2 app:rake gitlab:env:info + sameersbn/gitlab:15.0.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.0.3 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.0.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.0.2 +docker pull sameersbn/gitlab:15.0.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:15.0.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.0.3 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.0.2 + image: sameersbn/gitlab:15.0.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 7c626aa69..13577ced6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.0.2 +15.0.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 7c1a23c5f..7a4ef6903 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.0.2 + image: sameersbn/gitlab:15.0.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 4ab4b32d9..e73d29d2d 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.0.2 + image: sameersbn/gitlab:15.0.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index f36b01845..f8b1ba667 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.0.2 + image: sameersbn/gitlab:15.0.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 551fe5b87..fb9e873ac 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.0.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.0.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.0.2 +docker pull sameersbn/gitlab:15.0.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.0.2 +sameersbn/gitlab:15.0.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index fcad91dc0..f0ac45286 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.0.2 + image: sameersbn/gitlab:15.0.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 2822bfac9..a4f258f47 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.0.2 + image: sameersbn/gitlab:15.0.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 3168beaad..ea5e8eda8 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.0.2 + image: sameersbn/gitlab:15.0.3 env: - name: TZ value: Asia/Kolkata From 844d57dad2a066a92b021587f6e637b0b522fc98 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sat, 4 Jun 2022 22:55:03 +0900 Subject: [PATCH 213/522] update `*:object_store:enabled` regardless of the value apply for artifact,packages,terraform_state,lfs,uploads --- assets/runtime/functions | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index b9cbfdc0a..07477a6ae 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -980,6 +980,9 @@ gitlab_configure_ci() { } gitlab_configure_artifacts() { + update_template ${GITLAB_CONFIG} \ + GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED + if [[ ${GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED} == true ]]; then echo "Configuring gitlab::artifacts:object_store" @@ -997,7 +1000,6 @@ gitlab_configure_artifacts() { fi 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 \ @@ -1025,6 +1027,9 @@ gitlab_configure_artifacts() { gitlab_configure_packages() { + update_template ${GITLAB_CONFIG} \ + GITLAB_PACKAGES_OBJECT_STORE_ENABLED + if [[ ${GITLAB_PACKAGES_OBJECT_STORE_ENABLED} == true ]]; then echo "Configuring gitlab::packages:object_store" @@ -1042,7 +1047,6 @@ gitlab_configure_packages() { fi update_template ${GITLAB_CONFIG} \ - GITLAB_PACKAGES_OBJECT_STORE_ENABLED \ GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY \ GITLAB_PACKAGES_OBJECT_STORE_DIRECT_UPLOAD \ GITLAB_PACKAGES_OBJECT_STORE_BACKGROUND_UPLOAD \ @@ -1069,6 +1073,9 @@ gitlab_configure_packages() { } gitlab_configure_terraform_state() { + update_template ${GITLAB_CONFIG} \ + GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED + if [[ ${GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED} == true ]]; then echo "Configuring gitlab::terraform_state:object_store" @@ -1086,7 +1093,6 @@ gitlab_configure_terraform_state() { fi update_template ${GITLAB_CONFIG} \ - GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED \ GITLAB_TERRAFORM_STATE_OBJECT_STORE_REMOTE_DIRECTORY \ GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER \ GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_AWS_ACCESS_KEY_ID \ @@ -1110,6 +1116,9 @@ gitlab_configure_terraform_state() { } gitlab_configure_lfs() { + update_template ${GITLAB_CONFIG} \ + GITLAB_LFS_OBJECT_STORE_ENABLED \ + if [[ ${GITLAB_LFS_OBJECT_STORE_ENABLED} == true ]]; then echo "Configuring gitlab::lfs:object_store" @@ -1127,7 +1136,6 @@ gitlab_configure_lfs() { fi 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 \ @@ -1154,6 +1162,9 @@ gitlab_configure_lfs() { } gitlab_configure_uploads() { + update_template ${GITLAB_CONFIG} \ + GITLAB_UPLOADS_OBJECT_STORE_ENABLED + if [[ ${GITLAB_UPLOADS_OBJECT_STORE_ENABLED} == true ]]; then echo "Configuring gitlab::uploads:object_store" @@ -1171,7 +1182,6 @@ gitlab_configure_uploads() { fi 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 \ From fbcdd290becbbca4b7d3bb23e1de8769e886bf4e Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sun, 5 Jun 2022 16:01:21 +0900 Subject: [PATCH 214/522] fix condition to apply patch during build gitlab rewrite patch applying with find | while read chain `if [[ -f ]]` with globbing may not works --- 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 f34537d83..3d488e156 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -83,10 +83,10 @@ exec_as_git git config --global advice.detachedHead false 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} -if [[ -d "${GITLAB_BUILD_DIR}/patches" && -f "${GITLAB_BUILD_DIR}/patches/*.patch" ]]; then - echo "Applying patches for gitlab-foss..." - exec_as_git git -C ${GITLAB_INSTALL_DIR} apply --ignore-whitespace < ${GITLAB_BUILD_DIR}/patches/*.patch -fi +find "${GITLAB_BUILD_DIR}/patches/" -name "*.patch" | while read -r patch_file; do + printf "Applying patch %s for gitlab-foss...\n" "${patch_file}" + exec_as_git git -C ${GITLAB_INSTALL_DIR} apply --ignore-whitespace < "${patch_file}" +done GITLAB_SHELL_VERSION=${GITLAB_SHELL_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_SHELL_VERSION)} GITLAB_PAGES_VERSION=${GITLAB_PAGES_VERSION:-$(cat ${GITLAB_INSTALL_DIR}/GITLAB_PAGES_VERSION)} From 7d0739218f52744881e381f0c7d59d7ea15d18aa Mon Sep 17 00:00:00 2001 From: Poppo Date: Fri, 24 Jun 2022 20:12:32 +0200 Subject: [PATCH 215/522] fix env default variable --- 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 f2d25e6ac..908d368fc 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -176,7 +176,7 @@ GITLAB_TERRAFORM_STATE_ENABLED=${GITLAB_TERRAFORM_STATE_ENABLED:-true} GITLAB_TERRAFORM_STATE_STORAGE_PATH="${GITLAB_TERRAFORM_STATE_STORAGE_PATH:-$GITLAB_SHARED_DIR/terraform_state}" GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_ENABLED:-false} -GITLAB_TERRAFORM_STATE_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_PACKAGES_OBJECT_STORE_REMOTE_DIRECTORY:-terraform_state} +GITLAB_TERRAFORM_STATE_OBJECT_STORE_REMOTE_DIRECTORY=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_REMOTE_DIRECTORY:-terraform_state} GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER=${GITLAB_TERRAFORM_STATE_OBJECT_STORE_CONNECTION_PROVIDER:-$GITLAB_OBJECT_STORE_CONNECTION_PROVIDER} # TERRAFORM STATE:AWS From 6da7a2a07fb9d2858691cc5d4ae38f632292f023 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 25 Jun 2022 11:42:26 +0200 Subject: [PATCH 216/522] Upgrade GitLab CE to 15.1.0 --- Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- scripts/release-notes.sh | 10 +++++ 11 files changed, 53 insertions(+), 43 deletions(-) diff --git a/Dockerfile b/Dockerfile index 48064b423..6a9713416 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20220531 -ARG VERSION=15.0.3 +ARG VERSION=15.1.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \ GOLANG_VERSION=1.17.11 \ - GITLAB_SHELL_VERSION=14.3.0 \ - GITLAB_PAGES_VERSION=1.58.0 \ - GITALY_SERVER_VERSION=15.0.3 \ + GITLAB_SHELL_VERSION=14.7.4 \ + GITLAB_PAGES_VERSION=1.59.0 \ + GITALY_SERVER_VERSION=15.1.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 019a220fe..f6d4e59c1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.0.3 +# sameersbn/gitlab:15.1.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.0.3 +docker pull sameersbn/gitlab:15.1.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.0.3 + sameersbn/gitlab:15.1.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.0.3 + sameersbn/gitlab:15.1.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:15.0.3 + sameersbn/gitlab:15.1.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:15.0.3 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.0.3 + sameersbn/gitlab:15.1.0 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.0.3 + sameersbn/gitlab:15.1.0 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.0.3 + sameersbn/gitlab:15.1.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.0.3 + sameersbn/gitlab:15.1.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.0.3 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.0.3 + sameersbn/gitlab:15.1.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.0.3 + sameersbn/gitlab:15.1.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.0.3 + sameersbn/gitlab:15.1.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:15.0.3 + sameersbn/gitlab:15.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:15.0.3 app:sanitize + sameersbn/gitlab:15.1.0 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.3 app:rake db:setup + sameersbn/gitlab:15.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:15.0.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:15.0.3 app:rake gitlab:env:info + sameersbn/gitlab:15.1.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.1.0 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.1.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.0.3 +docker pull sameersbn/gitlab:15.1.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:15.0.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.1.0 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.0.3 + image: sameersbn/gitlab:15.1.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 13577ced6..d14dfbac3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.0.3 +15.1.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 7a4ef6903..d4ffcce7b 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.0.3 + image: sameersbn/gitlab:15.1.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index e73d29d2d..edcd69cb5 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.0.3 + image: sameersbn/gitlab:15.1.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index f8b1ba667..61b59a0c3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.0.3 + image: sameersbn/gitlab:15.1.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index fb9e873ac..00aaa6f51 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.1.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.0.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.1.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.0.3 +docker pull sameersbn/gitlab:15.1.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.0.3 +sameersbn/gitlab:15.1.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index f0ac45286..9a5a027a7 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.0.3 + image: sameersbn/gitlab:15.1.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index a4f258f47..7447fe332 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.0.3 + image: sameersbn/gitlab:15.1.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index ea5e8eda8..192bb1d25 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.0.3 + image: sameersbn/gitlab:15.1.0 env: - name: TZ value: Asia/Kolkata diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh index f84c2ba23..bc5140e16 100755 --- a/scripts/release-notes.sh +++ b/scripts/release-notes.sh @@ -40,6 +40,16 @@ Please note that this version does not yet include any rework as a consequence o You are kindly invited to provide contributions. +### Version-specific instructions for upgrades + +Please consider the version specific upgrading instructions for [GitLab CE 15.0.x](https://docs.gitlab.com/ee/update/#1500) and [GitLab CE 15.1.x](https://docs.gitlab.com/ee/update/#1510) + +* Elasticsearch 6.8 is no longer supported. Before you upgrade to GitLab 15.0, update Elasticsearch to any 7.x version. +* If you run external PostgreSQL, particularly AWS RDS, check you have a PostgreSQL bug fix to avoid the database crashing. +* The use of encrypted S3 buckets with storage-specific configuration is no longer supported after removing support for using background_upload. +* The certificate-based Kubernetes integration (DEPRECATED) is disabled by default, but you can be re-enable it through the certificate_based_clusters feature flag until GitLab 16.0. +* In GitLab 15.1.0, we are switching Rails ActiveSupport::Digest to use SHA256 instead of MD5. This affects ETag key generation for resources such as raw Snippet file downloads. In order to ensure consistent ETag key generation across multiple web nodes when upgrading, all servers must first be upgraded to 15.1.Z before upgrading to 15.2.0 or later. + ## Contributing If you find this image useful here's how you can help: From 4c576911b68be7abe67f7de760d7dddf0a32f19e Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 25 Jun 2022 11:46:28 +0200 Subject: [PATCH 217/522] Udate Changelog --- Changelog.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Changelog.md b/Changelog.md index 1ebc8bbd9..c35ba8135 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**15.1.0** + +- gitlab: upgrade CE to v15.1.0 +- gitaly: upgrade to v15.1.0 +- gitlab-shell: upgrade to v14.7.4 +- gitlab-pages: upgrade to v1.59.0 + **15.0.3** - gitlab: upgrade CE to v15.0.3 - gitaly: upgrade to v15.0.3 From 5c9c5cad1b027a00c4dd3abe9ce53efa39b4b7c3 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 25 Jun 2022 13:39:08 +0200 Subject: [PATCH 218/522] Temporary remove `geo` from `config/database.yml` --- assets/build/config/database.yml.postgresql | 100 ++++++++++++++++++++ assets/build/install.sh | 6 +- 2 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 assets/build/config/database.yml.postgresql diff --git a/assets/build/config/database.yml.postgresql b/assets/build/config/database.yml.postgresql new file mode 100644 index 000000000..180f8b018 --- /dev/null +++ b/assets/build/config/database.yml.postgresql @@ -0,0 +1,100 @@ +# HINT: This file is identical to the corresponding configuration file from the +# upstream repository, where the additional defined entries for `geo` had to be +# removed. Otherwise, it is not possible to build the image, since the build +# will fail with the error message: +# +# > rake aborted! +# > ERROR: This installation of GitLab uses unsupported database names in 'config/database.yml': geo. The only supported ones are main, ci. +# +# This adjustment is hopefully only a temporary workaround (see +# ). + +# +# PRODUCTION +# +production: + main: + adapter: postgresql + encoding: unicode + database: gitlabhq_production + username: git + password: "secure password" + host: localhost + # load_balancing: + # hosts: + # - host1.example.com + # - host2.example.com + # discover: + # nameserver: 1.2.3.4 + # port: 8600 + # record: secondary.postgresql.service.consul + # interval: 300 +# geo: +# adapter: postgresql +# encoding: unicode +# database: gitlabhq_geo_production +# username: git +# password: "secure password" +# host: localhost + +# +# Development specific +# +development: + main: + adapter: postgresql + encoding: unicode + database: gitlabhq_development + username: postgres + password: "secure password" + host: localhost + variables: + statement_timeout: 15s +# geo: +# adapter: postgresql +# encoding: unicode +# database: gitlabhq_geo_development +# username: postgres +# password: "secure password" +# host: localhost + +# +# Staging specific +# +staging: + main: + adapter: postgresql + encoding: unicode + database: gitlabhq_staging + username: git + password: "secure password" + host: localhost +# geo: +# adapter: postgresql +# encoding: unicode +# database: gitlabhq_geo_staging +# username: git +# password: "secure password" +# host: localhost + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: &test + main: + adapter: postgresql + encoding: unicode + database: gitlabhq_test + username: postgres + password: + host: localhost + prepared_statements: false + variables: + statement_timeout: 15s +# geo: +# adapter: postgresql +# encoding: unicode +# database: gitlabhq_geo_test +# username: postgres +# password: +# host: localhost diff --git a/assets/build/install.sh b/assets/build/install.sh index 3d488e156..f35bc1555 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -187,7 +187,11 @@ 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.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml +# +# Temporary workaround, see +# +# exec_as_git cp ${GITLAB_INSTALL_DIR}/config/database.yml.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml +exec_as_git cp ${GITLAB_BUILD_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 From ec2752ce888cf8337c9039e520e14dc0b616a054 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 2 Jul 2022 16:06:07 +0200 Subject: [PATCH 219/522] Upgrade GitLab CE to 15.1.1 --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index c35ba8135..f89f7fa71 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.1.1** + +- gitlab: upgrade CE to v15.1.1 +- gitaly: upgrade to v15.1.1 + **15.1.0** - gitlab: upgrade CE to v15.1.0 diff --git a/Dockerfile b/Dockerfile index 6a9713416..0970def3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220531 -ARG VERSION=15.1.0 +ARG VERSION=15.1.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.11 \ GITLAB_SHELL_VERSION=14.7.4 \ GITLAB_PAGES_VERSION=1.59.0 \ - GITALY_SERVER_VERSION=15.1.0 \ + GITALY_SERVER_VERSION=15.1.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index f6d4e59c1..014c8bc27 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.1.0 +# sameersbn/gitlab:15.1.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.1.0 +docker pull sameersbn/gitlab:15.1.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.1.0 + sameersbn/gitlab:15.1.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.1.0 + sameersbn/gitlab:15.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:15.1.0 + sameersbn/gitlab:15.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:15.1.0 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.1.0 + sameersbn/gitlab:15.1.1 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.1.0 + sameersbn/gitlab:15.1.1 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.1.0 + sameersbn/gitlab:15.1.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.1.0 + sameersbn/gitlab:15.1.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.1.0 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.1.0 + sameersbn/gitlab:15.1.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.1.0 + sameersbn/gitlab:15.1.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.1.0 + sameersbn/gitlab:15.1.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:15.1.0 + sameersbn/gitlab:15.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:15.1.0 app:sanitize + sameersbn/gitlab:15.1.1 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.0 app:rake db:setup + sameersbn/gitlab:15.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:15.1.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:15.1.0 app:rake gitlab:env:info + sameersbn/gitlab:15.1.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.1.1 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.1.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.1.0 +docker pull sameersbn/gitlab:15.1.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:15.1.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.1.1 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.1.0 + image: sameersbn/gitlab:15.1.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index d14dfbac3..68a28303f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.1.0 +15.1.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index d4ffcce7b..382416158 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.1.0 + image: sameersbn/gitlab:15.1.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index edcd69cb5..990239a6e 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.1.0 + image: sameersbn/gitlab:15.1.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 61b59a0c3..fdbb003bb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.1.0 + image: sameersbn/gitlab:15.1.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 00aaa6f51..d35611a0c 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.1.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.1.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.1.0 +docker pull sameersbn/gitlab:15.1.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.1.0 +sameersbn/gitlab:15.1.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 9a5a027a7..0babdcd3d 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.1.0 + image: sameersbn/gitlab:15.1.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 7447fe332..82ecbc18d 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.1.0 + image: sameersbn/gitlab:15.1.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 192bb1d25..9efaf2b1b 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.1.0 + image: sameersbn/gitlab:15.1.1 env: - name: TZ value: Asia/Kolkata From 2fed7b1d31d1fa0e8175b7c47ba4915aad22f751 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 6 Jul 2022 06:59:50 +0200 Subject: [PATCH 220/522] Upgrade GitLab CE to 15.1.2 --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index f89f7fa71..224b5a8f8 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.1.2** + +- gitlab: upgrade CE to v15.1.2 +- gitaly: upgrade to v15.1.2 + **15.1.1** - gitlab: upgrade CE to v15.1.1 diff --git a/Dockerfile b/Dockerfile index 0970def3a..217ae9e8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220531 -ARG VERSION=15.1.1 +ARG VERSION=15.1.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.11 \ GITLAB_SHELL_VERSION=14.7.4 \ GITLAB_PAGES_VERSION=1.59.0 \ - GITALY_SERVER_VERSION=15.1.1 \ + GITALY_SERVER_VERSION=15.1.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 014c8bc27..59f5650e1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.1.1 +# sameersbn/gitlab:15.1.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.1.1 +docker pull sameersbn/gitlab:15.1.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.1.1 + sameersbn/gitlab:15.1.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.1.1 + sameersbn/gitlab:15.1.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:15.1.1 + sameersbn/gitlab:15.1.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:15.1.1 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.1.1 + sameersbn/gitlab:15.1.2 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.1.1 + sameersbn/gitlab:15.1.2 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.1.1 + sameersbn/gitlab:15.1.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.1.1 + sameersbn/gitlab:15.1.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.1.1 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.1.1 + sameersbn/gitlab:15.1.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.1.1 + sameersbn/gitlab:15.1.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.1.1 + sameersbn/gitlab:15.1.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:15.1.1 + sameersbn/gitlab:15.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:15.1.1 app:sanitize + sameersbn/gitlab:15.1.2 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.1 app:rake db:setup + sameersbn/gitlab:15.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:15.1.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:15.1.1 app:rake gitlab:env:info + sameersbn/gitlab:15.1.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.1.2 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.1.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.1.1 +docker pull sameersbn/gitlab:15.1.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:15.1.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.1.2 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.1.1 + image: sameersbn/gitlab:15.1.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 68a28303f..0a75ce5d3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.1.1 +15.1.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 382416158..e25a779dc 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.1.1 + image: sameersbn/gitlab:15.1.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 990239a6e..fb0063e7e 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.1.1 + image: sameersbn/gitlab:15.1.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index fdbb003bb..c78b2df74 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.1.1 + image: sameersbn/gitlab:15.1.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index d35611a0c..e5a0dd169 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.1.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.1.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.1.1 +docker pull sameersbn/gitlab:15.1.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.1.1 +sameersbn/gitlab:15.1.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 0babdcd3d..6625780b9 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.1.1 + image: sameersbn/gitlab:15.1.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 82ecbc18d..ca03f2f82 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.1.1 + image: sameersbn/gitlab:15.1.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 9efaf2b1b..cfa41f125 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.1.1 + image: sameersbn/gitlab:15.1.2 env: - name: TZ value: Asia/Kolkata From 582580dd4688c3fb1dd07876c84486d5c25771bf Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Thu, 21 Jul 2022 11:28:05 +0100 Subject: [PATCH 221/522] Update to 15.1.3 --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 224b5a8f8..c2b67d649 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.1.3** + +- gitlab: upgrade CE to v15.1.3 +- gitaly: upgrade to v15.1.3 + **15.1.2** - gitlab: upgrade CE to v15.1.2 diff --git a/Dockerfile b/Dockerfile index 217ae9e8d..864249a9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220531 -ARG VERSION=15.1.2 +ARG VERSION=15.1.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.11 \ GITLAB_SHELL_VERSION=14.7.4 \ GITLAB_PAGES_VERSION=1.59.0 \ - GITALY_SERVER_VERSION=15.1.2 \ + GITALY_SERVER_VERSION=15.1.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 59f5650e1..4c7690420 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.1.2 +# sameersbn/gitlab:15.1.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.1.2 +docker pull sameersbn/gitlab:15.1.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.1.2 + sameersbn/gitlab:15.1.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.1.2 + sameersbn/gitlab:15.1.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:15.1.2 + sameersbn/gitlab:15.1.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:15.1.2 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.1.2 + sameersbn/gitlab:15.1.3 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.1.2 + sameersbn/gitlab:15.1.3 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.1.2 + sameersbn/gitlab:15.1.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.1.2 + sameersbn/gitlab:15.1.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.1.2 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.1.2 + sameersbn/gitlab:15.1.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.1.2 + sameersbn/gitlab:15.1.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.1.2 + sameersbn/gitlab:15.1.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:15.1.2 + sameersbn/gitlab:15.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:15.1.2 app:sanitize + sameersbn/gitlab:15.1.3 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.2 app:rake db:setup + sameersbn/gitlab:15.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:15.1.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.1.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:15.1.2 app:rake gitlab:env:info + sameersbn/gitlab:15.1.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.1.3 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.1.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.1.2 +docker pull sameersbn/gitlab:15.1.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:15.1.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.1.3 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.1.2 + image: sameersbn/gitlab:15.1.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 0a75ce5d3..bc573c880 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.1.2 +15.1.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index e25a779dc..4e9ac614d 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.1.2 + image: sameersbn/gitlab:15.1.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index fb0063e7e..acac94769 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.1.2 + image: sameersbn/gitlab:15.1.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index c78b2df74..c8b13ae7b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.1.2 + image: sameersbn/gitlab:15.1.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index e5a0dd169..78194f4d1 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.1.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.1.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.1.2 +docker pull sameersbn/gitlab:15.1.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.1.2 +sameersbn/gitlab:15.1.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 6625780b9..04d99a83f 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.1.2 + image: sameersbn/gitlab:15.1.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index ca03f2f82..20c7efbbc 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.1.2 + image: sameersbn/gitlab:15.1.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index cfa41f125..14d2d639d 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.1.2 + image: sameersbn/gitlab:15.1.3 env: - name: TZ value: Asia/Kolkata From 625af89abd53bb40e972d3d00b8200ef35366ae5 Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Tue, 26 Jul 2022 15:58:53 +0100 Subject: [PATCH 222/522] Update to 15.2.0 --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index c2b67d649..6bd1f3517 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.2.0** + +- gitlab: upgrade CE to v15.2.0 +- gitaly: upgrade to v15.2.0 + **15.1.3** - gitlab: upgrade CE to v15.1.3 diff --git a/Dockerfile b/Dockerfile index 864249a9e..fb5b8b8e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220531 -ARG VERSION=15.1.3 +ARG VERSION=15.2.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.11 \ GITLAB_SHELL_VERSION=14.7.4 \ GITLAB_PAGES_VERSION=1.59.0 \ - GITALY_SERVER_VERSION=15.1.3 \ + GITALY_SERVER_VERSION=15.2.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 4c7690420..2e8424fb7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.1.3 +# sameersbn/gitlab:15.2.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.1.3 +docker pull sameersbn/gitlab:15.2.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.1.3 + sameersbn/gitlab:15.2.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.1.3 + sameersbn/gitlab:15.2.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:15.1.3 + sameersbn/gitlab:15.2.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:15.1.3 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.1.3 + sameersbn/gitlab:15.2.0 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.1.3 + sameersbn/gitlab:15.2.0 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.1.3 + sameersbn/gitlab:15.2.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.1.3 + sameersbn/gitlab:15.2.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.1.3 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.1.3 + sameersbn/gitlab:15.2.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.1.3 + sameersbn/gitlab:15.2.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.1.3 + sameersbn/gitlab:15.2.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:15.1.3 + sameersbn/gitlab:15.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:15.1.3 app:sanitize + sameersbn/gitlab:15.2.0 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.3 app:rake db:setup + sameersbn/gitlab:15.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:15.1.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:15.1.3 app:rake gitlab:env:info + sameersbn/gitlab:15.2.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.2.0 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.2.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.1.3 +docker pull sameersbn/gitlab:15.2.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:15.1.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.2.0 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.1.3 + image: sameersbn/gitlab:15.2.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index bc573c880..6c43fc8ae 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.1.3 +15.2.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 4e9ac614d..b34e78156 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.1.3 + image: sameersbn/gitlab:15.2.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index acac94769..42e694e91 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.1.3 + image: sameersbn/gitlab:15.2.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index c8b13ae7b..991afd31b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.1.3 + image: sameersbn/gitlab:15.2.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 78194f4d1..788013fef 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.2.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.1.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.2.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.1.3 +docker pull sameersbn/gitlab:15.2.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.1.3 +sameersbn/gitlab:15.2.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 04d99a83f..01822610e 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.1.3 + image: sameersbn/gitlab:15.2.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 20c7efbbc..4f1f4ada1 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.1.3 + image: sameersbn/gitlab:15.2.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 14d2d639d..a43cfccdd 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.1.3 + image: sameersbn/gitlab:15.2.0 env: - name: TZ value: Asia/Kolkata From f250da43b68a771191caebd646c3c7219440670b Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Wed, 27 Jul 2022 08:34:55 +0100 Subject: [PATCH 223/522] Update Dockerfile Co-authored-by: Kazunori Kimura <33391846+kkimurak@users.noreply.github.com> --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fb5b8b8e7..61c3cfcef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \ GOLANG_VERSION=1.17.11 \ - GITLAB_SHELL_VERSION=14.7.4 \ - GITLAB_PAGES_VERSION=1.59.0 \ + GITLAB_SHELL_VERSION=14.9.0 \ + GITLAB_PAGES_VERSION=1.61.0 \ GITALY_SERVER_VERSION=15.2.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ From 932ce294d93eb341c92185d00a1f219a19b61123 Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Wed, 27 Jul 2022 08:35:27 +0100 Subject: [PATCH 224/522] Update Changelog.md Co-authored-by: Kazunori Kimura <33391846+kkimurak@users.noreply.github.com> --- Changelog.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog.md b/Changelog.md index 6bd1f3517..ece6217ce 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,8 @@ This file only reflects the changes that are made in this image. Please refer to - gitlab: upgrade CE to v15.2.0 - gitaly: upgrade to v15.2.0 +- gitlab-shell: upgrade to v14.9.0 +- gitlab-pages: upgrade to v1.61.0 **15.1.3** From fc190d53b4a91019df2c9feadbc63d90cab3e17c Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 28 Jul 2022 13:39:50 +0200 Subject: [PATCH 225/522] Update golang to 1.17.12 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index ece6217ce..76a501b23 100644 --- a/Changelog.md +++ b/Changelog.md @@ -8,6 +8,7 @@ This file only reflects the changes that are made in this image. Please refer to - gitaly: upgrade to v15.2.0 - gitlab-shell: upgrade to v14.9.0 - gitlab-pages: upgrade to v1.61.0 +- golang: upgrade to v1.17.12 **15.1.3** diff --git a/Dockerfile b/Dockerfile index 61c3cfcef..fccaf7fae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG VERSION=15.2.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \ - GOLANG_VERSION=1.17.11 \ + GOLANG_VERSION=1.17.12 \ GITLAB_SHELL_VERSION=14.9.0 \ GITLAB_PAGES_VERSION=1.61.0 \ GITALY_SERVER_VERSION=15.2.0 \ From d7b33653c63132b8e7ed3a7a1526706f7392ad8e Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 28 Jul 2022 13:40:19 +0200 Subject: [PATCH 226/522] Update release notes. --- scripts/release-notes.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh index bc5140e16..ec84e252d 100755 --- a/scripts/release-notes.sh +++ b/scripts/release-notes.sh @@ -42,13 +42,19 @@ You are kindly invited to provide contributions. ### Version-specific instructions for upgrades -Please consider the version specific upgrading instructions for [GitLab CE 15.0.x](https://docs.gitlab.com/ee/update/#1500) and [GitLab CE 15.1.x](https://docs.gitlab.com/ee/update/#1510) +Please consider the version specific upgrading instructions for +* [GitLab CE 15.0.x](https://docs.gitlab.com/ee/update/#1500), +* [GitLab CE 15.1.x](https://docs.gitlab.com/ee/update/#1510), and +* [GitLab CE 15.1.x](https://docs.gitlab.com/ee/update/#1520): * Elasticsearch 6.8 is no longer supported. Before you upgrade to GitLab 15.0, update Elasticsearch to any 7.x version. * If you run external PostgreSQL, particularly AWS RDS, check you have a PostgreSQL bug fix to avoid the database crashing. * The use of encrypted S3 buckets with storage-specific configuration is no longer supported after removing support for using background_upload. * The certificate-based Kubernetes integration (DEPRECATED) is disabled by default, but you can be re-enable it through the certificate_based_clusters feature flag until GitLab 16.0. * In GitLab 15.1.0, we are switching Rails ActiveSupport::Digest to use SHA256 instead of MD5. This affects ETag key generation for resources such as raw Snippet file downloads. In order to ensure consistent ETag key generation across multiple web nodes when upgrading, all servers must first be upgraded to 15.1.Z before upgrading to 15.2.0 or later. +* GitLab installations that have multiple web nodes should be upgraded to 15.1 before upgrading to 15.2 (and later) due to a configuration change in Rails that can result in inconsistent ETag key generation. +* Some Sidekiq workers were renamed in this release. To avoid any disruption, run [the Rake tasks to migrate any pending jobs](https://docs.gitlab.com/ee/raketasks/sidekiq_job_migration.html#future-jobs) before starting the upgrade to GitLab 15.2.0. + ## Contributing From db0a0fff018fd41c3be39888033cc9e73530f6d9 Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Thu, 28 Jul 2022 22:45:12 +0100 Subject: [PATCH 227/522] Update to 15.2.1 --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- scripts/release-notes.sh | 4 +- 12 files changed, 48 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 76a501b23..913eb9204 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.2.1** + +- gitlab: upgrade CE to v15.2.1 +- gitaly: upgrade to v15.2.1 + **15.2.0** - gitlab: upgrade CE to v15.2.0 diff --git a/Dockerfile b/Dockerfile index fccaf7fae..2e2246146 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220531 -ARG VERSION=15.2.0 +ARG VERSION=15.2.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.12 \ GITLAB_SHELL_VERSION=14.9.0 \ GITLAB_PAGES_VERSION=1.61.0 \ - GITALY_SERVER_VERSION=15.2.0 \ + GITALY_SERVER_VERSION=15.2.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 2e8424fb7..1f174253a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.2.0 +# sameersbn/gitlab:15.2.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.2.0 +docker pull sameersbn/gitlab:15.2.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.2.0 + sameersbn/gitlab:15.2.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.2.0 + sameersbn/gitlab:15.2.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:15.2.0 + sameersbn/gitlab:15.2.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:15.2.0 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.2.0 + sameersbn/gitlab:15.2.1 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.2.0 + sameersbn/gitlab:15.2.1 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.2.0 + sameersbn/gitlab:15.2.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.2.0 + sameersbn/gitlab:15.2.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.2.0 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.2.0 + sameersbn/gitlab:15.2.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.2.0 + sameersbn/gitlab:15.2.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.2.0 + sameersbn/gitlab:15.2.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:15.2.0 + sameersbn/gitlab:15.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:15.2.0 app:sanitize + sameersbn/gitlab:15.2.1 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.0 app:rake db:setup + sameersbn/gitlab:15.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:15.2.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:15.2.0 app:rake gitlab:env:info + sameersbn/gitlab:15.2.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.2.1 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.2.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.2.0 +docker pull sameersbn/gitlab:15.2.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:15.2.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.2.1 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.2.0 + image: sameersbn/gitlab:15.2.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 6c43fc8ae..2054e837b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.2.0 +15.2.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index b34e78156..ec93ae548 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.2.0 + image: sameersbn/gitlab:15.2.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 42e694e91..b80e68929 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.2.0 + image: sameersbn/gitlab:15.2.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 991afd31b..98b6f5b52 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.2.0 + image: sameersbn/gitlab:15.2.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 788013fef..6e81cdee2 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.2.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.2.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.2.0 +docker pull sameersbn/gitlab:15.2.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.2.0 +sameersbn/gitlab:15.2.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 01822610e..881f9a038 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.2.0 + image: sameersbn/gitlab:15.2.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 4f1f4ada1..46e8ebaa9 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.2.0 + image: sameersbn/gitlab:15.2.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index a43cfccdd..4bacd0c05 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.2.0 + image: sameersbn/gitlab:15.2.1 env: - name: TZ value: Asia/Kolkata diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh index ec84e252d..169312fc4 100755 --- a/scripts/release-notes.sh +++ b/scripts/release-notes.sh @@ -51,9 +51,9 @@ Please consider the version specific upgrading instructions for * If you run external PostgreSQL, particularly AWS RDS, check you have a PostgreSQL bug fix to avoid the database crashing. * The use of encrypted S3 buckets with storage-specific configuration is no longer supported after removing support for using background_upload. * The certificate-based Kubernetes integration (DEPRECATED) is disabled by default, but you can be re-enable it through the certificate_based_clusters feature flag until GitLab 16.0. -* In GitLab 15.1.0, we are switching Rails ActiveSupport::Digest to use SHA256 instead of MD5. This affects ETag key generation for resources such as raw Snippet file downloads. In order to ensure consistent ETag key generation across multiple web nodes when upgrading, all servers must first be upgraded to 15.1.Z before upgrading to 15.2.0 or later. +* In GitLab 15.1.0, we are switching Rails ActiveSupport::Digest to use SHA256 instead of MD5. This affects ETag key generation for resources such as raw Snippet file downloads. In order to ensure consistent ETag key generation across multiple web nodes when upgrading, all servers must first be upgraded to 15.1.Z before upgrading to 15.2.1 or later. * GitLab installations that have multiple web nodes should be upgraded to 15.1 before upgrading to 15.2 (and later) due to a configuration change in Rails that can result in inconsistent ETag key generation. -* Some Sidekiq workers were renamed in this release. To avoid any disruption, run [the Rake tasks to migrate any pending jobs](https://docs.gitlab.com/ee/raketasks/sidekiq_job_migration.html#future-jobs) before starting the upgrade to GitLab 15.2.0. +* Some Sidekiq workers were renamed in this release. To avoid any disruption, run [the Rake tasks to migrate any pending jobs](https://docs.gitlab.com/ee/raketasks/sidekiq_job_migration.html#future-jobs) before starting the upgrade to GitLab 15.2.1. ## Contributing From 5839401217c7e4c50cb3a02fe4365bc3ffe8f95a Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 29 Jul 2022 18:23:16 +0200 Subject: [PATCH 228/522] Upgrade to gitlab-pages v1.61.1 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 913eb9204..b8587ee41 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ This file only reflects the changes that are made in this image. Please refer to - gitlab: upgrade CE to v15.2.1 - gitaly: upgrade to v15.2.1 +- gitlab-pages: upgrade to v1.61.1 **15.2.0** diff --git a/Dockerfile b/Dockerfile index 2e2246146..e8d69c64b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \ GOLANG_VERSION=1.17.12 \ GITLAB_SHELL_VERSION=14.9.0 \ - GITLAB_PAGES_VERSION=1.61.0 \ + GITLAB_PAGES_VERSION=1.61.1 \ GITALY_SERVER_VERSION=15.2.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ From b063c95089f0bd07bbae33e098ca9a9a2977e55e Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Mon, 1 Aug 2022 21:05:50 +0200 Subject: [PATCH 229/522] Upgrade GitLab CE to 15.2.2 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index b8587ee41..dd33ae09d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**15.2.2** + +- gitlab: upgrade CE to v15.2.2 +- gitaly: upgrade to v15.2.2 +- golang: upgrade to v1.17.13 + **15.2.1** - gitlab: upgrade CE to v15.2.1 diff --git a/Dockerfile b/Dockerfile index e8d69c64b..9fb69b31b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20220531 -ARG VERSION=15.2.1 +ARG VERSION=15.2.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \ - GOLANG_VERSION=1.17.12 \ + GOLANG_VERSION=1.17.13 \ GITLAB_SHELL_VERSION=14.9.0 \ GITLAB_PAGES_VERSION=1.61.1 \ - GITALY_SERVER_VERSION=15.2.1 \ + GITALY_SERVER_VERSION=15.2.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 1f174253a..ed9eb26fa 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.2.1 +# sameersbn/gitlab:15.2.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.2.1 +docker pull sameersbn/gitlab:15.2.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.2.1 + sameersbn/gitlab:15.2.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.2.1 + sameersbn/gitlab:15.2.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:15.2.1 + sameersbn/gitlab:15.2.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:15.2.1 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.2.1 + sameersbn/gitlab:15.2.2 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.2.1 + sameersbn/gitlab:15.2.2 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.2.1 + sameersbn/gitlab:15.2.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.2.1 + sameersbn/gitlab:15.2.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.2.1 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.2.1 + sameersbn/gitlab:15.2.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.2.1 + sameersbn/gitlab:15.2.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.2.1 + sameersbn/gitlab:15.2.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:15.2.1 + sameersbn/gitlab:15.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:15.2.1 app:sanitize + sameersbn/gitlab:15.2.2 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.1 app:rake db:setup + sameersbn/gitlab:15.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:15.2.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:15.2.1 app:rake gitlab:env:info + sameersbn/gitlab:15.2.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.2.2 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.2.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.2.1 +docker pull sameersbn/gitlab:15.2.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:15.2.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.2.2 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.2.1 + image: sameersbn/gitlab:15.2.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 2054e837b..ef10e29ef 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.2.1 +15.2.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index ec93ae548..86165d74d 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.2.1 + image: sameersbn/gitlab:15.2.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index b80e68929..a009859cd 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.2.1 + image: sameersbn/gitlab:15.2.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 98b6f5b52..8af283066 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.2.1 + image: sameersbn/gitlab:15.2.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 6e81cdee2..9c03915b2 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.2.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.2.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.2.1 +docker pull sameersbn/gitlab:15.2.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.2.1 +sameersbn/gitlab:15.2.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 881f9a038..f517aa47c 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.2.1 + image: sameersbn/gitlab:15.2.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 46e8ebaa9..399a81010 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.2.1 + image: sameersbn/gitlab:15.2.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 4bacd0c05..51db2d55f 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.2.1 + image: sameersbn/gitlab:15.2.2 env: - name: TZ value: Asia/Kolkata From a90b508484d3c4cb06a77698769bfe9e51370656 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Mon, 22 Aug 2022 19:11:15 +0200 Subject: [PATCH 230/522] Upgrade GitLab CE to 15.3.0 --- Changelog.md | 8 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index dd33ae09d..9e2d8e90c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,14 @@ 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. +**15.3.0** + +- gitlab: upgrade CE to v15.3.0 +- gitaly: upgrade to v15.3.0 +- gitlab-shell: upgrade to v14.10.0 +- gitlab-pages: upgrade to v1.62.0 +- ubuntu: upgrade to focal-20220801 + **15.2.2** - gitlab: upgrade CE to v15.2.2 diff --git a/Dockerfile b/Dockerfile index 9fb69b31b..583549f85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20220531 +FROM ubuntu:focal-20220801 -ARG VERSION=15.2.2 +ARG VERSION=15.3.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \ GOLANG_VERSION=1.17.13 \ - GITLAB_SHELL_VERSION=14.9.0 \ - GITLAB_PAGES_VERSION=1.61.1 \ - GITALY_SERVER_VERSION=15.2.2 \ + GITLAB_SHELL_VERSION=14.10.0 \ + GITLAB_PAGES_VERSION=1.62.0 \ + GITALY_SERVER_VERSION=15.3.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index ed9eb26fa..e184d1ab6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.2.2 +# sameersbn/gitlab:15.3.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.2.2 +docker pull sameersbn/gitlab:15.3.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.2.2 + sameersbn/gitlab:15.3.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.2.2 + sameersbn/gitlab:15.3.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:15.2.2 + sameersbn/gitlab:15.3.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:15.2.2 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.2.2 + sameersbn/gitlab:15.3.0 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.2.2 + sameersbn/gitlab:15.3.0 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.2.2 + sameersbn/gitlab:15.3.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.2.2 + sameersbn/gitlab:15.3.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.2.2 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.2.2 + sameersbn/gitlab:15.3.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.2.2 + sameersbn/gitlab:15.3.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.2.2 + sameersbn/gitlab:15.3.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:15.2.2 + sameersbn/gitlab:15.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:15.2.2 app:sanitize + sameersbn/gitlab:15.3.0 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.2 app:rake db:setup + sameersbn/gitlab:15.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:15.2.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:15.2.2 app:rake gitlab:env:info + sameersbn/gitlab:15.3.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.3.0 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.3.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.2.2 +docker pull sameersbn/gitlab:15.3.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:15.2.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.3.0 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.2.2 + image: sameersbn/gitlab:15.3.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index ef10e29ef..5ff58dbcd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.2.2 +15.3.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 86165d74d..a06020e2e 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.2.2 + image: sameersbn/gitlab:15.3.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index a009859cd..e7d8f576c 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.2.2 + image: sameersbn/gitlab:15.3.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 8af283066..bc3820b76 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.2.2 + image: sameersbn/gitlab:15.3.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 9c03915b2..78705ebc6 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.3.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.2.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.3.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.2.2 +docker pull sameersbn/gitlab:15.3.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.2.2 +sameersbn/gitlab:15.3.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index f517aa47c..fecce01f9 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.2.2 + image: sameersbn/gitlab:15.3.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 399a81010..d627b6022 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.2.2 + image: sameersbn/gitlab:15.3.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 51db2d55f..fd25cf4c2 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.2.2 + image: sameersbn/gitlab:15.3.0 env: - name: TZ value: Asia/Kolkata From b46af43bab74d99aee9396193893ad0abf67b6ac Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 23 Aug 2022 15:52:59 +0200 Subject: [PATCH 231/522] Upgrade GitLab CE to 15.3.1 --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 9e2d8e90c..6c5cb5de9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.3.1** + +- gitlab: upgrade CE to v15.3.1 +- gitaly: upgrade to v15.3.1 + **15.3.0** - gitlab: upgrade CE to v15.3.0 diff --git a/Dockerfile b/Dockerfile index 583549f85..9ea23c737 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220801 -ARG VERSION=15.3.0 +ARG VERSION=15.3.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.13 \ GITLAB_SHELL_VERSION=14.10.0 \ GITLAB_PAGES_VERSION=1.62.0 \ - GITALY_SERVER_VERSION=15.3.0 \ + GITALY_SERVER_VERSION=15.3.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index e184d1ab6..2f769d9e2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.3.0 +# sameersbn/gitlab:15.3.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.3.0 +docker pull sameersbn/gitlab:15.3.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.3.0 + sameersbn/gitlab:15.3.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.3.0 + sameersbn/gitlab:15.3.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:15.3.0 + sameersbn/gitlab:15.3.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:15.3.0 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.3.0 + sameersbn/gitlab:15.3.1 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.3.0 + sameersbn/gitlab:15.3.1 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.3.0 + sameersbn/gitlab:15.3.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.3.0 + sameersbn/gitlab:15.3.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.3.0 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.3.0 + sameersbn/gitlab:15.3.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.3.0 + sameersbn/gitlab:15.3.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.3.0 + sameersbn/gitlab:15.3.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:15.3.0 + sameersbn/gitlab:15.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:15.3.0 app:sanitize + sameersbn/gitlab:15.3.1 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.0 app:rake db:setup + sameersbn/gitlab:15.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:15.3.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:15.3.0 app:rake gitlab:env:info + sameersbn/gitlab:15.3.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.3.1 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.3.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.3.0 +docker pull sameersbn/gitlab:15.3.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:15.3.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.3.1 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.3.0 + image: sameersbn/gitlab:15.3.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 5ff58dbcd..2d67a9de1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.3.0 +15.3.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index a06020e2e..af238a83f 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.3.0 + image: sameersbn/gitlab:15.3.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index e7d8f576c..ef7863b7c 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.3.0 + image: sameersbn/gitlab:15.3.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index bc3820b76..885b6bcf0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.3.0 + image: sameersbn/gitlab:15.3.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 78705ebc6..0fa9e45e5 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.3.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.3.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.3.0 +docker pull sameersbn/gitlab:15.3.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.3.0 +sameersbn/gitlab:15.3.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index fecce01f9..3a3b556fe 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.3.0 + image: sameersbn/gitlab:15.3.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index d627b6022..76b2435d8 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.3.0 + image: sameersbn/gitlab:15.3.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index fd25cf4c2..0251c190c 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.3.0 + image: sameersbn/gitlab:15.3.1 env: - name: TZ value: Asia/Kolkata From fbebf7a3fe7cc63e958048a39488e149966aa424 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 31 Aug 2022 17:19:24 +0200 Subject: [PATCH 232/522] Upgrade GitLab CE to 15.3.2 --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 6c5cb5de9..22477c438 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.3.2** + +- gitlab: upgrade CE to v15.3.2 +- gitaly: upgrade to v15.3.2 + **15.3.1** - gitlab: upgrade CE to v15.3.1 diff --git a/Dockerfile b/Dockerfile index 9ea23c737..98e1099e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220801 -ARG VERSION=15.3.1 +ARG VERSION=15.3.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.13 \ GITLAB_SHELL_VERSION=14.10.0 \ GITLAB_PAGES_VERSION=1.62.0 \ - GITALY_SERVER_VERSION=15.3.1 \ + GITALY_SERVER_VERSION=15.3.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 2f769d9e2..beaa59b92 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.3.1 +# sameersbn/gitlab:15.3.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.3.1 +docker pull sameersbn/gitlab:15.3.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.3.1 + sameersbn/gitlab:15.3.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.3.1 + sameersbn/gitlab:15.3.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:15.3.1 + sameersbn/gitlab:15.3.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:15.3.1 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.3.1 + sameersbn/gitlab:15.3.2 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.3.1 + sameersbn/gitlab:15.3.2 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.3.1 + sameersbn/gitlab:15.3.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.3.1 + sameersbn/gitlab:15.3.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.3.1 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.3.1 + sameersbn/gitlab:15.3.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.3.1 + sameersbn/gitlab:15.3.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.3.1 + sameersbn/gitlab:15.3.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:15.3.1 + sameersbn/gitlab:15.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:15.3.1 app:sanitize + sameersbn/gitlab:15.3.2 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.1 app:rake db:setup + sameersbn/gitlab:15.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:15.3.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:15.3.1 app:rake gitlab:env:info + sameersbn/gitlab:15.3.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.3.2 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.3.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.3.1 +docker pull sameersbn/gitlab:15.3.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:15.3.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.3.2 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.3.1 + image: sameersbn/gitlab:15.3.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 2d67a9de1..bb3dda5bd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.3.1 +15.3.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index af238a83f..b494141ff 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.3.1 + image: sameersbn/gitlab:15.3.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index ef7863b7c..a4b17bb38 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.3.1 + image: sameersbn/gitlab:15.3.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 885b6bcf0..63605435c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.3.1 + image: sameersbn/gitlab:15.3.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 0fa9e45e5..c82542169 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.3.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.3.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.3.1 +docker pull sameersbn/gitlab:15.3.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.3.1 +sameersbn/gitlab:15.3.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 3a3b556fe..0d375b075 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.3.1 + image: sameersbn/gitlab:15.3.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 76b2435d8..32662d308 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.3.1 + image: sameersbn/gitlab:15.3.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 0251c190c..1e96a2b3f 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.3.1 + image: sameersbn/gitlab:15.3.2 env: - name: TZ value: Asia/Kolkata From be9273c87f63ed0b1cc2f0b38a58d7f497bb0db6 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 1 Sep 2022 20:25:52 +0200 Subject: [PATCH 233/522] Revise release notes --- scripts/release-notes.sh | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh index 169312fc4..a9db77813 100755 --- a/scripts/release-notes.sh +++ b/scripts/release-notes.sh @@ -38,23 +38,9 @@ For installation and usage instructions please refer to the [README](https://git Please note that this version does not yet include any rework as a consequence of the major release and possibly some functions in our implementation might not be usable yet or only to a limited extent. -You are kindly invited to provide contributions. - -### Version-specific instructions for upgrades - -Please consider the version specific upgrading instructions for -* [GitLab CE 15.0.x](https://docs.gitlab.com/ee/update/#1500), -* [GitLab CE 15.1.x](https://docs.gitlab.com/ee/update/#1510), and -* [GitLab CE 15.1.x](https://docs.gitlab.com/ee/update/#1520): - -* Elasticsearch 6.8 is no longer supported. Before you upgrade to GitLab 15.0, update Elasticsearch to any 7.x version. -* If you run external PostgreSQL, particularly AWS RDS, check you have a PostgreSQL bug fix to avoid the database crashing. -* The use of encrypted S3 buckets with storage-specific configuration is no longer supported after removing support for using background_upload. -* The certificate-based Kubernetes integration (DEPRECATED) is disabled by default, but you can be re-enable it through the certificate_based_clusters feature flag until GitLab 16.0. -* In GitLab 15.1.0, we are switching Rails ActiveSupport::Digest to use SHA256 instead of MD5. This affects ETag key generation for resources such as raw Snippet file downloads. In order to ensure consistent ETag key generation across multiple web nodes when upgrading, all servers must first be upgraded to 15.1.Z before upgrading to 15.2.1 or later. -* GitLab installations that have multiple web nodes should be upgraded to 15.1 before upgrading to 15.2 (and later) due to a configuration change in Rails that can result in inconsistent ETag key generation. -* Some Sidekiq workers were renamed in this release. To avoid any disruption, run [the Rake tasks to migrate any pending jobs](https://docs.gitlab.com/ee/raketasks/sidekiq_job_migration.html#future-jobs) before starting the upgrade to GitLab 15.2.1. +Don't forget to consider the version specific upgrading instructions for [GitLab CE](https://docs.gitlab.com/ee/update/) *before* upgrading your GitLab CE instance! +You are kindly invited to provide contributions. ## Contributing From 76860a094dfd0735571048c4a08719becaebad28 Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Sat, 3 Sep 2022 18:16:30 +0100 Subject: [PATCH 234/522] Update to 15.3.3 --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 22477c438..52cfb76b7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.3.3** + +- gitlab: upgrade CE to v15.3.3 +- gitaly: upgrade to v15.3.3 + **15.3.2** - gitlab: upgrade CE to v15.3.2 diff --git a/Dockerfile b/Dockerfile index 98e1099e2..dc35c89c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220801 -ARG VERSION=15.3.2 +ARG VERSION=15.3.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.13 \ GITLAB_SHELL_VERSION=14.10.0 \ GITLAB_PAGES_VERSION=1.62.0 \ - GITALY_SERVER_VERSION=15.3.2 \ + GITALY_SERVER_VERSION=15.3.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index beaa59b92..6490c097a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.3.2 +# sameersbn/gitlab:15.3.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.3.2 +docker pull sameersbn/gitlab:15.3.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.3.2 + sameersbn/gitlab:15.3.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.3.2 + sameersbn/gitlab:15.3.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:15.3.2 + sameersbn/gitlab:15.3.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:15.3.2 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.3.2 + sameersbn/gitlab:15.3.3 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.3.2 + sameersbn/gitlab:15.3.3 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.3.2 + sameersbn/gitlab:15.3.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.3.2 + sameersbn/gitlab:15.3.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.3.2 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.3.2 + sameersbn/gitlab:15.3.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.3.2 + sameersbn/gitlab:15.3.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.3.2 + sameersbn/gitlab:15.3.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:15.3.2 + sameersbn/gitlab:15.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:15.3.2 app:sanitize + sameersbn/gitlab:15.3.3 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.2 app:rake db:setup + sameersbn/gitlab:15.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:15.3.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.3.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:15.3.2 app:rake gitlab:env:info + sameersbn/gitlab:15.3.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.3.3 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.3.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.3.2 +docker pull sameersbn/gitlab:15.3.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:15.3.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.3.3 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.3.2 + image: sameersbn/gitlab:15.3.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index bb3dda5bd..87b5b94fc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.3.2 +15.3.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index b494141ff..f199bfbdb 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.3.2 + image: sameersbn/gitlab:15.3.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index a4b17bb38..f41e9804e 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.3.2 + image: sameersbn/gitlab:15.3.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 63605435c..36777a9ea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.3.2 + image: sameersbn/gitlab:15.3.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index c82542169..ea4a05e53 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.3.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.3.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.3.2 +docker pull sameersbn/gitlab:15.3.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.3.2 +sameersbn/gitlab:15.3.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 0d375b075..523ec18e2 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.3.2 + image: sameersbn/gitlab:15.3.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 32662d308..d3fbcaf7c 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.3.2 + image: sameersbn/gitlab:15.3.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 1e96a2b3f..faa45415b 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.3.2 + image: sameersbn/gitlab:15.3.3 env: - name: TZ value: Asia/Kolkata From 8b9ca622f98e3cedbecfcfcd244393f30846f461 Mon Sep 17 00:00:00 2001 From: Ivan Baranov Date: Mon, 5 Sep 2022 21:46:20 +0900 Subject: [PATCH 235/522] Tested support for azure_activedirectory_v2 --- README.md | 18 ++++++++++++++++++ assets/runtime/config/gitlabhq/gitlab.yml | 6 ++++++ assets/runtime/env-defaults | 6 ++++++ assets/runtime/functions | 19 ++++++++++++++++++- 4 files changed, 48 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index beaa59b92..2b802be67 100644 --- a/README.md +++ b/README.md @@ -689,6 +689,8 @@ 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. +Also you can configure v2 endpoint (`azure_activedirectory_v2`) by using `OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_ID`, `OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_SECRET` and `OAUTH_AZURE_ACTIVEDIRECTORY_V2_TENANT_ID` environment variables. Optionally you can change label of login button using the `OAUTH_AZURE_ACTIVEDIRECTORY_V2_LABEL`. + ##### Generic OAuth2 To enable the Generic OAuth2 provider, you must register your application with your provider. You also need to confirm OAuth2 provider app's ID and secret, the client options and the user's response structure. @@ -2194,6 +2196,22 @@ Azure Client secret. No defaults. Azure Tenant ID. No defaults. +#### `OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_ID` + +Client ID for oauth provider `azure_activedirectory_v2`. If not set, corresponding oauth provider configuration will be removed from `gitlab.yml` during container startup. No defaults. + +#### `OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_SECRET` + +Client secret for oauth provider `azure_activedirectory_v2`. If not set, corresponding oauth provider configuration will be removed from `gitlab.yml` during container startup. No defaults. + +#### `OAUTH_AZURE_ACTIVEDIRECTORY_V2_TENANT_ID` + +Tenant ID for oauth provider `azure_activedirectory_v2`. If not set, corresponding oauth provider configuration will be removed from `gitlab.yml` during container startup. No defaults. + +#### `OAUTH_AZURE_ACTIVEDIRECTORY_V2_LABEL` + +Optional label for login button for `azure_activedirectory_v2`. Defaults to `Azure AD v2` + ##### `OAUTH2_GENERIC_APP_ID` Your OAuth2 App ID. No defaults. diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index a0c478918..49502277e 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -1023,6 +1023,12 @@ production: &base client_id: '{{OAUTH_AZURE_API_KEY}}', client_secret: '{{OAUTH_AZURE_API_SECRET}}', tenant_id: '{{OAUTH_AZURE_TENANT_ID}}' } } + - { name: 'azure_activedirectory_v2', + label: '{{OAUTH_AZURE_ACTIVEDIRECTORY_V2_LABEL}}', + args: { + client_id: '{{OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_ID}}', + client_secret: '{{OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_SECRET}}', + tenant_id: '{{OAUTH_AZURE_ACTIVEDIRECTORY_V2_TENANT_ID}}' } } # SSO maximum session duration in seconds. Defaults to CAS default of 8 hours. # cas3: diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 908d368fc..46624eafc 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -479,6 +479,12 @@ OAUTH_AZURE_API_KEY=${OAUTH_AZURE_API_KEY:-} OAUTH_AZURE_API_SECRET=${OAUTH_AZURE_API_SECRET:-} OAUTH_AZURE_TENANT_ID=${OAUTH_AZURE_TENANT_ID:-} +## AZURE Active Directory V2 endpoint +OAUTH_AZURE_ACTIVEDIRECTORY_V2_LABEL=${OAUTH_AZURE_ACTIVEDIRECTORY_V2_LABEL:-'Azure AD v2'} +OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_ID=${OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_ID:-} +OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_SECRET=${OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_SECRET:-} +OAUTH_AZURE_ACTIVEDIRECTORY_V2_TENANT_ID=${OAUTH_AZURE_ACTIVEDIRECTORY_V2_TENANT_ID:-} + ### SAML case $GITLAB_HTTPS in true) diff --git a/assets/runtime/functions b/assets/runtime/functions index 07477a6ae..90dbe1913 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -688,6 +688,22 @@ gitlab_configure_oauth_azure() { fi } +gitlab_configure_oauth_azure_ad_v2() { + # we don't check if OAUTH_AZURE_ACTIVEDIRECTORY_V2_LABEL because it is optional + if [[ -n ${OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_ID} && \ + -n ${OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_SECRET} && \ + -n ${OAUTH_AZURE_ACTIVEDIRECTORY_V2_TENANT_ID} ]]; then + echo "Configuring gitlab::oauth::azure_activedirectory_v2..." + update_template ${GITLAB_CONFIG} \ + OAUTH_AZURE_ACTIVEDIRECTORY_V2_LABEL \ + OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_ID \ + OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_SECRET \ + OAUTH_AZURE_ACTIVEDIRECTORY_V2_TENANT_ID + else + exec_as_git sed -i "/name: 'azure_activedirectory_v2'/,/{{OAUTH_AZURE_ACTIVEDIRECTORY_V2_TENANT_ID}}/d" ${GITLAB_CONFIG} + fi +} + gitlab_configure_oauth() { echo "Configuring gitlab::oauth..." @@ -704,6 +720,7 @@ gitlab_configure_oauth() { gitlab_configure_oauth_crowd gitlab_configure_oauth_auth0 gitlab_configure_oauth_azure + gitlab_configure_oauth_azure_ad_v2 OAUTH_ENABLED=${OAUTH_ENABLED:-false} update_template ${GITLAB_CONFIG} \ @@ -716,7 +733,7 @@ gitlab_configure_oauth() { OAUTH_EXTERNAL_PROVIDERS case ${OAUTH_AUTO_SIGN_IN_WITH_PROVIDER} in - cas3|google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd|azure_oauth2|oauth2_generic|$OAUTH2_GENERIC_NAME) + cas3|google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd|azure_oauth2|azure_activedirectory_v2|oauth2_generic|$OAUTH2_GENERIC_NAME) update_template ${GITLAB_CONFIG} OAUTH_AUTO_SIGN_IN_WITH_PROVIDER ;; *) From 5e20678aa823855a57936b783adebfa62beb095b Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Fri, 9 Sep 2022 15:02:10 +0100 Subject: [PATCH 236/522] Update README.md From 6766c014648ec1fa388f434897c9a7ce3e17e017 Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Wed, 21 Sep 2022 15:03:34 +0100 Subject: [PATCH 237/522] Update to Gitlab CE 15.4.0 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 52cfb76b7..fa569d946 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**15.4.0** + +- gitlab: upgrade CE to v15.4.0 +- gitaly: upgrade to v15.4.0 +- ubuntu: upgrade tofocal-20220826 + **15.3.3** - gitlab: upgrade CE to v15.3.3 diff --git a/Dockerfile b/Dockerfile index dc35c89c4..19a4e3dca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:focal-20220801 +FROM ubuntu:focal-20220826 -ARG VERSION=15.3.3 +ARG VERSION=15.4.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.13 \ GITLAB_SHELL_VERSION=14.10.0 \ GITLAB_PAGES_VERSION=1.62.0 \ - GITALY_SERVER_VERSION=15.3.3 \ + GITALY_SERVER_VERSION=15.4.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 6490c097a..9f5c20011 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.3.3 +# sameersbn/gitlab:15.4.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.3.3 +docker pull sameersbn/gitlab:15.4.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.3.3 + sameersbn/gitlab:15.4.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.3.3 + sameersbn/gitlab:15.4.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:15.3.3 + sameersbn/gitlab:15.4.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:15.3.3 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.3.3 + sameersbn/gitlab:15.4.0 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.3.3 + sameersbn/gitlab:15.4.0 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.3.3 + sameersbn/gitlab:15.4.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.3.3 + sameersbn/gitlab:15.4.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.3.3 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.3.3 + sameersbn/gitlab:15.4.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.3.3 + sameersbn/gitlab:15.4.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.3.3 + sameersbn/gitlab:15.4.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -758,14 +758,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:15.3.3 + sameersbn/gitlab:15.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:15.3.3 app:sanitize + sameersbn/gitlab:15.4.0 app:sanitize ``` #### Piwik @@ -2407,7 +2407,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2442,14 +2442,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.3 app:rake db:setup + sameersbn/gitlab:15.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:15.3.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2458,7 +2458,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2507,7 +2507,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:15.3.3 app:rake gitlab:env:info + sameersbn/gitlab:15.4.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2520,7 +2520,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.4.0 app:rake gitlab:import:repos ``` Or @@ -2551,7 +2551,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.4.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2575,12 +2575,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.3.3 +docker pull sameersbn/gitlab:15.4.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2605,7 +2605,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:15.3.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.4.0 ``` ### Shell Access @@ -2643,7 +2643,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.3.3 + image: sameersbn/gitlab:15.4.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 87b5b94fc..c915b5db7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.3.3 +15.4.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index f199bfbdb..33da2b2ab 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.3.3 + image: sameersbn/gitlab:15.4.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index f41e9804e..518c0409e 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.3.3 + image: sameersbn/gitlab:15.4.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 36777a9ea..74340f257 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.3.3 + image: sameersbn/gitlab:15.4.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ea4a05e53..346996c5a 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.4.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.3.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.3.3 +docker pull sameersbn/gitlab:15.4.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.3.3 +sameersbn/gitlab:15.4.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 523ec18e2..26d08d6ae 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.3.3 + image: sameersbn/gitlab:15.4.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index d3fbcaf7c..12fea873f 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.3.3 + image: sameersbn/gitlab:15.4.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index faa45415b..4acf7c553 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.3.3 + image: sameersbn/gitlab:15.4.0 env: - name: TZ value: Asia/Kolkata From b416245565ce582266fdaea33db8b17f7e3aff33 Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Fri, 30 Sep 2022 14:46:03 +0100 Subject: [PATCH 238/522] Update to Gitlab CE 15.4.1 --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index fa569d946..aac1bebcd 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.4.1** + +- gitlab: upgrade CE to v15.4.1 +- gitaly: upgrade to v15.4.1 + **15.4.0** - gitlab: upgrade CE to v15.4.0 diff --git a/Dockerfile b/Dockerfile index 19a4e3dca..4f6fde900 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220826 -ARG VERSION=15.4.0 +ARG VERSION=15.4.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.13 \ GITLAB_SHELL_VERSION=14.10.0 \ GITLAB_PAGES_VERSION=1.62.0 \ - GITALY_SERVER_VERSION=15.4.0 \ + GITALY_SERVER_VERSION=15.4.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 3c83ccab1..229a0e0f7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.4.0 +# sameersbn/gitlab:15.4.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.4.0 +docker pull sameersbn/gitlab:15.4.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.4.0 + sameersbn/gitlab:15.4.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.4.0 + sameersbn/gitlab:15.4.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:15.4.0 + sameersbn/gitlab:15.4.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:15.4.0 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.4.0 + sameersbn/gitlab:15.4.1 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.4.0 + sameersbn/gitlab:15.4.1 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.4.0 + sameersbn/gitlab:15.4.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.4.0 + sameersbn/gitlab:15.4.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.4.0 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.4.0 + sameersbn/gitlab:15.4.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.4.0 + sameersbn/gitlab:15.4.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.4.0 + sameersbn/gitlab:15.4.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.4.0 + sameersbn/gitlab:15.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:15.4.0 app:sanitize + sameersbn/gitlab:15.4.1 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.0 app:rake db:setup + sameersbn/gitlab:15.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:15.4.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.4.0 app:rake gitlab:env:info + sameersbn/gitlab:15.4.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.4.1 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.4.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.4.0 +docker pull sameersbn/gitlab:15.4.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.4.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.4.1 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.4.0 + image: sameersbn/gitlab:15.4.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index c915b5db7..72e9701a3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.4.0 +15.4.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 33da2b2ab..6bba87ae9 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.4.0 + image: sameersbn/gitlab:15.4.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 518c0409e..45c5161e1 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.4.0 + image: sameersbn/gitlab:15.4.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 74340f257..4fad29390 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.4.0 + image: sameersbn/gitlab:15.4.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 346996c5a..05842693d 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.4.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.4.0 +docker pull sameersbn/gitlab:15.4.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.4.0 +sameersbn/gitlab:15.4.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 26d08d6ae..4b7c08b12 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.4.0 + image: sameersbn/gitlab:15.4.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 12fea873f..4f12ba318 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.4.0 + image: sameersbn/gitlab:15.4.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 4acf7c553..4e88fc551 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.4.0 + image: sameersbn/gitlab:15.4.1 env: - name: TZ value: Asia/Kolkata From f38730dca47c52a2ae90080040f4586c54b9050f Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Wed, 5 Oct 2022 14:07:14 +0100 Subject: [PATCH 239/522] Upgrade GitLab CE to 15.4.2 --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index aac1bebcd..3f47ea93d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.4.2** + +- gitlab: upgrade CE to v15.4.2 +- gitaly: upgrade to v15.4.2 + **15.4.1** - gitlab: upgrade CE to v15.4.1 diff --git a/Dockerfile b/Dockerfile index 4f6fde900..09cb8a2f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220826 -ARG VERSION=15.4.1 +ARG VERSION=15.4.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.13 \ GITLAB_SHELL_VERSION=14.10.0 \ GITLAB_PAGES_VERSION=1.62.0 \ - GITALY_SERVER_VERSION=15.4.1 \ + GITALY_SERVER_VERSION=15.4.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 229a0e0f7..63149298f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.4.1 +# sameersbn/gitlab:15.4.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.4.1 +docker pull sameersbn/gitlab:15.4.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.4.1 + sameersbn/gitlab:15.4.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.4.1 + sameersbn/gitlab:15.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:15.4.1 + sameersbn/gitlab:15.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:15.4.1 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.4.1 + sameersbn/gitlab:15.4.2 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.4.1 + sameersbn/gitlab:15.4.2 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.4.1 + sameersbn/gitlab:15.4.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.4.1 + sameersbn/gitlab:15.4.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.4.1 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.4.1 + sameersbn/gitlab:15.4.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.4.1 + sameersbn/gitlab:15.4.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.4.1 + sameersbn/gitlab:15.4.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.4.1 + sameersbn/gitlab:15.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:15.4.1 app:sanitize + sameersbn/gitlab:15.4.2 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.1 app:rake db:setup + sameersbn/gitlab:15.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:15.4.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.4.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.4.1 app:rake gitlab:env:info + sameersbn/gitlab:15.4.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.4.2 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.4.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.4.1 +docker pull sameersbn/gitlab:15.4.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.4.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.4.2 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.4.1 + image: sameersbn/gitlab:15.4.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 72e9701a3..fcf934d16 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.4.1 +15.4.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 6bba87ae9..6fec5668f 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.4.1 + image: sameersbn/gitlab:15.4.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 45c5161e1..b03690e5c 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.4.1 + image: sameersbn/gitlab:15.4.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 4fad29390..6e43bde40 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.4.1 + image: sameersbn/gitlab:15.4.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 05842693d..9734fe22f 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.4.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.4.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.4.1 +docker pull sameersbn/gitlab:15.4.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.4.1 +sameersbn/gitlab:15.4.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 4b7c08b12..8d9fad54c 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.4.1 + image: sameersbn/gitlab:15.4.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 4f12ba318..c8cb2eec6 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.4.1 + image: sameersbn/gitlab:15.4.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 4e88fc551..58b153d74 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.4.1 + image: sameersbn/gitlab:15.4.2 env: - name: TZ value: Asia/Kolkata From f408585d8b2369e89c82a7a707dfd71f22dcf72b Mon Sep 17 00:00:00 2001 From: kkkkkks0 Date: Thu, 20 Oct 2022 18:58:03 +0800 Subject: [PATCH 240/522] fixes sameersbn#2645 --- assets/runtime/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index 90dbe1913..787ce5c8a 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1687,7 +1687,7 @@ generate_ssh_key() { } generate_ssh_host_keys() { - sed -i "s|^[#]*MaxStartups 10:30:60|MaxStartups ${GITLAB_SSH_MAXSTARTUPS}|" /etc/ssh/sshd_config + sed -i "s|^[#]*MaxStartups[^$]*|MaxStartups ${GITLAB_SSH_MAXSTARTUPS}|" /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... " From a95c0195930845170c0ea6b1d36730a4eeafb6d3 Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Thu, 20 Oct 2022 15:04:33 +0100 Subject: [PATCH 241/522] Upgrade to GitLab CE 15.4.3 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 3f47ea93d..753274407 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**15.4.3** + +- gitlab: upgrade CE to v15.4.3 +- gitaly: upgrade to v15.4.3 +- ubuntu: upgrade to focal-20220922 + **15.4.2** - gitlab: upgrade CE to v15.4.2 diff --git a/Dockerfile b/Dockerfile index 09cb8a2f8..26746f921 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:focal-20220826 +FROM ubuntu:focal-20220922 -ARG VERSION=15.4.2 +ARG VERSION=15.4.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.13 \ GITLAB_SHELL_VERSION=14.10.0 \ GITLAB_PAGES_VERSION=1.62.0 \ - GITALY_SERVER_VERSION=15.4.2 \ + GITALY_SERVER_VERSION=15.4.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 63149298f..da835d665 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.4.2 +# sameersbn/gitlab:15.4.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.4.2 +docker pull sameersbn/gitlab:15.4.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.4.2 + sameersbn/gitlab:15.4.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.4.2 + sameersbn/gitlab:15.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:15.4.2 + sameersbn/gitlab:15.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:15.4.2 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.4.2 + sameersbn/gitlab:15.4.3 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.4.2 + sameersbn/gitlab:15.4.3 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.4.2 + sameersbn/gitlab:15.4.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.4.2 + sameersbn/gitlab:15.4.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.4.2 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.4.2 + sameersbn/gitlab:15.4.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.4.2 + sameersbn/gitlab:15.4.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.4.2 + sameersbn/gitlab:15.4.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.4.2 + sameersbn/gitlab:15.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:15.4.2 app:sanitize + sameersbn/gitlab:15.4.3 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.2 app:rake db:setup + sameersbn/gitlab:15.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:15.4.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.4.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.4.2 app:rake gitlab:env:info + sameersbn/gitlab:15.4.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.4.3 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.4.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.4.2 +docker pull sameersbn/gitlab:15.4.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.4.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.4.3 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.4.2 + image: sameersbn/gitlab:15.4.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index fcf934d16..261c9b075 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.4.2 +15.4.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 6fec5668f..da24cb962 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.4.2 + image: sameersbn/gitlab:15.4.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index b03690e5c..75a5bcd31 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.4.2 + image: sameersbn/gitlab:15.4.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 6e43bde40..07685e5e0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.4.2 + image: sameersbn/gitlab:15.4.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 9734fe22f..bf488cf48 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.4.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.4.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.4.2 +docker pull sameersbn/gitlab:15.4.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.4.2 +sameersbn/gitlab:15.4.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 8d9fad54c..f57a30fae 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.4.2 + image: sameersbn/gitlab:15.4.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index c8cb2eec6..8d5521782 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.4.2 + image: sameersbn/gitlab:15.4.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 58b153d74..2eb1a3589 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.4.2 + image: sameersbn/gitlab:15.4.3 env: - name: TZ value: Asia/Kolkata From f37416f858d3186c159f92ef04c501bceb6ed9e8 Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Fri, 21 Oct 2022 09:55:18 +0100 Subject: [PATCH 242/522] Upgrade to GitLab CE 15.5.0 --- Changelog.md | 6 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 753274407..7a5bf02d4 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**15.5.0** + +- gitlab: upgrade CE to v15.5.0 +- gitaly: upgrade to v15.5.0 + + **15.4.3** - gitlab: upgrade CE to v15.4.3 diff --git a/Dockerfile b/Dockerfile index 26746f921..b1895d284 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220922 -ARG VERSION=15.4.3 +ARG VERSION=15.5.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.13 \ GITLAB_SHELL_VERSION=14.10.0 \ GITLAB_PAGES_VERSION=1.62.0 \ - GITALY_SERVER_VERSION=15.4.3 \ + GITALY_SERVER_VERSION=15.5.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index da835d665..9a732da7d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.4.3 +# sameersbn/gitlab:15.5.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.4.3 +docker pull sameersbn/gitlab:15.5.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.4.3 + sameersbn/gitlab:15.5.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.4.3 + sameersbn/gitlab:15.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:15.4.3 + sameersbn/gitlab:15.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:15.4.3 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.4.3 + sameersbn/gitlab:15.5.0 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.4.3 + sameersbn/gitlab:15.5.0 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.4.3 + sameersbn/gitlab:15.5.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.4.3 + sameersbn/gitlab:15.5.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.4.3 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.4.3 + sameersbn/gitlab:15.5.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.4.3 + sameersbn/gitlab:15.5.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.4.3 + sameersbn/gitlab:15.5.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.4.3 + sameersbn/gitlab:15.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:15.4.3 app:sanitize + sameersbn/gitlab:15.5.0 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.3 app:rake db:setup + sameersbn/gitlab:15.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:15.4.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.4.3 app:rake gitlab:env:info + sameersbn/gitlab:15.5.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.5.0 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.5.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.4.3 +docker pull sameersbn/gitlab:15.5.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.4.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.5.0 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.4.3 + image: sameersbn/gitlab:15.5.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 261c9b075..188dd74f5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.4.3 +15.5.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index da24cb962..4e7b0eae4 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.4.3 + image: sameersbn/gitlab:15.5.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 75a5bcd31..23991fa68 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.4.3 + image: sameersbn/gitlab:15.5.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 07685e5e0..a0983b7a6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.4.3 + image: sameersbn/gitlab:15.5.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index bf488cf48..e73c0330a 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.5.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.4.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.4.3 +docker pull sameersbn/gitlab:15.5.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.4.3 +sameersbn/gitlab:15.5.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index f57a30fae..1e9e631fc 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.4.3 + image: sameersbn/gitlab:15.5.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 8d5521782..e4495d4fb 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.4.3 + image: sameersbn/gitlab:15.5.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 2eb1a3589..c4a0ac196 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.4.3 + image: sameersbn/gitlab:15.5.0 env: - name: TZ value: Asia/Kolkata From 090d213642a1122d807292a9f31371696a7b44b7 Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Sun, 23 Oct 2022 12:33:33 +0100 Subject: [PATCH 243/522] Shell to 14.12.0 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 7a5bf02d4..c3a724b71 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ This file only reflects the changes that are made in this image. Please refer to - gitlab: upgrade CE to v15.5.0 - gitaly: upgrade to v15.5.0 +- gitlab-shell: upgrade to v14.12.0 **15.4.3** diff --git a/Dockerfile b/Dockerfile index b1895d284..8fe5ee1f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \ GOLANG_VERSION=1.17.13 \ - GITLAB_SHELL_VERSION=14.10.0 \ + GITLAB_SHELL_VERSION=14.12.0 \ GITLAB_PAGES_VERSION=1.62.0 \ GITALY_SERVER_VERSION=15.5.0 \ GITLAB_USER="git" \ From ae818faeaf2ed110facbe3b6de4a9a3210fbf14a Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Tue, 25 Oct 2022 09:35:04 +0100 Subject: [PATCH 244/522] Upgrade to GitLab CE 15.5.1 --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index c3a724b71..2367d3ae8 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.5.1** + +- gitlab: upgrade CE to v15.5.1 +- gitaly: upgrade to v15.5.1 + **15.5.0** - gitlab: upgrade CE to v15.5.0 diff --git a/Dockerfile b/Dockerfile index 8fe5ee1f3..ded0cda28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220922 -ARG VERSION=15.5.0 +ARG VERSION=15.5.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.13 \ GITLAB_SHELL_VERSION=14.12.0 \ GITLAB_PAGES_VERSION=1.62.0 \ - GITALY_SERVER_VERSION=15.5.0 \ + GITALY_SERVER_VERSION=15.5.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 9a732da7d..51680cd89 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.5.0 +# sameersbn/gitlab:15.5.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.5.0 +docker pull sameersbn/gitlab:15.5.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.0 + sameersbn/gitlab:15.5.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.0 + sameersbn/gitlab:15.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:15.5.0 + sameersbn/gitlab:15.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:15.5.0 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.5.0 + sameersbn/gitlab:15.5.1 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.5.0 + sameersbn/gitlab:15.5.1 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.0 + sameersbn/gitlab:15.5.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.0 + sameersbn/gitlab:15.5.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.5.0 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.5.0 + sameersbn/gitlab:15.5.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.5.0 + sameersbn/gitlab:15.5.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.5.0 + sameersbn/gitlab:15.5.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.5.0 + sameersbn/gitlab:15.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:15.5.0 app:sanitize + sameersbn/gitlab:15.5.1 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.0 app:rake db:setup + sameersbn/gitlab:15.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:15.5.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.5.0 app:rake gitlab:env:info + sameersbn/gitlab:15.5.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.5.1 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.5.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.5.0 +docker pull sameersbn/gitlab:15.5.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.5.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.5.1 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.5.0 + image: sameersbn/gitlab:15.5.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 188dd74f5..2e0b428c4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.5.0 +15.5.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 4e7b0eae4..f9d264970 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.0 + image: sameersbn/gitlab:15.5.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 23991fa68..51b7c2354 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.5.0 + image: sameersbn/gitlab:15.5.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index a0983b7a6..5b0d4eef3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.0 + image: sameersbn/gitlab:15.5.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index e73c0330a..3d2bb02c2 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.5.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.5.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.5.0 +docker pull sameersbn/gitlab:15.5.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.5.0 +sameersbn/gitlab:15.5.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 1e9e631fc..e732804b1 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.0 + image: sameersbn/gitlab:15.5.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index e4495d4fb..6824365c1 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.0 + image: sameersbn/gitlab:15.5.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index c4a0ac196..acea9985d 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.5.0 + image: sameersbn/gitlab:15.5.1 env: - name: TZ value: Asia/Kolkata From 3cad3ba81383d1cd358310a2327c74284b8cdd0b Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Wed, 2 Nov 2022 15:52:59 +0000 Subject: [PATCH 245/522] Upgrade to GitLab CE 15.5.2 --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 2367d3ae8..0e2a50e25 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.5.2** + +- gitlab: upgrade CE to v15.5.2 +- gitaly: upgrade to v15.5.2 + **15.5.1** - gitlab: upgrade CE to v15.5.1 diff --git a/Dockerfile b/Dockerfile index ded0cda28..415a8ef7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20220922 -ARG VERSION=15.5.1 +ARG VERSION=15.5.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.13 \ GITLAB_SHELL_VERSION=14.12.0 \ GITLAB_PAGES_VERSION=1.62.0 \ - GITALY_SERVER_VERSION=15.5.1 \ + GITALY_SERVER_VERSION=15.5.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 51680cd89..18468586e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.5.1 +# sameersbn/gitlab:15.5.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.5.1 +docker pull sameersbn/gitlab:15.5.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.1 + sameersbn/gitlab:15.5.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.1 + sameersbn/gitlab:15.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:15.5.1 + sameersbn/gitlab:15.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:15.5.1 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.5.1 + sameersbn/gitlab:15.5.2 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.5.1 + sameersbn/gitlab:15.5.2 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.1 + sameersbn/gitlab:15.5.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.1 + sameersbn/gitlab:15.5.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.5.1 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.5.1 + sameersbn/gitlab:15.5.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.5.1 + sameersbn/gitlab:15.5.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.5.1 + sameersbn/gitlab:15.5.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.5.1 + sameersbn/gitlab:15.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:15.5.1 app:sanitize + sameersbn/gitlab:15.5.2 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.1 app:rake db:setup + sameersbn/gitlab:15.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:15.5.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.5.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.5.1 app:rake gitlab:env:info + sameersbn/gitlab:15.5.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.5.2 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.5.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.5.1 +docker pull sameersbn/gitlab:15.5.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.5.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.5.2 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.5.1 + image: sameersbn/gitlab:15.5.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 2e0b428c4..9af1d968a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.5.1 +15.5.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index f9d264970..37f2c1836 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.1 + image: sameersbn/gitlab:15.5.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 51b7c2354..f1c147c18 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.5.1 + image: sameersbn/gitlab:15.5.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 5b0d4eef3..97dcc316f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.1 + image: sameersbn/gitlab:15.5.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 3d2bb02c2..1e60b9745 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.5.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.5.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.5.1 +docker pull sameersbn/gitlab:15.5.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.5.1 +sameersbn/gitlab:15.5.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index e732804b1..298501714 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.1 + image: sameersbn/gitlab:15.5.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 6824365c1..655edc467 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.1 + image: sameersbn/gitlab:15.5.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index acea9985d..c4a280ea9 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.5.1 + image: sameersbn/gitlab:15.5.2 env: - name: TZ value: Asia/Kolkata From c7499484a9f7cc338a1a1355fb050fde7c1fa9e4 Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Thu, 3 Nov 2022 21:52:02 +0000 Subject: [PATCH 246/522] Ubuntu - ubuntu: upgrade to focal-20221019 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 0e2a50e25..b2b4b07b4 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ This file only reflects the changes that are made in this image. Please refer to - gitlab: upgrade CE to v15.5.2 - gitaly: upgrade to v15.5.2 +- ubuntu: upgrade to focal-20221019 **15.5.1** diff --git a/Dockerfile b/Dockerfile index 415a8ef7e..4baa00198 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20220922 +FROM ubuntu:focal-20221019 ARG VERSION=15.5.2 From 590148a121109d85041fc92460f1ae277dcfe363 Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Wed, 9 Nov 2022 17:09:28 +0000 Subject: [PATCH 247/522] Upgrade to GitLab CE 15.5.3 --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index b2b4b07b4..30d1c3579 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.5.3** + +- gitlab: upgrade CE to v15.5.3 +- gitaly: upgrade to v15.5.3 + **15.5.2** - gitlab: upgrade CE to v15.5.2 diff --git a/Dockerfile b/Dockerfile index 4baa00198..798ba3de8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20221019 -ARG VERSION=15.5.2 +ARG VERSION=15.5.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.13 \ GITLAB_SHELL_VERSION=14.12.0 \ GITLAB_PAGES_VERSION=1.62.0 \ - GITALY_SERVER_VERSION=15.5.2 \ + GITALY_SERVER_VERSION=15.5.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 18468586e..c8d47aacb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.5.2 +# sameersbn/gitlab:15.5.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.5.2 +docker pull sameersbn/gitlab:15.5.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.2 + sameersbn/gitlab:15.5.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.2 + sameersbn/gitlab:15.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:15.5.2 + sameersbn/gitlab:15.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:15.5.2 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.5.2 + sameersbn/gitlab:15.5.3 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.5.2 + sameersbn/gitlab:15.5.3 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.2 + sameersbn/gitlab:15.5.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.2 + sameersbn/gitlab:15.5.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.5.2 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.5.2 + sameersbn/gitlab:15.5.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.5.2 + sameersbn/gitlab:15.5.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.5.2 + sameersbn/gitlab:15.5.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.5.2 + sameersbn/gitlab:15.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:15.5.2 app:sanitize + sameersbn/gitlab:15.5.3 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.2 app:rake db:setup + sameersbn/gitlab:15.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:15.5.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.5.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.5.2 app:rake gitlab:env:info + sameersbn/gitlab:15.5.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.5.3 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.5.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.5.2 +docker pull sameersbn/gitlab:15.5.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.5.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.5.3 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.5.2 + image: sameersbn/gitlab:15.5.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 9af1d968a..23a751eec 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.5.2 +15.5.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 37f2c1836..bc5cef780 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.2 + image: sameersbn/gitlab:15.5.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index f1c147c18..fd2a0c2a2 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.5.2 + image: sameersbn/gitlab:15.5.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 97dcc316f..5c02af0f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.2 + image: sameersbn/gitlab:15.5.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 1e60b9745..03f0a982d 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.5.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.5.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.5.2 +docker pull sameersbn/gitlab:15.5.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.5.2 +sameersbn/gitlab:15.5.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 298501714..73f9028ef 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.2 + image: sameersbn/gitlab:15.5.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 655edc467..0da1f71b1 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.2 + image: sameersbn/gitlab:15.5.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index c4a280ea9..12c6ce46e 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.5.2 + image: sameersbn/gitlab:15.5.3 env: - name: TZ value: Asia/Kolkata From a8037b726ef92381bf8fa0507f4daf0ed720c333 Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Mon, 14 Nov 2022 11:27:01 +0000 Subject: [PATCH 248/522] Upgrade to GitLab CE 15.5.4 --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 30d1c3579..b484d6602 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.5.4** + +- gitlab: upgrade CE to v15.5.4 +- gitaly: upgrade to v15.5.4 + **15.5.3** - gitlab: upgrade CE to v15.5.3 diff --git a/Dockerfile b/Dockerfile index 798ba3de8..5f2ee5961 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20221019 -ARG VERSION=15.5.3 +ARG VERSION=15.5.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.17.13 \ GITLAB_SHELL_VERSION=14.12.0 \ GITLAB_PAGES_VERSION=1.62.0 \ - GITALY_SERVER_VERSION=15.5.3 \ + GITALY_SERVER_VERSION=15.5.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index c8d47aacb..0b1ebf6f3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.5.3 +# sameersbn/gitlab:15.5.4 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.5.3 +docker pull sameersbn/gitlab:15.5.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.3 + sameersbn/gitlab:15.5.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.3 + sameersbn/gitlab:15.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:15.5.3 + sameersbn/gitlab:15.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:15.5.3 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.5.3 + sameersbn/gitlab:15.5.4 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.5.3 + sameersbn/gitlab:15.5.4 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.3 + sameersbn/gitlab:15.5.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.3 + sameersbn/gitlab:15.5.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.5.3 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.5.3 + sameersbn/gitlab:15.5.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.5.3 + sameersbn/gitlab:15.5.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.5.3 + sameersbn/gitlab:15.5.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.5.3 + sameersbn/gitlab:15.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:15.5.3 app:sanitize + sameersbn/gitlab:15.5.4 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.3 app:rake db:setup + sameersbn/gitlab:15.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:15.5.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.5.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.5.3 app:rake gitlab:env:info + sameersbn/gitlab:15.5.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.5.4 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.5.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.5.3 +docker pull sameersbn/gitlab:15.5.4 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.5.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.5.4 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.5.3 + image: sameersbn/gitlab:15.5.4 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 23a751eec..de0797d94 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.5.3 +15.5.4 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index bc5cef780..896a31f75 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.3 + image: sameersbn/gitlab:15.5.4 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index fd2a0c2a2..415d67139 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.5.3 + image: sameersbn/gitlab:15.5.4 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 5c02af0f5..9d1c5751d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.3 + image: sameersbn/gitlab:15.5.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 03f0a982d..6dfd95ef0 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.5.4 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.5.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.5.3 +docker pull sameersbn/gitlab:15.5.4 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.5.3 +sameersbn/gitlab:15.5.4 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 73f9028ef..e6e944f0f 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.3 + image: sameersbn/gitlab:15.5.4 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 0da1f71b1..2f0f5226a 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.3 + image: sameersbn/gitlab:15.5.4 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 12c6ce46e..c8554618d 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.5.3 + image: sameersbn/gitlab:15.5.4 env: - name: TZ value: Asia/Kolkata From a6ef2a3464a337e553568be98f95309013da1280 Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Tue, 22 Nov 2022 09:50:15 +0000 Subject: [PATCH 249/522] Upgrade to GitLab CE 15.6.0 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index b484d6602..06c48ca02 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**15.6.0** + +- gitlab: upgrade CE to v15.6.0 +- gitaly: upgrade to v15.6.0 +- gitlab-shell: upgrade to v14.13.0 +- gitlab-pages: upgrade to v1.63.0 + **15.5.4** - gitlab: upgrade CE to v15.5.4 diff --git a/Dockerfile b/Dockerfile index 5f2ee5961..7d1fad22f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20221019 -ARG VERSION=15.5.4 +ARG VERSION=15.6.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \ GOLANG_VERSION=1.17.13 \ - GITLAB_SHELL_VERSION=14.12.0 \ - GITLAB_PAGES_VERSION=1.62.0 \ - GITALY_SERVER_VERSION=15.5.4 \ + GITLAB_SHELL_VERSION=14.13.0 \ + GITLAB_PAGES_VERSION=1.63.0 \ + GITALY_SERVER_VERSION=15.6.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 0b1ebf6f3..cf892570f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.5.4 +# sameersbn/gitlab:15.6.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.5.4 +docker pull sameersbn/gitlab:15.6.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.4 + sameersbn/gitlab:15.6.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.4 + sameersbn/gitlab:15.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:15.5.4 + sameersbn/gitlab:15.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:15.5.4 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.5.4 + sameersbn/gitlab:15.6.0 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.5.4 + sameersbn/gitlab:15.6.0 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.4 + sameersbn/gitlab:15.6.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.5.4 + sameersbn/gitlab:15.6.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.5.4 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.5.4 + sameersbn/gitlab:15.6.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.5.4 + sameersbn/gitlab:15.6.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.5.4 + sameersbn/gitlab:15.6.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.5.4 + sameersbn/gitlab:15.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:15.5.4 app:sanitize + sameersbn/gitlab:15.6.0 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.4 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.4 app:rake db:setup + sameersbn/gitlab:15.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:15.5.4 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.5.4 app:rake gitlab:env:info + sameersbn/gitlab:15.6.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.4 app:rake gitlab:import:repos + sameersbn/gitlab:15.6.0 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.4 app:rake gitlab:import:repos + sameersbn/gitlab:15.6.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.5.4 +docker pull sameersbn/gitlab:15.6.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.5.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.6.0 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.5.4 + image: sameersbn/gitlab:15.6.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index de0797d94..9f6d8f2fd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.5.4 +15.6.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 896a31f75..ac00f8451 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.4 + image: sameersbn/gitlab:15.6.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 415d67139..96b159851 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.5.4 + image: sameersbn/gitlab:15.6.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 9d1c5751d..d7d9d8254 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.4 + image: sameersbn/gitlab:15.6.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 6dfd95ef0..76145fe9e 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.4 app:rake gitlab:backup:create + sameersbn/gitlab:15.6.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.4 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.5.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.6.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.5.4 +docker pull sameersbn/gitlab:15.6.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.5.4 +sameersbn/gitlab:15.6.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index e6e944f0f..dd302544a 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.4 + image: sameersbn/gitlab:15.6.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 2f0f5226a..02820c3ff 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.5.4 + image: sameersbn/gitlab:15.6.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index c8554618d..8ffcc537d 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.5.4 + image: sameersbn/gitlab:15.6.0 env: - name: TZ value: Asia/Kolkata From 8db9ed890823a14c6a5ff18bd22ffa4b59533e3a Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Wed, 23 Nov 2022 15:14:40 +0000 Subject: [PATCH 250/522] Upgrade Go & safe dir --- Changelog.md | 1 + Dockerfile | 2 +- assets/build/install.sh | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 06c48ca02..bc1c41cbd 100644 --- a/Changelog.md +++ b/Changelog.md @@ -8,6 +8,7 @@ This file only reflects the changes that are made in this image. Please refer to - gitaly: upgrade to v15.6.0 - gitlab-shell: upgrade to v14.13.0 - gitlab-pages: upgrade to v1.63.0 +- golang: upgrade to v1.18.8 **15.5.4** diff --git a/Dockerfile b/Dockerfile index 7d1fad22f..7bb14cd03 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG VERSION=15.6.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \ - GOLANG_VERSION=1.17.13 \ + GOLANG_VERSION=1.18.8 \ GITLAB_SHELL_VERSION=14.13.0 \ GITLAB_PAGES_VERSION=1.63.0 \ GITALY_SERVER_VERSION=15.6.0 \ diff --git a/assets/build/install.sh b/assets/build/install.sh index f35bc1555..0d16848d7 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -78,6 +78,7 @@ 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 exec_as_git git config --global advice.detachedHead false +exec_as_git git config --global --add safe.directory /home/git/gitlab # shallow clone gitlab-foss echo "Cloning gitlab-foss v.${GITLAB_VERSION}..." @@ -122,6 +123,7 @@ rm -rf ${GITLAB_HOME}/repositories # build gitlab-workhorse echo "Build gitlab-workhorse" +git config --global --add safe.directory /home/git/gitlab make -C ${GITLAB_WORKHORSE_BUILD_DIR} install # clean up rm -rf ${GITLAB_WORKHORSE_BUILD_DIR} From 03344e7af51095648e195e1119be88604cde02e2 Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Fri, 2 Dec 2022 10:07:15 +0000 Subject: [PATCH 251/522] Upgrade to GitLab CE 15.6.1 --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index bc1c41cbd..44bb57e80 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.6.1** + +- gitlab: upgrade CE to v15.6.1 +- gitaly: upgrade to v15.6.1 + **15.6.0** - gitlab: upgrade CE to v15.6.0 diff --git a/Dockerfile b/Dockerfile index 7bb14cd03..7348f6eea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20221019 -ARG VERSION=15.6.0 +ARG VERSION=15.6.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.18.8 \ GITLAB_SHELL_VERSION=14.13.0 \ GITLAB_PAGES_VERSION=1.63.0 \ - GITALY_SERVER_VERSION=15.6.0 \ + GITALY_SERVER_VERSION=15.6.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index cf892570f..6a2fdcfdf 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.6.0 +# sameersbn/gitlab:15.6.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.6.0 +docker pull sameersbn/gitlab:15.6.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.6.0 + sameersbn/gitlab:15.6.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.6.0 + sameersbn/gitlab:15.6.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:15.6.0 + sameersbn/gitlab:15.6.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:15.6.0 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.6.0 + sameersbn/gitlab:15.6.1 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.6.0 + sameersbn/gitlab:15.6.1 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.6.0 + sameersbn/gitlab:15.6.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.6.0 + sameersbn/gitlab:15.6.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.6.0 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.6.0 + sameersbn/gitlab:15.6.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.6.0 + sameersbn/gitlab:15.6.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.6.0 + sameersbn/gitlab:15.6.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.6.0 + sameersbn/gitlab:15.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:15.6.0 app:sanitize + sameersbn/gitlab:15.6.1 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.0 app:rake db:setup + sameersbn/gitlab:15.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:15.6.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.6.0 app:rake gitlab:env:info + sameersbn/gitlab:15.6.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.6.1 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.6.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.6.0 +docker pull sameersbn/gitlab:15.6.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.6.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.6.1 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.6.0 + image: sameersbn/gitlab:15.6.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 9f6d8f2fd..0ab55a66f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.6.0 +15.6.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index ac00f8451..3fce9ed91 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.6.0 + image: sameersbn/gitlab:15.6.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 96b159851..a7b847352 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.6.0 + image: sameersbn/gitlab:15.6.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index d7d9d8254..92990d364 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.6.0 + image: sameersbn/gitlab:15.6.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 76145fe9e..656e47a3a 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.6.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.6.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.6.0 +docker pull sameersbn/gitlab:15.6.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.6.0 +sameersbn/gitlab:15.6.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index dd302544a..79fe3059f 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.6.0 + image: sameersbn/gitlab:15.6.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 02820c3ff..d693da600 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.6.0 + image: sameersbn/gitlab:15.6.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 8ffcc537d..eb4ba68a8 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.6.0 + image: sameersbn/gitlab:15.6.1 env: - name: TZ value: Asia/Kolkata From 3e81776cb2adf779b8c75bbd8d0b31c16ae1e5df Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Tue, 6 Dec 2022 10:08:27 +0000 Subject: [PATCH 252/522] Upgrade to GitLab CE 15.6.2 --- Changelog.md | 5 +++ Dockerfile | 4 +- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 46 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index 44bb57e80..195432fe4 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.6.2** + +- gitlab: upgrade CE to v15.6.2 +- gitaly: upgrade to v15.6.2 + **15.6.1** - gitlab: upgrade CE to v15.6.1 diff --git a/Dockerfile b/Dockerfile index 7348f6eea..ace206335 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20221019 -ARG VERSION=15.6.1 +ARG VERSION=15.6.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.6 \ @@ -8,7 +8,7 @@ ENV GITLAB_VERSION=${VERSION} \ GOLANG_VERSION=1.18.8 \ GITLAB_SHELL_VERSION=14.13.0 \ GITLAB_PAGES_VERSION=1.63.0 \ - GITALY_SERVER_VERSION=15.6.1 \ + GITALY_SERVER_VERSION=15.6.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 6a2fdcfdf..bd4812b24 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.6.1 +# sameersbn/gitlab:15.6.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.6.1 +docker pull sameersbn/gitlab:15.6.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.6.1 + sameersbn/gitlab:15.6.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.6.1 + sameersbn/gitlab:15.6.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:15.6.1 + sameersbn/gitlab:15.6.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:15.6.1 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.6.1 + sameersbn/gitlab:15.6.2 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.6.1 + sameersbn/gitlab:15.6.2 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.6.1 + sameersbn/gitlab:15.6.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.6.1 + sameersbn/gitlab:15.6.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.6.1 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.6.1 + sameersbn/gitlab:15.6.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.6.1 + sameersbn/gitlab:15.6.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.6.1 + sameersbn/gitlab:15.6.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.6.1 + sameersbn/gitlab:15.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:15.6.1 app:sanitize + sameersbn/gitlab:15.6.2 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.1 app:rake db:setup + sameersbn/gitlab:15.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:15.6.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.6.1 app:rake gitlab:env:info + sameersbn/gitlab:15.6.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.6.2 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.6.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.6.1 +docker pull sameersbn/gitlab:15.6.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.6.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.6.2 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.6.1 + image: sameersbn/gitlab:15.6.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 0ab55a66f..e79fdbda3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.6.1 +15.6.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 3fce9ed91..1f0efe351 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.6.1 + image: sameersbn/gitlab:15.6.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index a7b847352..3d7a74cd4 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.6.1 + image: sameersbn/gitlab:15.6.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 92990d364..33828d088 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.6.1 + image: sameersbn/gitlab:15.6.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 656e47a3a..592f703b0 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.6.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.6.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.6.1 +docker pull sameersbn/gitlab:15.6.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.6.1 +sameersbn/gitlab:15.6.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 79fe3059f..101dcecc5 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.6.1 + image: sameersbn/gitlab:15.6.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index d693da600..a33e74814 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.6.1 + image: sameersbn/gitlab:15.6.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index eb4ba68a8..cd09bcdb3 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.6.1 + image: sameersbn/gitlab:15.6.2 env: - name: TZ value: Asia/Kolkata From 364df4c81d966cebfd6858b9b85f40afae4a4ff4 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 8 Dec 2022 17:13:51 +0100 Subject: [PATCH 253/522] Upgrade ruby to v2.7.7 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ace206335..856fe446e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ FROM ubuntu:focal-20221019 ARG VERSION=15.6.2 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=2.7.6 \ - RUBY_SOURCE_SHA256SUM="e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" \ + RUBY_VERSION=2.7.7 \ + RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \ GOLANG_VERSION=1.18.8 \ GITLAB_SHELL_VERSION=14.13.0 \ GITLAB_PAGES_VERSION=1.63.0 \ From 988cb396fb484ef4b684469916dd654965fea6d5 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 10 Dec 2022 13:46:38 +0100 Subject: [PATCH 254/522] Upgrade ruby to v3.0.4 --- Changelog.md | 3 +++ Dockerfile | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index 195432fe4..ee9e25d4d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,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. +- ruby: upgrade to v2.7.7 +- ruby: upgrade to v3.0.4 + **15.6.2** - gitlab: upgrade CE to v15.6.2 diff --git a/Dockerfile b/Dockerfile index 856fe446e..d326da36d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ FROM ubuntu:focal-20221019 ARG VERSION=15.6.2 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=2.7.7 \ - RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \ + RUBY_VERSION=3.0.4 \ + RUBY_SOURCE_SHA256SUM="70b47c207af04bce9acea262308fb42893d3e244f39a4abc586920a1c723722b" \ GOLANG_VERSION=1.18.8 \ GITLAB_SHELL_VERSION=14.13.0 \ GITLAB_PAGES_VERSION=1.63.0 \ From e94bf10a4f97b41ef71c713197aca17c10251996 Mon Sep 17 00:00:00 2001 From: accetto <34798830+accetto@users.noreply.github.com> Date: Sat, 10 Dec 2022 14:48:43 +0000 Subject: [PATCH 255/522] Update README.md Correction in section Configuration/Data Store Signed-off-by: accetto <34798830+accetto@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bd4812b24..f7796e03b 100644 --- a/README.md +++ b/README.md @@ -215,7 +215,7 @@ GitLab is a code hosting software and as such you don't want to lose your code w - `/home/git/data` -*Note: that if you are using the `docker-compose` approach, you must "inpect" the volumes (```docker volume inpect```) to check the mounted path.* +*Note: that if you are using the `docker-compose` approach, you must "inspect" the volumes (```docker volume inspect```) to check the mounted path.* SELinux users are also required to change the security context of the mount point so that it plays nicely with selinux. From cf581f3eb7ba0018c80d94dbd0d6dcb05eff1cc2 Mon Sep 17 00:00:00 2001 From: antt1995 Date: Thu, 22 Dec 2022 15:58:50 +0000 Subject: [PATCH 256/522] Upgrade to GitLab CE 15.6.3 --- Changelog.md | 6 +++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 49 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index ee9e25d4d..9d09b258b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**15.6.3** +- gitlab: upgrade CE to v15.6.3 +- gitaly: upgrade to v15.6.3 +- gitlab-pages: upgrade to v15.6.3 +- ubuntu: upgrade to focal-20221130 + - ruby: upgrade to v2.7.7 - ruby: upgrade to v3.0.4 diff --git a/Dockerfile b/Dockerfile index d326da36d..bb8d65ea8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20221019 +FROM ubuntu:focal-20221130 -ARG VERSION=15.6.2 +ARG VERSION=15.6.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.4 \ RUBY_SOURCE_SHA256SUM="70b47c207af04bce9acea262308fb42893d3e244f39a4abc586920a1c723722b" \ GOLANG_VERSION=1.18.8 \ GITLAB_SHELL_VERSION=14.13.0 \ - GITLAB_PAGES_VERSION=1.63.0 \ - GITALY_SERVER_VERSION=15.6.2 \ + GITLAB_PAGES_VERSION=15.6.3 \ + GITALY_SERVER_VERSION=15.6.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index f7796e03b..158b3c7f0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.6.2 +# sameersbn/gitlab:15.6.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.6.2 +docker pull sameersbn/gitlab:15.6.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.6.2 + sameersbn/gitlab:15.6.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.6.2 + sameersbn/gitlab:15.6.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:15.6.2 + sameersbn/gitlab:15.6.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:15.6.2 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.6.2 + sameersbn/gitlab:15.6.3 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.6.2 + sameersbn/gitlab:15.6.3 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.6.2 + sameersbn/gitlab:15.6.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.6.2 + sameersbn/gitlab:15.6.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.6.2 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.6.2 + sameersbn/gitlab:15.6.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.6.2 + sameersbn/gitlab:15.6.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.6.2 + sameersbn/gitlab:15.6.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.6.2 + sameersbn/gitlab:15.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:15.6.2 app:sanitize + sameersbn/gitlab:15.6.3 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.2 app:rake db:setup + sameersbn/gitlab:15.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:15.6.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.6.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.6.2 app:rake gitlab:env:info + sameersbn/gitlab:15.6.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.6.3 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.6.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.6.2 +docker pull sameersbn/gitlab:15.6.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.6.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.6.3 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.6.2 + image: sameersbn/gitlab:15.6.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index e79fdbda3..3678b9342 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.6.2 +15.6.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 1f0efe351..a7e52abf9 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.6.2 + image: sameersbn/gitlab:15.6.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 3d7a74cd4..4c154d2dd 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.6.2 + image: sameersbn/gitlab:15.6.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 33828d088..1e3f47e60 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.6.2 + image: sameersbn/gitlab:15.6.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 592f703b0..79e62c522 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.6.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.6.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.6.2 +docker pull sameersbn/gitlab:15.6.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.6.2 +sameersbn/gitlab:15.6.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 101dcecc5..edf7df18f 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.6.2 + image: sameersbn/gitlab:15.6.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index a33e74814..7800a0db1 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.6.2 + image: sameersbn/gitlab:15.6.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index cd09bcdb3..63fe5b823 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.6.2 + image: sameersbn/gitlab:15.6.3 env: - name: TZ value: Asia/Kolkata From c5cced2fdd0fdff3f630808b1a58e239853d90e2 Mon Sep 17 00:00:00 2001 From: antt1995 Date: Thu, 22 Dec 2022 16:01:07 +0000 Subject: [PATCH 257/522] Upgrade to GitLab CE 15.7.0 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 9d09b258b..ab9f6e4df 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.7.0** +- gitlab: upgrade CE to v15.7.0 +- gitaly: upgrade to v15.7.0 +- gitlab-pages: upgrade to v15.7.0 + **15.6.3** - gitlab: upgrade CE to v15.6.3 - gitaly: upgrade to v15.6.3 diff --git a/Dockerfile b/Dockerfile index bb8d65ea8..6bd30f102 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20221130 -ARG VERSION=15.6.3 +ARG VERSION=15.7.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.4 \ RUBY_SOURCE_SHA256SUM="70b47c207af04bce9acea262308fb42893d3e244f39a4abc586920a1c723722b" \ GOLANG_VERSION=1.18.8 \ GITLAB_SHELL_VERSION=14.13.0 \ - GITLAB_PAGES_VERSION=15.6.3 \ - GITALY_SERVER_VERSION=15.6.3 \ + GITLAB_PAGES_VERSION=15.7.0 \ + GITALY_SERVER_VERSION=15.7.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 158b3c7f0..5528cdf09 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.6.3 +# sameersbn/gitlab:15.7.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.6.3 +docker pull sameersbn/gitlab:15.7.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.6.3 + sameersbn/gitlab:15.7.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.6.3 + sameersbn/gitlab:15.7.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:15.6.3 + sameersbn/gitlab:15.7.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:15.6.3 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.6.3 + sameersbn/gitlab:15.7.0 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.6.3 + sameersbn/gitlab:15.7.0 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.6.3 + sameersbn/gitlab:15.7.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.6.3 + sameersbn/gitlab:15.7.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.6.3 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.6.3 + sameersbn/gitlab:15.7.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.6.3 + sameersbn/gitlab:15.7.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.6.3 + sameersbn/gitlab:15.7.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.6.3 + sameersbn/gitlab:15.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:15.6.3 app:sanitize + sameersbn/gitlab:15.7.0 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.3 app:rake db:setup + sameersbn/gitlab:15.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:15.6.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.6.3 app:rake gitlab:env:info + sameersbn/gitlab:15.7.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.7.0 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.7.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.6.3 +docker pull sameersbn/gitlab:15.7.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.6.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.7.0 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.6.3 + image: sameersbn/gitlab:15.7.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 3678b9342..3a3b50716 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.6.3 +15.7.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index a7e52abf9..85985b7b6 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.6.3 + image: sameersbn/gitlab:15.7.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 4c154d2dd..7bc1f2dab 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.6.3 + image: sameersbn/gitlab:15.7.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 1e3f47e60..f4f690348 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.6.3 + image: sameersbn/gitlab:15.7.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 79e62c522..35c81ae73 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.7.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.6.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.7.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.6.3 +docker pull sameersbn/gitlab:15.7.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.6.3 +sameersbn/gitlab:15.7.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index edf7df18f..c2eafa3a5 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.6.3 + image: sameersbn/gitlab:15.7.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 7800a0db1..6af50a1b9 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.6.3 + image: sameersbn/gitlab:15.7.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 63fe5b823..4f046a935 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.6.3 + image: sameersbn/gitlab:15.7.0 env: - name: TZ value: Asia/Kolkata From 8386b46009b849e6a220bb0c5596d5c8a29a5f7a Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Thu, 22 Dec 2022 21:06:27 +0000 Subject: [PATCH 258/522] Upgrade Ruby & Shell --- Changelog.md | 3 ++- Dockerfile | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Changelog.md b/Changelog.md index ab9f6e4df..ae809523d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,13 +6,14 @@ This file only reflects the changes that are made in this image. Please refer to - gitlab: upgrade CE to v15.7.0 - gitaly: upgrade to v15.7.0 - gitlab-pages: upgrade to v15.7.0 +- gitlab-shell: upgrade to v14.14.0 +- ruby: upgrade to v3.0.5 **15.6.3** - gitlab: upgrade CE to v15.6.3 - gitaly: upgrade to v15.6.3 - gitlab-pages: upgrade to v15.6.3 - ubuntu: upgrade to focal-20221130 - - ruby: upgrade to v2.7.7 - ruby: upgrade to v3.0.4 diff --git a/Dockerfile b/Dockerfile index 6bd30f102..ee83fd8df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,10 +3,10 @@ FROM ubuntu:focal-20221130 ARG VERSION=15.7.0 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=3.0.4 \ - RUBY_SOURCE_SHA256SUM="70b47c207af04bce9acea262308fb42893d3e244f39a4abc586920a1c723722b" \ + RUBY_VERSION=3.0.5 \ + RUBY_SOURCE_SHA256SUM="9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" \ GOLANG_VERSION=1.18.8 \ - GITLAB_SHELL_VERSION=14.13.0 \ + GITLAB_SHELL_VERSION=14.14.0 \ GITLAB_PAGES_VERSION=15.7.0 \ GITALY_SERVER_VERSION=15.7.0 \ GITLAB_USER="git" \ From d473f5f495267ba08dcd13f8e351bf8d94dcbad8 Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Fri, 6 Jan 2023 11:19:10 +0000 Subject: [PATCH 259/522] Upgrade to GitLab CE 15.7.1 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index ae809523d..554245493 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.7.1** +- gitlab: upgrade CE to v15.7.1 +- gitaly: upgrade to v15.7.1 +- gitlab-pages: upgrade to v15.7.1 + **15.7.0** - gitlab: upgrade CE to v15.7.0 - gitaly: upgrade to v15.7.0 diff --git a/Dockerfile b/Dockerfile index ee83fd8df..53f13cbd1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20221130 -ARG VERSION=15.7.0 +ARG VERSION=15.7.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.5 \ RUBY_SOURCE_SHA256SUM="9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" \ GOLANG_VERSION=1.18.8 \ GITLAB_SHELL_VERSION=14.14.0 \ - GITLAB_PAGES_VERSION=15.7.0 \ - GITALY_SERVER_VERSION=15.7.0 \ + GITLAB_PAGES_VERSION=15.7.1 \ + GITALY_SERVER_VERSION=15.7.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 5528cdf09..4504a355b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.7.0 +# sameersbn/gitlab:15.7.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.7.0 +docker pull sameersbn/gitlab:15.7.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.0 + sameersbn/gitlab:15.7.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.0 + sameersbn/gitlab:15.7.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:15.7.0 + sameersbn/gitlab:15.7.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:15.7.0 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.7.0 + sameersbn/gitlab:15.7.1 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.7.0 + sameersbn/gitlab:15.7.1 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.0 + sameersbn/gitlab:15.7.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.0 + sameersbn/gitlab:15.7.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.7.0 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.7.0 + sameersbn/gitlab:15.7.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.7.0 + sameersbn/gitlab:15.7.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.7.0 + sameersbn/gitlab:15.7.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.7.0 + sameersbn/gitlab:15.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:15.7.0 app:sanitize + sameersbn/gitlab:15.7.1 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.0 app:rake db:setup + sameersbn/gitlab:15.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:15.7.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.7.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.7.0 app:rake gitlab:env:info + sameersbn/gitlab:15.7.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.7.1 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.7.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.7.0 +docker pull sameersbn/gitlab:15.7.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.7.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.7.1 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.7.0 + image: sameersbn/gitlab:15.7.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 3a3b50716..38256ab5a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.7.0 +15.7.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 85985b7b6..a27704988 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.0 + image: sameersbn/gitlab:15.7.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 7bc1f2dab..2035a70ea 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.7.0 + image: sameersbn/gitlab:15.7.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index f4f690348..2d9652b74 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.0 + image: sameersbn/gitlab:15.7.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 35c81ae73..9a3d492f0 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.7.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.7.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.7.0 +docker pull sameersbn/gitlab:15.7.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.7.0 +sameersbn/gitlab:15.7.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index c2eafa3a5..e347a1182 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.0 + image: sameersbn/gitlab:15.7.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 6af50a1b9..9697b0874 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.0 + image: sameersbn/gitlab:15.7.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 4f046a935..b5df3b635 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.7.0 + image: sameersbn/gitlab:15.7.1 env: - name: TZ value: Asia/Kolkata From 30bb1b0a59dedfb62ae0865ae943b9d82a016def Mon Sep 17 00:00:00 2001 From: Antt1995 Date: Tue, 10 Jan 2023 01:18:10 +0000 Subject: [PATCH 260/522] Upgrade to GitLab CE 15.7.2 --- Changelog.md | 5 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 47 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 554245493..6983b62cb 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,11 @@ 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. +**15.7.2** +- gitlab: upgrade CE to v15.7.2 +- gitaly: upgrade to v15.7.2 +- gitlab-pages: upgrade to v15.7.2 + **15.7.1** - gitlab: upgrade CE to v15.7.1 - gitaly: upgrade to v15.7.1 diff --git a/Dockerfile b/Dockerfile index 53f13cbd1..5e122b5b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20221130 -ARG VERSION=15.7.1 +ARG VERSION=15.7.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.5 \ RUBY_SOURCE_SHA256SUM="9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" \ GOLANG_VERSION=1.18.8 \ GITLAB_SHELL_VERSION=14.14.0 \ - GITLAB_PAGES_VERSION=15.7.1 \ - GITALY_SERVER_VERSION=15.7.1 \ + GITLAB_PAGES_VERSION=15.7.2 \ + GITALY_SERVER_VERSION=15.7.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 4504a355b..d2cbaf0da 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.7.1 +# sameersbn/gitlab:15.7.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.7.1 +docker pull sameersbn/gitlab:15.7.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.1 + sameersbn/gitlab:15.7.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.1 + sameersbn/gitlab:15.7.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:15.7.1 + sameersbn/gitlab:15.7.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:15.7.1 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.7.1 + sameersbn/gitlab:15.7.2 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.7.1 + sameersbn/gitlab:15.7.2 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.1 + sameersbn/gitlab:15.7.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.1 + sameersbn/gitlab:15.7.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.7.1 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.7.1 + sameersbn/gitlab:15.7.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.7.1 + sameersbn/gitlab:15.7.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.7.1 + sameersbn/gitlab:15.7.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.7.1 + sameersbn/gitlab:15.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:15.7.1 app:sanitize + sameersbn/gitlab:15.7.2 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.1 app:rake db:setup + sameersbn/gitlab:15.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:15.7.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.7.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.7.1 app:rake gitlab:env:info + sameersbn/gitlab:15.7.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.7.2 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.7.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.7.1 +docker pull sameersbn/gitlab:15.7.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.7.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.7.2 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.7.1 + image: sameersbn/gitlab:15.7.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 38256ab5a..c5c8d0750 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.7.1 +15.7.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index a27704988..168aab27e 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.1 + image: sameersbn/gitlab:15.7.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 2035a70ea..5ec0a8ef5 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.7.1 + image: sameersbn/gitlab:15.7.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 2d9652b74..e8e08b682 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.1 + image: sameersbn/gitlab:15.7.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 9a3d492f0..5bed0cde0 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.7.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.7.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.7.1 +docker pull sameersbn/gitlab:15.7.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.7.1 +sameersbn/gitlab:15.7.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index e347a1182..822be28d8 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.1 + image: sameersbn/gitlab:15.7.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 9697b0874..fda910756 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.1 + image: sameersbn/gitlab:15.7.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index b5df3b635..624ca751c 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.7.1 + image: sameersbn/gitlab:15.7.2 env: - name: TZ value: Asia/Kolkata From 744448e8d0c6ae2f6f4d40b1ebc306cf458006a9 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 14 Jan 2023 14:03:05 +0100 Subject: [PATCH 261/522] Upgrade to GitLab CE 15.7.3 --- Changelog.md | 10 +++++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 6983b62cb..be7248ceb 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,17 +2,26 @@ 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. +**15.7.3** + +- gitlab: upgrade CE to v15.7.3 +- gitaly: upgrade to v15.7.3 +- gitlab-pages: upgrade to v15.7.3 + **15.7.2** + - gitlab: upgrade CE to v15.7.2 - gitaly: upgrade to v15.7.2 - gitlab-pages: upgrade to v15.7.2 **15.7.1** + - gitlab: upgrade CE to v15.7.1 - gitaly: upgrade to v15.7.1 - gitlab-pages: upgrade to v15.7.1 **15.7.0** + - gitlab: upgrade CE to v15.7.0 - gitaly: upgrade to v15.7.0 - gitlab-pages: upgrade to v15.7.0 @@ -20,6 +29,7 @@ This file only reflects the changes that are made in this image. Please refer to - ruby: upgrade to v3.0.5 **15.6.3** + - gitlab: upgrade CE to v15.6.3 - gitaly: upgrade to v15.6.3 - gitlab-pages: upgrade to v15.6.3 diff --git a/Dockerfile b/Dockerfile index 5e122b5b3..9ba5b84fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20221130 -ARG VERSION=15.7.2 +ARG VERSION=15.7.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.5 \ RUBY_SOURCE_SHA256SUM="9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" \ GOLANG_VERSION=1.18.8 \ GITLAB_SHELL_VERSION=14.14.0 \ - GITLAB_PAGES_VERSION=15.7.2 \ - GITALY_SERVER_VERSION=15.7.2 \ + GITLAB_PAGES_VERSION=15.7.3 \ + GITALY_SERVER_VERSION=15.7.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index d2cbaf0da..6622a6607 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.7.2 +# sameersbn/gitlab:15.7.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.7.2 +docker pull sameersbn/gitlab:15.7.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.2 + sameersbn/gitlab:15.7.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.2 + sameersbn/gitlab:15.7.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:15.7.2 + sameersbn/gitlab:15.7.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:15.7.2 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.7.2 + sameersbn/gitlab:15.7.3 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.7.2 + sameersbn/gitlab:15.7.3 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.2 + sameersbn/gitlab:15.7.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.2 + sameersbn/gitlab:15.7.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.7.2 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.7.2 + sameersbn/gitlab:15.7.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.7.2 + sameersbn/gitlab:15.7.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.7.2 + sameersbn/gitlab:15.7.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.7.2 + sameersbn/gitlab:15.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:15.7.2 app:sanitize + sameersbn/gitlab:15.7.3 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.2 app:rake db:setup + sameersbn/gitlab:15.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:15.7.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.7.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.7.2 app:rake gitlab:env:info + sameersbn/gitlab:15.7.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.7.3 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.7.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.7.2 +docker pull sameersbn/gitlab:15.7.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.7.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.7.3 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.7.2 + image: sameersbn/gitlab:15.7.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index c5c8d0750..93de1108e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.7.2 +15.7.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 168aab27e..2b09e6899 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.2 + image: sameersbn/gitlab:15.7.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 5ec0a8ef5..f07a932ab 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.7.2 + image: sameersbn/gitlab:15.7.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index e8e08b682..ab79632d1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.2 + image: sameersbn/gitlab:15.7.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 5bed0cde0..8f015df51 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.7.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.7.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.7.2 +docker pull sameersbn/gitlab:15.7.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.7.2 +sameersbn/gitlab:15.7.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 822be28d8..007ea9b64 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.2 + image: sameersbn/gitlab:15.7.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index fda910756..e3b1f92a8 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.2 + image: sameersbn/gitlab:15.7.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 624ca751c..040be9edd 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.7.2 + image: sameersbn/gitlab:15.7.3 env: - name: TZ value: Asia/Kolkata From 6b3dfc4d14e6d3998d8f60f5bf7cbd4f223016dd Mon Sep 17 00:00:00 2001 From: Ruben Silva Date: Wed, 18 Jan 2023 09:25:23 +0100 Subject: [PATCH 262/522] Upgrade to GitLab CE 15.7.5 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index be7248ceb..2b73b11e5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**15.7.5** + +- gitlab: upgrade CE to v15.7.5 +- gitaly: upgrade to v15.7.5 +- gitlab-pages: upgrade to v15.7.5 + **15.7.3** - gitlab: upgrade CE to v15.7.3 diff --git a/Dockerfile b/Dockerfile index 9ba5b84fa..7c68ad226 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20221130 -ARG VERSION=15.7.3 +ARG VERSION=15.7.5 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.5 \ RUBY_SOURCE_SHA256SUM="9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" \ GOLANG_VERSION=1.18.8 \ GITLAB_SHELL_VERSION=14.14.0 \ - GITLAB_PAGES_VERSION=15.7.3 \ - GITALY_SERVER_VERSION=15.7.3 \ + GITLAB_PAGES_VERSION=15.7.5 \ + GITALY_SERVER_VERSION=15.7.5 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 6622a6607..e6caf86b2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.7.3 +# sameersbn/gitlab:15.7.5 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.7.3 +docker pull sameersbn/gitlab:15.7.5 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.3 + sameersbn/gitlab:15.7.5 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.3 + sameersbn/gitlab:15.7.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:15.7.3 + sameersbn/gitlab:15.7.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:15.7.3 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.7.3 + sameersbn/gitlab:15.7.5 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.7.3 + sameersbn/gitlab:15.7.5 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.3 + sameersbn/gitlab:15.7.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.3 + sameersbn/gitlab:15.7.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.7.3 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.7.3 + sameersbn/gitlab:15.7.5 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.7.3 + sameersbn/gitlab:15.7.5 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.7.3 + sameersbn/gitlab:15.7.5 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.7.3 + sameersbn/gitlab:15.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:15.7.3 app:sanitize + sameersbn/gitlab:15.7.5 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.3 app:rake db:setup + sameersbn/gitlab:15.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:15.7.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.7.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.7.3 app:rake gitlab:env:info + sameersbn/gitlab:15.7.5 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.7.5 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.7.5 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.7.3 +docker pull sameersbn/gitlab:15.7.5 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.7.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.7.5 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.7.3 + image: sameersbn/gitlab:15.7.5 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 93de1108e..0d79499e7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.7.3 +15.7.5 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 2b09e6899..0877f9655 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.3 + image: sameersbn/gitlab:15.7.5 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index f07a932ab..ea5e9df98 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.7.3 + image: sameersbn/gitlab:15.7.5 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index ab79632d1..6750df56d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.3 + image: sameersbn/gitlab:15.7.5 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 8f015df51..cd225f36f 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.7.5 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.7.5 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.7.3 +docker pull sameersbn/gitlab:15.7.5 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.7.3 +sameersbn/gitlab:15.7.5 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 007ea9b64..d551c4358 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.3 + image: sameersbn/gitlab:15.7.5 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index e3b1f92a8..31e45e447 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.3 + image: sameersbn/gitlab:15.7.5 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 040be9edd..84c005152 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.7.3 + image: sameersbn/gitlab:15.7.5 env: - name: TZ value: Asia/Kolkata From 096085cd6c68bb4b63323d911e483ed3d71c75aa Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 22 Jan 2023 23:45:17 +0100 Subject: [PATCH 263/522] Upgrade to GitLab CE 15.8.0 --- Changelog.md | 8 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index 2b73b11e5..e78183c21 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,14 @@ 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. +**15.8.0** + +- gitlab: upgrade CE to v15.8.0 +- gitaly: upgrade to v15.8.0 +- gitlab-pages: upgrade to v15.8.0 +- gitlab-shell: upgrade to v14.15.0 +- golang: upgrade to v1.18.10 + **15.7.5** - gitlab: upgrade CE to v15.7.5 diff --git a/Dockerfile b/Dockerfile index 7c68ad226..3d6d4c574 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20221130 -ARG VERSION=15.7.5 +ARG VERSION=15.8.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.5 \ RUBY_SOURCE_SHA256SUM="9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" \ - GOLANG_VERSION=1.18.8 \ - GITLAB_SHELL_VERSION=14.14.0 \ - GITLAB_PAGES_VERSION=15.7.5 \ - GITALY_SERVER_VERSION=15.7.5 \ + GOLANG_VERSION=1.18.10 \ + GITLAB_SHELL_VERSION=14.15.0 \ + GITLAB_PAGES_VERSION=15.8.0 \ + GITALY_SERVER_VERSION=15.8.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index e6caf86b2..539f51763 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.7.5 +# sameersbn/gitlab:15.8.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.7.5 +docker pull sameersbn/gitlab:15.8.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.5 + sameersbn/gitlab:15.8.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.5 + sameersbn/gitlab:15.8.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:15.7.5 + sameersbn/gitlab:15.8.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:15.7.5 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.7.5 + sameersbn/gitlab:15.8.0 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.7.5 + sameersbn/gitlab:15.8.0 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.5 + sameersbn/gitlab:15.8.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.7.5 + sameersbn/gitlab:15.8.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.7.5 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.7.5 + sameersbn/gitlab:15.8.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.7.5 + sameersbn/gitlab:15.8.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.7.5 + sameersbn/gitlab:15.8.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.7.5 + sameersbn/gitlab:15.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:15.7.5 app:sanitize + sameersbn/gitlab:15.8.0 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.5 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.5 app:rake db:setup + sameersbn/gitlab:15.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:15.7.5 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.7.5 app:rake gitlab:env:info + sameersbn/gitlab:15.8.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.5 app:rake gitlab:import:repos + sameersbn/gitlab:15.8.0 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.5 app:rake gitlab:import:repos + sameersbn/gitlab:15.8.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.7.5 +docker pull sameersbn/gitlab:15.8.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.7.5 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.8.0 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.7.5 + image: sameersbn/gitlab:15.8.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 0d79499e7..acabd5c12 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.7.5 +15.8.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 0877f9655..199a15b2b 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.5 + image: sameersbn/gitlab:15.8.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index ea5e9df98..d1c3d06a9 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.7.5 + image: sameersbn/gitlab:15.8.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 6750df56d..2b298a6ba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.5 + image: sameersbn/gitlab:15.8.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index cd225f36f..602786ff7 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.5 app:rake gitlab:backup:create + sameersbn/gitlab:15.8.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.5 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.7.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.8.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.7.5 +docker pull sameersbn/gitlab:15.8.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.7.5 +sameersbn/gitlab:15.8.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index d551c4358..fd6ad331e 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.5 + image: sameersbn/gitlab:15.8.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 31e45e447..f1600b53d 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.7.5 + image: sameersbn/gitlab:15.8.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 84c005152..d7a83548c 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.7.5 + image: sameersbn/gitlab:15.8.0 env: - name: TZ value: Asia/Kolkata From 660202fcd0f26856e37a5af8306ab5b2015166f6 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura <33391846+kkimurak@users.noreply.github.com> Date: Tue, 24 Jan 2023 18:42:54 +0900 Subject: [PATCH 264/522] Rollback Ruby to v2.7.7 sameersbn/docker-gitlab#2698 Roll back to 364df4c81d966cebfd6858b9b85f40afae4a4ff4 (v2.7.6 -> v2.7.7) - Partially revert 8386b46009b849e6a220bb0c5596d5c8a29a5f7a (v3.0.4 -> v3.0.5) - Revert 988cb396fb484ef4b684469916dd654965fea6d5 (v2.7.7 -> v3.0.4) Affected releases are: v15.8.0, all v15.7.x and v15.6.x (15.6.3 or later) --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3d6d4c574..b1ef6e257 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ FROM ubuntu:focal-20221130 ARG VERSION=15.8.0 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=3.0.5 \ - RUBY_SOURCE_SHA256SUM="9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" \ + RUBY_VERSION=2.7.7 \ + RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \ GOLANG_VERSION=1.18.10 \ GITLAB_SHELL_VERSION=14.15.0 \ GITLAB_PAGES_VERSION=15.8.0 \ From 9abad29f24b469db3eec140b97cbcb1761a5fcac Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 25 Jan 2023 19:17:54 +0100 Subject: [PATCH 265/522] Update Changelog.md --- Changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Changelog.md b/Changelog.md index e78183c21..780e09c7e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,10 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +**15.8.0-1** + +- ruby: rollback to v2.7.7 + **15.8.0** - gitlab: upgrade CE to v15.8.0 From 991281c9fc175736e51255092e9073c2c8399bc6 Mon Sep 17 00:00:00 2001 From: Ruben Silva Date: Wed, 1 Feb 2023 07:42:28 +0100 Subject: [PATCH 266/522] Upgrade to GitLab CE 15.8.1 --- Changelog.md | 14 +++++-- Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 46 deletions(-) diff --git a/Changelog.md b/Changelog.md index 780e09c7e..a841633dc 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,15 +2,21 @@ 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. +**15.8.1** + +- gitlab: upgrade CE to v15.8.1 +- gitaly: upgrade to v15.8.1 +- gitlab-pages: upgrade to v15.8.1 + **15.8.0-1** - ruby: rollback to v2.7.7 -**15.8.0** +**15.8.1** -- gitlab: upgrade CE to v15.8.0 -- gitaly: upgrade to v15.8.0 -- gitlab-pages: upgrade to v15.8.0 +- gitlab: upgrade CE to v15.8.1 +- gitaly: upgrade to v15.8.1 +- gitlab-pages: upgrade to v15.8.1 - gitlab-shell: upgrade to v14.15.0 - golang: upgrade to v1.18.10 diff --git a/Dockerfile b/Dockerfile index b1ef6e257..203ea57e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20221130 -ARG VERSION=15.8.0 +ARG VERSION=15.8.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.7 \ RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \ GOLANG_VERSION=1.18.10 \ GITLAB_SHELL_VERSION=14.15.0 \ - GITLAB_PAGES_VERSION=15.8.0 \ - GITALY_SERVER_VERSION=15.8.0 \ + GITLAB_PAGES_VERSION=15.8.1 \ + GITALY_SERVER_VERSION=15.8.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 539f51763..1e43c95b5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.8.0 +# sameersbn/gitlab:15.8.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.8.0 +docker pull sameersbn/gitlab:15.8.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.8.0 + sameersbn/gitlab:15.8.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.8.0 + sameersbn/gitlab:15.8.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:15.8.0 + sameersbn/gitlab:15.8.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:15.8.0 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.8.0 + sameersbn/gitlab:15.8.1 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.8.0 + sameersbn/gitlab:15.8.1 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.8.0 + sameersbn/gitlab:15.8.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.8.0 + sameersbn/gitlab:15.8.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.8.0 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.8.0 + sameersbn/gitlab:15.8.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.8.0 + sameersbn/gitlab:15.8.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.8.0 + sameersbn/gitlab:15.8.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.8.0 + sameersbn/gitlab:15.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:15.8.0 app:sanitize + sameersbn/gitlab:15.8.1 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.0 app:rake db:setup + sameersbn/gitlab:15.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:15.8.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.8.0 app:rake gitlab:env:info + sameersbn/gitlab:15.8.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.8.1 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.8.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.8.0 +docker pull sameersbn/gitlab:15.8.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.8.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.8.1 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.8.0 + image: sameersbn/gitlab:15.8.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index acabd5c12..873bea49d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.8.0 +15.8.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 199a15b2b..ef92e8601 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.8.0 + image: sameersbn/gitlab:15.8.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index d1c3d06a9..05f2c2ffc 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.8.0 + image: sameersbn/gitlab:15.8.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 2b298a6ba..2114aa40f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.8.0 + image: sameersbn/gitlab:15.8.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 602786ff7..0d53ada32 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.8.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.8.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.8.0 +docker pull sameersbn/gitlab:15.8.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.8.0 +sameersbn/gitlab:15.8.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index fd6ad331e..7a18c8f12 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.8.0 + image: sameersbn/gitlab:15.8.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index f1600b53d..c26fb276e 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.8.0 + image: sameersbn/gitlab:15.8.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index d7a83548c..b24bdd048 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.8.0 + image: sameersbn/gitlab:15.8.1 env: - name: TZ value: Asia/Kolkata From d84cf4ad47917e4d40b9086bced24ee806bbf5ab Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 1 Feb 2023 15:43:13 +0100 Subject: [PATCH 267/522] Update Changelog.md --- Changelog.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Changelog.md b/Changelog.md index a841633dc..3ec8a1c9f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -12,11 +12,11 @@ This file only reflects the changes that are made in this image. Please refer to - ruby: rollback to v2.7.7 -**15.8.1** +**15.8.0** -- gitlab: upgrade CE to v15.8.1 -- gitaly: upgrade to v15.8.1 -- gitlab-pages: upgrade to v15.8.1 +- gitlab: upgrade CE to v15.8.0 +- gitaly: upgrade to v15.8.0 +- gitlab-pages: upgrade to v15.8.0 - gitlab-shell: upgrade to v14.15.0 - golang: upgrade to v1.18.10 From 6e7c15466a229f79d3f4e94fa0ba3ba181ca49e0 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 1 Feb 2023 15:44:23 +0100 Subject: [PATCH 268/522] Use newer docker baseimage --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 203ea57e4..cbecb80f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20221130 +FROM ubuntu:focal-20230126 ARG VERSION=15.8.1 From ab73d1c2b8a9b3dccf1e95172b2139ff9b078d4d Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 1 Feb 2023 15:46:57 +0100 Subject: [PATCH 269/522] Update Changelog.md --- Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog.md b/Changelog.md index 3ec8a1c9f..f69e6383c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,7 @@ This file only reflects the changes that are made in this image. Please refer to - gitlab: upgrade CE to v15.8.1 - gitaly: upgrade to v15.8.1 - gitlab-pages: upgrade to v15.8.1 +- ubuntu: upgrade to focal-20230126 **15.8.0-1** From 9b6ec634c900c7972c64f41648a2629f6b90da00 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 17 Feb 2023 07:41:37 +0100 Subject: [PATCH 270/522] Upgrade to GitLab CE 15.8.2 --- Changelog.md | 6 +++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 49 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index f69e6383c..2761d15f5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**15.8.2** + +- gitlab: upgrade CE to v15.8.1 +- gitaly: upgrade to v15.8.1 +- golang: upgrade to v1.19.6 + **15.8.1** - gitlab: upgrade CE to v15.8.1 diff --git a/Dockerfile b/Dockerfile index cbecb80f5..406d4ac49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230126 -ARG VERSION=15.8.1 +ARG VERSION=15.8.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.7 \ RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \ - GOLANG_VERSION=1.18.10 \ + GOLANG_VERSION=1.19.6 \ GITLAB_SHELL_VERSION=14.15.0 \ - GITLAB_PAGES_VERSION=15.8.1 \ - GITALY_SERVER_VERSION=15.8.1 \ + GITLAB_PAGES_VERSION=15.8.2 \ + GITALY_SERVER_VERSION=15.8.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 1e43c95b5..66a477933 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.8.1 +# sameersbn/gitlab:15.8.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.8.1 +docker pull sameersbn/gitlab:15.8.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.8.1 + sameersbn/gitlab:15.8.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.8.1 + sameersbn/gitlab:15.8.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:15.8.1 + sameersbn/gitlab:15.8.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:15.8.1 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.8.1 + sameersbn/gitlab:15.8.2 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.8.1 + sameersbn/gitlab:15.8.2 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.8.1 + sameersbn/gitlab:15.8.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.8.1 + sameersbn/gitlab:15.8.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.8.1 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.8.1 + sameersbn/gitlab:15.8.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.8.1 + sameersbn/gitlab:15.8.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.8.1 + sameersbn/gitlab:15.8.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.8.1 + sameersbn/gitlab:15.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:15.8.1 app:sanitize + sameersbn/gitlab:15.8.2 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.1 app:rake db:setup + sameersbn/gitlab:15.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:15.8.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.8.1 app:rake gitlab:env:info + sameersbn/gitlab:15.8.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.8.2 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.8.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.8.1 +docker pull sameersbn/gitlab:15.8.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.8.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.8.2 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.8.1 + image: sameersbn/gitlab:15.8.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 873bea49d..6ea50a00f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.8.1 +15.8.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index ef92e8601..b64f75e46 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.8.1 + image: sameersbn/gitlab:15.8.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 05f2c2ffc..2318f2371 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.8.1 + image: sameersbn/gitlab:15.8.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 2114aa40f..9e72febae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.8.1 + image: sameersbn/gitlab:15.8.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 0d53ada32..cdb4ce138 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.8.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.8.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.8.1 +docker pull sameersbn/gitlab:15.8.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.8.1 +sameersbn/gitlab:15.8.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 7a18c8f12..516027ec6 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.8.1 + image: sameersbn/gitlab:15.8.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index c26fb276e..95245c730 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.8.1 + image: sameersbn/gitlab:15.8.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index b24bdd048..b7ef3624d 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.8.1 + image: sameersbn/gitlab:15.8.2 env: - name: TZ value: Asia/Kolkata From c8f2ed3ded34ec4f86a25b84a6ddde794239588d Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 17 Feb 2023 07:54:17 +0100 Subject: [PATCH 271/522] Fix Changelog --- Changelog.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index 2761d15f5..50fee12d0 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,8 +4,9 @@ This file only reflects the changes that are made in this image. Please refer to **15.8.2** -- gitlab: upgrade CE to v15.8.1 -- gitaly: upgrade to v15.8.1 +- gitlab: upgrade CE to v15.8.2 +- gitaly: upgrade to v15.8.2 +- gitlab-pages: upgrade to v15.8.2 - golang: upgrade to v1.19.6 **15.8.1** From 255ec9461a61d8fbe92e79112abf75e539a69539 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Wed, 22 Feb 2023 03:58:27 +0900 Subject: [PATCH 272/522] Increase default SIDEKIQ_MEMORY_KILLER_MAX_RSS to 2GB There are many warnings like below recorded in {GITLAB_LOG_DIR}/supervisord/sidekiq.log. This can be avoided by simply increasing SIDEKIQ_MEMORY_KILLER_MAX_RSS. ---- { "severity": "WARN", "time": "[MASKED]", "class": "Gitlab::SidekiqDaemon::MemoryKiller", "pid": [MASKED], "message": "Sidekiq worker RSS out of range", "current_rss": 1009636, "soft_limit_rss": 1000000, "hard_limit_rss": [MASKED], "memory_total_kb": [MASKED], "reason": "current_rss(1009636) \u003e soft_limit_rss(1000000)", "running_jobs": [], "retry": 0 } ---- For sameersbn/gitlab, this parameter have been introduced with following commit on May 21, 2015 and never updated until today: e4008cc7ab9efd626511af4c43e52e2a9490d612 On upstream, the default setting documentation is updated here: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31682 but it is said "the documentation is outdated" at this time. I could not find out when the value is increased. At least, In omnibus-gitlab, this have been introduced in MR 2360 (release 11.10.0+ce.0 / 11.10.0+ee.0) https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/2360 --- README.md | 2 +- assets/runtime/env-defaults | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 66a477933..693ef7742 100644 --- a/README.md +++ b/README.md @@ -1746,7 +1746,7 @@ 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) +Non-zero value enables the SidekiqMemoryKiller. Defaults to `2000000`. For additional options refer [Configuring the MemoryKiller](http://doc.gitlab.com/ce/operations/sidekiq_memory_killer.html) ##### `GITLAB_SIDEKIQ_LOG_FORMAT` diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 46624eafc..deab8a2a8 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -62,7 +62,7 @@ REDIS_DB_NUMBER=${REDIS_DB_NUMBER:-0} ## SIDEKIQ SIDEKIQ_SHUTDOWN_TIMEOUT=${SIDEKIQ_SHUTDOWN_TIMEOUT:-4} SIDEKIQ_CONCURRENCY=${SIDEKIQ_CONCURRENCY:-25} -SIDEKIQ_MEMORY_KILLER_MAX_RSS=${SIDEKIQ_MEMORY_KILLER_MAX_RSS:-1000000} +SIDEKIQ_MEMORY_KILLER_MAX_RSS=${SIDEKIQ_MEMORY_KILLER_MAX_RSS:-2000000} GITLAB_SIDEKIQ_LOG_FORMAT=${GITLAB_SIDEKIQ_LOG_FORMAT:-json} ## PUMA From af9e984fd6156f314070a44dbf968894a79b1a6b Mon Sep 17 00:00:00 2001 From: Sam Mosleh Date: Wed, 22 Feb 2023 14:29:55 +0300 Subject: [PATCH 273/522] Mount /tmp/builds from host to runners --- docs/docker-swarm-traefik-registry.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/docker-swarm-traefik-registry.md b/docs/docker-swarm-traefik-registry.md index cf6f479dc..671bd7f55 100644 --- a/docs/docker-swarm-traefik-registry.md +++ b/docs/docker-swarm-traefik-registry.md @@ -331,6 +331,7 @@ docker run -d \ --name gitlab-runner \ --restart always \ -v gitlab-runner:/etc/gitlab-runner \ + -v /tmp/builds:/tmp/builds \ -v /var/run/docker.sock:/var/run/docker.sock \ gitlab/gitlab-runner:latest ``` @@ -363,7 +364,11 @@ gitlab-runner \ register -n \ --name "Docker Runner" \ --executor docker \ + --locked false \ + --access-level not_protected \ + --builds-dir /tmp/builds \ --docker-image docker:latest \ + --docker-volumes /tmp/builds:/tmp/builds --docker-volumes /var/run/docker.sock:/var/run/docker.sock \ --url $GITLAB_URL \ --registration-token $GITLAB_TOKEN \ From 10a48c1541489e4248253aa1513056f82ddcb9e6 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Wed, 22 Feb 2023 04:55:17 +0900 Subject: [PATCH 274/522] Clarify user=root in supervisord.conf to prevent "Supervisor running as root" warning --- assets/build/install.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/build/install.sh b/assets/build/install.sh index 0d16848d7..46537070c 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -251,6 +251,10 @@ echo "UseDNS no" >> /etc/ssh/sshd_config # move supervisord.log file to ${GITLAB_LOG_DIR}/supervisor/ sed -i "s|^[#]*logfile=.*|logfile=${GITLAB_LOG_DIR}/supervisor/supervisord.log ;|" /etc/supervisor/supervisord.conf +# prevent confusing warning "CRIT Supervisor running as root" by clarify run as root +# user not defined in supervisord.conf by default, so just append it after [supervisord] block +sed -i "/\[supervisord\]/a user=root" /etc/supervisor/supervisord.conf + # move nginx logs to ${GITLAB_LOG_DIR}/nginx sed -i \ -e "s|access_log /var/log/nginx/access.log;|access_log ${GITLAB_LOG_DIR}/nginx/access.log;|" \ From a1dcfe6eaf6436e9ff668e39dcf49a4d5efe1c92 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Wed, 22 Feb 2023 04:24:00 +0900 Subject: [PATCH 275/522] Update sidekiq supervisord config; sidekiq v6.0 Sidekiq is updated to v6.0 here (first contained tag: v14.4.0-ee) https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69655 In Sidekiq 6.0, these options have been marked as "deprecated": -P (set pid file) -L (set log file) See https://github.com/sidekiq/sidekiq/commit/3f5b1c5 Now, we can see error message in {GITLAB_LOGS_DIR}/supervisor/sidekiq.log like below: ---- ERROR: PID file creation was removed in Sidekiq 6.0, please use a proper process supervisor to start and manage your services ERROR: Logfile redirection was removed in Sidekiq 6.0, Sidekiq will only log to STDOUT ---- Just stop using this option. --- assets/build/install.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index 46537070c..774aaa6af 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -353,8 +353,6 @@ command=bundle exec sidekiq -c {{SIDEKIQ_CONCURRENCY}} -C ${GITLAB_INSTALL_DIR}/config/sidekiq_queues.yml -e ${RAILS_ENV} -t {{SIDEKIQ_SHUTDOWN_TIMEOUT}} - -P ${GITLAB_INSTALL_DIR}/tmp/pids/sidekiq.pid - -L ${GITLAB_INSTALL_DIR}/log/sidekiq.log user=git autostart=true autorestart=true From 1ddbbffa87a016b0547dc4f7d16c8a9ea494d1f6 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 25 Feb 2023 09:04:25 +0100 Subject: [PATCH 276/522] Upgrade to GitLab CE 15.9.0 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 50fee12d0..09e615236 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**15.9.0** + +- gitlab: upgrade CE to v15.9.0 +- gitaly: upgrade to v15.9.0 +- gitlab-pages: upgrade to v15.9.0 +- gitlab-shell: upgrade to v14.17.0 + **15.8.2** - gitlab: upgrade CE to v15.8.2 diff --git a/Dockerfile b/Dockerfile index 406d4ac49..b9c3305a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230126 -ARG VERSION=15.8.2 +ARG VERSION=15.9.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.7 \ RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \ GOLANG_VERSION=1.19.6 \ - GITLAB_SHELL_VERSION=14.15.0 \ - GITLAB_PAGES_VERSION=15.8.2 \ - GITALY_SERVER_VERSION=15.8.2 \ + GITLAB_SHELL_VERSION=14.17.0 \ + GITLAB_PAGES_VERSION=15.9.0 \ + GITALY_SERVER_VERSION=15.9.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 66a477933..a5320278f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.8.2 +# sameersbn/gitlab:15.9.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.8.2 +docker pull sameersbn/gitlab:15.9.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.8.2 + sameersbn/gitlab:15.9.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.8.2 + sameersbn/gitlab:15.9.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:15.8.2 + sameersbn/gitlab:15.9.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:15.8.2 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.8.2 + sameersbn/gitlab:15.9.0 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.8.2 + sameersbn/gitlab:15.9.0 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.8.2 + sameersbn/gitlab:15.9.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.8.2 + sameersbn/gitlab:15.9.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.8.2 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.8.2 + sameersbn/gitlab:15.9.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.8.2 + sameersbn/gitlab:15.9.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.8.2 + sameersbn/gitlab:15.9.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.8.2 + sameersbn/gitlab:15.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:15.8.2 app:sanitize + sameersbn/gitlab:15.9.0 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.2 app:rake db:setup + sameersbn/gitlab:15.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:15.8.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.8.2 app:rake gitlab:env:info + sameersbn/gitlab:15.9.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.9.0 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.9.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.8.2 +docker pull sameersbn/gitlab:15.9.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.8.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.9.0 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.8.2 + image: sameersbn/gitlab:15.9.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 6ea50a00f..26268b586 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.8.2 +15.9.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index b64f75e46..93f302030 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.8.2 + image: sameersbn/gitlab:15.9.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 2318f2371..87efa247a 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.8.2 + image: sameersbn/gitlab:15.9.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 9e72febae..10e7d8d2b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.8.2 + image: sameersbn/gitlab:15.9.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index cdb4ce138..94951a0cd 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.9.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.8.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.9.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.8.2 +docker pull sameersbn/gitlab:15.9.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.8.2 +sameersbn/gitlab:15.9.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 516027ec6..96b2f08fd 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.8.2 + image: sameersbn/gitlab:15.9.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 95245c730..2881be5b7 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.8.2 + image: sameersbn/gitlab:15.9.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index b7ef3624d..1bd59c7ee 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.8.2 + image: sameersbn/gitlab:15.9.0 env: - name: TZ value: Asia/Kolkata From 7e2632746ada6fa812612aa32664643f0a1db081 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 25 Feb 2023 09:51:09 +0100 Subject: [PATCH 277/522] Upgrade to GitLab CE 15.9.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 09e615236..cf730b364 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**15.9.1** + +- gitlab: upgrade CE to v15.9.1 +- gitaly: upgrade to v15.9.1 +- gitlab-pages: upgrade to v15.9.1 + **15.9.0** - gitlab: upgrade CE to v15.9.0 diff --git a/Dockerfile b/Dockerfile index b9c3305a7..97ababe1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230126 -ARG VERSION=15.9.0 +ARG VERSION=15.9.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.7 \ RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \ GOLANG_VERSION=1.19.6 \ GITLAB_SHELL_VERSION=14.17.0 \ - GITLAB_PAGES_VERSION=15.9.0 \ - GITALY_SERVER_VERSION=15.9.0 \ + GITLAB_PAGES_VERSION=15.9.1 \ + GITALY_SERVER_VERSION=15.9.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index a5320278f..1adaefc58 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.9.0 +# sameersbn/gitlab:15.9.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.9.0 +docker pull sameersbn/gitlab:15.9.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.9.0 + sameersbn/gitlab:15.9.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.9.0 + sameersbn/gitlab:15.9.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:15.9.0 + sameersbn/gitlab:15.9.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:15.9.0 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.9.0 + sameersbn/gitlab:15.9.1 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.9.0 + sameersbn/gitlab:15.9.1 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.9.0 + sameersbn/gitlab:15.9.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.9.0 + sameersbn/gitlab:15.9.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.9.0 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.9.0 + sameersbn/gitlab:15.9.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.9.0 + sameersbn/gitlab:15.9.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.9.0 + sameersbn/gitlab:15.9.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.9.0 + sameersbn/gitlab:15.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:15.9.0 app:sanitize + sameersbn/gitlab:15.9.1 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.0 app:rake db:setup + sameersbn/gitlab:15.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:15.9.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.9.0 app:rake gitlab:env:info + sameersbn/gitlab:15.9.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.9.1 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.9.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.9.0 +docker pull sameersbn/gitlab:15.9.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.9.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.9.1 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.9.0 + image: sameersbn/gitlab:15.9.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 26268b586..0609f86d5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.9.0 +15.9.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 93f302030..5c760a675 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.9.0 + image: sameersbn/gitlab:15.9.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 87efa247a..ee165a3e5 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.9.0 + image: sameersbn/gitlab:15.9.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 10e7d8d2b..36515fe5a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.9.0 + image: sameersbn/gitlab:15.9.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 94951a0cd..262702fd6 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.9.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.9.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.9.0 +docker pull sameersbn/gitlab:15.9.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.9.0 +sameersbn/gitlab:15.9.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 96b2f08fd..6b2b94336 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.9.0 + image: sameersbn/gitlab:15.9.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 2881be5b7..fb0b3c485 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.9.0 + image: sameersbn/gitlab:15.9.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 1bd59c7ee..5aef04329 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.9.0 + image: sameersbn/gitlab:15.9.1 env: - name: TZ value: Asia/Kolkata From bb1af3a06755b4176efced559e02c0a3c71733ad Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Mon, 6 Mar 2023 20:14:30 +0100 Subject: [PATCH 278/522] Upgrade to GitLab CE 15.9.2 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index cf730b364..9f8680deb 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**15.9.2** + +- gitlab: upgrade CE to v15.9.2 +- gitaly: upgrade to v15.9.2 +- gitlab-pages: upgrade to v15.9.2 +- ubuntu: upgrade to focal-20230301 + **15.9.1** - gitlab: upgrade CE to v15.9.1 diff --git a/Dockerfile b/Dockerfile index 97ababe1a..119b8ab02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20230126 +FROM ubuntu:focal-20230301 -ARG VERSION=15.9.1 +ARG VERSION=15.9.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.7 \ RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \ GOLANG_VERSION=1.19.6 \ GITLAB_SHELL_VERSION=14.17.0 \ - GITLAB_PAGES_VERSION=15.9.1 \ - GITALY_SERVER_VERSION=15.9.1 \ + GITLAB_PAGES_VERSION=15.9.2 \ + GITALY_SERVER_VERSION=15.9.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 1adaefc58..5f4974af6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.9.1 +# sameersbn/gitlab:15.9.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.9.1 +docker pull sameersbn/gitlab:15.9.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.9.1 + sameersbn/gitlab:15.9.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.9.1 + sameersbn/gitlab:15.9.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:15.9.1 + sameersbn/gitlab:15.9.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:15.9.1 + sameersbn/gitlab:15.9.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.9.1 + sameersbn/gitlab:15.9.2 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.9.1 + sameersbn/gitlab:15.9.2 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.9.1 + sameersbn/gitlab:15.9.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.9.1 + sameersbn/gitlab:15.9.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.9.1 + sameersbn/gitlab:15.9.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. @@ -507,7 +507,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:15.9.1 + sameersbn/gitlab:15.9.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.9.1 + sameersbn/gitlab:15.9.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.9.1 + sameersbn/gitlab:15.9.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.9.1 + sameersbn/gitlab:15.9.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:15.9.1 app:sanitize + sameersbn/gitlab:15.9.2 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.9.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.1 app:rake db:setup + sameersbn/gitlab:15.9.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:15.9.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.9.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.9.1 app:rake gitlab:env:info + sameersbn/gitlab:15.9.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.9.2 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.9.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.9.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:15.9.1 +docker pull sameersbn/gitlab:15.9.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.9.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.9.2 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.9.1 + image: sameersbn/gitlab:15.9.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 0609f86d5..3390913b7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.9.1 +15.9.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 5c760a675..47aa2b4d4 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.9.1 + image: sameersbn/gitlab:15.9.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index ee165a3e5..c4b63fe91 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.9.1 + image: sameersbn/gitlab:15.9.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 36515fe5a..e206668c4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.9.1 + image: sameersbn/gitlab:15.9.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 262702fd6..233283d3e 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.9.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.9.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.9.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.9.1 +docker pull sameersbn/gitlab:15.9.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.9.1 +sameersbn/gitlab:15.9.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 6b2b94336..ea4def88d 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.9.1 + image: sameersbn/gitlab:15.9.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index fb0b3c485..eb8bd7be5 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.9.1 + image: sameersbn/gitlab:15.9.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 5aef04329..30e8407b3 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.9.1 + image: sameersbn/gitlab:15.9.2 env: - name: TZ value: Asia/Kolkata From 7b37de25687424b18ae0a402a631d8949e7146a5 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Mon, 13 Mar 2023 00:23:15 +0100 Subject: [PATCH 279/522] Upgrade GitLab CE to 15.9.3 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 9f8680deb..a4f3e61e5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**15.9.3** + +- gitlab: upgrade CE to v15.9.3 +- gitaly: upgrade to v15.9.3 +- gitlab-pages: upgrade to v15.9.3 +- golang: upgrade to v1.20.2 + **15.9.2** - gitlab: upgrade CE to v15.9.2 diff --git a/Dockerfile b/Dockerfile index 119b8ab02..c2164122d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230301 -ARG VERSION=15.9.2 +ARG VERSION=15.9.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.7 \ RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \ - GOLANG_VERSION=1.19.6 \ + GOLANG_VERSION=1.20.2 \ GITLAB_SHELL_VERSION=14.17.0 \ - GITLAB_PAGES_VERSION=15.9.2 \ - GITALY_SERVER_VERSION=15.9.2 \ + GITLAB_PAGES_VERSION=15.9.3 \ + GITALY_SERVER_VERSION=15.9.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 62ab70c7a..068950b77 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.9.2 +# sameersbn/gitlab:15.9.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.9.2 +docker pull sameersbn/gitlab:15.9.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.9.2 + sameersbn/gitlab:15.9.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.9.2 + sameersbn/gitlab:15.9.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:15.9.2 + sameersbn/gitlab:15.9.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:15.9.2 + sameersbn/gitlab:15.9.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.9.2 + sameersbn/gitlab:15.9.3 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.9.2 + sameersbn/gitlab:15.9.3 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.9.2 + sameersbn/gitlab:15.9.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.9.2 + sameersbn/gitlab:15.9.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.9.2 + sameersbn/gitlab:15.9.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. @@ -507,7 +507,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:15.9.2 + sameersbn/gitlab:15.9.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.9.2 + sameersbn/gitlab:15.9.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.9.2 + sameersbn/gitlab:15.9.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.9.2 + sameersbn/gitlab:15.9.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:15.9.2 app:sanitize + sameersbn/gitlab:15.9.3 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.9.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.2 app:rake db:setup + sameersbn/gitlab:15.9.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:15.9.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.9.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.9.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.9.2 app:rake gitlab:env:info + sameersbn/gitlab:15.9.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.9.3 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.9.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.9.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:15.9.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:15.9.2 +docker pull sameersbn/gitlab:15.9.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.9.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.9.3 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.9.2 + image: sameersbn/gitlab:15.9.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 3390913b7..9a3465a25 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.9.2 +15.9.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 47aa2b4d4..998e8a3c1 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.9.2 + image: sameersbn/gitlab:15.9.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index c4b63fe91..871d314bb 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.9.2 + image: sameersbn/gitlab:15.9.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index e206668c4..70d6da8b0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.9.2 + image: sameersbn/gitlab:15.9.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 233283d3e..153a7f9de 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.9.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.9.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.9.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.9.2 +docker pull sameersbn/gitlab:15.9.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.9.2 +sameersbn/gitlab:15.9.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index ea4def88d..23f443f5e 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.9.2 + image: sameersbn/gitlab:15.9.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index eb8bd7be5..89a8e8805 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.9.2 + image: sameersbn/gitlab:15.9.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 30e8407b3..10fc0aff7 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.9.2 + image: sameersbn/gitlab:15.9.3 env: - name: TZ value: Asia/Kolkata From 268af6625968b8e1747585b0b54ba4f9c3f6ae2f Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 23 Mar 2023 20:24:45 +0100 Subject: [PATCH 280/522] Upgrade GitLab CE to 15.10.0 --- Changelog.md | 8 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index a4f3e61e5..5272b9550 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,14 @@ 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. +**15.10.0** + +- gitlab: upgrade CE to v15.10.0 +- gitaly: upgrade to v15.10.0 +- gitlab-pages: upgrade to v15.10.0 +- gitlab-shell: upgrade to v14.18.0 +- ubuntu: upgrade to focal-20230308 + **15.9.3** - gitlab: upgrade CE to v15.9.3 diff --git a/Dockerfile b/Dockerfile index c2164122d..e66ff840d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20230301 +FROM ubuntu:focal-20230308 -ARG VERSION=15.9.3 +ARG VERSION=15.10.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.7 \ RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \ GOLANG_VERSION=1.20.2 \ - GITLAB_SHELL_VERSION=14.17.0 \ - GITLAB_PAGES_VERSION=15.9.3 \ - GITALY_SERVER_VERSION=15.9.3 \ + GITLAB_SHELL_VERSION=14.18.0 \ + GITLAB_PAGES_VERSION=15.10.0 \ + GITALY_SERVER_VERSION=15.10.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 068950b77..af3cd633d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.9.3 +# sameersbn/gitlab:15.10.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.9.3 +docker pull sameersbn/gitlab:15.10.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.9.3 + sameersbn/gitlab:15.10.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.9.3 + sameersbn/gitlab:15.10.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:15.9.3 + sameersbn/gitlab:15.10.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:15.9.3 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.9.3 + sameersbn/gitlab:15.10.0 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.9.3 + sameersbn/gitlab:15.10.0 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.9.3 + sameersbn/gitlab:15.10.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.9.3 + sameersbn/gitlab:15.10.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.9.3 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.9.3 + sameersbn/gitlab:15.10.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.9.3 + sameersbn/gitlab:15.10.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.9.3 + sameersbn/gitlab:15.10.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.9.3 + sameersbn/gitlab:15.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:15.9.3 app:sanitize + sameersbn/gitlab:15.10.0 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.3 app:rake db:setup + sameersbn/gitlab:15.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:15.9.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.9.3 app:rake gitlab:env:info + sameersbn/gitlab:15.10.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.10.0 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.10.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.9.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:15.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:15.9.3 +docker pull sameersbn/gitlab:15.10.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.9.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.10.0 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.9.3 + image: sameersbn/gitlab:15.10.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 9a3465a25..9f7cbe79b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.9.3 +15.10.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 998e8a3c1..b6e942521 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.9.3 + image: sameersbn/gitlab:15.10.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 871d314bb..d601c412c 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.9.3 + image: sameersbn/gitlab:15.10.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 70d6da8b0..dfc25cab9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.9.3 + image: sameersbn/gitlab:15.10.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 153a7f9de..fd97e7e45 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.10.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.9.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.10.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.9.3 +docker pull sameersbn/gitlab:15.10.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.9.3 +sameersbn/gitlab:15.10.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 23f443f5e..55d30f369 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.9.3 + image: sameersbn/gitlab:15.10.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 89a8e8805..d293cb2be 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.9.3 + image: sameersbn/gitlab:15.10.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 10fc0aff7..f2f5ec48b 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.9.3 + image: sameersbn/gitlab:15.10.0 env: - name: TZ value: Asia/Kolkata From 4bfc8974ba0f3fe9cb3614e6e57c828e6e85c793 Mon Sep 17 00:00:00 2001 From: Markus Zimmermann Date: Fri, 24 Mar 2023 11:55:42 +0100 Subject: [PATCH 281/522] Allow SSH clients to explicitly set the Git transfer protocol This allows to the client to explicitly select protocol version 2, which is much more efficient. Without allowing that environment variable it seems that SSH connections are always stuck in version1. See https://docs.gitlab.com/ee/administration/git_protocol.html on how to check if protocol 2 is used. --- assets/build/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/build/install.sh b/assets/build/install.sh index 774aaa6af..ffeb4d083 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -246,6 +246,7 @@ sed -i \ -e "s|^[#]*LogLevel INFO|LogLevel VERBOSE|" \ -e "s|^[#]*AuthorizedKeysFile.*|AuthorizedKeysFile %h/.ssh/authorized_keys %h/.ssh/authorized_keys_proxy|" \ /etc/ssh/sshd_config +echo "AcceptEnv GIT_PROTOCOL" >> /etc/ssh/sshd_config # Allow clients to explicitly set the Git transfer protocol, e.g. to enable version 2. echo "UseDNS no" >> /etc/ssh/sshd_config # move supervisord.log file to ${GITLAB_LOG_DIR}/supervisor/ From 7a49de8775b0eaff31b61db2fde5206ce45501f9 Mon Sep 17 00:00:00 2001 From: sam-mosleh <41725025+sam-mosleh@users.noreply.github.com> Date: Wed, 29 Mar 2023 03:17:21 +0330 Subject: [PATCH 282/522] Add missing trailing backslash Co-authored-by: Kazunori Kimura <33391846+kkimurak@users.noreply.github.com> --- docs/docker-swarm-traefik-registry.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docker-swarm-traefik-registry.md b/docs/docker-swarm-traefik-registry.md index 671bd7f55..7f941efba 100644 --- a/docs/docker-swarm-traefik-registry.md +++ b/docs/docker-swarm-traefik-registry.md @@ -368,7 +368,7 @@ gitlab-runner \ --access-level not_protected \ --builds-dir /tmp/builds \ --docker-image docker:latest \ - --docker-volumes /tmp/builds:/tmp/builds + --docker-volumes /tmp/builds:/tmp/builds \ --docker-volumes /var/run/docker.sock:/var/run/docker.sock \ --url $GITLAB_URL \ --registration-token $GITLAB_TOKEN \ From 95bc778ee0cb4159bf18303e683cd4a14ad0e440 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Fri, 31 Mar 2023 03:00:49 +0900 Subject: [PATCH 283/522] Silence "CRIT unixServer" warning from supervisord Silence the message like below: CRIT Server 'unix_http_server' running without any HTTP authentication checking Reference: https://github.com/Supervisor/supervisor/issues/717#issuecomment-176860145 https://github.com/sameersbn/docker-redmine/commit/0fb84b9 --- assets/build/install.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/build/install.sh b/assets/build/install.sh index 774aaa6af..0331e1f43 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -251,6 +251,10 @@ echo "UseDNS no" >> /etc/ssh/sshd_config # move supervisord.log file to ${GITLAB_LOG_DIR}/supervisor/ sed -i "s|^[#]*logfile=.*|logfile=${GITLAB_LOG_DIR}/supervisor/supervisord.log ;|" /etc/supervisor/supervisord.conf +# silence "CRIT Server 'unix_http_server' running without any HTTP authentication checking" message +# https://github.com/Supervisor/supervisor/issues/717 +sed -i '/\.sock/a password=dummy' /etc/supervisor/supervisord.conf +sed -i '/\.sock/a username=dummy' /etc/supervisor/supervisord.conf # prevent confusing warning "CRIT Supervisor running as root" by clarify run as root # user not defined in supervisord.conf by default, so just append it after [supervisord] block sed -i "/\[supervisord\]/a user=root" /etc/supervisor/supervisord.conf From a5582d96f598cc3adba24fa124f8c5a9354aec3a Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 31 Mar 2023 10:36:45 +0200 Subject: [PATCH 284/522] Upgrade GitLab CE to 15.10.1 --- Changelog.md | 8 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index 5272b9550..c69a98013 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,14 @@ 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. +**15.10.1** + +- gitlab: upgrade CE to v15.10.1 +- gitaly: upgrade to v15.10.1 +- gitlab-pages: upgrade to v15.10.1 +- ruby: upgrade to v2.7.8 +- ubuntu: upgrade to focal-20230308 + **15.10.0** - gitlab: upgrade CE to v15.10.0 diff --git a/Dockerfile b/Dockerfile index e66ff840d..568352fda 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230308 -ARG VERSION=15.10.0 +ARG VERSION=15.10.1 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=2.7.7 \ - RUBY_SOURCE_SHA256SUM="e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" \ + RUBY_VERSION=2.7.8 \ + RUBY_SOURCE_SHA256SUM="c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0" \ GOLANG_VERSION=1.20.2 \ GITLAB_SHELL_VERSION=14.18.0 \ - GITLAB_PAGES_VERSION=15.10.0 \ - GITALY_SERVER_VERSION=15.10.0 \ + GITLAB_PAGES_VERSION=15.10.1 \ + GITALY_SERVER_VERSION=15.10.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index af3cd633d..e0febc05e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.10.0 +# sameersbn/gitlab:15.10.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.10.0 +docker pull sameersbn/gitlab:15.10.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.10.0 + sameersbn/gitlab:15.10.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.10.0 + sameersbn/gitlab:15.10.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:15.10.0 + sameersbn/gitlab:15.10.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:15.10.0 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.10.0 + sameersbn/gitlab:15.10.1 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.10.0 + sameersbn/gitlab:15.10.1 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.10.0 + sameersbn/gitlab:15.10.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.10.0 + sameersbn/gitlab:15.10.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.10.0 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.10.0 + sameersbn/gitlab:15.10.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.10.0 + sameersbn/gitlab:15.10.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.10.0 + sameersbn/gitlab:15.10.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.10.0 + sameersbn/gitlab:15.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:15.10.0 app:sanitize + sameersbn/gitlab:15.10.1 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.0 app:rake db:setup + sameersbn/gitlab:15.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:15.10.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.10.0 app:rake gitlab:env:info + sameersbn/gitlab:15.10.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.10.1 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.10.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.10.0 +docker pull sameersbn/gitlab:15.10.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.10.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.10.1 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.10.0 + image: sameersbn/gitlab:15.10.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 9f7cbe79b..08aeefc4d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.10.0 +15.10.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index b6e942521..2f9cad957 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.10.0 + image: sameersbn/gitlab:15.10.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index d601c412c..f79372068 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.10.0 + image: sameersbn/gitlab:15.10.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index dfc25cab9..433a41f53 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.10.0 + image: sameersbn/gitlab:15.10.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index fd97e7e45..9fc30f59c 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.10.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.10.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.10.0 +docker pull sameersbn/gitlab:15.10.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.10.0 +sameersbn/gitlab:15.10.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 55d30f369..27d154ee9 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.10.0 + image: sameersbn/gitlab:15.10.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index d293cb2be..ace019a12 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.10.0 + image: sameersbn/gitlab:15.10.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index f2f5ec48b..7db6ed141 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.10.0 + image: sameersbn/gitlab:15.10.1 env: - name: TZ value: Asia/Kolkata From 41c5afe8041e195691824128a8fd542311b6ed8e Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 7 Apr 2023 08:45:55 +0200 Subject: [PATCH 285/522] Upgrade GitLab CE to 15.10.2 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index c69a98013..a0c32d0ec 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**15.10.2** + +- gitlab: upgrade CE to v15.10.2 +- gitaly: upgrade to v15.10.2 +- gitlab-pages: upgrade to v15.10.2 +- golang: upgrade to v1.20.3 + **15.10.1** - gitlab: upgrade CE to v15.10.1 diff --git a/Dockerfile b/Dockerfile index 568352fda..f378fa33e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230308 -ARG VERSION=15.10.1 +ARG VERSION=15.10.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.8 \ RUBY_SOURCE_SHA256SUM="c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0" \ - GOLANG_VERSION=1.20.2 \ + GOLANG_VERSION=1.20.3 \ GITLAB_SHELL_VERSION=14.18.0 \ - GITLAB_PAGES_VERSION=15.10.1 \ - GITALY_SERVER_VERSION=15.10.1 \ + GITLAB_PAGES_VERSION=15.10.2 \ + GITALY_SERVER_VERSION=15.10.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index e0febc05e..ff1111587 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.10.1 +# sameersbn/gitlab:15.10.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.10.1 +docker pull sameersbn/gitlab:15.10.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.10.1 + sameersbn/gitlab:15.10.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.10.1 + sameersbn/gitlab:15.10.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:15.10.1 + sameersbn/gitlab:15.10.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:15.10.1 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.10.1 + sameersbn/gitlab:15.10.2 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.10.1 + sameersbn/gitlab:15.10.2 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.10.1 + sameersbn/gitlab:15.10.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.10.1 + sameersbn/gitlab:15.10.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.10.1 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.10.1 + sameersbn/gitlab:15.10.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.10.1 + sameersbn/gitlab:15.10.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.10.1 + sameersbn/gitlab:15.10.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.10.1 + sameersbn/gitlab:15.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:15.10.1 app:sanitize + sameersbn/gitlab:15.10.2 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.1 app:rake db:setup + sameersbn/gitlab:15.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:15.10.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.10.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.10.1 app:rake gitlab:env:info + sameersbn/gitlab:15.10.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.10.2 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.10.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.10.1 +docker pull sameersbn/gitlab:15.10.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.10.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.10.2 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.10.1 + image: sameersbn/gitlab:15.10.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 08aeefc4d..93d70a7d0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.10.1 +15.10.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 2f9cad957..6db02335d 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.10.1 + image: sameersbn/gitlab:15.10.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index f79372068..1e7c31e48 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.10.1 + image: sameersbn/gitlab:15.10.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 433a41f53..b62b07e53 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.10.1 + image: sameersbn/gitlab:15.10.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 9fc30f59c..8fb615f56 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.10.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.10.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.10.1 +docker pull sameersbn/gitlab:15.10.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.10.1 +sameersbn/gitlab:15.10.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 27d154ee9..b136c5bd4 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.10.1 + image: sameersbn/gitlab:15.10.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index ace019a12..c80b612d6 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.10.1 + image: sameersbn/gitlab:15.10.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 7db6ed141..2eac4ef0d 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.10.1 + image: sameersbn/gitlab:15.10.2 env: - name: TZ value: Asia/Kolkata From 286b938f932dc50b22254060d24d7766a7731b77 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 16 Apr 2023 20:21:24 +0200 Subject: [PATCH 286/522] Upgrade GitLab CE to 15.10.3 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index a0c32d0ec..08d96d6ae 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**15.10.3** + +- gitlab: upgrade CE to v15.10.3 +- gitaly: upgrade to v15.10.3 +- gitlab-pages: upgrade to v15.10.3 + **15.10.2** - gitlab: upgrade CE to v15.10.2 diff --git a/Dockerfile b/Dockerfile index f378fa33e..9c10e969f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230308 -ARG VERSION=15.10.2 +ARG VERSION=15.10.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.8 \ RUBY_SOURCE_SHA256SUM="c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0" \ GOLANG_VERSION=1.20.3 \ GITLAB_SHELL_VERSION=14.18.0 \ - GITLAB_PAGES_VERSION=15.10.2 \ - GITALY_SERVER_VERSION=15.10.2 \ + GITLAB_PAGES_VERSION=15.10.3 \ + GITALY_SERVER_VERSION=15.10.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index ff1111587..f9bc05f25 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.10.2 +# sameersbn/gitlab:15.10.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.10.2 +docker pull sameersbn/gitlab:15.10.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.10.2 + sameersbn/gitlab:15.10.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.10.2 + sameersbn/gitlab:15.10.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:15.10.2 + sameersbn/gitlab:15.10.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:15.10.2 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.10.2 + sameersbn/gitlab:15.10.3 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.10.2 + sameersbn/gitlab:15.10.3 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.10.2 + sameersbn/gitlab:15.10.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.10.2 + sameersbn/gitlab:15.10.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.10.2 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.10.2 + sameersbn/gitlab:15.10.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.10.2 + sameersbn/gitlab:15.10.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.10.2 + sameersbn/gitlab:15.10.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.10.2 + sameersbn/gitlab:15.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:15.10.2 app:sanitize + sameersbn/gitlab:15.10.3 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.2 app:rake db:setup + sameersbn/gitlab:15.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:15.10.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.10.2 app:rake gitlab:env:info + sameersbn/gitlab:15.10.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.10.3 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.10.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.10.2 +docker pull sameersbn/gitlab:15.10.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.10.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.10.3 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.10.2 + image: sameersbn/gitlab:15.10.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 93d70a7d0..0eb5841aa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.10.2 +15.10.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 6db02335d..e18e3e3d2 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.10.2 + image: sameersbn/gitlab:15.10.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 1e7c31e48..f3e85d9cb 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.10.2 + image: sameersbn/gitlab:15.10.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index b62b07e53..46ad2f893 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.10.2 + image: sameersbn/gitlab:15.10.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 8fb615f56..e5222c8ab 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.10.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.10.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.10.2 +docker pull sameersbn/gitlab:15.10.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.10.2 +sameersbn/gitlab:15.10.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index b136c5bd4..5e85da829 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.10.2 + image: sameersbn/gitlab:15.10.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index c80b612d6..ac3b5d06a 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.10.2 + image: sameersbn/gitlab:15.10.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 2eac4ef0d..93d27c430 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.10.2 + image: sameersbn/gitlab:15.10.3 env: - name: TZ value: Asia/Kolkata From 029186dc631d39aebed9fe7e1f5672212c79174b Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Fri, 8 Jul 2022 09:34:37 +0900 Subject: [PATCH 287/522] Avoid permission error on creating config file `assets/build/config/database.yml.postgresql` is owned by root:root, and permission is rwxrw---- so the user `git` (`${GILTAB_USER}`) doesn't have a permission to copy the file. This raises an error while building. --- assets/build/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index 92d3343ea..b84cbe902 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -193,7 +193,8 @@ exec_as_git cp ${GITLAB_INSTALL_DIR}/config/gitlab.yml.example ${GITLAB_INSTALL_ # Temporary workaround, see # # exec_as_git cp ${GITLAB_INSTALL_DIR}/config/database.yml.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml -exec_as_git cp ${GITLAB_BUILD_DIR}/config/database.yml.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml +cp ${GITLAB_BUILD_DIR}/config/database.yml.postgresql ${GITLAB_INSTALL_DIR}/config/database.yml +chown ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/config/database.yml # Installs nodejs packages required to compile webpack exec_as_git yarn install --production --pure-lockfile From c39cb4d600869f65d483014eaeee3014f35bf843 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 22 Apr 2023 22:32:22 +0200 Subject: [PATCH 288/522] Upgrade GitLab CE to 15.11.0 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 08d96d6ae..1749a6f52 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**15.11.0** + +- gitlab: upgrade CE to v15.11.0 +- gitaly: upgrade to v15.11.0 +- gitlab-pages: upgrade to v15.11.0 +- ubuntu: upgrade to focal-20230412 + **15.10.3** - gitlab: upgrade CE to v15.10.3 diff --git a/Dockerfile b/Dockerfile index 9c10e969f..3a160cc52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20230308 +FROM ubuntu:focal-20230412 -ARG VERSION=15.10.3 +ARG VERSION=15.11.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.8 \ RUBY_SOURCE_SHA256SUM="c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0" \ GOLANG_VERSION=1.20.3 \ GITLAB_SHELL_VERSION=14.18.0 \ - GITLAB_PAGES_VERSION=15.10.3 \ - GITALY_SERVER_VERSION=15.10.3 \ + GITLAB_PAGES_VERSION=15.11.0 \ + GITALY_SERVER_VERSION=15.11.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index f9bc05f25..eda0c1e4e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.10.3 +# sameersbn/gitlab:15.11.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.10.3 +docker pull sameersbn/gitlab:15.11.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.10.3 + sameersbn/gitlab:15.11.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.10.3 + sameersbn/gitlab:15.11.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:15.10.3 + sameersbn/gitlab:15.11.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:15.10.3 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.10.3 + sameersbn/gitlab:15.11.0 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.10.3 + sameersbn/gitlab:15.11.0 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.10.3 + sameersbn/gitlab:15.11.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.10.3 + sameersbn/gitlab:15.11.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.10.3 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.10.3 + sameersbn/gitlab:15.11.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.10.3 + sameersbn/gitlab:15.11.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.10.3 + sameersbn/gitlab:15.11.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.10.3 + sameersbn/gitlab:15.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:15.10.3 app:sanitize + sameersbn/gitlab:15.11.0 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.3 app:rake db:setup + sameersbn/gitlab:15.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:15.10.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.10.3 app:rake gitlab:env:info + sameersbn/gitlab:15.11.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.11.0 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.11.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.10.3 +docker pull sameersbn/gitlab:15.11.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.10.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.11.0 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.10.3 + image: sameersbn/gitlab:15.11.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 0eb5841aa..33db3f0ea 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.10.3 +15.11.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index e18e3e3d2..b43f40486 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.10.3 + image: sameersbn/gitlab:15.11.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index f3e85d9cb..77cf997a5 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.10.3 + image: sameersbn/gitlab:15.11.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 46ad2f893..536b0f818 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.10.3 + image: sameersbn/gitlab:15.11.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index e5222c8ab..003aba0b5 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.11.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.10.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.11.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.10.3 +docker pull sameersbn/gitlab:15.11.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.10.3 +sameersbn/gitlab:15.11.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 5e85da829..cbe5fd66d 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.10.3 + image: sameersbn/gitlab:15.11.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index ac3b5d06a..3505dd11b 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.10.3 + image: sameersbn/gitlab:15.11.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 93d27c430..458015b12 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.10.3 + image: sameersbn/gitlab:15.11.0 env: - name: TZ value: Asia/Kolkata From d9e936ae1edc89106c05bb586cdedd6218b91be8 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 4 May 2023 05:41:38 +0200 Subject: [PATCH 289/522] Upgrade GitLab CE to 15.11.1 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 1749a6f52..7936f5288 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**15.11.1** + +- gitlab: upgrade CE to v15.11.1 +- gitaly: upgrade to v15.11.1 +- gitlab-pages: upgrade to v15.11.1 +- golang: upgrade to v1.20.4 + **15.11.0** - gitlab: upgrade CE to v15.11.0 diff --git a/Dockerfile b/Dockerfile index 3a160cc52..ba0388633 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230412 -ARG VERSION=15.11.0 +ARG VERSION=15.11.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.8 \ RUBY_SOURCE_SHA256SUM="c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0" \ - GOLANG_VERSION=1.20.3 \ + GOLANG_VERSION=1.20.4 \ GITLAB_SHELL_VERSION=14.18.0 \ - GITLAB_PAGES_VERSION=15.11.0 \ - GITALY_SERVER_VERSION=15.11.0 \ + GITLAB_PAGES_VERSION=15.11.1 \ + GITALY_SERVER_VERSION=15.11.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index eda0c1e4e..6d3de9cf1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.11.0 +# sameersbn/gitlab:15.11.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.11.0 +docker pull sameersbn/gitlab:15.11.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.11.0 + sameersbn/gitlab:15.11.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.11.0 + sameersbn/gitlab:15.11.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:15.11.0 + sameersbn/gitlab:15.11.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:15.11.0 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.11.0 + sameersbn/gitlab:15.11.1 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.11.0 + sameersbn/gitlab:15.11.1 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.11.0 + sameersbn/gitlab:15.11.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.11.0 + sameersbn/gitlab:15.11.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.11.0 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.11.0 + sameersbn/gitlab:15.11.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.11.0 + sameersbn/gitlab:15.11.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.11.0 + sameersbn/gitlab:15.11.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.11.0 + sameersbn/gitlab:15.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:15.11.0 app:sanitize + sameersbn/gitlab:15.11.1 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.0 app:rake db:setup + sameersbn/gitlab:15.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:15.11.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.11.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.11.0 app:rake gitlab:env:info + sameersbn/gitlab:15.11.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.11.1 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.0 app:rake gitlab:import:repos + sameersbn/gitlab:15.11.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.11.0 +docker pull sameersbn/gitlab:15.11.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.11.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.11.1 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.11.0 + image: sameersbn/gitlab:15.11.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 33db3f0ea..558cc008c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.11.0 +15.11.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index b43f40486..2e32b35be 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.0 + image: sameersbn/gitlab:15.11.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 77cf997a5..2c617397c 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.11.0 + image: sameersbn/gitlab:15.11.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 536b0f818..a4b7bc5e6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.0 + image: sameersbn/gitlab:15.11.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 003aba0b5..03afaf677 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.0 app:rake gitlab:backup:create + sameersbn/gitlab:15.11.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.0 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.11.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.11.0 +docker pull sameersbn/gitlab:15.11.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.11.0 +sameersbn/gitlab:15.11.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index cbe5fd66d..4789f3d78 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.0 + image: sameersbn/gitlab:15.11.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 3505dd11b..80ba3dab7 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.0 + image: sameersbn/gitlab:15.11.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 458015b12..be2a346bd 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.11.0 + image: sameersbn/gitlab:15.11.1 env: - name: TZ value: Asia/Kolkata From c0a2827cd299d72f532cbb63cb4ac24b080beeaf Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 5 May 2023 17:01:23 +0200 Subject: [PATCH 290/522] Upgrade GitLab CE to 15.11.2 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 7936f5288..ea33e4a46 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**15.11.2** + +- gitlab: upgrade CE to v15.11.2 +- gitaly: upgrade to v15.11.2 +- gitlab-pages: upgrade to v15.11.2 + **15.11.1** - gitlab: upgrade CE to v15.11.1 diff --git a/Dockerfile b/Dockerfile index ba0388633..33a07388c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230412 -ARG VERSION=15.11.1 +ARG VERSION=15.11.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=2.7.8 \ RUBY_SOURCE_SHA256SUM="c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0" \ GOLANG_VERSION=1.20.4 \ GITLAB_SHELL_VERSION=14.18.0 \ - GITLAB_PAGES_VERSION=15.11.1 \ - GITALY_SERVER_VERSION=15.11.1 \ + GITLAB_PAGES_VERSION=15.11.2 \ + GITALY_SERVER_VERSION=15.11.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 6d3de9cf1..ff708d701 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.11.1 +# sameersbn/gitlab:15.11.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.11.1 +docker pull sameersbn/gitlab:15.11.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.11.1 + sameersbn/gitlab:15.11.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.11.1 + sameersbn/gitlab:15.11.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:15.11.1 + sameersbn/gitlab:15.11.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:15.11.1 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.11.1 + sameersbn/gitlab:15.11.2 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.11.1 + sameersbn/gitlab:15.11.2 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.11.1 + sameersbn/gitlab:15.11.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.11.1 + sameersbn/gitlab:15.11.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.11.1 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.11.1 + sameersbn/gitlab:15.11.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.11.1 + sameersbn/gitlab:15.11.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.11.1 + sameersbn/gitlab:15.11.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.11.1 + sameersbn/gitlab:15.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:15.11.1 app:sanitize + sameersbn/gitlab:15.11.2 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.1 app:rake db:setup + sameersbn/gitlab:15.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:15.11.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.11.1 app:rake gitlab:env:info + sameersbn/gitlab:15.11.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.11.2 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.1 app:rake gitlab:import:repos + sameersbn/gitlab:15.11.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.11.1 +docker pull sameersbn/gitlab:15.11.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.11.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.11.2 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.11.1 + image: sameersbn/gitlab:15.11.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 558cc008c..2677654c9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.11.1 +15.11.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 2e32b35be..ad48faab5 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.1 + image: sameersbn/gitlab:15.11.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 2c617397c..f3cb76d9d 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.11.1 + image: sameersbn/gitlab:15.11.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index a4b7bc5e6..fca820033 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.1 + image: sameersbn/gitlab:15.11.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 03afaf677..eb26b09ba 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.1 app:rake gitlab:backup:create + sameersbn/gitlab:15.11.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.1 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.11.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.11.1 +docker pull sameersbn/gitlab:15.11.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.11.1 +sameersbn/gitlab:15.11.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 4789f3d78..461667a60 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.1 + image: sameersbn/gitlab:15.11.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 80ba3dab7..2f6e226c8 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.1 + image: sameersbn/gitlab:15.11.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index be2a346bd..d50d1b386 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.11.1 + image: sameersbn/gitlab:15.11.2 env: - name: TZ value: Asia/Kolkata From 632ca2bc17850644cf55070e595768ecf3fa48c4 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 11 May 2023 20:12:09 +0200 Subject: [PATCH 291/522] Upgrade GitLab CE to 15.11.3 --- Changelog.md | 7 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 51 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index ea33e4a46..49779289c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**15.11.3** + +- gitlab: upgrade CE to v15.11.3 +- gitaly: upgrade to v15.11.3 +- gitlab-pages: upgrade to v15.11.3 +- ruby: upgrade to v3.0.6 + **15.11.2** - gitlab: upgrade CE to v15.11.2 diff --git a/Dockerfile b/Dockerfile index 33a07388c..e966e52b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230412 -ARG VERSION=15.11.2 +ARG VERSION=15.11.3 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=2.7.8 \ - RUBY_SOURCE_SHA256SUM="c2dab63cbc8f2a05526108ad419efa63a67ed4074dbbcf9fc2b1ca664cb45ba0" \ + RUBY_VERSION=3.0.6 \ + RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.20.4 \ GITLAB_SHELL_VERSION=14.18.0 \ - GITLAB_PAGES_VERSION=15.11.2 \ - GITALY_SERVER_VERSION=15.11.2 \ + GITLAB_PAGES_VERSION=15.11.3 \ + GITALY_SERVER_VERSION=15.11.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index ff708d701..cbdeb9660 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.11.2 +# sameersbn/gitlab:15.11.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.11.2 +docker pull sameersbn/gitlab:15.11.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.11.2 + sameersbn/gitlab:15.11.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.11.2 + sameersbn/gitlab:15.11.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:15.11.2 + sameersbn/gitlab:15.11.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:15.11.2 + sameersbn/gitlab:15.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: @@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:15.11.2 + sameersbn/gitlab:15.11.3 ``` #### Linking to Redis Container @@ -374,7 +374,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.11.2 + sameersbn/gitlab:15.11.3 ``` #### Mail @@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.11.2 + sameersbn/gitlab:15.11.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -407,7 +407,7 @@ docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.11.2 + sameersbn/gitlab:15.11.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -491,7 +491,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:15.11.2 + sameersbn/gitlab:15.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. @@ -507,7 +507,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:15.11.2 + sameersbn/gitlab:15.11.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -530,7 +530,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:15.11.2 + sameersbn/gitlab:15.11.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -578,7 +578,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:15.11.2 + sameersbn/gitlab:15.11.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -760,14 +760,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:15.11.2 + sameersbn/gitlab:15.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:15.11.2 app:sanitize + sameersbn/gitlab:15.11.3 app:sanitize ``` #### Piwik @@ -2425,7 +2425,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.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. @@ -2460,14 +2460,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.2 app:rake db:setup + sameersbn/gitlab:15.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:15.11.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -2476,7 +2476,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.11.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2525,7 +2525,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:15.11.2 app:rake gitlab:env:info + sameersbn/gitlab:15.11.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2538,7 +2538,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.11.3 app:rake gitlab:import:repos ``` Or @@ -2569,7 +2569,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.2 app:rake gitlab:import:repos + sameersbn/gitlab:15.11.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2593,12 +2593,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.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:15.11.2 +docker pull sameersbn/gitlab:15.11.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2623,7 +2623,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:15.11.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.11.3 ``` ### Shell Access @@ -2661,7 +2661,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.11.2 + image: sameersbn/gitlab:15.11.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 2677654c9..43d240373 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.11.2 +15.11.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index ad48faab5..34678bf6b 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.2 + image: sameersbn/gitlab:15.11.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index f3cb76d9d..5786c1798 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.11.2 + image: sameersbn/gitlab:15.11.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index fca820033..15e88f6e5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.2 + image: sameersbn/gitlab:15.11.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index eb26b09ba..6aafe9416 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.2 app:rake gitlab:backup:create + sameersbn/gitlab:15.11.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.2 app:rake gitlab:backup:restore + sameersbn/gitlab:15.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.11.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.11.2 +docker pull sameersbn/gitlab:15.11.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.11.2 +sameersbn/gitlab:15.11.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 461667a60..4f8cfaa13 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.2 + image: sameersbn/gitlab:15.11.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 2f6e226c8..aab4e3408 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.2 + image: sameersbn/gitlab:15.11.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index d50d1b386..802194373 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.11.2 + image: sameersbn/gitlab:15.11.3 env: - name: TZ value: Asia/Kolkata From 260f548c5b4bd0c4e602740128aeca6058331f4d Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Thu, 20 Apr 2023 18:59:25 +0900 Subject: [PATCH 292/522] Ship with multiple versions of postgresql-client MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is intended to work even in environments without an internet connection. - Use latest version of pg_isready on checking database connection - Switch postgresql-client version checking server on startup - If the server versions do not match exactly, use the latest installed client and warn on docker log From postgresql documentation: https://www.postgresql.org/docs/15/app-pgdump.html#PG-DUMP-NOTES > Also, it is not guaranteed that pg_dump's output can be loaded > into a server of an older major version — not even if the dump > was taken from a server of that version. To switch client version, generate a file ~/.postgresqlrc with content like: {server side major version} {server hostname}:{server port} {default database} See detail on: https://manpages.ubuntu.com/manpages/bionic/man5/postgresqlrc.5.html Following messages appear on docker log: - Detected server version: 140007 - Generating /home/git/.postgresqlrc --- Dockerfile | 3 ++- assets/runtime/functions | 56 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e966e52b9..f0f245c9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,7 +44,8 @@ RUN 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-12 postgresql-contrib-12 redis-tools \ + nginx openssh-server postgresql-contrib redis-tools \ + postgresql-client-12 postgresql-client-13 postgresql-client-14 postgresql-client-15 \ python3 python3-docutils nodejs yarn gettext-base graphicsmagick \ libpq5 zlib1g libyaml-0-2 libssl1.1 \ libgdbm6 libreadline8 libncurses5 libffi7 \ diff --git a/assets/runtime/functions b/assets/runtime/functions index 787ce5c8a..34a0a0e9b 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -149,7 +149,7 @@ gitlab_finalize_database_parameters() { gitlab_check_database_connection() { - prog=$(find /usr/lib/postgresql/ -name pg_isready) + prog=$(find /usr/lib/postgresql/ -name pg_isready -type f | sort | tail -n1) prog="${prog} -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER} -d ${DB_NAME} -t 1" timeout=60 @@ -167,11 +167,65 @@ gitlab_check_database_connection() { echo } +gitlab_generate_postgresqlrc() { + echo "Configuring /home/${GITLAB_USER}/.postgresqlrc to avoid version mismatch on dumping" + # server_version_num property is a number built from version string: + # https://www.postgresql.org/docs/15/libpq-status.html#LIBPQ-PQSERVERVERSION + # > The result is formed by multiplying the server's major version number by 10000 and adding the minor version number. + # > For example, version 10.1 will be returned as 100001, and version 11.0 will be returned as 110000. Zero is returned if the connection is bad. + # > + # > Prior to major version 10, PostgreSQL used three-part version numbers in which the first two parts together represented the major version. + # > For those versions, PQserverVersion uses two digits for each part; + # > for example version 9.1.5 will be returned as 90105, and version 9.2.0 will be returned as 90200. + # + # This difference also appends to apt package name. + # For example, in ubuntu:focal, postgresql-client-{8.2, 8.3, 8.4, 9.0, 9.1, 9.2, 9.3, 9.4, 9.5, 9.6, 10, 11, 12, 13, 14, 15} are available. + # + DB_SERVER_VERSION=$(PGPASSWORD=${DB_PASS} psql -h "${DB_HOST}" -p "${DB_PORT}" -U "${DB_USER}" -d "${DB_NAME}" -Atw -c "SHOW server_version_num") + if [[ "${DB_SERVER_VERSION}" -eq 0 ]]; then + echo + echo "Could not retrieve database server version correctly. Aborting..." + return 1 + fi + + echo "- Detected server version: ${DB_SERVER_VERSION}" + + # Anyway, we can get major version (8, 9, 10 and so on) by dividing by 10000. + # DB_SERVER_VERSION_MAJOR=${DB_SERVER_VERSION%%.*} + DB_SERVER_VERSION_MAJOR=$((DB_SERVER_VERSION/10000)) + DB_CLIENT_VERSION_PACKAGE_NAME= + + if [[ "${DB_SERVER_VERSION_MAJOR}" -ge 10 ]]; then + # v10 or later: use "rought major version" as version number in package name + DB_CLIENT_VERSION_PACKAGE_NAME=${DB_SERVER_VERSION_MAJOR} + else + # prior to v10: convert + # FIXME: rough implementation + # It exploits the fact that there is no version such as 9.10, and it lacks versatility. + # divide by 100, then replace first 0 to comma + DB_CLIENT_VERSION_PACKAGE_NAME=$((DB_SERVER_VERSION/100)) + DB_CLIENT_VERSION_PACKAGE_NAME=${DB_CLIENT_VERSION_PACKAGE_NAME/0/.} + fi + + # if exact-match client not found, select latest version from installed clients + if [[ "$(apt-cache pkgnames postgresql-client | grep -e "-${DB_CLIENT_VERSION_PACKAGE_NAME}" | wc -l)" -ne 1 ]]; then + LATEST_CLIENT="$(apt-cache pkgnames postgresql-client | grep -v -e "-common" | sort --version-sort | tail -n1)" + DB_CLIENT_VERSION_PACKAGE_NAME=${LATEST_CLIENT/postgresql-client-/} + echo "gitlab_generate_postgresqlrc(): WARNING - Suitable client not installed. postgresql-client-${DB_CLIENT_VERSION_PACKAGE_NAME} will be used but you may face issue (database in backup will be empty, for example)" + fi + + # generate ~/.postgresqlrc to switch client version + GITLAB_USER_POSTGRESQLRC="/home/${GITLAB_USER}/.postgresqlrc" + echo "- Generating ${GITLAB_USER_POSTGRESQLRC}" + echo "${DB_CLIENT_VERSION_PACKAGE_NAME} ${DB_HOST}:${DB_PORT} ${DB_NAME}" | exec_as_git tee "${GITLAB_USER_POSTGRESQLRC}" +} + gitlab_configure_database() { echo -n "Configuring gitlab::database" gitlab_finalize_database_parameters gitlab_check_database_connection + gitlab_generate_postgresqlrc update_template ${GITLAB_DATABASE_CONFIG} \ DB_ENCODING \ From b3b700a7019a1a2a9f17a88f81d85cd2ec8a0e67 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Thu, 20 Apr 2023 18:59:44 +0900 Subject: [PATCH 293/522] Uninstall unused postgresql-client on startup Unused clients are determinate by checking ~/.postgresqlrc Uninstall logs like the following will appear in the docker log: - Uninstalling unused version(s) of client: postgresql-client-12 --- assets/runtime/functions | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/assets/runtime/functions b/assets/runtime/functions index 34a0a0e9b..4b0200753 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -220,12 +220,36 @@ gitlab_generate_postgresqlrc() { echo "${DB_CLIENT_VERSION_PACKAGE_NAME} ${DB_HOST}:${DB_PORT} ${DB_NAME}" | exec_as_git tee "${GITLAB_USER_POSTGRESQLRC}" } +gitlab_uninstall_unused_database_client() { + if [[ -f "/home/${GITLAB_USER}/.postgresqlrc" ]]; then + # refer /home/${GITLAB_USER}/.postgresqlrc and pick up versions in use + # .postgresqlrc contains following information per line + # database_major_version host:port database_name + # - ignore lines starts with # by specifying pattern /^[^#]/ + # - first field is the version number in use. + # - cocnat whole lines into single string. convert newline to \| + # this is escaped regex "OR" + # now we got the following regex that can be used as an option to grep: + # \|-12\|-13 + DB_CLIENT_VERSIONS_IN_USE="$(awk '/^[^#]/ {printf("\|-%s",$1)}' "/home/${GITLAB_USER}/.postgresqlrc")" + + # we also need to keep postgresql-client-common package to switch based on ~/.postgresqlrc + REGEX_DB_CLIENT_VERSIONS_IN_USE="-common${DB_CLIENT_VERSIONS_IN_USE}" + + # remove unused client using regex above + UNUSED_DB_CLIENTS=$(apt-cache pkgnames postgresql-client | grep -v -e "${REGEX_DB_CLIENT_VERSIONS_IN_USE}" | tr '\n' ' ') + echo "- Uninstalling unused client(s): ${UNUSED_DB_CLIENTS}" + DEBIAN_FRONTEND=noninteractive apt-get -qq remove -- ${UNUSED_DB_CLIENTS} >/dev/null + fi +} + gitlab_configure_database() { echo -n "Configuring gitlab::database" gitlab_finalize_database_parameters gitlab_check_database_connection gitlab_generate_postgresqlrc + gitlab_uninstall_unused_database_client update_template ${GITLAB_DATABASE_CONFIG} \ DB_ENCODING \ From b736b992d696c147703faa347c801c7360ebeb3b Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sun, 21 May 2023 21:23:53 +0900 Subject: [PATCH 294/522] README.md: Add description about postgresql-client switching behavior Co-authored by: Steven Achilles --- README.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/README.md b/README.md index cbdeb9660..3639dcc71 100644 --- a/README.md +++ b/README.md @@ -240,6 +240,29 @@ GitLab uses a database backend to store its data. You can configure this image t #### PostgreSQL +**Important note:** This image is shipped with different versions of the `postgresql-client`. + +During the startup of the container, the major version of the database system is checked based on the specified connection destination. Only the version of the `postgresql-client`, that matches the major version of the Postgres database is used. All other versions of the `postgresql-client` are deleted at runtime. + +This behavior can be checked using the command `docker logs` and an output like the following should be available: + +````sh +… +Configuring gitlab::database +- Installing postgresql client to avoid version mismatch on dumping +-- Detected server version: 140007 +- Generating /home/git/.postgresqlrc +14 postgresql:5432 gitlabhq_production +- Uninstalling unused client(s): postgresql-client-12 postgresql-client-13 postgresql-client-15 +… +```` + +Please note furthermore, that only combatible versions of the `postgresql-client` to GitLab are shipped with this image. Currently these belogn to + +- `postgresql-client-12`, +- `postgresql-client-13`, +- `postgresql-client-14`, +- and `postgresql-client-15`. *NOTE:* version 13.7.0 and later requires PostgreSQL version 12.x ##### External PostgreSQL Server From 69d490b75741dc08b84d88290149d31eb01d265a Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Tue, 23 May 2023 04:04:57 +0900 Subject: [PATCH 295/522] README.md: Add note for the case any version of client does not match --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3639dcc71..58b9996ff 100644 --- a/README.md +++ b/README.md @@ -242,7 +242,7 @@ GitLab uses a database backend to store its data. You can configure this image t **Important note:** This image is shipped with different versions of the `postgresql-client`. -During the startup of the container, the major version of the database system is checked based on the specified connection destination. Only the version of the `postgresql-client`, that matches the major version of the Postgres database is used. All other versions of the `postgresql-client` are deleted at runtime. +During the startup of the container, the major version of the database system is checked based on the specified connection destination. Only the version of the `postgresql-client`, that matches the major version of the Postgres database is used. If the major version of any version of the client does not match, the latest client is used (but may causes issues). All other versions of the `postgresql-client` are deleted at runtime. This behavior can be checked using the command `docker logs` and an output like the following should be available: From 110a8d75abff870534bce4e21f7b40a18f058083 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Mon, 22 May 2023 21:14:14 +0200 Subject: [PATCH 296/522] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 58b9996ff..9cbda7198 100644 --- a/README.md +++ b/README.md @@ -242,7 +242,7 @@ GitLab uses a database backend to store its data. You can configure this image t **Important note:** This image is shipped with different versions of the `postgresql-client`. -During the startup of the container, the major version of the database system is checked based on the specified connection destination. Only the version of the `postgresql-client`, that matches the major version of the Postgres database is used. If the major version of any version of the client does not match, the latest client is used (but may causes issues). All other versions of the `postgresql-client` are deleted at runtime. +During the startup of the container, the major version of the database system is checked based on the specified connection destination. Only the version of the `postgresql-client`, that matches the major version of the Postgres database is used. If the major version of any version of the included clients does not match, the latest client is used (but may causes issues). All other versions of the `postgresql-client` are deleted at runtime. This behavior can be checked using the command `docker logs` and an output like the following should be available: @@ -263,6 +263,7 @@ Please note furthermore, that only combatible versions of the `postgresql-client - `postgresql-client-13`, - `postgresql-client-14`, - and `postgresql-client-15`. + *NOTE:* version 13.7.0 and later requires PostgreSQL version 12.x ##### External PostgreSQL Server From 72aa6828682691c072a7628c2dd8af2f1a9ed65d Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Mon, 22 May 2023 21:59:49 +0200 Subject: [PATCH 297/522] Upgrade GitLab CE to 15.11.4 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 49779289c..e28fc5191 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**15.11.4** + +- gitlab: upgrade CE to v15.11.4 +- gitaly: upgrade to v15.11.4 +- gitlab-pages: upgrade to v15.11.4 + **15.11.3** - gitlab: upgrade CE to v15.11.3 diff --git a/Dockerfile b/Dockerfile index f0f245c9c..03191ad78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230412 -ARG VERSION=15.11.3 +ARG VERSION=15.11.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.20.4 \ GITLAB_SHELL_VERSION=14.18.0 \ - GITLAB_PAGES_VERSION=15.11.3 \ - GITALY_SERVER_VERSION=15.11.3 \ + GITLAB_PAGES_VERSION=15.11.4 \ + GITALY_SERVER_VERSION=15.11.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 9cbda7198..bf5516bff 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.11.3 +# sameersbn/gitlab:15.11.4 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.11.3 +docker pull sameersbn/gitlab:15.11.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.11.3 + sameersbn/gitlab:15.11.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.11.3 + sameersbn/gitlab:15.11.4 ``` ### Database @@ -288,7 +288,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:15.11.3 + sameersbn/gitlab:15.11.4 ``` ##### Linking to PostgreSQL Container @@ -332,7 +332,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:15.11.3 + sameersbn/gitlab:15.11.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: @@ -371,7 +371,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:15.11.3 + sameersbn/gitlab:15.11.4 ``` #### Linking to Redis Container @@ -398,7 +398,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.11.3 + sameersbn/gitlab:15.11.4 ``` #### Mail @@ -411,7 +411,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:15.11.3 + sameersbn/gitlab:15.11.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -431,7 +431,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:15.11.3 + sameersbn/gitlab:15.11.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -515,7 +515,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:15.11.3 + sameersbn/gitlab:15.11.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. @@ -531,7 +531,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:15.11.3 + sameersbn/gitlab:15.11.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -554,7 +554,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:15.11.3 + sameersbn/gitlab:15.11.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -602,7 +602,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:15.11.3 + sameersbn/gitlab:15.11.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:15.11.3 + sameersbn/gitlab:15.11.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:15.11.3 app:sanitize + sameersbn/gitlab:15.11.4 app:sanitize ``` #### Piwik @@ -2449,7 +2449,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.11.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. @@ -2484,14 +2484,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.3 app:rake db:setup + sameersbn/gitlab:15.11.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:15.11.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.11.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. @@ -2500,7 +2500,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.11.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2549,7 +2549,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:15.11.3 app:rake gitlab:env:info + sameersbn/gitlab:15.11.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2562,7 +2562,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.11.4 app:rake gitlab:import:repos ``` Or @@ -2593,7 +2593,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.3 app:rake gitlab:import:repos + sameersbn/gitlab:15.11.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2617,12 +2617,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.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:15.11.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:15.11.3 +docker pull sameersbn/gitlab:15.11.4 ``` - **Step 2**: Stop and remove the currently running image @@ -2647,7 +2647,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:15.11.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.11.4 ``` ### Shell Access @@ -2685,7 +2685,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.11.3 + image: sameersbn/gitlab:15.11.4 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 43d240373..35a0a8cbe 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.11.3 +15.11.4 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 34678bf6b..dfb9b2ee0 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.3 + image: sameersbn/gitlab:15.11.4 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 5786c1798..72552cd4d 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.11.3 + image: sameersbn/gitlab:15.11.4 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 15e88f6e5..d4fbbe237 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.3 + image: sameersbn/gitlab:15.11.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 6aafe9416..87d951b1c 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.3 app:rake gitlab:backup:create + sameersbn/gitlab:15.11.4 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.3 app:rake gitlab:backup:restore + sameersbn/gitlab:15.11.4 app:rake gitlab:backup:restore ``` The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.11.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.11.3 +docker pull sameersbn/gitlab:15.11.4 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.11.3 +sameersbn/gitlab:15.11.4 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 4f8cfaa13..295752e1e 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.3 + image: sameersbn/gitlab:15.11.4 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index aab4e3408..8c8f1006c 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.3 + image: sameersbn/gitlab:15.11.4 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 802194373..e89ccfe8c 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.11.3 + image: sameersbn/gitlab:15.11.4 env: - name: TZ value: Asia/Kolkata From f9e3ae132e44b4e8856013515de1d01ad5d2e81d Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Mon, 22 May 2023 22:05:21 +0200 Subject: [PATCH 298/522] Upgrade GitLab CE to 15.11.5 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index e28fc5191..fabd74f8e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**15.11.5** + +- gitlab: upgrade CE to v15.11.5 +- gitaly: upgrade to v15.11.5 +- gitlab-pages: upgrade to v15.11.5 + **15.11.4** - gitlab: upgrade CE to v15.11.4 diff --git a/Dockerfile b/Dockerfile index 03191ad78..9fdeb18cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230412 -ARG VERSION=15.11.4 +ARG VERSION=15.11.5 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.20.4 \ GITLAB_SHELL_VERSION=14.18.0 \ - GITLAB_PAGES_VERSION=15.11.4 \ - GITALY_SERVER_VERSION=15.11.4 \ + GITLAB_PAGES_VERSION=15.11.5 \ + GITALY_SERVER_VERSION=15.11.5 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index bf5516bff..bceda684e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.11.4 +# sameersbn/gitlab:15.11.5 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.11.4 +docker pull sameersbn/gitlab:15.11.5 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.11.4 + sameersbn/gitlab:15.11.5 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.11.4 + sameersbn/gitlab:15.11.5 ``` ### Database @@ -288,7 +288,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:15.11.4 + sameersbn/gitlab:15.11.5 ``` ##### Linking to PostgreSQL Container @@ -332,7 +332,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:15.11.4 + sameersbn/gitlab:15.11.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: @@ -371,7 +371,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:15.11.4 + sameersbn/gitlab:15.11.5 ``` #### Linking to Redis Container @@ -398,7 +398,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.11.4 + sameersbn/gitlab:15.11.5 ``` #### Mail @@ -411,7 +411,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:15.11.4 + sameersbn/gitlab:15.11.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -431,7 +431,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:15.11.4 + sameersbn/gitlab:15.11.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -515,7 +515,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:15.11.4 + sameersbn/gitlab:15.11.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. @@ -531,7 +531,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:15.11.4 + sameersbn/gitlab:15.11.5 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -554,7 +554,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:15.11.4 + sameersbn/gitlab:15.11.5 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -602,7 +602,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:15.11.4 + sameersbn/gitlab:15.11.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:15.11.4 + sameersbn/gitlab:15.11.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:15.11.4 app:sanitize + sameersbn/gitlab:15.11.5 app:sanitize ``` #### Piwik @@ -2449,7 +2449,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.4 app:rake gitlab:backup:create + sameersbn/gitlab:15.11.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. @@ -2484,14 +2484,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.4 app:rake db:setup + sameersbn/gitlab:15.11.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:15.11.4 app:rake gitlab:backup:restore + sameersbn/gitlab:15.11.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. @@ -2500,7 +2500,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:15.11.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2549,7 +2549,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:15.11.4 app:rake gitlab:env:info + sameersbn/gitlab:15.11.5 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2562,7 +2562,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.4 app:rake gitlab:import:repos + sameersbn/gitlab:15.11.5 app:rake gitlab:import:repos ``` Or @@ -2593,7 +2593,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.4 app:rake gitlab:import:repos + sameersbn/gitlab:15.11.5 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2617,12 +2617,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.11.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:15.11.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:15.11.4 +docker pull sameersbn/gitlab:15.11.5 ``` - **Step 2**: Stop and remove the currently running image @@ -2647,7 +2647,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:15.11.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:15.11.5 ``` ### Shell Access @@ -2685,7 +2685,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.11.4 + image: sameersbn/gitlab:15.11.5 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 35a0a8cbe..1a4cce617 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.11.4 +15.11.5 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index dfb9b2ee0..477f273ae 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.4 + image: sameersbn/gitlab:15.11.5 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 72552cd4d..6906d67c0 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.11.4 + image: sameersbn/gitlab:15.11.5 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index d4fbbe237..db3b4e105 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.4 + image: sameersbn/gitlab:15.11.5 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 87d951b1c..6a11b1ead 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.4 app:rake gitlab:backup:create + sameersbn/gitlab:15.11.5 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.4 app:rake gitlab:backup:restore + sameersbn/gitlab:15.11.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:15.11.5 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.11.4 +docker pull sameersbn/gitlab:15.11.5 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.11.4 +sameersbn/gitlab:15.11.5 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 295752e1e..45531ad74 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.4 + image: sameersbn/gitlab:15.11.5 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 8c8f1006c..d7eef6251 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.4 + image: sameersbn/gitlab:15.11.5 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index e89ccfe8c..e07b98530 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.11.4 + image: sameersbn/gitlab:15.11.5 env: - name: TZ value: Asia/Kolkata From 24e2b581fbcbd6dc60187c2423c87e123f87090d Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Wed, 24 May 2023 20:26:06 +0900 Subject: [PATCH 299/522] Use `purge` instead to uninstall unused db clients Instead of `remove` that does not remove actual files. Co-authored-by: @f-io --- assets/runtime/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index 4b0200753..45e70b5d6 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -239,7 +239,7 @@ gitlab_uninstall_unused_database_client() { # remove unused client using regex above UNUSED_DB_CLIENTS=$(apt-cache pkgnames postgresql-client | grep -v -e "${REGEX_DB_CLIENT_VERSIONS_IN_USE}" | tr '\n' ' ') echo "- Uninstalling unused client(s): ${UNUSED_DB_CLIENTS}" - DEBIAN_FRONTEND=noninteractive apt-get -qq remove -- ${UNUSED_DB_CLIENTS} >/dev/null + DEBIAN_FRONTEND=noninteractive apt-get -qq purge -- ${UNUSED_DB_CLIENTS} >/dev/null fi } From 598a6666932ab1a703efc1c8f99ec70701b11d77 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Thu, 25 May 2023 12:44:32 +0900 Subject: [PATCH 300/522] Add `-y` option on uninstalling unused db client Co-authored-by: Steven Achilles Co-authored-by: @f-io --- assets/runtime/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index 45e70b5d6..e445c913e 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -239,7 +239,7 @@ gitlab_uninstall_unused_database_client() { # remove unused client using regex above UNUSED_DB_CLIENTS=$(apt-cache pkgnames postgresql-client | grep -v -e "${REGEX_DB_CLIENT_VERSIONS_IN_USE}" | tr '\n' ' ') echo "- Uninstalling unused client(s): ${UNUSED_DB_CLIENTS}" - DEBIAN_FRONTEND=noninteractive apt-get -qq purge -- ${UNUSED_DB_CLIENTS} >/dev/null + DEBIAN_FRONTEND=noninteractive apt-get -qq -y purge -- ${UNUSED_DB_CLIENTS} >/dev/null fi } From fcd5297d5dab1f383383e5ff7826a4bda3e77f98 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 23 May 2023 21:14:16 +0200 Subject: [PATCH 301/522] Remove postgresql-client-12 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9fdeb18cd..481c241c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,7 @@ RUN set -ex && \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ sudo supervisor logrotate locales curl \ nginx openssh-server postgresql-contrib redis-tools \ - postgresql-client-12 postgresql-client-13 postgresql-client-14 postgresql-client-15 \ + postgresql-client-13 postgresql-client-14 postgresql-client-15 \ python3 python3-docutils nodejs yarn gettext-base graphicsmagick \ libpq5 zlib1g libyaml-0-2 libssl1.1 \ libgdbm6 libreadline8 libncurses5 libffi7 \ From be00b11ea2733c62b9f1ada9e40c8c90c2af2ba5 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 24 May 2023 06:14:43 +0200 Subject: [PATCH 302/522] Include Postgres requirements in mail template --- scripts/release-notes.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh index a9db77813..0c84db159 100755 --- a/scripts/release-notes.sh +++ b/scripts/release-notes.sh @@ -38,7 +38,9 @@ For installation and usage instructions please refer to the [README](https://git Please note that this version does not yet include any rework as a consequence of the major release and possibly some functions in our implementation might not be usable yet or only to a limited extent. -Don't forget to consider the version specific upgrading instructions for [GitLab CE](https://docs.gitlab.com/ee/update/) *before* upgrading your GitLab CE instance! +Don't forget to consider the version specific upgrading instructions for [GitLab CE](https://docs.gitlab.com/ee/update/) **before** upgrading your GitLab CE instance! + +**GitLab 16.0 requires at least PostgreSQL 13.** You are kindly invited to provide contributions. From 5fc732eb3cf6782202eb263b9002c2f53aa824e3 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 24 May 2023 17:13:38 +0200 Subject: [PATCH 303/522] Add new configuration options for database.yml --- assets/build/config/database.yml.postgresql | 44 +++++++++++++++++++++ assets/runtime/config/gitlabhq/database.yml | 10 ++++- 2 files changed, 53 insertions(+), 1 deletion(-) diff --git a/assets/build/config/database.yml.postgresql b/assets/build/config/database.yml.postgresql index 180f8b018..198db0000 100644 --- a/assets/build/config/database.yml.postgresql +++ b/assets/build/config/database.yml.postgresql @@ -29,6 +29,14 @@ production: # port: 8600 # record: secondary.postgresql.service.consul # interval: 300 + ci: + adapter: postgresql + encoding: unicode + database: gitlabhq_production + database_tasks: false + username: git + password: "secure password" + host: localhost # geo: # adapter: postgresql # encoding: unicode @@ -50,6 +58,16 @@ development: host: localhost variables: statement_timeout: 15s + ci: + adapter: postgresql + encoding: unicode + database: gitlabhq_development + database_tasks: false + username: postgres + password: "secure password" + host: localhost + variables: + statement_timeout: 15s # geo: # adapter: postgresql # encoding: unicode @@ -69,6 +87,14 @@ staging: username: git password: "secure password" host: localhost + ci: + adapter: postgresql + encoding: unicode + database: gitlabhq_staging + database_tasks: false + username: git + password: "secure password" + host: localhost # geo: # adapter: postgresql # encoding: unicode @@ -91,6 +117,17 @@ test: &test prepared_statements: false variables: statement_timeout: 15s + ci: + adapter: postgresql + encoding: unicode + database: gitlabhq_test + database_tasks: false + username: postgres + password: + host: localhost + prepared_statements: false + variables: + statement_timeout: 15s # geo: # adapter: postgresql # encoding: unicode @@ -98,3 +135,10 @@ test: &test # username: postgres # password: # host: localhost +# embedding: +# adapter: postgresql +# encoding: unicode +# database: gitlabhq_embedding_test +# username: postgres +# password: +# host: localhost diff --git a/assets/runtime/config/gitlabhq/database.yml b/assets/runtime/config/gitlabhq/database.yml index 0423a57c4..a18e55c74 100644 --- a/assets/runtime/config/gitlabhq/database.yml +++ b/assets/runtime/config/gitlabhq/database.yml @@ -12,4 +12,12 @@ production: password: "{{DB_PASS}}" pool: {{DB_POOL}} prepared_statements: {{DB_PREPARED_STATEMENTS}} - + ci: + adapter: postgresql + encoding: {{DB_ENCODING}} + database: {{DB_NAME}} + database_tasks: false + host: {{DB_HOST}} + port: {{DB_PORT}} + username: {{DB_USER}} + password: "{{DB_PASS}}" From 88148ec146799807a3edd67d8a4ed1ae61f7961d Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 24 May 2023 17:35:43 +0200 Subject: [PATCH 304/522] Upgrade GitLab CE to 16.0.0 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index fabd74f8e..d7696db14 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**16.0.0** + +- gitlab: upgrade CE to v16.0.0 +- gitaly: upgrade to v16.0.0 +- gitlab-pages: upgrade to v16.0.0 +- gitlab-shell: upgrade to v14.20.0 + **15.11.5** - gitlab: upgrade CE to v15.11.5 diff --git a/Dockerfile b/Dockerfile index 481c241c3..491e81332 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230412 -ARG VERSION=15.11.5 +ARG VERSION=16.0.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.20.4 \ - GITLAB_SHELL_VERSION=14.18.0 \ - GITLAB_PAGES_VERSION=15.11.5 \ - GITALY_SERVER_VERSION=15.11.5 \ + GITLAB_SHELL_VERSION=14.20.0 \ + GITLAB_PAGES_VERSION=16.0.0 \ + GITALY_SERVER_VERSION=16.0.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index bceda684e..af4544ff5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:15.11.5 +# sameersbn/gitlab:16.0.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:15.11.5 +docker pull sameersbn/gitlab:16.0.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.11.5 + sameersbn/gitlab:16.0.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:15.11.5 + sameersbn/gitlab:16.0.0 ``` ### Database @@ -288,7 +288,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:15.11.5 + sameersbn/gitlab:16.0.0 ``` ##### Linking to PostgreSQL Container @@ -332,7 +332,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:15.11.5 + sameersbn/gitlab:16.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: @@ -371,7 +371,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:15.11.5 + sameersbn/gitlab:16.0.0 ``` #### Linking to Redis Container @@ -398,7 +398,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:15.11.5 + sameersbn/gitlab:16.0.0 ``` #### Mail @@ -411,7 +411,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:15.11.5 + sameersbn/gitlab:16.0.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -431,7 +431,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:15.11.5 + sameersbn/gitlab:16.0.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -515,7 +515,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:15.11.5 + sameersbn/gitlab:16.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. @@ -531,7 +531,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:15.11.5 + sameersbn/gitlab:16.0.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -554,7 +554,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:15.11.5 + sameersbn/gitlab:16.0.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -602,7 +602,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:15.11.5 + sameersbn/gitlab:16.0.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:15.11.5 + sameersbn/gitlab:16.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:15.11.5 app:sanitize + sameersbn/gitlab:16.0.0 app:sanitize ``` #### Piwik @@ -2449,7 +2449,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.5 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2484,14 +2484,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.5 app:rake db:setup + sameersbn/gitlab:16.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:15.11.5 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2500,7 +2500,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2549,7 +2549,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:15.11.5 app:rake gitlab:env:info + sameersbn/gitlab:16.0.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2562,7 +2562,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.5 app:rake gitlab:import:repos + sameersbn/gitlab:16.0.0 app:rake gitlab:import:repos ``` Or @@ -2593,7 +2593,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.5 app:rake gitlab:import:repos + sameersbn/gitlab:16.0.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2617,12 +2617,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:15.11.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:16.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:15.11.5 +docker pull sameersbn/gitlab:16.0.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2647,7 +2647,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:15.11.5 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.0.0 ``` ### Shell Access @@ -2685,7 +2685,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:15.11.5 + image: sameersbn/gitlab:16.0.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 1a4cce617..946789e61 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -15.11.5 +16.0.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 477f273ae..c6d65406c 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.5 + image: sameersbn/gitlab:16.0.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 6906d67c0..07d4355a2 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:15.11.5 + image: sameersbn/gitlab:16.0.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index db3b4e105..0500cd0d9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.5 + image: sameersbn/gitlab:16.0.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 6a11b1ead..57ef4f177 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.5 app:rake gitlab:backup:create + sameersbn/gitlab:16.0.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.5 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:15.11.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.0.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:15.11.5 +docker pull sameersbn/gitlab:16.0.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:15.11.5 +sameersbn/gitlab:16.0.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 45531ad74..09c14f527 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.5 + image: sameersbn/gitlab:16.0.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index d7eef6251..cfd674847 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:15.11.5 + image: sameersbn/gitlab:16.0.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index e07b98530..dbe44a4a0 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:15.11.5 + image: sameersbn/gitlab:16.0.0 env: - name: TZ value: Asia/Kolkata From 230284ebcf54f8ca7ada56d78d352a2d37f750d2 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 25 May 2023 18:14:23 +0200 Subject: [PATCH 305/522] Do not copy ruby by installing gitaly --- assets/build/install.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index b84cbe902..b266654d4 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -146,7 +146,12 @@ git clone -q -b v${GITALY_SERVER_VERSION} --depth 1 ${GITLAB_GITALY_URL} ${GITLA # install gitaly make -C ${GITLAB_GITALY_BUILD_DIR} install mkdir -p ${GITLAB_GITALY_INSTALL_DIR} -cp -a ${GITLAB_GITALY_BUILD_DIR}/ruby ${GITLAB_GITALY_INSTALL_DIR}/ +# The following line causes some issues. However, according to +# and +# there seems to +# be some attempts to remove ruby from gitaly. +# +# 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} From 5d215d6f25f41d45faa925dd6b2963507261dd07 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 25 May 2023 21:05:54 +0200 Subject: [PATCH 306/522] Upgrade GitLab CE to 16.0.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index d7696db14..b86da0d25 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**16.0.1** + +- gitlab: upgrade CE to v16.0.1 +- gitaly: upgrade to v16.0.1 +- gitlab-pages: upgrade to v16.0.1 + **16.0.0** - gitlab: upgrade CE to v16.0.0 diff --git a/Dockerfile b/Dockerfile index 491e81332..e19634b0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230412 -ARG VERSION=16.0.0 +ARG VERSION=16.0.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.20.4 \ GITLAB_SHELL_VERSION=14.20.0 \ - GITLAB_PAGES_VERSION=16.0.0 \ - GITALY_SERVER_VERSION=16.0.0 \ + GITLAB_PAGES_VERSION=16.0.1 \ + GITALY_SERVER_VERSION=16.0.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index af4544ff5..d88fd1e4a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.0.0 +# sameersbn/gitlab:16.0.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.0.0 +docker pull sameersbn/gitlab:16.0.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.0.0 + sameersbn/gitlab:16.0.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.0.0 + sameersbn/gitlab:16.0.1 ``` ### Database @@ -288,7 +288,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:16.0.0 + sameersbn/gitlab:16.0.1 ``` ##### Linking to PostgreSQL Container @@ -332,7 +332,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:16.0.0 + sameersbn/gitlab:16.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: @@ -371,7 +371,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:16.0.0 + sameersbn/gitlab:16.0.1 ``` #### Linking to Redis Container @@ -398,7 +398,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.0.0 + sameersbn/gitlab:16.0.1 ``` #### Mail @@ -411,7 +411,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:16.0.0 + sameersbn/gitlab:16.0.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -431,7 +431,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:16.0.0 + sameersbn/gitlab:16.0.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -515,7 +515,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:16.0.0 + sameersbn/gitlab:16.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. @@ -531,7 +531,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:16.0.0 + sameersbn/gitlab:16.0.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -554,7 +554,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:16.0.0 + sameersbn/gitlab:16.0.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -602,7 +602,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:16.0.0 + sameersbn/gitlab:16.0.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:16.0.0 + sameersbn/gitlab:16.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:16.0.0 app:sanitize + sameersbn/gitlab:16.0.1 app:sanitize ``` #### Piwik @@ -2449,7 +2449,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2484,14 +2484,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.0 app:rake db:setup + sameersbn/gitlab:16.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:16.0.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2500,7 +2500,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2549,7 +2549,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:16.0.0 app:rake gitlab:env:info + sameersbn/gitlab:16.0.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2562,7 +2562,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.0.1 app:rake gitlab:import:repos ``` Or @@ -2593,7 +2593,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.0.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2617,12 +2617,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.0.0 +docker pull sameersbn/gitlab:16.0.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2647,7 +2647,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:16.0.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.0.1 ``` ### Shell Access @@ -2685,7 +2685,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.0.0 + image: sameersbn/gitlab:16.0.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 946789e61..7141108f1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.0.0 +16.0.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index c6d65406c..64b8f83c4 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.0 + image: sameersbn/gitlab:16.0.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 07d4355a2..d6c339213 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.0.0 + image: sameersbn/gitlab:16.0.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 0500cd0d9..60980975b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.0 + image: sameersbn/gitlab:16.0.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 57ef4f177..78adeba89 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.0.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.0.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.0.0 +docker pull sameersbn/gitlab:16.0.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.0.0 +sameersbn/gitlab:16.0.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 09c14f527..7f744b562 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.0 + image: sameersbn/gitlab:16.0.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index cfd674847..53c470750 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.0 + image: sameersbn/gitlab:16.0.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index dbe44a4a0..32dfbd13f 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.0.0 + image: sameersbn/gitlab:16.0.1 env: - name: TZ value: Asia/Kolkata From 7140f0342b6d8aadd6e2b0ff7fd74f22a23a5e68 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Fri, 2 Jun 2023 22:12:29 +0900 Subject: [PATCH 307/522] Fix unused client removal on restarted container Handle the case where the target does not exist in the process of deleting unused clients. Such a situation will not occur in newly launched containers, but will occur if they are restarted. During container restarts, container status are preserved. If the unused database client was deleted in the last run, grep will not match anything. It returns non-zero code and the container stops there because entrypoint sets option `-e` (exit immediately on non-zero exit code excluding some special cases) This commit make the uninstall process to handle the case UNUSED_DB_CLIENTS is empty. --- assets/runtime/functions | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index e445c913e..496a28e0c 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -237,7 +237,16 @@ gitlab_uninstall_unused_database_client() { REGEX_DB_CLIENT_VERSIONS_IN_USE="-common${DB_CLIENT_VERSIONS_IN_USE}" # remove unused client using regex above - UNUSED_DB_CLIENTS=$(apt-cache pkgnames postgresql-client | grep -v -e "${REGEX_DB_CLIENT_VERSIONS_IN_USE}" | tr '\n' ' ') + # grep may return non-zero code on mo match, so fake the exit code with the `|| true` to swallow that + UNUSED_DB_CLIENTS=$(apt-cache pkgnames postgresql-client | grep -v -e "${REGEX_DB_CLIENT_VERSIONS_IN_USE}" || true) + if [[ "${UNUSED_DB_CLIENTS}" == "" ]]; then + echo "- All installed version of clients are in use. Did not uninstalled any client..." + return + fi + + # just to get clean log, convert newline (package name delimiter) to single whitespace + UNUSED_DB_CLIENTS=$(echo ${UNUSED_DB_CLIENTS} | tr '\n' ' ') + echo "- Uninstalling unused client(s): ${UNUSED_DB_CLIENTS}" DEBIAN_FRONTEND=noninteractive apt-get -qq -y purge -- ${UNUSED_DB_CLIENTS} >/dev/null fi From 2e7102401ace7ba290a63419ca870ad0995f117f Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Wed, 7 Jun 2023 22:32:26 +0900 Subject: [PATCH 308/522] README: postgresql-client-12 no longer contained --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index d88fd1e4a..65d5448cf 100644 --- a/README.md +++ b/README.md @@ -259,7 +259,6 @@ Configuring gitlab::database Please note furthermore, that only combatible versions of the `postgresql-client` to GitLab are shipped with this image. Currently these belogn to -- `postgresql-client-12`, - `postgresql-client-13`, - `postgresql-client-14`, - and `postgresql-client-15`. From df09358dce5962a39a052d41a0228ff8b100e76e Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Wed, 7 Jun 2023 22:36:52 +0900 Subject: [PATCH 309/522] README: Fix typo in note about postgresql-client --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 65d5448cf..fae3b64d3 100644 --- a/README.md +++ b/README.md @@ -257,7 +257,7 @@ Configuring gitlab::database … ```` -Please note furthermore, that only combatible versions of the `postgresql-client` to GitLab are shipped with this image. Currently these belogn to +Please note furthermore, that only compatible versions of the `postgresql-client` to GitLab are shipped with this image. Currently these belong to - `postgresql-client-13`, - `postgresql-client-14`, From e123975ab8747faba01bea51d39d8366388a8e0a Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 7 Jun 2023 14:50:58 +0200 Subject: [PATCH 310/522] Upgrade GitLab CE to 16.0.2 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index b86da0d25..38bf99a45 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,13 @@ This file only reflects the changes that are made in this image. Please refer to **16.0.1** +- gitlab: upgrade CE to v16.0.2 +- gitaly: upgrade to v16.0.2 +- gitlab-pages: upgrade to v16.0.2 +- golang: upgrade to v1.20.5 + +**16.0.1** + - gitlab: upgrade CE to v16.0.1 - gitaly: upgrade to v16.0.1 - gitlab-pages: upgrade to v16.0.1 diff --git a/Dockerfile b/Dockerfile index e19634b0e..5bf6486ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230412 -ARG VERSION=16.0.1 +ARG VERSION=16.0.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ - GOLANG_VERSION=1.20.4 \ + GOLANG_VERSION=1.20.5 \ GITLAB_SHELL_VERSION=14.20.0 \ - GITLAB_PAGES_VERSION=16.0.1 \ - GITALY_SERVER_VERSION=16.0.1 \ + GITLAB_PAGES_VERSION=16.0.2 \ + GITALY_SERVER_VERSION=16.0.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index fae3b64d3..176967695 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.0.1 +# sameersbn/gitlab:16.0.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.0.1 +docker pull sameersbn/gitlab:16.0.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.0.1 + sameersbn/gitlab:16.0.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.0.1 + sameersbn/gitlab:16.0.2 ``` ### Database @@ -287,7 +287,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:16.0.1 + sameersbn/gitlab:16.0.2 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.0.1 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.0.1 + sameersbn/gitlab:16.0.2 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.0.1 + sameersbn/gitlab:16.0.2 ``` #### Mail @@ -410,7 +410,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:16.0.1 + sameersbn/gitlab:16.0.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.0.1 + sameersbn/gitlab:16.0.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.0.1 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.0.1 + sameersbn/gitlab:16.0.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.0.1 + sameersbn/gitlab:16.0.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.0.1 + sameersbn/gitlab:16.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:16.0.1 + sameersbn/gitlab:16.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:16.0.1 app:sanitize + sameersbn/gitlab:16.0.2 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.1 app:rake db:setup + sameersbn/gitlab:16.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:16.0.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.0.1 app:rake gitlab:env:info + sameersbn/gitlab:16.0.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.0.2 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.0.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.0.1 +docker pull sameersbn/gitlab:16.0.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.0.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.0.2 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.0.1 + image: sameersbn/gitlab:16.0.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 7141108f1..d04447a1e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.0.1 +16.0.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 64b8f83c4..6829d93ed 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.1 + image: sameersbn/gitlab:16.0.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index d6c339213..118cada51 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.0.1 + image: sameersbn/gitlab:16.0.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 60980975b..d872a72d9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.1 + image: sameersbn/gitlab:16.0.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 78adeba89..aa67e7b9f 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.0.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.0.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.0.1 +docker pull sameersbn/gitlab:16.0.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.0.1 +sameersbn/gitlab:16.0.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 7f744b562..775dea621 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.1 + image: sameersbn/gitlab:16.0.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 53c470750..53d5f6874 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.1 + image: sameersbn/gitlab:16.0.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 32dfbd13f..555f3fa94 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.0.1 + image: sameersbn/gitlab:16.0.2 env: - name: TZ value: Asia/Kolkata From 983922b5f5a8f50becb020a0184d44bd447a981e Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 7 Jun 2023 17:54:29 +0200 Subject: [PATCH 311/522] Update Changelog.md --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 38bf99a45..0e8159a58 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,7 +2,7 @@ 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. -**16.0.1** +**16.0.2** - gitlab: upgrade CE to v16.0.2 - gitaly: upgrade to v16.0.2 From df4a0934042a6f2a724a07bc6b3dc393645933c6 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 7 Jun 2023 14:55:50 +0200 Subject: [PATCH 312/522] Upgrade GitLab CE to 16.0.3 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 0e8159a58..0c5157a92 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**16.0.3** + +- gitlab: upgrade CE to v16.0.3 +- gitaly: upgrade to v16.0.3 +- gitlab-pages: upgrade to v16.0.3 + **16.0.2** - gitlab: upgrade CE to v16.0.2 diff --git a/Dockerfile b/Dockerfile index 5bf6486ed..2eb92862d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230412 -ARG VERSION=16.0.2 +ARG VERSION=16.0.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.20.5 \ GITLAB_SHELL_VERSION=14.20.0 \ - GITLAB_PAGES_VERSION=16.0.2 \ - GITALY_SERVER_VERSION=16.0.2 \ + GITLAB_PAGES_VERSION=16.0.3 \ + GITALY_SERVER_VERSION=16.0.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 176967695..5c1f665a9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.0.2 +# sameersbn/gitlab:16.0.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.0.2 +docker pull sameersbn/gitlab:16.0.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.0.2 + sameersbn/gitlab:16.0.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.0.2 + sameersbn/gitlab:16.0.3 ``` ### Database @@ -287,7 +287,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:16.0.2 + sameersbn/gitlab:16.0.3 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.0.2 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.0.2 + sameersbn/gitlab:16.0.3 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.0.2 + sameersbn/gitlab:16.0.3 ``` #### Mail @@ -410,7 +410,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:16.0.2 + sameersbn/gitlab:16.0.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.0.2 + sameersbn/gitlab:16.0.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.0.2 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.0.2 + sameersbn/gitlab:16.0.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.0.2 + sameersbn/gitlab:16.0.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.0.2 + sameersbn/gitlab:16.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:16.0.2 + sameersbn/gitlab:16.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:16.0.2 app:sanitize + sameersbn/gitlab:16.0.3 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.2 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.2 app:rake db:setup + sameersbn/gitlab:16.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:16.0.2 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.0.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.0.2 app:rake gitlab:env:info + sameersbn/gitlab:16.0.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.2 app:rake gitlab:import:repos + sameersbn/gitlab:16.0.3 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.2 app:rake gitlab:import:repos + sameersbn/gitlab:16.0.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.0.2 +docker pull sameersbn/gitlab:16.0.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.0.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.0.3 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.0.2 + image: sameersbn/gitlab:16.0.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index d04447a1e..04627b68d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.0.2 +16.0.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 6829d93ed..df6c50aeb 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.2 + image: sameersbn/gitlab:16.0.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 118cada51..5a4b01667 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.0.2 + image: sameersbn/gitlab:16.0.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index d872a72d9..4ac916ab5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.2 + image: sameersbn/gitlab:16.0.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index aa67e7b9f..271d0d398 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.2 app:rake gitlab:backup:create + sameersbn/gitlab:16.0.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.2 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.0.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.0.2 +docker pull sameersbn/gitlab:16.0.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.0.2 +sameersbn/gitlab:16.0.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 775dea621..fc6d477df 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.2 + image: sameersbn/gitlab:16.0.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 53d5f6874..411ff814e 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.2 + image: sameersbn/gitlab:16.0.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 555f3fa94..9b09b8f90 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.0.2 + image: sameersbn/gitlab:16.0.3 env: - name: TZ value: Asia/Kolkata From 7718f194a544dbc6636a7e4a954d47a72126257d Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 14 Jun 2023 20:56:35 +0200 Subject: [PATCH 313/522] Upgrade GitLab CE to 16.0.4 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 0c5157a92..243b2b997 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**16.0.4** + +- gitlab: upgrade CE to v16.0.4 +- gitaly: upgrade to v16.0.4 +- gitlab-pages: upgrade to v16.0.4 + **16.0.3** - gitlab: upgrade CE to v16.0.3 diff --git a/Dockerfile b/Dockerfile index 2eb92862d..01f17a2ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230412 -ARG VERSION=16.0.3 +ARG VERSION=16.0.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.20.5 \ GITLAB_SHELL_VERSION=14.20.0 \ - GITLAB_PAGES_VERSION=16.0.3 \ - GITALY_SERVER_VERSION=16.0.3 \ + GITLAB_PAGES_VERSION=16.0.4 \ + GITALY_SERVER_VERSION=16.0.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 5c1f665a9..2c3e17622 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.0.3 +# sameersbn/gitlab:16.0.4 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.0.3 +docker pull sameersbn/gitlab:16.0.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.0.3 + sameersbn/gitlab:16.0.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.0.3 + sameersbn/gitlab:16.0.4 ``` ### Database @@ -287,7 +287,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:16.0.3 + sameersbn/gitlab:16.0.4 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.0.3 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.0.3 + sameersbn/gitlab:16.0.4 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.0.3 + sameersbn/gitlab:16.0.4 ``` #### Mail @@ -410,7 +410,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:16.0.3 + sameersbn/gitlab:16.0.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.0.3 + sameersbn/gitlab:16.0.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.0.3 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.0.3 + sameersbn/gitlab:16.0.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.0.3 + sameersbn/gitlab:16.0.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.0.3 + sameersbn/gitlab:16.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:16.0.3 + sameersbn/gitlab:16.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:16.0.3 app:sanitize + sameersbn/gitlab:16.0.4 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.3 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.3 app:rake db:setup + sameersbn/gitlab:16.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:16.0.3 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.0.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.0.3 app:rake gitlab:env:info + sameersbn/gitlab:16.0.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.3 app:rake gitlab:import:repos + sameersbn/gitlab:16.0.4 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.3 app:rake gitlab:import:repos + sameersbn/gitlab:16.0.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.0.3 +docker pull sameersbn/gitlab:16.0.4 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.0.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.0.4 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.0.3 + image: sameersbn/gitlab:16.0.4 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 04627b68d..05b505513 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.0.3 +16.0.4 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index df6c50aeb..162dc0b89 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.3 + image: sameersbn/gitlab:16.0.4 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 5a4b01667..b3d6cfcc3 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.0.3 + image: sameersbn/gitlab:16.0.4 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 4ac916ab5..a2475666d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.3 + image: sameersbn/gitlab:16.0.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 271d0d398..324194727 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.3 app:rake gitlab:backup:create + sameersbn/gitlab:16.0.4 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.3 app:rake gitlab:backup:restore + sameersbn/gitlab:16.0.4 app:rake gitlab:backup:restore ``` The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.0.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.0.3 +docker pull sameersbn/gitlab:16.0.4 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.0.3 +sameersbn/gitlab:16.0.4 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index fc6d477df..b4b78f411 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.3 + image: sameersbn/gitlab:16.0.4 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 411ff814e..1cd53cc15 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.3 + image: sameersbn/gitlab:16.0.4 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 9b09b8f90..4c32e5042 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.0.3 + image: sameersbn/gitlab:16.0.4 env: - name: TZ value: Asia/Kolkata From 208b1e81b2b0ba093d981c621d334bda22f4f305 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 18 Jun 2023 09:29:36 +0200 Subject: [PATCH 314/522] Upgrade GitLab CE to 16.0.5 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 243b2b997..26dce0b0e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**16.0.5** + +- gitlab: upgrade CE to v16.0.45 +- gitaly: upgrade to v16.0.5 +- gitlab-pages: upgrade to v16.0.5 +- ubuntu: upgrade to focal-20230605 + **16.0.4** - gitlab: upgrade CE to v16.0.4 diff --git a/Dockerfile b/Dockerfile index 01f17a2ad..ce1ecd1d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20230412 +FROM ubuntu:focal-20230605 -ARG VERSION=16.0.4 +ARG VERSION=16.0.5 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.20.5 \ GITLAB_SHELL_VERSION=14.20.0 \ - GITLAB_PAGES_VERSION=16.0.4 \ - GITALY_SERVER_VERSION=16.0.4 \ + GITLAB_PAGES_VERSION=16.0.5 \ + GITALY_SERVER_VERSION=16.0.5 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 2c3e17622..a4f476636 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.0.4 +# sameersbn/gitlab:16.0.5 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.0.4 +docker pull sameersbn/gitlab:16.0.5 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.0.4 + sameersbn/gitlab:16.0.5 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.0.4 + sameersbn/gitlab:16.0.5 ``` ### Database @@ -287,7 +287,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:16.0.4 + sameersbn/gitlab:16.0.5 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.0.4 + sameersbn/gitlab:16.0.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: @@ -370,7 +370,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:16.0.4 + sameersbn/gitlab:16.0.5 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.0.4 + sameersbn/gitlab:16.0.5 ``` #### Mail @@ -410,7 +410,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:16.0.4 + sameersbn/gitlab:16.0.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.0.4 + sameersbn/gitlab:16.0.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.0.4 + sameersbn/gitlab:16.0.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. @@ -530,7 +530,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:16.0.4 + sameersbn/gitlab:16.0.5 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.0.4 + sameersbn/gitlab:16.0.5 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.0.4 + sameersbn/gitlab:16.0.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:16.0.4 + sameersbn/gitlab:16.0.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:16.0.4 app:sanitize + sameersbn/gitlab:16.0.5 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.4 app:rake gitlab:backup:create + sameersbn/gitlab:16.0.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.4 app:rake db:setup + sameersbn/gitlab:16.0.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:16.0.4 app:rake gitlab:backup:restore + sameersbn/gitlab:16.0.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.0.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.0.4 app:rake gitlab:env:info + sameersbn/gitlab:16.0.5 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.4 app:rake gitlab:import:repos + sameersbn/gitlab:16.0.5 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.4 app:rake gitlab:import:repos + sameersbn/gitlab:16.0.5 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.0.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:16.0.4 +docker pull sameersbn/gitlab:16.0.5 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.0.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.0.5 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.0.4 + image: sameersbn/gitlab:16.0.5 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 05b505513..e85a0ad07 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.0.4 +16.0.5 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 162dc0b89..b4bfdfe5e 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.4 + image: sameersbn/gitlab:16.0.5 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index b3d6cfcc3..ba61d7c14 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.0.4 + image: sameersbn/gitlab:16.0.5 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index a2475666d..c92c4c77d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.4 + image: sameersbn/gitlab:16.0.5 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 324194727..6b48b4a6d 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.4 app:rake gitlab:backup:create + sameersbn/gitlab:16.0.5 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.4 app:rake gitlab:backup:restore + sameersbn/gitlab:16.0.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.0.5 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.0.4 +docker pull sameersbn/gitlab:16.0.5 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.0.4 +sameersbn/gitlab:16.0.5 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index b4b78f411..8e3dfb390 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.4 + image: sameersbn/gitlab:16.0.5 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 1cd53cc15..789466dc1 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.4 + image: sameersbn/gitlab:16.0.5 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 4c32e5042..6da779c2d 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.0.4 + image: sameersbn/gitlab:16.0.5 env: - name: TZ value: Asia/Kolkata From a63405d433d39e0c6f5d863c5083792d277fd542 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 18 Jun 2023 09:42:35 +0200 Subject: [PATCH 315/522] Add pool option to database.yml --- assets/runtime/config/gitlabhq/database.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/runtime/config/gitlabhq/database.yml b/assets/runtime/config/gitlabhq/database.yml index a18e55c74..6ca70ad2a 100644 --- a/assets/runtime/config/gitlabhq/database.yml +++ b/assets/runtime/config/gitlabhq/database.yml @@ -21,3 +21,4 @@ production: port: {{DB_PORT}} username: {{DB_USER}} password: "{{DB_PASS}}" + pool: {{DB_POOL}} From b2062dd6e2f54662d67da99795606aa0f91529e8 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 23 Jun 2023 19:21:50 +0200 Subject: [PATCH 316/522] Upgrade GitLab CE to 16.1.0 --- Changelog.md | 9 ++++- Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 51 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index 26dce0b0e..be5efc6d9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,9 +2,16 @@ 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. +**16.1.0** + +- gitlab: upgrade CE to v16.1.0 +- gitaly: upgrade to v16.1.0 +- gitlab-pages: upgrade to v16.1.0 +- gitlab-shell: upgrade to v14.23.0 + **16.0.5** -- gitlab: upgrade CE to v16.0.45 +- gitlab: upgrade CE to v16.0.5 - gitaly: upgrade to v16.0.5 - gitlab-pages: upgrade to v16.0.5 - ubuntu: upgrade to focal-20230605 diff --git a/Dockerfile b/Dockerfile index ce1ecd1d2..a24aa1121 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230605 -ARG VERSION=16.0.5 +ARG VERSION=16.1.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.20.5 \ - GITLAB_SHELL_VERSION=14.20.0 \ - GITLAB_PAGES_VERSION=16.0.5 \ - GITALY_SERVER_VERSION=16.0.5 \ + GITLAB_SHELL_VERSION=14.23.0 \ + GITLAB_PAGES_VERSION=16.1.0 \ + GITALY_SERVER_VERSION=16.1.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index a4f476636..39bba8438 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.0.5 +# sameersbn/gitlab:16.1.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.0.5 +docker pull sameersbn/gitlab:16.1.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.0.5 + sameersbn/gitlab:16.1.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.0.5 + sameersbn/gitlab:16.1.0 ``` ### Database @@ -287,7 +287,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:16.0.5 + sameersbn/gitlab:16.1.0 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.0.5 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.0.5 + sameersbn/gitlab:16.1.0 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.0.5 + sameersbn/gitlab:16.1.0 ``` #### Mail @@ -410,7 +410,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:16.0.5 + sameersbn/gitlab:16.1.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.0.5 + sameersbn/gitlab:16.1.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.0.5 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.0.5 + sameersbn/gitlab:16.1.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.0.5 + sameersbn/gitlab:16.1.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.0.5 + sameersbn/gitlab:16.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:16.0.5 + sameersbn/gitlab:16.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:16.0.5 app:sanitize + sameersbn/gitlab:16.1.0 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.5 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.5 app:rake db:setup + sameersbn/gitlab:16.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:16.0.5 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.0.5 app:rake gitlab:env:info + sameersbn/gitlab:16.1.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.5 app:rake gitlab:import:repos + sameersbn/gitlab:16.1.0 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.5 app:rake gitlab:import:repos + sameersbn/gitlab:16.1.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.0.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:16.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:16.0.5 +docker pull sameersbn/gitlab:16.1.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.0.5 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.1.0 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.0.5 + image: sameersbn/gitlab:16.1.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index e85a0ad07..e0228cf18 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.0.5 +16.1.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index b4bfdfe5e..5e3bffd21 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.5 + image: sameersbn/gitlab:16.1.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index ba61d7c14..26d7c7231 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.0.5 + image: sameersbn/gitlab:16.1.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index c92c4c77d..f3f9872b5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.5 + image: sameersbn/gitlab:16.1.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 6b48b4a6d..37b29884d 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.5 app:rake gitlab:backup:create + sameersbn/gitlab:16.1.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.5 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.0.5 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.1.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.0.5 +docker pull sameersbn/gitlab:16.1.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.0.5 +sameersbn/gitlab:16.1.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 8e3dfb390..926052a34 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.5 + image: sameersbn/gitlab:16.1.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 789466dc1..ad3b7dff2 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.0.5 + image: sameersbn/gitlab:16.1.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 6da779c2d..d5731d2d9 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.0.5 + image: sameersbn/gitlab:16.1.0 env: - name: TZ value: Asia/Kolkata From fbb9a7422b4572e0f1d5029747a8a96af0318aee Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 24 Jun 2023 08:40:57 +0200 Subject: [PATCH 317/522] Update puma.rb --- assets/runtime/config/gitlabhq/puma.rb | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/assets/runtime/config/gitlabhq/puma.rb b/assets/runtime/config/gitlabhq/puma.rb index f48ff788a..df5b5eeac 100644 --- a/assets/runtime/config/gitlabhq/puma.rb +++ b/assets/runtime/config/gitlabhq/puma.rb @@ -39,7 +39,6 @@ workers {{PUMA_WORKERS}} require_relative "{{GITLAB_INSTALL_DIR}}/lib/gitlab/cluster/lifecycle_events" -require_relative "{{GITLAB_INSTALL_DIR}}/lib/gitlab/cluster/puma_worker_killer_initializer" on_restart do # Signal application hooks that we're about to restart @@ -60,6 +59,11 @@ Gitlab::Cluster::LifecycleEvents.do_worker_start end +on_worker_shutdown do + # Signal application hooks that a worker is shutting down + Gitlab::Cluster::LifecycleEvents.do_worker_stop +end + # Preload the application before starting the workers; this conflicts with # phased restart feature. (off by default) preload_app! @@ -72,6 +76,9 @@ # worker_timeout {{PUMA_TIMEOUT}} +# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput +wait_for_less_busy_worker ENV.fetch('https://github.com/PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f + # Use json formatter require_relative "{{GITLAB_INSTALL_DIR}}/lib/gitlab/puma_logging/json_formatter" @@ -79,3 +86,12 @@ log_formatter do |str| json_formatter.call(str) end + +lowlevel_error_handler do |ex, env| + if Raven.configuration.capture_allowed? + Raven.capture_exception(ex, tags: { 'handler': 'puma_low_level' }, extra: { puma_env: env }) + end + + # note the below is just a Rack response + [500, {}, ["An error has occurred and reported in the system's low-level error handler."]] +end From ec8eb9c5687ac7f883fdbd1d350b8ff17f0da522 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 1 Jul 2023 10:02:57 +0200 Subject: [PATCH 318/522] Upgrade GitLab CE to 16.1.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index be5efc6d9..d9c69046d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**16.1.1** + +- gitlab: upgrade CE to v16.1.1 +- gitaly: upgrade to v16.1.1 +- gitlab-pages: upgrade to v16.1.1 + **16.1.0** - gitlab: upgrade CE to v16.1.0 diff --git a/Dockerfile b/Dockerfile index a24aa1121..14113847a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230605 -ARG VERSION=16.1.0 +ARG VERSION=16.1.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.20.5 \ GITLAB_SHELL_VERSION=14.23.0 \ - GITLAB_PAGES_VERSION=16.1.0 \ - GITALY_SERVER_VERSION=16.1.0 \ + GITLAB_PAGES_VERSION=16.1.1 \ + GITALY_SERVER_VERSION=16.1.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 39bba8438..fc5d0c58a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.1.0 +# sameersbn/gitlab:16.1.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.1.0 +docker pull sameersbn/gitlab:16.1.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.1.0 + sameersbn/gitlab:16.1.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.1.0 + sameersbn/gitlab:16.1.1 ``` ### Database @@ -287,7 +287,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:16.1.0 + sameersbn/gitlab:16.1.1 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.1.0 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.1.0 + sameersbn/gitlab:16.1.1 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.1.0 + sameersbn/gitlab:16.1.1 ``` #### Mail @@ -410,7 +410,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:16.1.0 + sameersbn/gitlab:16.1.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.1.0 + sameersbn/gitlab:16.1.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.1.0 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.1.0 + sameersbn/gitlab:16.1.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.1.0 + sameersbn/gitlab:16.1.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.1.0 + sameersbn/gitlab:16.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:16.1.0 + sameersbn/gitlab:16.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:16.1.0 app:sanitize + sameersbn/gitlab:16.1.1 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.0 app:rake db:setup + sameersbn/gitlab:16.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:16.1.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.1.0 app:rake gitlab:env:info + sameersbn/gitlab:16.1.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.1.1 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.1.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.1.0 +docker pull sameersbn/gitlab:16.1.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.1.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.1.1 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.1.0 + image: sameersbn/gitlab:16.1.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index e0228cf18..1afe54c7b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.1.0 +16.1.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 5e3bffd21..cff55e926 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.1.0 + image: sameersbn/gitlab:16.1.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 26d7c7231..a4c302a96 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.1.0 + image: sameersbn/gitlab:16.1.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index f3f9872b5..a88399f19 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.1.0 + image: sameersbn/gitlab:16.1.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 37b29884d..1c898bcbb 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.1.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.1.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.1.0 +docker pull sameersbn/gitlab:16.1.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.1.0 +sameersbn/gitlab:16.1.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 926052a34..ccfdbbba1 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.1.0 + image: sameersbn/gitlab:16.1.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index ad3b7dff2..ecd41aded 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.1.0 + image: sameersbn/gitlab:16.1.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index d5731d2d9..63d2cbb73 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.1.0 + image: sameersbn/gitlab:16.1.1 env: - name: TZ value: Asia/Kolkata From fc33f9e90f02815a8b501ee09d208dc6e70b0be7 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 6 Jul 2023 22:01:01 +0200 Subject: [PATCH 319/522] Upgrade GitLab CE to 16.1.2 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index d9c69046d..07fd004f5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**16.1.2** + +- gitlab: upgrade CE to v16.1.2 +- gitaly: upgrade to v16.1.2 +- gitlab-pages: upgrade to v16.1.2 +- ubuntu: upgrade to focal-20230624 + **16.1.1** - gitlab: upgrade CE to v16.1.1 diff --git a/Dockerfile b/Dockerfile index 14113847a..3cda1247c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20230605 +FROM ubuntu:focal-20230624 -ARG VERSION=16.1.1 +ARG VERSION=16.1.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.20.5 \ GITLAB_SHELL_VERSION=14.23.0 \ - GITLAB_PAGES_VERSION=16.1.1 \ - GITALY_SERVER_VERSION=16.1.1 \ + GITLAB_PAGES_VERSION=16.1.2 \ + GITALY_SERVER_VERSION=16.1.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index fc5d0c58a..38766c58a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.1.1 +# sameersbn/gitlab:16.1.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.1.1 +docker pull sameersbn/gitlab:16.1.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.1.1 + sameersbn/gitlab:16.1.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.1.1 + sameersbn/gitlab:16.1.2 ``` ### Database @@ -287,7 +287,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:16.1.1 + sameersbn/gitlab:16.1.2 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.1.1 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.1.1 + sameersbn/gitlab:16.1.2 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.1.1 + sameersbn/gitlab:16.1.2 ``` #### Mail @@ -410,7 +410,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:16.1.1 + sameersbn/gitlab:16.1.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.1.1 + sameersbn/gitlab:16.1.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.1.1 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.1.1 + sameersbn/gitlab:16.1.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.1.1 + sameersbn/gitlab:16.1.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.1.1 + sameersbn/gitlab:16.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:16.1.1 + sameersbn/gitlab:16.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:16.1.1 app:sanitize + sameersbn/gitlab:16.1.2 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.1 app:rake db:setup + sameersbn/gitlab:16.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:16.1.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.1.1 app:rake gitlab:env:info + sameersbn/gitlab:16.1.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.1.2 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.1.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.1.1 +docker pull sameersbn/gitlab:16.1.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.1.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.1.2 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.1.1 + image: sameersbn/gitlab:16.1.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 1afe54c7b..2393940e1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.1.1 +16.1.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index cff55e926..6b347e75b 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.1.1 + image: sameersbn/gitlab:16.1.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index a4c302a96..7bd79e145 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.1.1 + image: sameersbn/gitlab:16.1.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index a88399f19..7c932569f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.1.1 + image: sameersbn/gitlab:16.1.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 1c898bcbb..5e7504894 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.1.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.1.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.1.1 +docker pull sameersbn/gitlab:16.1.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.1.1 +sameersbn/gitlab:16.1.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index ccfdbbba1..d01fd8e32 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.1.1 + image: sameersbn/gitlab:16.1.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index ecd41aded..4f51d2b7a 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.1.1 + image: sameersbn/gitlab:16.1.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 63d2cbb73..b77d5a80b 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.1.1 + image: sameersbn/gitlab:16.1.2 env: - name: TZ value: Asia/Kolkata From eb5130f86e5e46feb1aab0ea861d7788af035916 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 22 Jul 2023 18:46:31 +0200 Subject: [PATCH 320/522] Upgrade GitLab CE to 16.2.0 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 07fd004f5..5cdbc0cc8 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**16.2.0** + +- gitlab: upgrade CE to v16.2.0 +- gitaly: upgrade to v16.2.0 +- gitlab-pages: upgrade to v16.2.0 +- golang: upgrade to v1.20.6 + **16.1.2** - gitlab: upgrade CE to v16.1.2 diff --git a/Dockerfile b/Dockerfile index 3cda1247c..31868bb95 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230624 -ARG VERSION=16.1.2 +ARG VERSION=16.2.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ - GOLANG_VERSION=1.20.5 \ + GOLANG_VERSION=1.20.6 \ GITLAB_SHELL_VERSION=14.23.0 \ - GITLAB_PAGES_VERSION=16.1.2 \ - GITALY_SERVER_VERSION=16.1.2 \ + GITLAB_PAGES_VERSION=16.2.0 \ + GITALY_SERVER_VERSION=16.2.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 38766c58a..b48732a51 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.1.2 +# sameersbn/gitlab:16.2.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.1.2 +docker pull sameersbn/gitlab:16.2.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.1.2 + sameersbn/gitlab:16.2.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.1.2 + sameersbn/gitlab:16.2.0 ``` ### Database @@ -287,7 +287,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:16.1.2 + sameersbn/gitlab:16.2.0 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.1.2 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.1.2 + sameersbn/gitlab:16.2.0 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.1.2 + sameersbn/gitlab:16.2.0 ``` #### Mail @@ -410,7 +410,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:16.1.2 + sameersbn/gitlab:16.2.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.1.2 + sameersbn/gitlab:16.2.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.1.2 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.1.2 + sameersbn/gitlab:16.2.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.1.2 + sameersbn/gitlab:16.2.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.1.2 + sameersbn/gitlab:16.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:16.1.2 + sameersbn/gitlab:16.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:16.1.2 app:sanitize + sameersbn/gitlab:16.2.0 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.2 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.2 app:rake db:setup + sameersbn/gitlab:16.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:16.1.2 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.1.2 app:rake gitlab:env:info + sameersbn/gitlab:16.2.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.2 app:rake gitlab:import:repos + sameersbn/gitlab:16.2.0 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.2 app:rake gitlab:import:repos + sameersbn/gitlab:16.2.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.1.2 +docker pull sameersbn/gitlab:16.2.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.1.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.2.0 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.1.2 + image: sameersbn/gitlab:16.2.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 2393940e1..fd1bd70b7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.1.2 +16.2.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 6b347e75b..6d09c1a80 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.1.2 + image: sameersbn/gitlab:16.2.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 7bd79e145..616fd42e9 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.1.2 + image: sameersbn/gitlab:16.2.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 7c932569f..c4cc02167 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.1.2 + image: sameersbn/gitlab:16.2.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 5e7504894..9fd56bbfe 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.2 app:rake gitlab:backup:create + sameersbn/gitlab:16.2.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.2 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.1.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.2.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.1.2 +docker pull sameersbn/gitlab:16.2.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.1.2 +sameersbn/gitlab:16.2.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index d01fd8e32..1bdf8151f 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.1.2 + image: sameersbn/gitlab:16.2.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 4f51d2b7a..ad96eab45 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.1.2 + image: sameersbn/gitlab:16.2.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index b77d5a80b..d8a24cb34 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.1.2 + image: sameersbn/gitlab:16.2.0 env: - name: TZ value: Asia/Kolkata From ecd2b35bdfa20c6b0c9f230916bad2576777c26b Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 28 Jul 2023 19:15:23 +0200 Subject: [PATCH 321/522] Upgrade GitLab CE to 16.2.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 5cdbc0cc8..6ccbe6d30 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**16.2.1** + +- gitlab: upgrade CE to v16.2.1 +- gitaly: upgrade to v16.2.1 +- gitlab-pages: upgrade to v16.2.1 + **16.2.0** - gitlab: upgrade CE to v16.2.0 diff --git a/Dockerfile b/Dockerfile index 31868bb95..f7abcbd65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230624 -ARG VERSION=16.2.0 +ARG VERSION=16.2.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.20.6 \ GITLAB_SHELL_VERSION=14.23.0 \ - GITLAB_PAGES_VERSION=16.2.0 \ - GITALY_SERVER_VERSION=16.2.0 \ + GITLAB_PAGES_VERSION=16.2.1 \ + GITALY_SERVER_VERSION=16.2.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index b48732a51..d4f783c5e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.2.0 +# sameersbn/gitlab:16.2.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.2.0 +docker pull sameersbn/gitlab:16.2.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.2.0 + sameersbn/gitlab:16.2.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.2.0 + sameersbn/gitlab:16.2.1 ``` ### Database @@ -287,7 +287,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:16.2.0 + sameersbn/gitlab:16.2.1 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.2.0 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.2.0 + sameersbn/gitlab:16.2.1 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.2.0 + sameersbn/gitlab:16.2.1 ``` #### Mail @@ -410,7 +410,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:16.2.0 + sameersbn/gitlab:16.2.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.2.0 + sameersbn/gitlab:16.2.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.2.0 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.2.0 + sameersbn/gitlab:16.2.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.2.0 + sameersbn/gitlab:16.2.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.2.0 + sameersbn/gitlab:16.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:16.2.0 + sameersbn/gitlab:16.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:16.2.0 app:sanitize + sameersbn/gitlab:16.2.1 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.0 app:rake db:setup + sameersbn/gitlab:16.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:16.2.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.2.0 app:rake gitlab:env:info + sameersbn/gitlab:16.2.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.2.1 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.2.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.2.0 +docker pull sameersbn/gitlab:16.2.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.2.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.2.1 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.2.0 + image: sameersbn/gitlab:16.2.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index fd1bd70b7..383210814 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.2.0 +16.2.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 6d09c1a80..c24990be1 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.0 + image: sameersbn/gitlab:16.2.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 616fd42e9..9317e380f 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.2.0 + image: sameersbn/gitlab:16.2.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index c4cc02167..874adca5a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.0 + image: sameersbn/gitlab:16.2.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 9fd56bbfe..8b9e4381f 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.2.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.2.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.2.0 +docker pull sameersbn/gitlab:16.2.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.2.0 +sameersbn/gitlab:16.2.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 1bdf8151f..ea890bb90 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.0 + image: sameersbn/gitlab:16.2.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index ad96eab45..6247c91f6 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.0 + image: sameersbn/gitlab:16.2.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index d8a24cb34..540c59ae9 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.2.0 + image: sameersbn/gitlab:16.2.1 env: - name: TZ value: Asia/Kolkata From cc97ed19f0d256fd5571ff23b97ab7bbbca84386 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 4 Aug 2023 18:05:20 +0200 Subject: [PATCH 322/522] Upgrade GitLab CE to 16.2.2 --- Changelog.md | 8 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index 6ccbe6d30..797974dbf 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,14 @@ 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. +**16.2.2** + +- gitlab: upgrade CE to v16.2.2 +- gitaly: upgrade to v16.2.2 +- gitlab-pages: upgrade to v16.2.2 +- golang: upgrade to v1.20.7 +- ubuntu: upgrade to focal-20230801 + **16.2.1** - gitlab: upgrade CE to v16.2.1 diff --git a/Dockerfile b/Dockerfile index f7abcbd65..eacab6850 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20230624 +FROM ubuntu:focal-20230801 -ARG VERSION=16.2.1 +ARG VERSION=16.2.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ - GOLANG_VERSION=1.20.6 \ + GOLANG_VERSION=1.20.7 \ GITLAB_SHELL_VERSION=14.23.0 \ - GITLAB_PAGES_VERSION=16.2.1 \ - GITALY_SERVER_VERSION=16.2.1 \ + GITLAB_PAGES_VERSION=16.2.2 \ + GITALY_SERVER_VERSION=16.2.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index d4f783c5e..07cbe3e90 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.2.1 +# sameersbn/gitlab:16.2.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.2.1 +docker pull sameersbn/gitlab:16.2.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.2.1 + sameersbn/gitlab:16.2.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.2.1 + sameersbn/gitlab:16.2.2 ``` ### Database @@ -287,7 +287,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:16.2.1 + sameersbn/gitlab:16.2.2 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.2.1 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.2.1 + sameersbn/gitlab:16.2.2 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.2.1 + sameersbn/gitlab:16.2.2 ``` #### Mail @@ -410,7 +410,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:16.2.1 + sameersbn/gitlab:16.2.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.2.1 + sameersbn/gitlab:16.2.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.2.1 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.2.1 + sameersbn/gitlab:16.2.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.2.1 + sameersbn/gitlab:16.2.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.2.1 + sameersbn/gitlab:16.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:16.2.1 + sameersbn/gitlab:16.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:16.2.1 app:sanitize + sameersbn/gitlab:16.2.2 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.1 app:rake db:setup + sameersbn/gitlab:16.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:16.2.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.2.1 app:rake gitlab:env:info + sameersbn/gitlab:16.2.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.2.2 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.2.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.2.1 +docker pull sameersbn/gitlab:16.2.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.2.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.2.2 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.2.1 + image: sameersbn/gitlab:16.2.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 383210814..092a0a507 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.2.1 +16.2.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index c24990be1..d6cb6d9a1 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.1 + image: sameersbn/gitlab:16.2.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 9317e380f..38f80941e 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.2.1 + image: sameersbn/gitlab:16.2.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 874adca5a..fd1fbaee0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.1 + image: sameersbn/gitlab:16.2.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 8b9e4381f..509a7f433 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.2.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.2.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.2.1 +docker pull sameersbn/gitlab:16.2.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.2.1 +sameersbn/gitlab:16.2.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index ea890bb90..35b5289b9 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.1 + image: sameersbn/gitlab:16.2.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 6247c91f6..eabac9620 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.1 + image: sameersbn/gitlab:16.2.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 540c59ae9..f0150ec47 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.2.1 + image: sameersbn/gitlab:16.2.2 env: - name: TZ value: Asia/Kolkata From 2c12bd7e30173fbe12686e87096421b659670618 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 5 Aug 2023 09:55:19 +0200 Subject: [PATCH 323/522] Upgrade GitLab CE to 16.2.3 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 797974dbf..deaf74901 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**16.2.3** + +- gitlab: upgrade CE to v16.2.3 +- gitaly: upgrade to v16.2.3 +- gitlab-pages: upgrade to v16.2.3 + **16.2.2** - gitlab: upgrade CE to v16.2.2 diff --git a/Dockerfile b/Dockerfile index eacab6850..21fc164d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230801 -ARG VERSION=16.2.2 +ARG VERSION=16.2.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.20.7 \ GITLAB_SHELL_VERSION=14.23.0 \ - GITLAB_PAGES_VERSION=16.2.2 \ - GITALY_SERVER_VERSION=16.2.2 \ + GITLAB_PAGES_VERSION=16.2.3 \ + GITALY_SERVER_VERSION=16.2.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 07cbe3e90..468b22dc9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.2.2 +# sameersbn/gitlab:16.2.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.2.2 +docker pull sameersbn/gitlab:16.2.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.2.2 + sameersbn/gitlab:16.2.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.2.2 + sameersbn/gitlab:16.2.3 ``` ### Database @@ -287,7 +287,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:16.2.2 + sameersbn/gitlab:16.2.3 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.2.2 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.2.2 + sameersbn/gitlab:16.2.3 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.2.2 + sameersbn/gitlab:16.2.3 ``` #### Mail @@ -410,7 +410,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:16.2.2 + sameersbn/gitlab:16.2.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.2.2 + sameersbn/gitlab:16.2.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.2.2 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.2.2 + sameersbn/gitlab:16.2.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.2.2 + sameersbn/gitlab:16.2.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.2.2 + sameersbn/gitlab:16.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:16.2.2 + sameersbn/gitlab:16.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:16.2.2 app:sanitize + sameersbn/gitlab:16.2.3 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.2 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.2 app:rake db:setup + sameersbn/gitlab:16.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:16.2.2 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.2.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.2.2 app:rake gitlab:env:info + sameersbn/gitlab:16.2.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.2 app:rake gitlab:import:repos + sameersbn/gitlab:16.2.3 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.2 app:rake gitlab:import:repos + sameersbn/gitlab:16.2.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.2.2 +docker pull sameersbn/gitlab:16.2.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.2.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.2.3 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.2.2 + image: sameersbn/gitlab:16.2.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 092a0a507..f4ae2a3b3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.2.2 +16.2.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index d6cb6d9a1..64e77f7ad 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.2 + image: sameersbn/gitlab:16.2.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 38f80941e..b786c311c 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.2.2 + image: sameersbn/gitlab:16.2.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index fd1fbaee0..ee5c8dabe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.2 + image: sameersbn/gitlab:16.2.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 509a7f433..414c4d48c 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.2 app:rake gitlab:backup:create + sameersbn/gitlab:16.2.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.2 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.2.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.2.2 +docker pull sameersbn/gitlab:16.2.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.2.2 +sameersbn/gitlab:16.2.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 35b5289b9..2efa0e4dc 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.2 + image: sameersbn/gitlab:16.2.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index eabac9620..57fb4903e 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.2 + image: sameersbn/gitlab:16.2.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index f0150ec47..6d03aa00a 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.2.2 + image: sameersbn/gitlab:16.2.3 env: - name: TZ value: Asia/Kolkata From 7d8e8affa97fd34e6facacea0bf55b9b61b51a56 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sat, 12 Aug 2023 12:49:10 +0900 Subject: [PATCH 324/522] Upgrade nodejs apt source repo from 16.x to 18.x Required version is updated from v16.15.0 to v18.16.0 with GitLab v16.1.0 release - "Update required node version to 18.16.0 or later" https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106898 Then nodejs v18.16.1 with GitLab v16.2.0 - "Update Node.js to 18.16.1" https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124802 And will be updated to v18.17.0 soon (not released yet, but already merged) - "Update Node.js to 18.17.0" https://gitlab.com/gitlab-org/gitlab/-/merge_requests/127560 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1d86a5d31..df02ab548 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ RUN set -ex && \ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ && echo 'deb http://apt.postgresql.org/pub/repos/apt/ focal-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_16.x focal main' > /etc/apt/sources.list.d/nodesource.list \ + && echo 'deb https://deb.nodesource.com/node_18.x focal 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 \ From 87fe3890a47351495ce7e7cdd2ad5388bbf46b74 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 12 Aug 2023 10:00:01 +0200 Subject: [PATCH 325/522] Upgrade GitLab CE to 16.2.4 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index deaf74901..2edc2d8b7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**16.2.4** + +- gitlab: upgrade CE to v16.2.4 +- gitaly: upgrade to v16.2.4 +- gitlab-pages: upgrade to v16.2.4 +- golang: upgrade to v1.21.0 + **16.2.3** - gitlab: upgrade CE to v16.2.3 diff --git a/Dockerfile b/Dockerfile index 21fc164d6..1d86a5d31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230801 -ARG VERSION=16.2.3 +ARG VERSION=16.2.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ - GOLANG_VERSION=1.20.7 \ + GOLANG_VERSION=1.21.0 \ GITLAB_SHELL_VERSION=14.23.0 \ - GITLAB_PAGES_VERSION=16.2.3 \ - GITALY_SERVER_VERSION=16.2.3 \ + GITLAB_PAGES_VERSION=16.2.4 \ + GITALY_SERVER_VERSION=16.2.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 468b22dc9..7cf9e3e9b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.2.3 +# sameersbn/gitlab:16.2.4 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.2.3 +docker pull sameersbn/gitlab:16.2.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.2.3 + sameersbn/gitlab:16.2.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.2.3 + sameersbn/gitlab:16.2.4 ``` ### Database @@ -287,7 +287,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:16.2.3 + sameersbn/gitlab:16.2.4 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.2.3 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.2.3 + sameersbn/gitlab:16.2.4 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.2.3 + sameersbn/gitlab:16.2.4 ``` #### Mail @@ -410,7 +410,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:16.2.3 + sameersbn/gitlab:16.2.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.2.3 + sameersbn/gitlab:16.2.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.2.3 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.2.3 + sameersbn/gitlab:16.2.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.2.3 + sameersbn/gitlab:16.2.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.2.3 + sameersbn/gitlab:16.2.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:16.2.3 + sameersbn/gitlab:16.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:16.2.3 app:sanitize + sameersbn/gitlab:16.2.4 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.3 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.3 app:rake db:setup + sameersbn/gitlab:16.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:16.2.3 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.2.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.2.3 app:rake gitlab:env:info + sameersbn/gitlab:16.2.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.3 app:rake gitlab:import:repos + sameersbn/gitlab:16.2.4 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.3 app:rake gitlab:import:repos + sameersbn/gitlab:16.2.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.2.3 +docker pull sameersbn/gitlab:16.2.4 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.2.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.2.4 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.2.3 + image: sameersbn/gitlab:16.2.4 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index f4ae2a3b3..3ef1174be 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.2.3 +16.2.4 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 64e77f7ad..cd2dd3dce 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.3 + image: sameersbn/gitlab:16.2.4 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index b786c311c..34a27f1fc 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.2.3 + image: sameersbn/gitlab:16.2.4 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index ee5c8dabe..d722fba10 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.3 + image: sameersbn/gitlab:16.2.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 414c4d48c..3c4775ed1 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.3 app:rake gitlab:backup:create + sameersbn/gitlab:16.2.4 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.3 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.2.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.2.3 +docker pull sameersbn/gitlab:16.2.4 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.2.3 +sameersbn/gitlab:16.2.4 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 2efa0e4dc..ba63f53a5 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.3 + image: sameersbn/gitlab:16.2.4 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 57fb4903e..f0e327dce 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.3 + image: sameersbn/gitlab:16.2.4 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 6d03aa00a..8e9f130e0 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.2.3 + image: sameersbn/gitlab:16.2.4 env: - name: TZ value: Asia/Kolkata From 8a9c8b6f63a7f4b5d5eb580ea1f062e35f26590b Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 22 Aug 2023 21:18:16 +0200 Subject: [PATCH 326/522] Upgrade GitLab CE to 16.3.0 --- Changelog.md | 6 +++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 49 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 2edc2d8b7..ddd5c5651 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**16.3.0** + +- gitlab: upgrade CE to v16.3.0 +- gitaly: upgrade to v16.3.0 +- gitlab-pages: upgrade to v16.3.0 + **16.2.4** - gitlab: upgrade CE to v16.2.4 diff --git a/Dockerfile b/Dockerfile index 1d86a5d31..e565111da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230801 -ARG VERSION=16.2.4 +ARG VERSION=16.3.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.21.0 \ - GITLAB_SHELL_VERSION=14.23.0 \ - GITLAB_PAGES_VERSION=16.2.4 \ - GITALY_SERVER_VERSION=16.2.4 \ + GITLAB_SHELL_VERSION=14.26.0 \ + GITLAB_PAGES_VERSION=16.3.0 \ + GITALY_SERVER_VERSION=16.3.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 7cf9e3e9b..0182c51d1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.2.4 +# sameersbn/gitlab:16.3.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.2.4 +docker pull sameersbn/gitlab:16.3.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.2.4 + sameersbn/gitlab:16.3.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.2.4 + sameersbn/gitlab:16.3.0 ``` ### Database @@ -287,7 +287,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:16.2.4 + sameersbn/gitlab:16.3.0 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.2.4 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.2.4 + sameersbn/gitlab:16.3.0 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.2.4 + sameersbn/gitlab:16.3.0 ``` #### Mail @@ -410,7 +410,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:16.2.4 + sameersbn/gitlab:16.3.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.2.4 + sameersbn/gitlab:16.3.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.2.4 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.2.4 + sameersbn/gitlab:16.3.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.2.4 + sameersbn/gitlab:16.3.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.2.4 + sameersbn/gitlab:16.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:16.2.4 + sameersbn/gitlab:16.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:16.2.4 app:sanitize + sameersbn/gitlab:16.3.0 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.4 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.4 app:rake db:setup + sameersbn/gitlab:16.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:16.2.4 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.2.4 app:rake gitlab:env:info + sameersbn/gitlab:16.3.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.4 app:rake gitlab:import:repos + sameersbn/gitlab:16.3.0 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.4 app:rake gitlab:import:repos + sameersbn/gitlab:16.3.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.2.4 +docker pull sameersbn/gitlab:16.3.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.2.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.3.0 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.2.4 + image: sameersbn/gitlab:16.3.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 3ef1174be..d9a8a3578 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.2.4 +16.3.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index cd2dd3dce..b7d63ddff 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.4 + image: sameersbn/gitlab:16.3.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 34a27f1fc..67cb4c81a 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.2.4 + image: sameersbn/gitlab:16.3.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index d722fba10..fcd81b1e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.4 + image: sameersbn/gitlab:16.3.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 3c4775ed1..629cbbadb 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.4 app:rake gitlab:backup:create + sameersbn/gitlab:16.3.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.4 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.2.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.3.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.2.4 +docker pull sameersbn/gitlab:16.3.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.2.4 +sameersbn/gitlab:16.3.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index ba63f53a5..21ffe0205 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.4 + image: sameersbn/gitlab:16.3.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index f0e327dce..2477e4f49 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.2.4 + image: sameersbn/gitlab:16.3.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 8e9f130e0..a9adae1fd 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.2.4 + image: sameersbn/gitlab:16.3.0 env: - name: TZ value: Asia/Kolkata From c51770292e1aa8f72ea89fb03eade85fa8ee04ff Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 23 Aug 2023 17:49:33 +0200 Subject: [PATCH 327/522] Add temporary patch for lfs object URL --- ...condition-for-csr-policy-allow-lfs_v16.3.0.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch diff --git a/assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch b/assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch new file mode 100644 index 000000000..ef82ccff4 --- /dev/null +++ b/assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch @@ -0,0 +1,13 @@ +diff --git a/lib/gitlab/content_security_policy/config_loader.rb b/lib/gitlab/content_security_policy/config_loader.rb +index 9fb3c7d362f..d012c8b3b7b 100644 +--- a/lib/gitlab/content_security_policy/config_loader.rb ++++ b/lib/gitlab/content_security_policy/config_loader.rb +@@ -84,7 +84,7 @@ def allow_snowplow_micro(directives) + end + + def allow_lfs(directives) +- return unless Gitlab.config.lfs.enabled && LfsObjectUploader.direct_download_enabled? ++ return unless Gitlab.config.lfs.enabled && Gitlab.config.lfs.object_store.enabled && LfsObjectUploader.direct_download_enabled? + + lfs_url = build_lfs_url + return unless lfs_url.present? From 22ab5727ae2529197502d6aa37f5b4eca55dec49 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 2 Sep 2023 07:05:35 +0200 Subject: [PATCH 328/522] Upgrade GitLab CE to 16.3.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index ddd5c5651..37746c7cf 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**16.3.1** + +- gitlab: upgrade CE to v16.3.1 +- gitaly: upgrade to v16.3.1 +- gitlab-pages: upgrade to v16.3.1 + **16.3.0** - gitlab: upgrade CE to v16.3.0 diff --git a/Dockerfile b/Dockerfile index 7bf8164c6..56b58d009 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230801 -ARG VERSION=16.3.0 +ARG VERSION=16.3.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.21.0 \ GITLAB_SHELL_VERSION=14.26.0 \ - GITLAB_PAGES_VERSION=16.3.0 \ - GITALY_SERVER_VERSION=16.3.0 \ + GITLAB_PAGES_VERSION=16.3.1 \ + GITALY_SERVER_VERSION=16.3.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 0182c51d1..f90a06449 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.3.0 +# sameersbn/gitlab:16.3.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.3.0 +docker pull sameersbn/gitlab:16.3.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.3.0 + sameersbn/gitlab:16.3.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.3.0 + sameersbn/gitlab:16.3.1 ``` ### Database @@ -287,7 +287,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:16.3.0 + sameersbn/gitlab:16.3.1 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.3.0 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.3.0 + sameersbn/gitlab:16.3.1 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.3.0 + sameersbn/gitlab:16.3.1 ``` #### Mail @@ -410,7 +410,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:16.3.0 + sameersbn/gitlab:16.3.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.3.0 + sameersbn/gitlab:16.3.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.3.0 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.3.0 + sameersbn/gitlab:16.3.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.3.0 + sameersbn/gitlab:16.3.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.3.0 + sameersbn/gitlab:16.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:16.3.0 + sameersbn/gitlab:16.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:16.3.0 app:sanitize + sameersbn/gitlab:16.3.1 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.0 app:rake db:setup + sameersbn/gitlab:16.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:16.3.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.3.0 app:rake gitlab:env:info + sameersbn/gitlab:16.3.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.3.1 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.3.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.3.0 +docker pull sameersbn/gitlab:16.3.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.3.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.3.1 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.3.0 + image: sameersbn/gitlab:16.3.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index d9a8a3578..32e9db3f9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.3.0 +16.3.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index b7d63ddff..cadffbdc3 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.0 + image: sameersbn/gitlab:16.3.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 67cb4c81a..f22635dcf 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.3.0 + image: sameersbn/gitlab:16.3.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index fcd81b1e8..6df1bc698 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.0 + image: sameersbn/gitlab:16.3.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 629cbbadb..00bdb8c41 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.3.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.3.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.3.0 +docker pull sameersbn/gitlab:16.3.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.3.0 +sameersbn/gitlab:16.3.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 21ffe0205..f1a59d111 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.0 + image: sameersbn/gitlab:16.3.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 2477e4f49..b6b538af0 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.0 + image: sameersbn/gitlab:16.3.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index a9adae1fd..c6b1939cb 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.3.0 + image: sameersbn/gitlab:16.3.1 env: - name: TZ value: Asia/Kolkata From 2fb3680976b5fd74f68112c736fc6751277542dd Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 2 Sep 2023 08:28:56 +0200 Subject: [PATCH 329/522] Remove temporary patch for lfs object URL (see c51770292e) --- ...0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename assets/build/patches/{0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch => 0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak} (100%) diff --git a/assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch b/assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak similarity index 100% rename from assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch rename to assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak From f90bafce66ab2e265eb82e250635a34ad58b233a Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 7 Sep 2023 20:31:22 +0200 Subject: [PATCH 330/522] Upgrade to GitLab CE 16.3.2 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 37746c7cf..b9c2b3381 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**16.3.2** + +- gitlab: upgrade CE to v16.3.2 +- gitaly: upgrade to v16.3.2 +- gitlab-pages: upgrade to v16.3.2 +- golang: upgrade to v1.21.1 + **16.3.1** - gitlab: upgrade CE to v16.3.1 diff --git a/Dockerfile b/Dockerfile index 56b58d009..d93e53abb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230801 -ARG VERSION=16.3.1 +ARG VERSION=16.3.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ - GOLANG_VERSION=1.21.0 \ + GOLANG_VERSION=1.21.1 \ GITLAB_SHELL_VERSION=14.26.0 \ - GITLAB_PAGES_VERSION=16.3.1 \ - GITALY_SERVER_VERSION=16.3.1 \ + GITLAB_PAGES_VERSION=16.3.2 \ + GITALY_SERVER_VERSION=16.3.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index f90a06449..bf015b482 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.3.1 +# sameersbn/gitlab:16.3.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.3.1 +docker pull sameersbn/gitlab:16.3.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.3.1 + sameersbn/gitlab:16.3.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.3.1 + sameersbn/gitlab:16.3.2 ``` ### Database @@ -287,7 +287,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:16.3.1 + sameersbn/gitlab:16.3.2 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.3.1 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.3.1 + sameersbn/gitlab:16.3.2 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.3.1 + sameersbn/gitlab:16.3.2 ``` #### Mail @@ -410,7 +410,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:16.3.1 + sameersbn/gitlab:16.3.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.3.1 + sameersbn/gitlab:16.3.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.3.1 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.3.1 + sameersbn/gitlab:16.3.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.3.1 + sameersbn/gitlab:16.3.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.3.1 + sameersbn/gitlab:16.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:16.3.1 + sameersbn/gitlab:16.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:16.3.1 app:sanitize + sameersbn/gitlab:16.3.2 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.1 app:rake db:setup + sameersbn/gitlab:16.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:16.3.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.3.1 app:rake gitlab:env:info + sameersbn/gitlab:16.3.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.3.2 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.3.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.3.1 +docker pull sameersbn/gitlab:16.3.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.3.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.3.2 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.3.1 + image: sameersbn/gitlab:16.3.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 32e9db3f9..b10c7dda7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.3.1 +16.3.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index cadffbdc3..5cd2fa1cf 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.1 + image: sameersbn/gitlab:16.3.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index f22635dcf..e03b3ecd8 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.3.1 + image: sameersbn/gitlab:16.3.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 6df1bc698..cdc643d28 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.1 + image: sameersbn/gitlab:16.3.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 00bdb8c41..7afd7aa88 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.3.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.3.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.3.1 +docker pull sameersbn/gitlab:16.3.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.3.1 +sameersbn/gitlab:16.3.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index f1a59d111..6fa91890a 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.1 + image: sameersbn/gitlab:16.3.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index b6b538af0..91ae62be0 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.1 + image: sameersbn/gitlab:16.3.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index c6b1939cb..ac4d6a47d 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.3.1 + image: sameersbn/gitlab:16.3.2 env: - name: TZ value: Asia/Kolkata From 25f5a93ac5b8983671cad7004555f84ed3479a20 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 13 Sep 2023 06:59:15 +0200 Subject: [PATCH 331/522] Upgrade to GitLab CE 16.3.3 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index b9c2b3381..7b208d2d1 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**16.3.3** + +- gitlab: upgrade CE to v16.3.3 +- gitaly: upgrade to v16.3.3 +- gitlab-pages: upgrade to v16.3.3 + **16.3.2** - gitlab: upgrade CE to v16.3.2 diff --git a/Dockerfile b/Dockerfile index d93e53abb..435e18916 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230801 -ARG VERSION=16.3.2 +ARG VERSION=16.3.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.21.1 \ GITLAB_SHELL_VERSION=14.26.0 \ - GITLAB_PAGES_VERSION=16.3.2 \ - GITALY_SERVER_VERSION=16.3.2 \ + GITLAB_PAGES_VERSION=16.3.3 \ + GITALY_SERVER_VERSION=16.3.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index bf015b482..61d23b726 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.3.2 +# sameersbn/gitlab:16.3.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.3.2 +docker pull sameersbn/gitlab:16.3.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.3.2 + sameersbn/gitlab:16.3.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.3.2 + sameersbn/gitlab:16.3.3 ``` ### Database @@ -287,7 +287,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:16.3.2 + sameersbn/gitlab:16.3.3 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.3.2 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.3.2 + sameersbn/gitlab:16.3.3 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.3.2 + sameersbn/gitlab:16.3.3 ``` #### Mail @@ -410,7 +410,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:16.3.2 + sameersbn/gitlab:16.3.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.3.2 + sameersbn/gitlab:16.3.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.3.2 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.3.2 + sameersbn/gitlab:16.3.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.3.2 + sameersbn/gitlab:16.3.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.3.2 + sameersbn/gitlab:16.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:16.3.2 + sameersbn/gitlab:16.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:16.3.2 app:sanitize + sameersbn/gitlab:16.3.3 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.2 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.2 app:rake db:setup + sameersbn/gitlab:16.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:16.3.2 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.3.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.3.2 app:rake gitlab:env:info + sameersbn/gitlab:16.3.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.2 app:rake gitlab:import:repos + sameersbn/gitlab:16.3.3 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.2 app:rake gitlab:import:repos + sameersbn/gitlab:16.3.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.3.2 +docker pull sameersbn/gitlab:16.3.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.3.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.3.3 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.3.2 + image: sameersbn/gitlab:16.3.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index b10c7dda7..1dd56bff6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.3.2 +16.3.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 5cd2fa1cf..5a37eee27 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.2 + image: sameersbn/gitlab:16.3.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index e03b3ecd8..1ea90008d 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.3.2 + image: sameersbn/gitlab:16.3.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index cdc643d28..7461dabdf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.2 + image: sameersbn/gitlab:16.3.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 7afd7aa88..b8c86c040 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.2 app:rake gitlab:backup:create + sameersbn/gitlab:16.3.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.2 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.3.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.3.2 +docker pull sameersbn/gitlab:16.3.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.3.2 +sameersbn/gitlab:16.3.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 6fa91890a..28977b05a 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.2 + image: sameersbn/gitlab:16.3.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 91ae62be0..c619c80e8 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.2 + image: sameersbn/gitlab:16.3.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index ac4d6a47d..7659b72eb 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.3.2 + image: sameersbn/gitlab:16.3.3 env: - name: TZ value: Asia/Kolkata From f742f4d151510217c8ce6ee088877b57d206877f Mon Sep 17 00:00:00 2001 From: Patrick Remy Date: Tue, 19 Sep 2023 09:45:42 +0200 Subject: [PATCH 332/522] Upgrade to GitLab CE 16.3.4 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 7b208d2d1..14884deca 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**16.3.4** + +- gitlab: upgrade CE to v16.3.4 +- gitaly: upgrade to v16.3.4 +- gitlab-pages: upgrade to v16.3.4 + **16.3.3** - gitlab: upgrade CE to v16.3.3 diff --git a/Dockerfile b/Dockerfile index 435e18916..c71fed951 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230801 -ARG VERSION=16.3.3 +ARG VERSION=16.3.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.21.1 \ GITLAB_SHELL_VERSION=14.26.0 \ - GITLAB_PAGES_VERSION=16.3.3 \ - GITALY_SERVER_VERSION=16.3.3 \ + GITLAB_PAGES_VERSION=16.3.4 \ + GITALY_SERVER_VERSION=16.3.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 61d23b726..77d0a9e8f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.3.3 +# sameersbn/gitlab:16.3.4 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.3.3 +docker pull sameersbn/gitlab:16.3.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.3.3 + sameersbn/gitlab:16.3.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.3.3 + sameersbn/gitlab:16.3.4 ``` ### Database @@ -287,7 +287,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:16.3.3 + sameersbn/gitlab:16.3.4 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.3.3 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.3.3 + sameersbn/gitlab:16.3.4 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.3.3 + sameersbn/gitlab:16.3.4 ``` #### Mail @@ -410,7 +410,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:16.3.3 + sameersbn/gitlab:16.3.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.3.3 + sameersbn/gitlab:16.3.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.3.3 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.3.3 + sameersbn/gitlab:16.3.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.3.3 + sameersbn/gitlab:16.3.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.3.3 + sameersbn/gitlab:16.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:16.3.3 + sameersbn/gitlab:16.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:16.3.3 app:sanitize + sameersbn/gitlab:16.3.4 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.3 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.3 app:rake db:setup + sameersbn/gitlab:16.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:16.3.3 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.3.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.3.3 app:rake gitlab:env:info + sameersbn/gitlab:16.3.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.3 app:rake gitlab:import:repos + sameersbn/gitlab:16.3.4 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.3 app:rake gitlab:import:repos + sameersbn/gitlab:16.3.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.3.3 +docker pull sameersbn/gitlab:16.3.4 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.3.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.3.4 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.3.3 + image: sameersbn/gitlab:16.3.4 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 1dd56bff6..abd15e762 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.3.3 +16.3.4 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 5a37eee27..6549c5a1e 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.3 + image: sameersbn/gitlab:16.3.4 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 1ea90008d..4f805e204 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.3.3 + image: sameersbn/gitlab:16.3.4 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 7461dabdf..051b6b2f8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.3 + image: sameersbn/gitlab:16.3.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index b8c86c040..d5a49f8d4 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.3 app:rake gitlab:backup:create + sameersbn/gitlab:16.3.4 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.3 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.3.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.3.3 +docker pull sameersbn/gitlab:16.3.4 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.3.3 +sameersbn/gitlab:16.3.4 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 28977b05a..886596977 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.3 + image: sameersbn/gitlab:16.3.4 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index c619c80e8..f9f809ee0 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.3 + image: sameersbn/gitlab:16.3.4 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 7659b72eb..330b4c06b 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.3.3 + image: sameersbn/gitlab:16.3.4 env: - name: TZ value: Asia/Kolkata From 8c1c480265641d2aa32063ad54af8f5fbf10d993 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 28 Sep 2023 20:13:36 +0200 Subject: [PATCH 333/522] Upgrade to GitLab CE 16.4.0 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 14884deca..55392f8e0 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**16.4.0** + +- gitlab: upgrade CE to v16.4.0 +- gitaly: upgrade to v16.4.0 +- gitlab-pages: upgrade to v16.4.0 +- gitlab-shell: upgrade to v14.28.0 + **16.3.4** - gitlab: upgrade CE to v16.3.4 diff --git a/Dockerfile b/Dockerfile index c71fed951..1aa75eda2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230801 -ARG VERSION=16.3.4 +ARG VERSION=16.4.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.21.1 \ - GITLAB_SHELL_VERSION=14.26.0 \ - GITLAB_PAGES_VERSION=16.3.4 \ - GITALY_SERVER_VERSION=16.3.4 \ + GITLAB_SHELL_VERSION=14.28.0 \ + GITLAB_PAGES_VERSION=16.4.0 \ + GITALY_SERVER_VERSION=16.4.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 77d0a9e8f..816807c8e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.3.4 +# sameersbn/gitlab:16.4.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.3.4 +docker pull sameersbn/gitlab:16.4.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.3.4 + sameersbn/gitlab:16.4.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.3.4 + sameersbn/gitlab:16.4.0 ``` ### Database @@ -287,7 +287,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:16.3.4 + sameersbn/gitlab:16.4.0 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.3.4 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.3.4 + sameersbn/gitlab:16.4.0 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.3.4 + sameersbn/gitlab:16.4.0 ``` #### Mail @@ -410,7 +410,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:16.3.4 + sameersbn/gitlab:16.4.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.3.4 + sameersbn/gitlab:16.4.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.3.4 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.3.4 + sameersbn/gitlab:16.4.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.3.4 + sameersbn/gitlab:16.4.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.3.4 + sameersbn/gitlab:16.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:16.3.4 + sameersbn/gitlab:16.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:16.3.4 app:sanitize + sameersbn/gitlab:16.4.0 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.4 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.4 app:rake db:setup + sameersbn/gitlab:16.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:16.3.4 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.3.4 app:rake gitlab:env:info + sameersbn/gitlab:16.4.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.4 app:rake gitlab:import:repos + sameersbn/gitlab:16.4.0 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.4 app:rake gitlab:import:repos + sameersbn/gitlab:16.4.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.3.4 +docker pull sameersbn/gitlab:16.4.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.3.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.4.0 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.3.4 + image: sameersbn/gitlab:16.4.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index abd15e762..29b7b9ad9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.3.4 +16.4.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 6549c5a1e..98627a143 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.4 + image: sameersbn/gitlab:16.4.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 4f805e204..9b775a50a 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.3.4 + image: sameersbn/gitlab:16.4.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 051b6b2f8..ae3456abb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.4 + image: sameersbn/gitlab:16.4.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index d5a49f8d4..d38902a0a 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.4 app:rake gitlab:backup:create + sameersbn/gitlab:16.4.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.4 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.3.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.3.4 +docker pull sameersbn/gitlab:16.4.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.3.4 +sameersbn/gitlab:16.4.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 886596977..b84a00a34 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.4 + image: sameersbn/gitlab:16.4.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index f9f809ee0..48779507f 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.3.4 + image: sameersbn/gitlab:16.4.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 330b4c06b..8ec44443b 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.3.4 + image: sameersbn/gitlab:16.4.0 env: - name: TZ value: Asia/Kolkata From 02d95f14316a784b4080ef98ac25e5d8d80eb9d1 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 30 Sep 2023 17:35:02 +0200 Subject: [PATCH 334/522] Upgrade to GitLab CE 16.4.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 55392f8e0..400fc865e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**16.4.1** + +- gitlab: upgrade CE to v16.4.1 +- gitaly: upgrade to v16.4.1 +- gitlab-pages: upgrade to v16.4.1 + **16.4.0** - gitlab: upgrade CE to v16.4.0 diff --git a/Dockerfile b/Dockerfile index 1aa75eda2..cfc0174d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20230801 -ARG VERSION=16.4.0 +ARG VERSION=16.4.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.21.1 \ GITLAB_SHELL_VERSION=14.28.0 \ - GITLAB_PAGES_VERSION=16.4.0 \ - GITALY_SERVER_VERSION=16.4.0 \ + GITLAB_PAGES_VERSION=16.4.1 \ + GITALY_SERVER_VERSION=16.4.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 816807c8e..8e4578ef2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.4.0 +# sameersbn/gitlab:16.4.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.4.0 +docker pull sameersbn/gitlab:16.4.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.4.0 + sameersbn/gitlab:16.4.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.4.0 + sameersbn/gitlab:16.4.1 ``` ### Database @@ -287,7 +287,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:16.4.0 + sameersbn/gitlab:16.4.1 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.4.0 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.4.0 + sameersbn/gitlab:16.4.1 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.4.0 + sameersbn/gitlab:16.4.1 ``` #### Mail @@ -410,7 +410,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:16.4.0 + sameersbn/gitlab:16.4.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.4.0 + sameersbn/gitlab:16.4.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.4.0 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.4.0 + sameersbn/gitlab:16.4.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.4.0 + sameersbn/gitlab:16.4.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.4.0 + sameersbn/gitlab:16.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:16.4.0 + sameersbn/gitlab:16.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:16.4.0 app:sanitize + sameersbn/gitlab:16.4.1 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.4.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.4.0 app:rake db:setup + sameersbn/gitlab:16.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:16.4.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.4.0 app:rake gitlab:env:info + sameersbn/gitlab:16.4.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.4.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.4.1 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.4.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.4.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.4.0 +docker pull sameersbn/gitlab:16.4.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.4.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.4.1 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.4.0 + image: sameersbn/gitlab:16.4.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 29b7b9ad9..0baffb7e2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.4.0 +16.4.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 98627a143..62fcd6c94 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.4.0 + image: sameersbn/gitlab:16.4.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 9b775a50a..4ffefe945 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.4.0 + image: sameersbn/gitlab:16.4.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index ae3456abb..8f34ed567 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.4.0 + image: sameersbn/gitlab:16.4.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index d38902a0a..26210ec99 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.4.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.4.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.4.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.4.0 +docker pull sameersbn/gitlab:16.4.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.4.0 +sameersbn/gitlab:16.4.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index b84a00a34..9450d6ba1 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.4.0 + image: sameersbn/gitlab:16.4.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 48779507f..5de6f51da 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.4.0 + image: sameersbn/gitlab:16.4.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 8ec44443b..6e892f3c3 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.4.0 + image: sameersbn/gitlab:16.4.1 env: - name: TZ value: Asia/Kolkata From c8bc43b9142fb817fb63cc388fb7af7cdf876f83 Mon Sep 17 00:00:00 2001 From: massej Date: Sun, 1 Oct 2023 13:40:45 -0400 Subject: [PATCH 335/522] Added missing label and scope variable field. --- assets/runtime/config/gitlabhq/gitlab.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 49502277e..cdb7a8055 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -1017,6 +1017,8 @@ production: &base email: '{{OAUTH2_GENERIC_USER_EMAIL}}' } }, + authorize_params: { scope: "{{OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE}}" }, + label: '{{OAUTH2_GENERIC_LABEL}}', name: '{{OAUTH2_GENERIC_NAME}}' }} - { name: 'azure_oauth2', args: { From af693c5ecc09f0ae02924ec6b8b51938e1eab177 Mon Sep 17 00:00:00 2001 From: massej Date: Sun, 1 Oct 2023 13:44:28 -0400 Subject: [PATCH 336/522] Update env-defaults --- assets/runtime/env-defaults | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index deab8a2a8..e13db5fe6 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -531,6 +531,8 @@ OAUTH2_GENERIC_ID_PATH=${OAUTH2_GENERIC_ID_PATH:-} OAUTH2_GENERIC_USER_UID=${OAUTH2_GENERIC_USER_UID:-} OAUTH2_GENERIC_USER_NAME=${OAUTH2_GENERIC_USER_NAME:-} OAUTH2_GENERIC_USER_EMAIL=${OAUTH2_GENERIC_USER_EMAIL:-} +OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE=${OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE:-} +OAUTH2_GENERIC_LABEL=${OAUTH2_GENERIC_LABEL:-} OAUTH2_GENERIC_NAME=${OAUTH2_GENERIC_NAME:-} ## ANALYTICS From a903d9829066671b8384d66c564b53251233a05e Mon Sep 17 00:00:00 2001 From: massej Date: Sun, 1 Oct 2023 13:45:02 -0400 Subject: [PATCH 337/522] Update functions --- assets/runtime/functions | 2 ++ 1 file changed, 2 insertions(+) diff --git a/assets/runtime/functions b/assets/runtime/functions index 496a28e0c..7febb24cb 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -722,6 +722,8 @@ gitlab_configure_oauth2_generic() { OAUTH2_GENERIC_USER_UID \ OAUTH2_GENERIC_USER_NAME \ OAUTH2_GENERIC_USER_EMAIL \ + OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE \ + OAUTH2_GENERIC_LABEL \ OAUTH2_GENERIC_NAME else exec_as_git sed -i "/name: 'oauth2_generic'/,/{{OAUTH2_GENERIC_NAME}}/d" ${GITLAB_CONFIG} From fa75409aff25ccf4371e6e83b8857272c2f2aff6 Mon Sep 17 00:00:00 2001 From: massej Date: Sun, 1 Oct 2023 13:48:54 -0400 Subject: [PATCH 338/522] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8e4578ef2..ff5d89dbd 100644 --- a/README.md +++ b/README.md @@ -718,7 +718,7 @@ Also you can configure v2 endpoint (`azure_activedirectory_v2`) by using `OAUTH_ To enable the Generic OAuth2 provider, you must register your application with your provider. You also need to confirm OAuth2 provider app's ID and secret, the client options and the user's response structure. -As an example this code has been tested with Keycloak, with the following variables: `OAUTH2_GENERIC_APP_ID`, `OAUTH2_GENERIC_APP_SECRET`, `OAUTH2_GENERIC_CLIENT_SITE`, `OAUTH2_GENERIC_CLIENT_USER_INFO_URL`, `OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL`, `OAUTH2_GENERIC_CLIENT_TOKEN_URL`, `OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT`, `OAUTH2_GENERIC_ID_PATH`, `OAUTH2_GENERIC_USER_UID`, `OAUTH2_GENERIC_USER_NAME`, `OAUTH2_GENERIC_USER_EMAIL`, `OAUTH2_GENERIC_NAME`, +As an example this code has been tested with Keycloak, with the following variables: `OAUTH2_GENERIC_APP_ID`, `OAUTH2_GENERIC_APP_SECRET`, `OAUTH2_GENERIC_CLIENT_SITE`, `OAUTH2_GENERIC_CLIENT_USER_INFO_URL`, `OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL`, `OAUTH2_GENERIC_CLIENT_TOKEN_URL`, `OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT`, `OAUTH2_GENERIC_ID_PATH`, `OAUTH2_GENERIC_USER_UID`, `OAUTH2_GENERIC_USER_NAME`, `OAUTH2_GENERIC_USER_EMAIL`, `OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE`, `OAUTH2_GENERIC_LABEL` and `OAUTH2_GENERIC_NAME`. See [GitLab documentation](https://docs.gitlab.com/ee/integration/oauth2_generic.html#sign-into-gitlab-with-almost-any-oauth2-provider) and [Omniauth-oauth2-generic documentation](https://gitlab.com/satorix/omniauth-oauth2-generic) for more details. From ab0e2e63f8d177e44d1de0d0bd3b1f0cd5ae6a01 Mon Sep 17 00:00:00 2001 From: massej Date: Sun, 1 Oct 2023 13:49:47 -0400 Subject: [PATCH 339/522] Update docker-compose.yml --- contrib/docker-swarm/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 62fcd6c94..38145e481 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -163,6 +163,8 @@ services: - OAUTH2_GENERIC_USER_UID= - OAUTH2_GENERIC_USER_NAME= - OAUTH2_GENERIC_USER_EMAIL= + - OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE= + - OAUTH2_GENERIC_LABEL= - OAUTH2_GENERIC_NAME= - OAUTH_AZURE_API_KEY= From 964e29c92dd9b28aa50a3c7a56826eb624941ee2 Mon Sep 17 00:00:00 2001 From: massej Date: Sun, 1 Oct 2023 13:55:50 -0400 Subject: [PATCH 340/522] Fix tipo. --- docs/keycloak-idp.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md index 149e639cb..8a5b9ad37 100644 --- a/docs/keycloak-idp.md +++ b/docs/keycloak-idp.md @@ -42,7 +42,7 @@ Set the following in the docker-compose file: The following must also be configured: ```yaml - - OAUTH2_GENERIC_USER_UID='preffered_usename' + - OAUTH2_GENERIC_USER_UID='prefered_username' - OAUTH2_GENERIC_USER_NAME='name' - OAUTH2_GENERIC_USER_EMAIL='email' ``` From 8bcb068cacfc6b29828d09795c9e9d9492bcc8c3 Mon Sep 17 00:00:00 2001 From: massej Date: Mon, 2 Oct 2023 09:00:08 -0400 Subject: [PATCH 341/522] Update README.md --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index ff5d89dbd..15c4df893 100644 --- a/README.md +++ b/README.md @@ -2279,6 +2279,14 @@ The OAuth2 generic user name. No defaults The OAuth2 generic user email. No defaults +##### `OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE` + +The scope of your OAuth2 provider. No defaults + +##### `OAUTH2_GENERIC_LABEL` + +The label of your OAuth2 provider. No defaults + ##### `OAUTH2_GENERIC_NAME` The name of your OAuth2 provider. No defaults From 755a9ac8f97190fb48b4f10cb2020c8745c03b77 Mon Sep 17 00:00:00 2001 From: massej Date: Mon, 2 Oct 2023 09:28:54 -0400 Subject: [PATCH 342/522] Update docs/keycloak-idp.md Co-authored-by: Kazunori Kimura <33391846+kkimurak@users.noreply.github.com> --- docs/keycloak-idp.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md index 8a5b9ad37..b3aff53c3 100644 --- a/docs/keycloak-idp.md +++ b/docs/keycloak-idp.md @@ -42,7 +42,7 @@ Set the following in the docker-compose file: The following must also be configured: ```yaml - - OAUTH2_GENERIC_USER_UID='prefered_username' + - OAUTH2_GENERIC_USER_UID='preferred_username' - OAUTH2_GENERIC_USER_NAME='name' - OAUTH2_GENERIC_USER_EMAIL='email' ``` From a2dd4e5ed8fac3e059c4d15845895fd68c5b66e9 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Wed, 27 Sep 2023 19:15:03 +0900 Subject: [PATCH 343/522] Accept multiple hosts for RACK_ATTACK_WHITELIST see sameersbn/docker-gitlab#2828 The current setup also accepts multiple hosts, but the syntax is a bit strange. The leading/trailing double quotes are embedded in the configuration file itself, so users should expect double quotes around the string they set. In other words, when setting two hosts 0.0.0.0 and 1.1.1.1, you will set the strings 0.0.0.0","1.1.1.1 in the environment variables. This is not intuitive. This commit removes double quote around corresponding config and set backward compatibility fallback process to surround whole with [], each host with double quote. Also, validation script (written in ruby) will be executed during configuration. Example docker-compose.yml ````yaml services: gitlab: image: sameersbn/gitlab:latest environment: - RACK_ATTACK_WHITELIST='["127.0.0.1","0.0.0.0"]' ```` Co-authored-by: Mikhail Khadarenka --- README.md | 14 +++++++++++- assets/runtime/config/gitlabhq/gitlab.yml | 2 +- assets/runtime/env-defaults | 26 ++++++++++++++++++++++- assets/runtime/functions | 18 ++++++++++++++++ 4 files changed, 57 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8e4578ef2..bf1099cf3 100644 --- a/README.md +++ b/README.md @@ -2381,7 +2381,19 @@ Enable/disable rack middleware for blocking & throttling abusive requests Defaul ##### `RACK_ATTACK_WHITELIST` -Always allow requests from whitelisted host. Defaults to `127.0.0.1` +Always allow requests from whitelisted host. +This should be a valid yaml sequence of host address. Each host address string must be a valid IP address that can be passed to `IPAddr.new` of ruby. See [ruby-lang reference](https://docs.ruby-lang.org/en/3.0/IPAddr.html#method-c-new) for detail. +If you need to set multiple hosts, set this parameter like `["1.1.1.1","192.168.0.0/24"]` for example. In docker-compose.yml, you have to quote whole value like below: + +````yaml +environment: +# pattern 1: surround with single quote, double quote each IP address +- RACK_ATTACK_WHITELIST='["1.1.1.1","192.168.0.0/24"]' +# pattern 2: surround with double quote, single quote each IP address +- RACK_ATTACK_WHITELIST="['1.1.1.1','192.168.0.0/24']" +```` + +Defaults to `["127.0.0.1"]` ##### `RACK_ATTACK_MAXRETRY` diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 49502277e..5754ad3c2 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -1231,7 +1231,7 @@ production: &base enabled: {{RACK_ATTACK_ENABLED}} # # Whitelist requests from 127.0.0.1 for web proxies (NGINX/Apache) with incorrect headers - ip_whitelist: ["{{RACK_ATTACK_WHITELIST}}"] + ip_whitelist: {{RACK_ATTACK_WHITELIST}} # # Limit the number of Git HTTP authentication attempts per IP maxretry: {{RACK_ATTACK_MAXRETRY}} diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index deab8a2a8..f29734902 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -544,7 +544,31 @@ PIWIK_SITE_ID=${PIWIK_SITE_ID:-} ## RACK ATTACK RACK_ATTACK_ENABLED=${RACK_ATTACK_ENABLED:-true} -RACK_ATTACK_WHITELIST=${RACK_ATTACK_WHITELIST:-"127.0.0.1"} +RACK_ATTACK_WHITELIST=${RACK_ATTACK_WHITELIST:-'["127.0.0.1"]'} +RACK_ATTACK_WHITELIST=${RACK_ATTACK_WHITELIST// /} +# Backward compatibility : See sameersbn/docker-gitlab#2828 +# Pre-check: each host is surrounded by single / double quotation +# if not, generated string will be [127.0.0.1] for example and ruby raises error +RACK_ATTACK_WHITELIST_ORIGIN=${RACK_ATTACK_WHITELIST} +# remove [], then iterate entries +RACK_ATTACK_WHITELIST=${RACK_ATTACK_WHITELIST#"["} +RACK_ATTACK_WHITELIST=${RACK_ATTACK_WHITELIST%"]"} +IFS_ORG=${IFS} +IFS=, +for host in ${RACK_ATTACK_WHITELIST}; do + # Both single / double quotation may be used + if ! [[ ${host} =~ ^(\"|\').*(\"|\')$ ]]; then + RACK_ATTACK_WHITELIST=${RACK_ATTACK_WHITELIST/${host}/\"${host//(\'|\")/}\"} + fi +done +IFS=$IFS_ORG +# surround with [] +RACK_ATTACK_WHITELIST="[${RACK_ATTACK_WHITELIST}]" +if [[ "${RACK_ATTACK_WHITELIST}" != "${RACK_ATTACK_WHITELIST_ORIGIN}" ]]; then + printf "[warning] RACK_ATTACK_WHITELIST must be a yaml sequence of hosts.\nFixing from %s to %s\n" \ + "${RACK_ATTACK_WHITELIST_ORIGIN}" \ + "${RACK_ATTACK_WHITELIST}" +fi RACK_ATTACK_MAXRETRY=${RACK_ATTACK_MAXRETRY:-10} RACK_ATTACK_FINDTIME=${RACK_ATTACK_FINDTIME:-60} RACK_ATTACK_BANTIME=${RACK_ATTACK_BANTIME:-3600} diff --git a/assets/runtime/functions b/assets/runtime/functions index 496a28e0c..a1607e2af 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1068,6 +1068,24 @@ gitlab_configure_analytics() { gitlab_configure_rack_attack() { echo "Configuring gitlab::rack_attack..." + + # validity check : RACK_ATTACK_WHITELIST should be an array of valid IP Address string + echo " Validating RACK_ATTACK_WHITELIST..." + /usr/bin/env ruby << SCRIPT + require 'ipaddr' + ${RACK_ATTACK_WHITELIST}.each do |host| + begin + printf(" input=%s, to_range=%s\n", host, IPAddr.new(host).to_range) + rescue IPAddr::InvalidAddressError => e + p e + exit 1 + rescue => e + put "Unexpected error", e + exit 1 + end + end +SCRIPT + update_template ${GITLAB_CONFIG} \ RACK_ATTACK_ENABLED \ RACK_ATTACK_WHITELIST \ From da0d78bf5b5c2d228e6868bad5dc0dc7ca7717dd Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Mon, 2 Oct 2023 18:34:45 +0900 Subject: [PATCH 344/522] Add build patch to avoid removing node_modules note: Only affected if using the relative_url feature `gitlab/script/frontent/preinstall.mjs` is introduced since v16.4.0. This script is executed on container startup, if using the relative url. This script removes `NODE_MODULES` (/home/git/gitlab/node_modules) when "the folder seems to end up being a corrupted somehow" See more detail: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130938 On sameersbn/gitlab, the folder node_modules is declared as volume. The volume is always busy so that cannot be removed in the container. You can see following error reported on container startup (sameersbn/gitlab:16.4.0 or later). ```` yarn install v1.22.19 $ node ./scripts/frontend/preinstall.mjs [WARNING] package.json changed significantly. Removing node_modules to be sure there are no problems. node:internal/process/esm_loader:97 internalBinding('errors').triggerUncaughtException( ^ [Error: EBUSY: resource busy or locked, rmdir '/home/git/gitlab/node_modules'] { errno: -16, code: 'EBUSY', syscall: 'rmdir', path: '/home/git/gitlab/node_modules' } Node.js v18.17.1 error Command failed with exit code 1. info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command. ----- ```` This PR add a build time patch to change the behavior of script/frontend/preinstall.mjs to not to remove node_modules directly, but empty it instead. --- ...s-to-avoid-removing-node_modules_dir.patch | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 assets/build/patches/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch diff --git a/assets/build/patches/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch b/assets/build/patches/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch new file mode 100644 index 000000000..a5646ff38 --- /dev/null +++ b/assets/build/patches/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch @@ -0,0 +1,28 @@ +diff --git a/scripts/frontend/preinstall.mjs b/scripts/frontend/preinstall.mjs +index 09d980344eac..b1514e803b75 100644 +--- a/scripts/frontend/preinstall.mjs ++++ b/scripts/frontend/preinstall.mjs +@@ -1,6 +1,6 @@ + import { dirname, join } from 'node:path'; + import { fileURLToPath } from 'node:url'; +-import { readFile, rm } from 'node:fs/promises'; ++import { readdir, readFile, rm, stat } from 'node:fs/promises'; + + const ROOT_PATH = join(dirname(fileURLToPath(import.meta.url)), '..', '..'); + const NODE_MODULES = join(ROOT_PATH, 'node_modules'); +@@ -55,5 +55,14 @@ if (!arraysHaveSameItems(prevTopLevelPatterns, currentTopLevelPatterns)) { + console.error( + '[WARNING] package.json changed significantly. Removing node_modules to be sure there are no problems.', + ); +- await rm(NODE_MODULES, { recursive: true, force: true }); ++ // sameersbn/gitlab : avoid removing NODE_MODULES directly, iterate its content instead ++ // The path NODE_MODULES is declared as docker volume - always busy so that cannot be removed ++ // before iterating, check if the directory exists ++ const isDirectory = await stat(NODE_MODULES).then((stat) => stat.isDirectory()).catch(() => false); ++ if(isDirectory) { ++ for (const dir_ent of await readdir(NODE_MODULES, { withFileTypes: true})) { ++ const to_remove = join(NODE_MODULES, dir_ent.name); ++ await rm(to_remove, { recursive: true, force: true }); ++ } ++ } + } From 43d0a969d158f83186a7da2e9ea63a7f278a4370 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Mon, 23 Oct 2023 00:36:46 +0200 Subject: [PATCH 345/522] Upgrade to GitLab CE 16.5.0 --- Changelog.md | 9 +++++ Dockerfile | 12 +++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 54 insertions(+), 45 deletions(-) diff --git a/Changelog.md b/Changelog.md index 400fc865e..8ff91af83 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,15 @@ 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. +**16.5.0** + +- gitlab: upgrade CE to v16.5.0 +- gitaly: upgrade to v16.5.0 +- gitlab-pages: upgrade to v16.5.0 +- gitlab-shell: upgrade to v14.29.0 +- golang: upgrade to v1.21.3 +- ubuntu: upgrade to focal-20231003 + **16.4.1** - gitlab: upgrade CE to v16.4.1 diff --git a/Dockerfile b/Dockerfile index cfc0174d8..ed3197673 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20230801 +FROM ubuntu:focal-20231003 -ARG VERSION=16.4.1 +ARG VERSION=16.5.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ - GOLANG_VERSION=1.21.1 \ - GITLAB_SHELL_VERSION=14.28.0 \ - GITLAB_PAGES_VERSION=16.4.1 \ - GITALY_SERVER_VERSION=16.4.1 \ + GOLANG_VERSION=1.21.3 \ + GITLAB_SHELL_VERSION=14.29.0 \ + GITLAB_PAGES_VERSION=16.5.0 \ + GITALY_SERVER_VERSION=16.5.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 8e4578ef2..b36983a9f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.4.1 +# sameersbn/gitlab:16.5.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.4.1 +docker pull sameersbn/gitlab:16.5.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.4.1 + sameersbn/gitlab:16.5.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.4.1 + sameersbn/gitlab:16.5.0 ``` ### Database @@ -287,7 +287,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:16.4.1 + sameersbn/gitlab:16.5.0 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.4.1 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.4.1 + sameersbn/gitlab:16.5.0 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.4.1 + sameersbn/gitlab:16.5.0 ``` #### Mail @@ -410,7 +410,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:16.4.1 + sameersbn/gitlab:16.5.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.4.1 + sameersbn/gitlab:16.5.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.4.1 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.4.1 + sameersbn/gitlab:16.5.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.4.1 + sameersbn/gitlab:16.5.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.4.1 + sameersbn/gitlab:16.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:16.4.1 + sameersbn/gitlab:16.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:16.4.1 app:sanitize + sameersbn/gitlab:16.5.0 app:sanitize ``` #### Piwik @@ -2448,7 +2448,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.4.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2483,14 +2483,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.4.1 app:rake db:setup + sameersbn/gitlab:16.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:16.4.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2499,7 +2499,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2548,7 +2548,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:16.4.1 app:rake gitlab:env:info + sameersbn/gitlab:16.5.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2561,7 +2561,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.4.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.5.0 app:rake gitlab:import:repos ``` Or @@ -2592,7 +2592,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.4.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.5.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2616,12 +2616,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.4.1 +docker pull sameersbn/gitlab:16.5.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2646,7 +2646,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:16.4.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.5.0 ``` ### Shell Access @@ -2684,7 +2684,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.4.1 + image: sameersbn/gitlab:16.5.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 0baffb7e2..28ebe8b4d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.4.1 +16.5.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 62fcd6c94..9e35870c7 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.4.1 + image: sameersbn/gitlab:16.5.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 4ffefe945..eb1cf2cd7 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.4.1 + image: sameersbn/gitlab:16.5.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 8f34ed567..82258b288 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.4.1 + image: sameersbn/gitlab:16.5.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 26210ec99..a507c0d4d 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.4.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.5.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.4.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.4.1 +docker pull sameersbn/gitlab:16.5.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.4.1 +sameersbn/gitlab:16.5.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 9450d6ba1..101053f4c 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.4.1 + image: sameersbn/gitlab:16.5.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 5de6f51da..6c9a026c6 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.4.1 + image: sameersbn/gitlab:16.5.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 6e892f3c3..2e570ecb7 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.4.1 + image: sameersbn/gitlab:16.5.0 env: - name: TZ value: Asia/Kolkata From d11ae7b617d429b7867fc32b03959d259eb1f95f Mon Sep 17 00:00:00 2001 From: massej Date: Mon, 23 Oct 2023 22:17:20 -0400 Subject: [PATCH 346/522] Added missing configuration variable OAUTH_ALLOW_BYPASS_TWO_FACTOR. --- README.md | 4 ++++ assets/runtime/config/gitlabhq/gitlab.yml | 2 +- assets/runtime/env-defaults | 1 + assets/runtime/functions | 3 ++- contrib/docker-swarm/docker-compose.yml | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e7479d617..bb3ac5cc5 100644 --- a/README.md +++ b/README.md @@ -2023,6 +2023,10 @@ Allow users with existing accounts to login and auto link their account via the Comma separated list if oauth providers to disallow access to `internal` projects. Users creating accounts via these providers will have access internal projects. Accepted values are `cas3`, `github`, `bitbucket`, `gitlab`, `google_oauth2`, `facebook`, `twitter`, `saml`, `crowd`, `auth0` and `azure_oauth2`. No default. +##### `OAUTH_ALLOW_BYPASS_TWO_FACTOR` + +Comma separated list of oauth providers where users can sign in without using two-factor authentication (2FA). Defaults to `[]`. + ##### `OAUTH_CAS3_LABEL` The "Sign in with" button label. Defaults to "cas3". diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 35d4e4db0..04a220cdb 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -918,7 +918,7 @@ production: &base # This option should only be configured for providers which already have two factor. # This configration dose not apply to SAML. # (default: false) - allow_bypass_two_factor: null + allow_bypass_two_factor: [{{OAUTH_ALLOW_BYPASS_TWO_FACTOR}}] ## Auth providers # Uncomment the following lines and fill in the data of the auth provider you want to use diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index fe49d61f1..6f4e4a734 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -426,6 +426,7 @@ OAUTH_BLOCK_AUTO_CREATED_USERS=${OAUTH_BLOCK_AUTO_CREATED_USERS:-true} OAUTH_AUTO_LINK_LDAP_USER=${OAUTH_AUTO_LINK_LDAP_USER:-false} OAUTH_AUTO_LINK_SAML_USER=${OAUTH_AUTO_LINK_SAML_USER:-false} OAUTH_EXTERNAL_PROVIDERS=${OAUTH_EXTERNAL_PROVIDERS:-} +OAUTH_ALLOW_BYPASS_TWO_FACTOR=${OAUTH_ALLOW_BYPASS_TWO_FACTOR:-} ### GOOGLE OAUTH_GOOGLE_API_KEY=${OAUTH_GOOGLE_API_KEY:-} diff --git a/assets/runtime/functions b/assets/runtime/functions index 9deaa2fc1..8efd0a237 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -819,7 +819,8 @@ gitlab_configure_oauth() { OAUTH_AUTO_LINK_LDAP_USER \ OAUTH_AUTO_LINK_SAML_USER \ OAUTH_AUTO_LINK_USER \ - OAUTH_EXTERNAL_PROVIDERS + OAUTH_EXTERNAL_PROVIDERS \ + OAUTH_ALLOW_BYPASS_TWO_FACTOR case ${OAUTH_AUTO_SIGN_IN_WITH_PROVIDER} in cas3|google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd|azure_oauth2|azure_activedirectory_v2|oauth2_generic|$OAUTH2_GENERIC_NAME) diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 38145e481..28512b693 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -99,6 +99,7 @@ services: - OAUTH_AUTO_LINK_LDAP_USER=false - OAUTH_AUTO_LINK_SAML_USER=false - OAUTH_EXTERNAL_PROVIDERS= + - OAUTH_ALLOW_BYPASS_TWO_FACTOR= - OAUTH_CAS3_LABEL=cas3 - OAUTH_CAS3_SERVER= From 6021919e32368ec9a78f1e742606f489b708dc04 Mon Sep 17 00:00:00 2001 From: massej Date: Tue, 24 Oct 2023 08:21:28 -0400 Subject: [PATCH 347/522] Update docker-compose.yml --- contrib/docker-swarm/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 28512b693..9fa1f6d72 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -99,7 +99,7 @@ services: - OAUTH_AUTO_LINK_LDAP_USER=false - OAUTH_AUTO_LINK_SAML_USER=false - OAUTH_EXTERNAL_PROVIDERS= - - OAUTH_ALLOW_BYPASS_TWO_FACTOR= + - OAUTH_ALLOW_BYPASS_TWO_FACTOR=false - OAUTH_CAS3_LABEL=cas3 - OAUTH_CAS3_SERVER= From 00011258590c681d853aa6e2505175d1bc005d53 Mon Sep 17 00:00:00 2001 From: massej Date: Tue, 24 Oct 2023 08:22:08 -0400 Subject: [PATCH 348/522] Update env-defaults --- 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 6f4e4a734..4c0a529f2 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -426,7 +426,7 @@ OAUTH_BLOCK_AUTO_CREATED_USERS=${OAUTH_BLOCK_AUTO_CREATED_USERS:-true} OAUTH_AUTO_LINK_LDAP_USER=${OAUTH_AUTO_LINK_LDAP_USER:-false} OAUTH_AUTO_LINK_SAML_USER=${OAUTH_AUTO_LINK_SAML_USER:-false} OAUTH_EXTERNAL_PROVIDERS=${OAUTH_EXTERNAL_PROVIDERS:-} -OAUTH_ALLOW_BYPASS_TWO_FACTOR=${OAUTH_ALLOW_BYPASS_TWO_FACTOR:-} +OAUTH_ALLOW_BYPASS_TWO_FACTOR=${OAUTH_ALLOW_BYPASS_TWO_FACTOR:-false} ### GOOGLE OAUTH_GOOGLE_API_KEY=${OAUTH_GOOGLE_API_KEY:-} From 9500ad163bbb4f80b8695ed34e48173f71f85e56 Mon Sep 17 00:00:00 2001 From: massej Date: Tue, 24 Oct 2023 08:23:00 -0400 Subject: [PATCH 349/522] Update README.md Co-authored-by: Kazunori Kimura <33391846+kkimurak@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bb3ac5cc5..965e5a604 100644 --- a/README.md +++ b/README.md @@ -2025,7 +2025,7 @@ Comma separated list if oauth providers to disallow access to `internal` project ##### `OAUTH_ALLOW_BYPASS_TWO_FACTOR` -Comma separated list of oauth providers where users can sign in without using two-factor authentication (2FA). Defaults to `[]`. +Specify oauth providers where users can sign in without using two-factor authentication (2FA). You can define this using an array of providers like `["twitter", "google_oauth2"]`. Setting this to `true` or `false` applies to all - allow all or none. Defaults to `false`. ##### `OAUTH_CAS3_LABEL` From e574613c9e130f6628f717f362288e82ce0e5ef7 Mon Sep 17 00:00:00 2001 From: massej Date: Tue, 24 Oct 2023 08:23:11 -0400 Subject: [PATCH 350/522] Update assets/runtime/config/gitlabhq/gitlab.yml Co-authored-by: Kazunori Kimura <33391846+kkimurak@users.noreply.github.com> --- 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 04a220cdb..226ced2e8 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -918,7 +918,7 @@ production: &base # This option should only be configured for providers which already have two factor. # This configration dose not apply to SAML. # (default: false) - allow_bypass_two_factor: [{{OAUTH_ALLOW_BYPASS_TWO_FACTOR}}] + allow_bypass_two_factor: {{OAUTH_ALLOW_BYPASS_TWO_FACTOR}} ## Auth providers # Uncomment the following lines and fill in the data of the auth provider you want to use From bac9b4f876ee5e034a30878d1894f591278dab71 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 3 Nov 2023 22:16:56 +0100 Subject: [PATCH 351/522] Upgrade to GitLab CE 16.5.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 8ff91af83..5ad398335 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**16.5.1** + +- gitlab: upgrade CE to v16.5.1 +- gitaly: upgrade to v16.5.1 +- gitlab-pages: upgrade to v16.5.1 + **16.5.0** - gitlab: upgrade CE to v16.5.0 diff --git a/Dockerfile b/Dockerfile index ed3197673..294171370 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20231003 -ARG VERSION=16.5.0 +ARG VERSION=16.5.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.21.3 \ GITLAB_SHELL_VERSION=14.29.0 \ - GITLAB_PAGES_VERSION=16.5.0 \ - GITALY_SERVER_VERSION=16.5.0 \ + GITLAB_PAGES_VERSION=16.5.1 \ + GITALY_SERVER_VERSION=16.5.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 5951d0f12..b79091f5c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.5.0 +# sameersbn/gitlab:16.5.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.5.0 +docker pull sameersbn/gitlab:16.5.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.5.0 + sameersbn/gitlab:16.5.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.5.0 + sameersbn/gitlab:16.5.1 ``` ### Database @@ -287,7 +287,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:16.5.0 + sameersbn/gitlab:16.5.1 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.5.0 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.5.0 + sameersbn/gitlab:16.5.1 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.5.0 + sameersbn/gitlab:16.5.1 ``` #### Mail @@ -410,7 +410,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:16.5.0 + sameersbn/gitlab:16.5.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.5.0 + sameersbn/gitlab:16.5.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.5.0 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.5.0 + sameersbn/gitlab:16.5.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.5.0 + sameersbn/gitlab:16.5.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.5.0 + sameersbn/gitlab:16.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:16.5.0 + sameersbn/gitlab:16.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:16.5.0 app:sanitize + sameersbn/gitlab:16.5.1 app:sanitize ``` #### Piwik @@ -2472,7 +2472,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.5.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2507,14 +2507,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.5.0 app:rake db:setup + sameersbn/gitlab:16.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:16.5.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2572,7 +2572,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:16.5.0 app:rake gitlab:env:info + sameersbn/gitlab:16.5.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.5.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.5.1 app:rake gitlab:import:repos ``` Or @@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.5.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.5.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.5.0 +docker pull sameersbn/gitlab:16.5.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2670,7 +2670,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:16.5.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.5.1 ``` ### Shell Access @@ -2708,7 +2708,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.5.0 + image: sameersbn/gitlab:16.5.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 28ebe8b4d..773e5b01b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.5.0 +16.5.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 3ae23ee6c..b1bcfc713 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.5.0 + image: sameersbn/gitlab:16.5.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index eb1cf2cd7..5b3805e3d 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.5.0 + image: sameersbn/gitlab:16.5.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 82258b288..d88e88957 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.5.0 + image: sameersbn/gitlab:16.5.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index a507c0d4d..50b195c12 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.5.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.5.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.5.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.5.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.5.0 +docker pull sameersbn/gitlab:16.5.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.5.0 +sameersbn/gitlab:16.5.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 101053f4c..165a525bc 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.5.0 + image: sameersbn/gitlab:16.5.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 6c9a026c6..1a78bf861 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.5.0 + image: sameersbn/gitlab:16.5.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 2e570ecb7..e325d3324 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.5.0 + image: sameersbn/gitlab:16.5.1 env: - name: TZ value: Asia/Kolkata From c814fb7ac9e28152a00e1a1151e0f93748fbec70 Mon Sep 17 00:00:00 2001 From: Filipe Roque Date: Sat, 4 Nov 2023 13:26:54 +0000 Subject: [PATCH 352/522] Upgrade instructions form Postgresql 12 to 14 Postgres 15 has a permissions problem. See https://github.com/sameersbn/docker-postgresql/issues/168 --- .circleci/config.yml | 3 +++ README.md | 14 +++++++------- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/postgresql-rc.yml | 2 +- 8 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d2e2676f6..d7154f9d8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -231,6 +231,9 @@ jobs: - run: name: Wait for stack bootup command: sleep 90 + - run: + name: Show logs + command: docker-compose logs - run: name: Test image bootup command: | diff --git a/README.md b/README.md index b79091f5c..779abded0 100644 --- a/README.md +++ b/README.md @@ -172,7 +172,7 @@ docker run --name gitlab-postgresql -d \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --env 'DB_EXTENSION=pg_trgm,btree_gist' \ --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \ - sameersbn/postgresql:12-20200524 + sameersbn/postgresql:14-20230628 ``` Step 2. Launch a redis container @@ -236,7 +236,7 @@ docker run --name gitlab -d \ GitLab uses a database backend to store its data. You can configure this image to use PostgreSQL. -*Note:* GitLab requieres PostgreSQL now. So use an older image < 12.1 or migrate to PostgresSQL +*Note:* GitLab requires PostgreSQL now. So use an older image < 12.1 or migrate to PostgresSQL #### PostgreSQL @@ -263,7 +263,7 @@ Please note furthermore, that only compatible versions of the `postgresql-client - `postgresql-client-14`, - and `postgresql-client-15`. -*NOTE:* version 13.7.0 and later requires PostgreSQL version 12.x +*NOTE:* Version 13.7.0 and later requires PostgreSQL version 12.x. Version 16.0.0 and later requires PostgreSQL version 13.x ##### External PostgreSQL Server @@ -301,7 +301,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:12-20200524 +docker pull sameersbn/postgresql:14-20230628 ``` For data persistence lets create a store for the postgresql and start the container. @@ -321,7 +321,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:12-20200524 + sameersbn/postgresql:14-20230628 ``` 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. @@ -2630,9 +2630,9 @@ Usage when using `docker-compose` can also be found there. > > Since GitLab release `8.6.0` PostgreSQL users should enable `pg_trgm` extension on the GitLab database. Refer to GitLab's [Postgresql Requirements](http://doc.gitlab.com/ce/install/requirements.html#postgresql-requirements) for more information > -> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:12-20200524` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: ). +> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:14-20230628` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: ). > -> As of version 13.7.0, the required PostgreSQL is version 12.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql). +> As of version 13.7.0, the required PostgreSQL is version 12.x. As of version 16.0.0, the required PostgreSQL is version 13.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql). GitLabHQ releases new versions on the 22nd of every month, bugfix releases immediately follow. I update this project almost immediately when a release is made (at least it has been the case so far). If you are using the image in production environments I recommend that you delay updates by a couple of days after the gitlab release, allowing some time for the dust to settle down. diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index b1bcfc713..40dd50319 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -11,7 +11,7 @@ services: postgresql: restart: always - image: sameersbn/postgresql:12-20200524 + image: sameersbn/postgresql:14-20230628 volumes: - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z environment: diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 5b3805e3d..e89b57b08 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -12,7 +12,7 @@ services: - node.labels.gitlab.redis-data == true postgresql: - image: sameersbn/postgresql:12-20200524 + image: sameersbn/postgresql:14-20230628 volumes: - postgresql-data:/var/lib/postgresql:Z environment: diff --git a/docker-compose.yml b/docker-compose.yml index d88e88957..22294623b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: postgresql: restart: always - image: sameersbn/postgresql:12-20200524 + image: sameersbn/postgresql:14-20230628 volumes: - postgresql-data:/var/lib/postgresql:Z environment: diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 165a525bc..461d4de52 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -11,7 +11,7 @@ services: postgresql: restart: always - image: sameersbn/postgresql:12-20200524 + image: sameersbn/postgresql:14-20230628 volumes: - postgresql-data:/var/lib/postgresql:Z environment: diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 1a78bf861..895bf903b 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -11,7 +11,7 @@ services: postgresql: restart: always - image: sameersbn/postgresql:12-20200524 + image: sameersbn/postgresql:14-20230628 volumes: - postgresql:/var/lib/postgresql:Z environment: diff --git a/kubernetes/postgresql-rc.yml b/kubernetes/postgresql-rc.yml index dee508791..9498d28b0 100644 --- a/kubernetes/postgresql-rc.yml +++ b/kubernetes/postgresql-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: postgresql - image: sameersbn/postgresql:12-20200524 + image: sameersbn/postgresql:14-20230628 env: - name: DB_USER value: gitlab From 51cc21dfc8cbc1173476a5f3ec68a3d193511829 Mon Sep 17 00:00:00 2001 From: Filipe Roque Date: Thu, 9 Nov 2023 13:53:04 +0000 Subject: [PATCH 353/522] Bump orb to circleci/docker@2.4.0 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d7154f9d8..4bafdaecf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 orbs: shellcheck: circleci/shellcheck@3.1.1 - docker: circleci/docker@2.1.1 + docker: circleci/docker@2.4.0 go: circleci/go@1.7.1 commands: From d37154d59fe2b5387f1d742598f5c7d3188ce62a Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 19 Nov 2023 13:57:56 +0100 Subject: [PATCH 354/522] Upgrade to GitLab CE 16.6.0 --- Changelog.md | 8 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index 5ad398335..581bf4699 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,14 @@ 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. +**16.6.0** + +- gitlab: upgrade CE to v16.6.0 +- gitaly: upgrade to v16.6.0 +- gitlab-pages: upgrade to v16.6.0 +- gitlab-shell: upgrade to v14.30.0 +- golang: upgrade to v1.21.4 + **16.5.1** - gitlab: upgrade CE to v16.5.1 diff --git a/Dockerfile b/Dockerfile index 294171370..d9935c717 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20231003 -ARG VERSION=16.5.1 +ARG VERSION=16.6.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ - GOLANG_VERSION=1.21.3 \ - GITLAB_SHELL_VERSION=14.29.0 \ - GITLAB_PAGES_VERSION=16.5.1 \ - GITALY_SERVER_VERSION=16.5.1 \ + GOLANG_VERSION=1.21.4 \ + GITLAB_SHELL_VERSION=14.30.0 \ + GITLAB_PAGES_VERSION=16.6.0 \ + GITALY_SERVER_VERSION=16.6.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 779abded0..4a74e4e03 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.5.1 +# sameersbn/gitlab:16.6.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.5.1 +docker pull sameersbn/gitlab:16.6.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.5.1 + sameersbn/gitlab:16.6.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.5.1 + sameersbn/gitlab:16.6.0 ``` ### Database @@ -287,7 +287,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:16.5.1 + sameersbn/gitlab:16.6.0 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.5.1 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.5.1 + sameersbn/gitlab:16.6.0 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.5.1 + sameersbn/gitlab:16.6.0 ``` #### Mail @@ -410,7 +410,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:16.5.1 + sameersbn/gitlab:16.6.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.5.1 + sameersbn/gitlab:16.6.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.5.1 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.5.1 + sameersbn/gitlab:16.6.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.5.1 + sameersbn/gitlab:16.6.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.5.1 + sameersbn/gitlab:16.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:16.5.1 + sameersbn/gitlab:16.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:16.5.1 app:sanitize + sameersbn/gitlab:16.6.0 app:sanitize ``` #### Piwik @@ -2472,7 +2472,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.5.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2507,14 +2507,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.5.1 app:rake db:setup + sameersbn/gitlab:16.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:16.5.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2572,7 +2572,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:16.5.1 app:rake gitlab:env:info + sameersbn/gitlab:16.6.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.5.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.6.0 app:rake gitlab:import:repos ``` Or @@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.5.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.6.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.5.1 +docker pull sameersbn/gitlab:16.6.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2670,7 +2670,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:16.5.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.6.0 ``` ### Shell Access @@ -2708,7 +2708,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.5.1 + image: sameersbn/gitlab:16.6.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 773e5b01b..bd015b903 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.5.1 +16.6.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 40dd50319..44eba4b65 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.5.1 + image: sameersbn/gitlab:16.6.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index e89b57b08..61ee541a0 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.5.1 + image: sameersbn/gitlab:16.6.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 22294623b..46b1f3a6a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.5.1 + image: sameersbn/gitlab:16.6.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 50b195c12..e2fe0324a 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.5.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.6.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.5.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.5.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.6.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.5.1 +docker pull sameersbn/gitlab:16.6.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.5.1 +sameersbn/gitlab:16.6.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 461d4de52..017935fc8 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.5.1 + image: sameersbn/gitlab:16.6.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 895bf903b..97c104637 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.5.1 + image: sameersbn/gitlab:16.6.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index e325d3324..67371cf0f 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.5.1 + image: sameersbn/gitlab:16.6.0 env: - name: TZ value: Asia/Kolkata From d74fb49fc9c05433acaaceaa9a3dcb70f1faa5a0 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 2 Dec 2023 08:49:39 +0100 Subject: [PATCH 355/522] Upgrade to GitLab CE 16.6.1 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 581bf4699..986dd0abf 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**16.6.1** + +- gitlab: upgrade CE to v16.6.1 +- gitaly: upgrade to v16.6.1 +- gitlab-pages: upgrade to v16.6.1 +- ubuntu: upgrade to focal-20231128 + **16.6.0** - gitlab: upgrade CE to v16.6.0 diff --git a/Dockerfile b/Dockerfile index d9935c717..f32674d64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20231003 +FROM ubuntu:focal-20231128 -ARG VERSION=16.6.0 +ARG VERSION=16.6.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ GOLANG_VERSION=1.21.4 \ GITLAB_SHELL_VERSION=14.30.0 \ - GITLAB_PAGES_VERSION=16.6.0 \ - GITALY_SERVER_VERSION=16.6.0 \ + GITLAB_PAGES_VERSION=16.6.1 \ + GITALY_SERVER_VERSION=16.6.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 4a74e4e03..4f05c8a7c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.6.0 +# sameersbn/gitlab:16.6.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.6.0 +docker pull sameersbn/gitlab:16.6.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.6.0 + sameersbn/gitlab:16.6.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.6.0 + sameersbn/gitlab:16.6.1 ``` ### Database @@ -287,7 +287,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:16.6.0 + sameersbn/gitlab:16.6.1 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.6.0 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.6.0 + sameersbn/gitlab:16.6.1 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.6.0 + sameersbn/gitlab:16.6.1 ``` #### Mail @@ -410,7 +410,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:16.6.0 + sameersbn/gitlab:16.6.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.6.0 + sameersbn/gitlab:16.6.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.6.0 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.6.0 + sameersbn/gitlab:16.6.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.6.0 + sameersbn/gitlab:16.6.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.6.0 + sameersbn/gitlab:16.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:16.6.0 + sameersbn/gitlab:16.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:16.6.0 app:sanitize + sameersbn/gitlab:16.6.1 app:sanitize ``` #### Piwik @@ -2472,7 +2472,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2507,14 +2507,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.0 app:rake db:setup + sameersbn/gitlab:16.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:16.6.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2572,7 +2572,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:16.6.0 app:rake gitlab:env:info + sameersbn/gitlab:16.6.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.6.1 app:rake gitlab:import:repos ``` Or @@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.6.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.6.0 +docker pull sameersbn/gitlab:16.6.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2670,7 +2670,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:16.6.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.6.1 ``` ### Shell Access @@ -2708,7 +2708,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.6.0 + image: sameersbn/gitlab:16.6.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index bd015b903..d9216d9a9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.6.0 +16.6.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 44eba4b65..a2e0e9dfb 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.6.0 + image: sameersbn/gitlab:16.6.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 61ee541a0..30da17031 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.6.0 + image: sameersbn/gitlab:16.6.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 46b1f3a6a..0c34b28a5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.6.0 + image: sameersbn/gitlab:16.6.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index e2fe0324a..857d5f00d 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.6.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.6.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.6.0 +docker pull sameersbn/gitlab:16.6.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.6.0 +sameersbn/gitlab:16.6.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 017935fc8..634d48593 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.6.0 + image: sameersbn/gitlab:16.6.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 97c104637..e55ae62d1 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.6.0 + image: sameersbn/gitlab:16.6.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 67371cf0f..e2011e266 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.6.0 + image: sameersbn/gitlab:16.6.1 env: - name: TZ value: Asia/Kolkata From ee2d0826218ffb650f24dc25714133fdd4777009 Mon Sep 17 00:00:00 2001 From: Alexis Lefebvre Date: Mon, 4 Dec 2023 11:41:55 +0100 Subject: [PATCH 356/522] README.md: Docker is not new anymore --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4f05c8a7c..35e1dc1e7 100644 --- a/README.md +++ b/README.md @@ -93,9 +93,9 @@ See [Contributors](../../graphs/contributors) for the complete list developers t ## Issues -Docker is a relatively new project and is active being developed and tested by a thriving community of developers and testers and every release of docker features many enhancements and bugfixes. +Docker is actively being developed and tested by a thriving community of developers and testers and every release of Docker features many enhancements and bugfixes. -Given the nature of the development and release cycle it is very important that you have the latest version of docker installed because any issue that you encounter might have already been fixed with a newer docker release. +Given the nature of the development and release cycle it is very important that you have the latest version of Docker installed because any issue that you encounter might have already been fixed with a newer Docker release. Install the most recent version of the Docker Engine for your platform using the [official Docker releases](http://docs.docker.com/engine/installation/), which can also be installed using: From d6a78cca23fe7a4400b0c27051c4ba327eb8a083 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 16 Dec 2023 23:28:49 +0100 Subject: [PATCH 357/522] Upgrade to GitLab CE 16.6.2 --- Changelog.md | 8 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index 986dd0abf..e9017f26a 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,14 @@ 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. +**16.6.2** + +- gitlab: upgrade CE to v16.6.2 +- gitaly: upgrade to v16.6.2 +- gitlab-pages: upgrade to v16.6.2 +- golang: upgrade to v1.21.5 +- ubuntu: upgrade to focal-20231211 + **16.6.1** - gitlab: upgrade CE to v16.6.1 diff --git a/Dockerfile b/Dockerfile index f32674d64..d901e9627 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20231128 +FROM ubuntu:focal-20231211 -ARG VERSION=16.6.1 +ARG VERSION=16.6.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.0.6 \ RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ - GOLANG_VERSION=1.21.4 \ + GOLANG_VERSION=1.21.5 \ GITLAB_SHELL_VERSION=14.30.0 \ - GITLAB_PAGES_VERSION=16.6.1 \ - GITALY_SERVER_VERSION=16.6.1 \ + GITLAB_PAGES_VERSION=16.6.2 \ + GITALY_SERVER_VERSION=16.6.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 35e1dc1e7..1534ccc33 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.6.1 +# sameersbn/gitlab:16.6.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.6.1 +docker pull sameersbn/gitlab:16.6.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.6.1 + sameersbn/gitlab:16.6.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.6.1 + sameersbn/gitlab:16.6.2 ``` ### Database @@ -287,7 +287,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:16.6.1 + sameersbn/gitlab:16.6.2 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.6.1 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.6.1 + sameersbn/gitlab:16.6.2 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.6.1 + sameersbn/gitlab:16.6.2 ``` #### Mail @@ -410,7 +410,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:16.6.1 + sameersbn/gitlab:16.6.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.6.1 + sameersbn/gitlab:16.6.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.6.1 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.6.1 + sameersbn/gitlab:16.6.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.6.1 + sameersbn/gitlab:16.6.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.6.1 + sameersbn/gitlab:16.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:16.6.1 + sameersbn/gitlab:16.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:16.6.1 app:sanitize + sameersbn/gitlab:16.6.2 app:sanitize ``` #### Piwik @@ -2472,7 +2472,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2507,14 +2507,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.1 app:rake db:setup + sameersbn/gitlab:16.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:16.6.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2572,7 +2572,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:16.6.1 app:rake gitlab:env:info + sameersbn/gitlab:16.6.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.6.2 app:rake gitlab:import:repos ``` Or @@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.6.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.6.1 +docker pull sameersbn/gitlab:16.6.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2670,7 +2670,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:16.6.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.6.2 ``` ### Shell Access @@ -2708,7 +2708,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.6.1 + image: sameersbn/gitlab:16.6.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index d9216d9a9..357607e88 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.6.1 +16.6.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index a2e0e9dfb..ec06e5995 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.6.1 + image: sameersbn/gitlab:16.6.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 30da17031..ea6a5dac2 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.6.1 + image: sameersbn/gitlab:16.6.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 0c34b28a5..cc147e5b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.6.1 + image: sameersbn/gitlab:16.6.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 857d5f00d..e066da900 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.6.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.6.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.6.1 +docker pull sameersbn/gitlab:16.6.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.6.1 +sameersbn/gitlab:16.6.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 634d48593..5c6e00e9c 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.6.1 + image: sameersbn/gitlab:16.6.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index e55ae62d1..133fb0da2 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.6.1 + image: sameersbn/gitlab:16.6.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index e2011e266..2266874de 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.6.1 + image: sameersbn/gitlab:16.6.2 env: - name: TZ value: Asia/Kolkata From 00911c934deee289047291559d03a3a1f25cd6b2 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 24 Dec 2023 13:11:35 +0100 Subject: [PATCH 358/522] Upgrade to GitLab CE 16.7.0 --- Changelog.md | 8 ++++ Dockerfile | 12 +++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- scripts/release-notes.sh | 8 ++-- 12 files changed, 57 insertions(+), 49 deletions(-) diff --git a/Changelog.md b/Changelog.md index e9017f26a..f58da1439 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,14 @@ 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. +**16.7.0** + +- gitlab: upgrade CE to v16.7.0 +- gitaly: upgrade to v16.7.0 +- gitlab-pages: upgrade to v16.7.0 +- gitlab-shell: upgrade to v14.32.0 +- ruby: upgrade to v3.1.4 + **16.6.2** - gitlab: upgrade CE to v16.6.2 diff --git a/Dockerfile b/Dockerfile index d901e9627..228d04b93 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20231211 -ARG VERSION=16.6.2 +ARG VERSION=16.7.0 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=3.0.6 \ - RUBY_SOURCE_SHA256SUM="6e6cbd490030d7910c0ff20edefab4294dfcd1046f0f8f47f78b597987ac683e" \ + RUBY_VERSION=3.1.4 \ + RUBY_SOURCE_SHA256SUM="a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6" \ GOLANG_VERSION=1.21.5 \ - GITLAB_SHELL_VERSION=14.30.0 \ - GITLAB_PAGES_VERSION=16.6.2 \ - GITALY_SERVER_VERSION=16.6.2 \ + GITLAB_SHELL_VERSION=14.32.0 \ + GITLAB_PAGES_VERSION=16.7.0 \ + GITALY_SERVER_VERSION=16.7.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 1534ccc33..9a69d711c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.6.2 +# sameersbn/gitlab:16.7.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.6.2 +docker pull sameersbn/gitlab:16.7.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.6.2 + sameersbn/gitlab:16.7.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.6.2 + sameersbn/gitlab:16.7.0 ``` ### Database @@ -287,7 +287,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:16.6.2 + sameersbn/gitlab:16.7.0 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.6.2 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.6.2 + sameersbn/gitlab:16.7.0 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.6.2 + sameersbn/gitlab:16.7.0 ``` #### Mail @@ -410,7 +410,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:16.6.2 + sameersbn/gitlab:16.7.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.6.2 + sameersbn/gitlab:16.7.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.6.2 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.6.2 + sameersbn/gitlab:16.7.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.6.2 + sameersbn/gitlab:16.7.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.6.2 + sameersbn/gitlab:16.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:16.6.2 + sameersbn/gitlab:16.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:16.6.2 app:sanitize + sameersbn/gitlab:16.7.0 app:sanitize ``` #### Piwik @@ -2472,7 +2472,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.2 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2507,14 +2507,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.2 app:rake db:setup + sameersbn/gitlab:16.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:16.6.2 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2572,7 +2572,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:16.6.2 app:rake gitlab:env:info + sameersbn/gitlab:16.7.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.2 app:rake gitlab:import:repos + sameersbn/gitlab:16.7.0 app:rake gitlab:import:repos ``` Or @@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.2 app:rake gitlab:import:repos + sameersbn/gitlab:16.7.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.6.2 +docker pull sameersbn/gitlab:16.7.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2670,7 +2670,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:16.6.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.7.0 ``` ### Shell Access @@ -2708,7 +2708,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.6.2 + image: sameersbn/gitlab:16.7.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 357607e88..2e4239c31 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.6.2 +16.7.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index ec06e5995..0529eef73 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.6.2 + image: sameersbn/gitlab:16.7.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index ea6a5dac2..c97fa63c5 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.6.2 + image: sameersbn/gitlab:16.7.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index cc147e5b8..ba9f18386 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.6.2 + image: sameersbn/gitlab:16.7.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index e066da900..39f54e602 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.2 app:rake gitlab:backup:create + sameersbn/gitlab:16.7.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.2 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.6.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.7.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.6.2 +docker pull sameersbn/gitlab:16.7.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.6.2 +sameersbn/gitlab:16.7.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 5c6e00e9c..30f4fc4c0 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.6.2 + image: sameersbn/gitlab:16.7.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 133fb0da2..bd0bd9f1c 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.6.2 + image: sameersbn/gitlab:16.7.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 2266874de..6edf8ed5d 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.6.2 + image: sameersbn/gitlab:16.7.0 env: - name: TZ value: Asia/Kolkata diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh index 0c84db159..42ee9ef7f 100755 --- a/scripts/release-notes.sh +++ b/scripts/release-notes.sh @@ -40,13 +40,13 @@ Please note that this version does not yet include any rework as a consequence o Don't forget to consider the version specific upgrading instructions for [GitLab CE](https://docs.gitlab.com/ee/update/) **before** upgrading your GitLab CE instance! -**GitLab 16.0 requires at least PostgreSQL 13.** - -You are kindly invited to provide contributions. +Please note: +- GitLab 16.6.x requires at least PostgreSQL 13. +- As of GitLab 16.7, PostgreSQL 14 is the default version. However, PostgreSQL 14 isn't supported on Geo deployments and is planned for future releases (see ). ## Contributing -If you find this image useful here's how you can help: +You are kindly invited to provide contributions. If you find this image useful here's how you can help: - Send a Pull Request with your awesome new features and bug fixes - Be a part of the community and help resolve [issues](https://github.com/sameersbn/docker-gitlab/issues) From 9b813743617ebc2f76db35efd178ab56342591e1 Mon Sep 17 00:00:00 2001 From: nickshek Date: Fri, 12 Jan 2024 17:35:14 +0800 Subject: [PATCH 359/522] Update GitLab version to 16.7.2 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 10 files changed, 47 insertions(+), 41 deletions(-) diff --git a/Changelog.md b/Changelog.md index f58da1439..53d3bb5bc 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**16.7.2** + +- gitlab: upgrade CE to v16.7.2 +- gitaly: upgrade to v16.7.2 +- gitlab-pages: upgrade to v16.7.2 + **16.7.0** - gitlab: upgrade CE to v16.7.0 diff --git a/Dockerfile b/Dockerfile index 228d04b93..1acd52dc0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20231211 -ARG VERSION=16.7.0 +ARG VERSION=16.7.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.1.4 \ RUBY_SOURCE_SHA256SUM="a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6" \ GOLANG_VERSION=1.21.5 \ GITLAB_SHELL_VERSION=14.32.0 \ - GITLAB_PAGES_VERSION=16.7.0 \ - GITALY_SERVER_VERSION=16.7.0 \ + GITLAB_PAGES_VERSION=16.7.2 \ + GITALY_SERVER_VERSION=16.7.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 9a69d711c..5b9ed9541 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.7.0 +# sameersbn/gitlab:16.7.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.7.0 +docker pull sameersbn/gitlab:16.7.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.7.0 + sameersbn/gitlab:16.7.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.7.0 + sameersbn/gitlab:16.7.2 ``` ### Database @@ -287,7 +287,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:16.7.0 + sameersbn/gitlab:16.7.2 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.7.0 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.7.0 + sameersbn/gitlab:16.7.2 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.7.0 + sameersbn/gitlab:16.7.2 ``` #### Mail @@ -410,7 +410,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:16.7.0 + sameersbn/gitlab:16.7.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.7.0 + sameersbn/gitlab:16.7.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.7.0 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.7.0 + sameersbn/gitlab:16.7.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.7.0 + sameersbn/gitlab:16.7.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.7.0 + sameersbn/gitlab:16.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:16.7.0 + sameersbn/gitlab:16.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:16.7.0 app:sanitize + sameersbn/gitlab:16.7.2 app:sanitize ``` #### Piwik @@ -2472,7 +2472,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2507,14 +2507,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.0 app:rake db:setup + sameersbn/gitlab:16.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:16.7.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.7.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2572,7 +2572,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:16.7.0 app:rake gitlab:env:info + sameersbn/gitlab:16.7.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.7.2 app:rake gitlab:import:repos ``` Or @@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.7.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.7.0 +docker pull sameersbn/gitlab:16.7.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2670,7 +2670,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:16.7.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.7.2 ``` ### Shell Access @@ -2708,7 +2708,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.7.0 + image: sameersbn/gitlab:16.7.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 2e4239c31..64eae8f54 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.7.0 +16.7.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 0529eef73..7aff6120b 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.7.0 + image: sameersbn/gitlab:16.7.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index c97fa63c5..8ebea7593 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.7.0 + image: sameersbn/gitlab:16.7.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index ba9f18386..4b8fd12f7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.7.0 + image: sameersbn/gitlab:16.7.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 39f54e602..e530a0395 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.7.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.7.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.7.0 +docker pull sameersbn/gitlab:16.7.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.7.0 +sameersbn/gitlab:16.7.2 ``` diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index bd0bd9f1c..916c4f144 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.7.0 + image: sameersbn/gitlab:16.7.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 6edf8ed5d..78e7cdd49 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.7.0 + image: sameersbn/gitlab:16.7.2 env: - name: TZ value: Asia/Kolkata From ee8cd340caf3dc8caafc20a371f0bb7bb1ef0c09 Mon Sep 17 00:00:00 2001 From: Nick Shek Date: Fri, 12 Jan 2024 17:59:34 +0800 Subject: [PATCH 360/522] Update GitLab version to 16.7.2 --- docs/docker-compose-keycloak.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 30f4fc4c0..e93ab3226 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.7.0 + image: sameersbn/gitlab:16.7.2 depends_on: - redis - postgresql From 80866611b55f765161ce488304ec15fce922226d Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 12 Jan 2024 20:03:35 +0100 Subject: [PATCH 361/522] Upgrade golang to v1.21.6 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 53d3bb5bc..bbd23b2ff 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,7 @@ This file only reflects the changes that are made in this image. Please refer to - gitlab: upgrade CE to v16.7.2 - gitaly: upgrade to v16.7.2 - gitlab-pages: upgrade to v16.7.2 +- golang: upgrade to v1.21.6 **16.7.0** diff --git a/Dockerfile b/Dockerfile index 1acd52dc0..3b1c6fbef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG VERSION=16.7.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.1.4 \ RUBY_SOURCE_SHA256SUM="a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6" \ - GOLANG_VERSION=1.21.5 \ + GOLANG_VERSION=1.21.6 \ GITLAB_SHELL_VERSION=14.32.0 \ GITLAB_PAGES_VERSION=16.7.2 \ GITALY_SERVER_VERSION=16.7.2 \ From 2e8f9ced9fffbaeb1330dc7c42726e456d461cac Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 13 Jan 2024 15:36:59 +0100 Subject: [PATCH 362/522] Upgrade to GitLab CE 16.7.3 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index bbd23b2ff..73bc7805a 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**16.7.3** + +- gitlab: upgrade CE to v16.7.3 +- gitaly: upgrade to v16.7.3 +- gitlab-pages: upgrade to v16.7.3 + **16.7.2** - gitlab: upgrade CE to v16.7.2 diff --git a/Dockerfile b/Dockerfile index 3b1c6fbef..943df10a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20231211 -ARG VERSION=16.7.2 +ARG VERSION=16.7.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.1.4 \ RUBY_SOURCE_SHA256SUM="a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6" \ GOLANG_VERSION=1.21.6 \ GITLAB_SHELL_VERSION=14.32.0 \ - GITLAB_PAGES_VERSION=16.7.2 \ - GITALY_SERVER_VERSION=16.7.2 \ + GITLAB_PAGES_VERSION=16.7.3 \ + GITALY_SERVER_VERSION=16.7.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 5b9ed9541..1d8f73ef7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.7.2 +# sameersbn/gitlab:16.7.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.7.2 +docker pull sameersbn/gitlab:16.7.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.7.2 + sameersbn/gitlab:16.7.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.7.2 + sameersbn/gitlab:16.7.3 ``` ### Database @@ -287,7 +287,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:16.7.2 + sameersbn/gitlab:16.7.3 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.7.2 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.7.2 + sameersbn/gitlab:16.7.3 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.7.2 + sameersbn/gitlab:16.7.3 ``` #### Mail @@ -410,7 +410,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:16.7.2 + sameersbn/gitlab:16.7.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.7.2 + sameersbn/gitlab:16.7.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.7.2 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.7.2 + sameersbn/gitlab:16.7.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.7.2 + sameersbn/gitlab:16.7.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.7.2 + sameersbn/gitlab:16.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:16.7.2 + sameersbn/gitlab:16.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:16.7.2 app:sanitize + sameersbn/gitlab:16.7.3 app:sanitize ``` #### Piwik @@ -2472,7 +2472,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.2 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2507,14 +2507,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.2 app:rake db:setup + sameersbn/gitlab:16.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:16.7.2 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.7.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2572,7 +2572,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:16.7.2 app:rake gitlab:env:info + sameersbn/gitlab:16.7.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.2 app:rake gitlab:import:repos + sameersbn/gitlab:16.7.3 app:rake gitlab:import:repos ``` Or @@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.2 app:rake gitlab:import:repos + sameersbn/gitlab:16.7.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.7.2 +docker pull sameersbn/gitlab:16.7.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2670,7 +2670,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:16.7.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.7.3 ``` ### Shell Access @@ -2708,7 +2708,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.7.2 + image: sameersbn/gitlab:16.7.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 64eae8f54..38e176f31 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.7.2 +16.7.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 7aff6120b..907d00410 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.7.2 + image: sameersbn/gitlab:16.7.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 8ebea7593..a585098f9 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.7.2 + image: sameersbn/gitlab:16.7.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 4b8fd12f7..720396c7a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.7.2 + image: sameersbn/gitlab:16.7.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index e530a0395..241be3be7 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.2 app:rake gitlab:backup:create + sameersbn/gitlab:16.7.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.2 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.7.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.7.2 +docker pull sameersbn/gitlab:16.7.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.7.2 +sameersbn/gitlab:16.7.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index e93ab3226..8436c956e 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.7.2 + image: sameersbn/gitlab:16.7.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 916c4f144..f98f83936 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.7.2 + image: sameersbn/gitlab:16.7.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 78e7cdd49..8cd953291 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.7.2 + image: sameersbn/gitlab:16.7.3 env: - name: TZ value: Asia/Kolkata From d16119b54bd838b69292e519e8a582ec9c07fc3e Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Mon, 3 Apr 2023 19:04:25 +0900 Subject: [PATCH 363/522] Remove ajv as an explicit dependency There was an issue that `ajv` is not installed by mistake. This issue have been fixed on upstream, a few years ago. Now, we can revert the change. This commit partially reverts 985d57afb9673b2f5acb1f12cbc13f230f6ec074 See sameersbn/gitlab#1358 It seems that fix MR on upstream is https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14543 but we cannot check diff because source / target branch removed by mistake Anyway, no need to add ajv as an explicit dependency with (at least) gitlab v11 or later --- assets/build/install.sh | 1 - assets/runtime/functions | 1 - 2 files changed, 2 deletions(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index b266654d4..f70ebac6c 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -203,7 +203,6 @@ chown ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/config/database.yml # Installs nodejs packages required to compile webpack 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 NODE_OPTIONS="--max-old-space-size=4096" diff --git a/assets/runtime/functions b/assets/runtime/functions index 8efd0a237..4762b98a0 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -2168,7 +2168,6 @@ migrate_database() { echo "Prepare recomplie assets... Installing missing node_modules for assets" chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules exec_as_git yarn install --production --pure-lockfile - exec_as_git yarn add ajv@^4.0.0 echo "Recompiling assets (relative_url in use), this could take a while..." exec_as_git bundle exec rake gitlab:assets:compile NODE_OPTIONS="--max-old-space-size=4096" >/dev/null 2>&1 fi From 3885a455d12a4e37ce829e590a763b4a3194e22f Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Thu, 18 Jan 2024 02:02:41 +0900 Subject: [PATCH 364/522] Add build patch to prevent rake task assets:compile to remove assets dir GitLab does not launch after second run if relative url is used. This is caused by following upstream change to remove assets directory on assets compile. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103715 This is introduced on v15.6.0 ````sh $ git -C ../gitlab.git/ tag --contains e46d92c0 | sort --version-sort | head -n 1 v15.6.0-ee ```` 1. `sameersbn/gitlab` create symbolic link /home/git/gitlab/public/assets/ to point /home/git/data/tmp/assets if relative url is used. This is to store assets in the docker volume to avoid unnecessary recompilations. These assets are removed and recompiled only when the gitlab version or relative url root is changed. 2. By the change provided by gitlab.com/gitlab-org/gitlab!103715, rake task `gitlab:assets:compile` became to remove assets directory directly (by `FileUtils.rm_rf()`). It does not remove compiled assets itself, but remove symlink /home/git/gitlab/public/assets . Then it compiles assets as usual, but they will be stored in newly-created normal directory /home/git/gitlab/public/assets/ 3. On container down, whole container statement (except volumes) will be reset. These compiled assets will be removed as well because they are not in docker volume. 4. As we store version info and relative url root path to /home/git/data/tmp/, we cannot recognize we have to recompile assets (that have been removed by mistake) To avoid the issue, this commit add a build time patch to change the behavior of rake task `gitlab:assets:compile` to empty assets instead of removing assets directory itself. --- ...4-fix-raketask-gitlab-assets-compile.patch | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch diff --git a/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch b/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch new file mode 100644 index 000000000..f03bf8e5f --- /dev/null +++ b/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch @@ -0,0 +1,20 @@ +diff --git a/lib/tasks/gitlab/assets.rake b/lib/tasks/gitlab/assets.rake +index b8a6e7018767..5096d81ea63f 100644 +--- a/lib/tasks/gitlab/assets.rake ++++ b/lib/tasks/gitlab/assets.rake +@@ -96,7 +96,14 @@ namespace :gitlab do + puts "Assets SHA256 for `HEAD`: #{Tasks::Gitlab::Assets.head_assets_sha256.inspect}" + + if Tasks::Gitlab::Assets.head_assets_sha256 != Tasks::Gitlab::Assets.master_assets_sha256 +- FileUtils.rm_rf([Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR] + Dir.glob('app/assets/javascripts/locale/**/app.js')) ++ # sameersbn/gitlab takes a cache of public_assets_dir by symlinking to volume to speedup relaunch (if relative url is used) ++ # so do not remove the directory directly, empty instead ++ # Dir.glob("*") ignores dotfiles (even it is fine to remove here), so list up children manually ++ removal_targets = Dir.glob('app/assets/javascripts/locale/**/app.js') ++ if Dir.exists?(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR) ++ removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)} ++ end ++ FileUtils.rm_rf(removal_targets, secure: true) + + # gettext:compile needs to run before rake:assets:precompile because + # app/assets/javascripts/locale/**/app.js are pre-compiled by Sprockets From 7a536bcdfdd5ceea6795ef8f0a8a579804892a69 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 19 Jan 2024 22:59:19 +0100 Subject: [PATCH 365/522] Upgrade to GitLab CE 16.8.0 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 73bc7805a..e4019a53b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**16.8.0** + +- gitlab: upgrade CE to v16.8.0 +- gitaly: upgrade to v16.8.0 +- gitlab-pages: upgrade to v16.8.0 + **16.7.3** - gitlab: upgrade CE to v16.7.3 diff --git a/Dockerfile b/Dockerfile index 943df10a3..6d367b882 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20231211 -ARG VERSION=16.7.3 +ARG VERSION=16.8.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.1.4 \ RUBY_SOURCE_SHA256SUM="a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6" \ GOLANG_VERSION=1.21.6 \ GITLAB_SHELL_VERSION=14.32.0 \ - GITLAB_PAGES_VERSION=16.7.3 \ - GITALY_SERVER_VERSION=16.7.3 \ + GITLAB_PAGES_VERSION=16.8.0 \ + GITALY_SERVER_VERSION=16.8.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 1d8f73ef7..82b42dc61 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.7.3 +# sameersbn/gitlab:16.8.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.7.3 +docker pull sameersbn/gitlab:16.8.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.7.3 + sameersbn/gitlab:16.8.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.7.3 + sameersbn/gitlab:16.8.0 ``` ### Database @@ -287,7 +287,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:16.7.3 + sameersbn/gitlab:16.8.0 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.7.3 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.7.3 + sameersbn/gitlab:16.8.0 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.7.3 + sameersbn/gitlab:16.8.0 ``` #### Mail @@ -410,7 +410,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:16.7.3 + sameersbn/gitlab:16.8.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.7.3 + sameersbn/gitlab:16.8.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.7.3 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.7.3 + sameersbn/gitlab:16.8.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.7.3 + sameersbn/gitlab:16.8.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.7.3 + sameersbn/gitlab:16.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:16.7.3 + sameersbn/gitlab:16.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:16.7.3 app:sanitize + sameersbn/gitlab:16.8.0 app:sanitize ``` #### Piwik @@ -2472,7 +2472,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.3 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2507,14 +2507,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.3 app:rake db:setup + sameersbn/gitlab:16.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:16.7.3 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2572,7 +2572,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:16.7.3 app:rake gitlab:env:info + sameersbn/gitlab:16.8.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.3 app:rake gitlab:import:repos + sameersbn/gitlab:16.8.0 app:rake gitlab:import:repos ``` Or @@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.3 app:rake gitlab:import:repos + sameersbn/gitlab:16.8.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.7.3 +docker pull sameersbn/gitlab:16.8.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2670,7 +2670,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:16.7.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.8.0 ``` ### Shell Access @@ -2708,7 +2708,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.7.3 + image: sameersbn/gitlab:16.8.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 38e176f31..93eef160e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.7.3 +16.8.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 907d00410..af19e479a 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.7.3 + image: sameersbn/gitlab:16.8.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index a585098f9..2582b09df 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.7.3 + image: sameersbn/gitlab:16.8.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 720396c7a..f74998c1f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.7.3 + image: sameersbn/gitlab:16.8.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 241be3be7..359730b1b 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.3 app:rake gitlab:backup:create + sameersbn/gitlab:16.8.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.3 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.7.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.8.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.7.3 +docker pull sameersbn/gitlab:16.8.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.7.3 +sameersbn/gitlab:16.8.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 8436c956e..1241a9e16 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.7.3 + image: sameersbn/gitlab:16.8.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index f98f83936..ab66673f1 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.7.3 + image: sameersbn/gitlab:16.8.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 8cd953291..4dd1ee000 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.7.3 + image: sameersbn/gitlab:16.8.0 env: - name: TZ value: Asia/Kolkata From b546aeb9556c1eba3da38aff83394a7096a6408d Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 25 Jan 2024 22:05:03 +0100 Subject: [PATCH 366/522] Upgrade GitLab CE to 16.8.1 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index e4019a53b..cafdd8d7d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**16.8.1** + +- gitlab: upgrade CE to v16.8.1 +- gitaly: upgrade to v16.8.1 +- gitlab-pages: upgrade to v16.8.1 +- gitlab-shell: upgrade to v14.33.0 + **16.8.0** - gitlab: upgrade CE to v16.8.0 diff --git a/Dockerfile b/Dockerfile index 6d367b882..0092435ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20231211 -ARG VERSION=16.8.0 +ARG VERSION=16.8.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.1.4 \ RUBY_SOURCE_SHA256SUM="a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6" \ GOLANG_VERSION=1.21.6 \ - GITLAB_SHELL_VERSION=14.32.0 \ - GITLAB_PAGES_VERSION=16.8.0 \ - GITALY_SERVER_VERSION=16.8.0 \ + GITLAB_SHELL_VERSION=14.33.0 \ + GITLAB_PAGES_VERSION=16.8.1 \ + GITALY_SERVER_VERSION=16.8.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 82b42dc61..a50c2eab0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.8.0 +# sameersbn/gitlab:16.8.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.8.0 +docker pull sameersbn/gitlab:16.8.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.8.0 + sameersbn/gitlab:16.8.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.8.0 + sameersbn/gitlab:16.8.1 ``` ### Database @@ -287,7 +287,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:16.8.0 + sameersbn/gitlab:16.8.1 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.8.0 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.8.0 + sameersbn/gitlab:16.8.1 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.8.0 + sameersbn/gitlab:16.8.1 ``` #### Mail @@ -410,7 +410,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:16.8.0 + sameersbn/gitlab:16.8.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.8.0 + sameersbn/gitlab:16.8.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.8.0 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.8.0 + sameersbn/gitlab:16.8.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.8.0 + sameersbn/gitlab:16.8.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.8.0 + sameersbn/gitlab:16.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:16.8.0 + sameersbn/gitlab:16.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:16.8.0 app:sanitize + sameersbn/gitlab:16.8.1 app:sanitize ``` #### Piwik @@ -2472,7 +2472,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2507,14 +2507,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.0 app:rake db:setup + sameersbn/gitlab:16.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:16.8.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2572,7 +2572,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:16.8.0 app:rake gitlab:env:info + sameersbn/gitlab:16.8.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.8.1 app:rake gitlab:import:repos ``` Or @@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.8.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.8.0 +docker pull sameersbn/gitlab:16.8.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2670,7 +2670,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:16.8.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.8.1 ``` ### Shell Access @@ -2708,7 +2708,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.8.0 + image: sameersbn/gitlab:16.8.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 93eef160e..f49d56fbb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.8.0 +16.8.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index af19e479a..4fa2d8f19 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.8.0 + image: sameersbn/gitlab:16.8.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 2582b09df..d814f6fd7 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.8.0 + image: sameersbn/gitlab:16.8.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index f74998c1f..3213e612e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.8.0 + image: sameersbn/gitlab:16.8.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 359730b1b..bd4d20918 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.8.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.8.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.8.0 +docker pull sameersbn/gitlab:16.8.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.8.0 +sameersbn/gitlab:16.8.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 1241a9e16..80ad32d73 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.8.0 + image: sameersbn/gitlab:16.8.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index ab66673f1..6cb4b7649 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.8.0 + image: sameersbn/gitlab:16.8.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 4dd1ee000..ec7670255 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.8.0 + image: sameersbn/gitlab:16.8.1 env: - name: TZ value: Asia/Kolkata From 9345235f27a4367d9c96c4e157745eb42a6b0337 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Fri, 26 Jan 2024 15:40:16 +0900 Subject: [PATCH 367/522] Replace removed function in patch for `assets::compile` `Dir.exists?(file_name) -> bool` have been deprecated since Ruby 2.1 and removed on Ruby 3.2. See https://bugs.ruby-lang.org/issues/17391 Replacement is `Dir.exist?(file_name) -> bool`. --- .../build/patches/0004-fix-raketask-gitlab-assets-compile.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch b/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch index f03bf8e5f..7563b75a0 100644 --- a/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch +++ b/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch @@ -11,7 +11,7 @@ index b8a6e7018767..5096d81ea63f 100644 + # so do not remove the directory directly, empty instead + # Dir.glob("*") ignores dotfiles (even it is fine to remove here), so list up children manually + removal_targets = Dir.glob('app/assets/javascripts/locale/**/app.js') -+ if Dir.exists?(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR) ++ if Dir.exist?(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR) + removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)} + end + FileUtils.rm_rf(removal_targets, secure: true) From 1c286f72d1e19a119b979ef177b90cf06bb5bc3f Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Fri, 26 Jan 2024 15:42:54 +0900 Subject: [PATCH 368/522] Remove trailing whitespace in patch for `assets:compile` to suppress warning on build like below: Applying patch /etc/docker-gitlab/build/patches/0004-fix-raketask-gitlab-assets-compile.patch for gitlab-foss... :15: trailing whitespace. removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)} warning: 1 line adds whitespace errors. --- .../build/patches/0004-fix-raketask-gitlab-assets-compile.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch b/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch index 7563b75a0..a0877b832 100644 --- a/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch +++ b/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch @@ -12,7 +12,7 @@ index b8a6e7018767..5096d81ea63f 100644 + # Dir.glob("*") ignores dotfiles (even it is fine to remove here), so list up children manually + removal_targets = Dir.glob('app/assets/javascripts/locale/**/app.js') + if Dir.exist?(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR) -+ removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)} ++ removal_targets += Dir.children(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR).map {|child| File.join(Tasks::Gitlab::Assets::PUBLIC_ASSETS_DIR, child)} + end + FileUtils.rm_rf(removal_targets, secure: true) From acabea3a493d80024adfc5f37e224a57c5d31e5d Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Tue, 28 Nov 2023 10:13:03 +0900 Subject: [PATCH 369/522] Update Ruby to 3.2.3 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0092435ed..627a57ae9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ FROM ubuntu:focal-20231211 ARG VERSION=16.8.1 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=3.1.4 \ - RUBY_SOURCE_SHA256SUM="a3d55879a0dfab1d7141fdf10d22a07dbf8e5cdc4415da1bde06127d5cc3c7b6" \ + RUBY_VERSION=3.2.3 \ + RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \ GOLANG_VERSION=1.21.6 \ GITLAB_SHELL_VERSION=14.33.0 \ GITLAB_PAGES_VERSION=16.8.1 \ From 3f2e8c2ce4eb9c521e25ca6afaedf66a8fd62b6b Mon Sep 17 00:00:00 2001 From: Daniel Mulholland Date: Sun, 11 Feb 2024 10:17:36 +1300 Subject: [PATCH 370/522] Create ci_secure_files directory if missing, closes #2790 --- assets/runtime/functions | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index 4762b98a0..42ce83b9b 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1659,7 +1659,12 @@ initialize_datadir() { chmod u+rwX ${GITLAB_SHARED_DIR} chown ${GITLAB_USER}: ${GITLAB_SHARED_DIR} - # create attifacts dir + # create the ci_secure_files directory + mkdir -p ${GITLAB_SHARED_DIR}/ci_secure_files + chmod u+rwX ${GITLAB_SHARED_DIR}/ci_secure_files + chown ${GITLAB_USER}: ${GITLAB_SHARED_DIR}/ci_secure_files + + # create artifacts dir mkdir -p ${GITLAB_ARTIFACTS_DIR} chmod u+rwX ${GITLAB_ARTIFACTS_DIR} chown ${GITLAB_USER}: ${GITLAB_ARTIFACTS_DIR} From e636b969a9cc75ed41083565a829a3e74ec5c131 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Mon, 29 Jan 2024 18:20:18 +0900 Subject: [PATCH 371/522] Revise build patch structure to allow patching each middleware or library Just move patches to assets/build/patches/gitlabhq Folder name are matched to assets/runtime/config --- assets/build/install.sh | 2 +- ...fix-feature-checking-for-gitaly-on-a-fresh-install.patch.bak | 0 ...002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak | 0 ...-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch | 0 .../0004-fix-raketask-gitlab-assets-compile.patch | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename assets/build/patches/{ => gitlabhq}/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch.bak (100%) rename assets/build/patches/{ => gitlabhq}/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak (100%) rename assets/build/patches/{ => gitlabhq}/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch (100%) rename assets/build/patches/{ => gitlabhq}/0004-fix-raketask-gitlab-assets-compile.patch (100%) diff --git a/assets/build/install.sh b/assets/build/install.sh index f70ebac6c..37fb485b0 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -84,7 +84,7 @@ exec_as_git git config --global --add safe.directory /home/git/gitlab 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} -find "${GITLAB_BUILD_DIR}/patches/" -name "*.patch" | while read -r patch_file; do +find "${GITLAB_BUILD_DIR}/patches/gitlabhq" -name "*.patch" | while read -r patch_file; do printf "Applying patch %s for gitlab-foss...\n" "${patch_file}" exec_as_git git -C ${GITLAB_INSTALL_DIR} apply --ignore-whitespace < "${patch_file}" done diff --git a/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch.bak b/assets/build/patches/gitlabhq/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch.bak similarity index 100% rename from assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch.bak rename to assets/build/patches/gitlabhq/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch.bak diff --git a/assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak b/assets/build/patches/gitlabhq/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak similarity index 100% rename from assets/build/patches/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak rename to assets/build/patches/gitlabhq/0002-fix-condition-for-csr-policy-allow-lfs_v16.3.0.patch.bak diff --git a/assets/build/patches/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch b/assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch similarity index 100% rename from assets/build/patches/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch rename to assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch diff --git a/assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch b/assets/build/patches/gitlabhq/0004-fix-raketask-gitlab-assets-compile.patch similarity index 100% rename from assets/build/patches/0004-fix-raketask-gitlab-assets-compile.patch rename to assets/build/patches/gitlabhq/0004-fix-raketask-gitlab-assets-compile.patch From 9f5961939dd859ff3c4567312d430656d602e320 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Tue, 30 Jan 2024 12:17:18 +0900 Subject: [PATCH 372/522] Allow patching Ruby, add patch for lib/securernadom.rb Backport: fix behavior of `SecureRandom.gen_random_openssl(n)` commit: https://github.com/ruby/ruby/commit/64e503eb62aff0952b655e9a86217e355f786146 This has been merged into the Ruby 3.3 release, but Ruby (at least) 3.0 and later are affected by the issues fixed by this commit. --- assets/build/install.sh | 4 ++ .../0001-avoid-seeding_until-ruby3.3.0.patch | 45 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 assets/build/patches/ruby/0001-avoid-seeding_until-ruby3.3.0.patch diff --git a/assets/build/install.sh b/assets/build/install.sh index 37fb485b0..31a23b691 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -47,6 +47,10 @@ mkdir /tmp/ruby && cd /tmp/ruby curl --remote-name -Ss "${RUBY_SRC_URL}" printf '%s ruby-%s.tar.gz' "${RUBY_SOURCE_SHA256SUM}" "${RUBY_VERSION}" | sha256sum -c - tar xzf ruby-"${RUBY_VERSION}".tar.gz && cd ruby-"${RUBY_VERSION}" +find "${GITLAB_BUILD_DIR}/patches/ruby" -name "*.patch" | while read -r patch_file; do + echo "Applying patch ${patch_file}" + patch -p1 -i "${patch_file}" +done ./configure --disable-install-rdoc --enable-shared make -j"$(nproc)" make install diff --git a/assets/build/patches/ruby/0001-avoid-seeding_until-ruby3.3.0.patch b/assets/build/patches/ruby/0001-avoid-seeding_until-ruby3.3.0.patch new file mode 100644 index 000000000..5fd7dcbe7 --- /dev/null +++ b/assets/build/patches/ruby/0001-avoid-seeding_until-ruby3.3.0.patch @@ -0,0 +1,45 @@ +From 64e503eb62aff0952b655e9a86217e355f786146 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= + +Date: Thu, 13 Apr 2023 15:36:24 +0900 +Subject: [PATCH] avoid seeding + +OpenSSL's man page previously stated that "the application is +responsible for seeding the PRNG by calling RAND_add" (see [1]). +So we had this code. However things changed. They no longer +say so, instead "manual (re-)seeding of the default OpenSSL +random generator is not necessary" now (see [2]). It seems all +OpenSSL versions that we support now already behaves like this. +Let's follow that. + +[1]: https://www.openssl.org/docs/man1.0.2/man3/RAND_add.html +[2]: https://www.openssl.org/docs/manmaster/man3/RAND_add.html +--- + lib/securerandom.rb | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/lib/securerandom.rb b/lib/securerandom.rb +index 07ae048634..c5be6ce734 100644 +--- a/lib/securerandom.rb ++++ b/lib/securerandom.rb +@@ -47,17 +47,6 @@ def bytes(n) + private + + def gen_random_openssl(n) +- @pid = 0 unless defined?(@pid) +- pid = $$ +- unless @pid == pid +- now = Process.clock_gettime(Process::CLOCK_REALTIME, :nanosecond) +- OpenSSL::Random.random_add([now, @pid, pid].join(""), 0.0) +- seed = Random.urandom(16) +- if (seed) +- OpenSSL::Random.random_add(seed, 16) +- end +- @pid = pid +- end + return OpenSSL::Random.random_bytes(n) + end + +-- +2.43.0.windows.1 + From 82b2c171624a3aeb864dfdaac5267edf8e7ef51c Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Mon, 12 Feb 2024 20:01:30 +0100 Subject: [PATCH 373/522] Upgrade GitLab CE to 16.8.2 --- Changelog.md | 8 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index cafdd8d7d..b4763c4fe 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,14 @@ 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. +**16.8.2** + +- gitlab: upgrade CE to v16.8.2 +- gitaly: upgrade to v16.8.2 +- gitlab-pages: upgrade to v16.8.2 +- golang: upgrade to v1.22.0 +- ubuntu: upgrade to focal-20240123 + **16.8.1** - gitlab: upgrade CE to v16.8.1 diff --git a/Dockerfile b/Dockerfile index 627a57ae9..096231618 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20231211 +FROM ubuntu:focal-20240123 -ARG VERSION=16.8.1 +ARG VERSION=16.8.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.3 \ RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \ - GOLANG_VERSION=1.21.6 \ + GOLANG_VERSION=1.22.0 \ GITLAB_SHELL_VERSION=14.33.0 \ - GITLAB_PAGES_VERSION=16.8.1 \ - GITALY_SERVER_VERSION=16.8.1 \ + GITLAB_PAGES_VERSION=16.8.2 \ + GITALY_SERVER_VERSION=16.8.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index a50c2eab0..8f2fa3389 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.8.1 +# sameersbn/gitlab:16.8.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.8.1 +docker pull sameersbn/gitlab:16.8.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.8.1 + sameersbn/gitlab:16.8.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.8.1 + sameersbn/gitlab:16.8.2 ``` ### Database @@ -287,7 +287,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:16.8.1 + sameersbn/gitlab:16.8.2 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.8.1 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.8.1 + sameersbn/gitlab:16.8.2 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.8.1 + sameersbn/gitlab:16.8.2 ``` #### Mail @@ -410,7 +410,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:16.8.1 + sameersbn/gitlab:16.8.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.8.1 + sameersbn/gitlab:16.8.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.8.1 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.8.1 + sameersbn/gitlab:16.8.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.8.1 + sameersbn/gitlab:16.8.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.8.1 + sameersbn/gitlab:16.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:16.8.1 + sameersbn/gitlab:16.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:16.8.1 app:sanitize + sameersbn/gitlab:16.8.2 app:sanitize ``` #### Piwik @@ -2472,7 +2472,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2507,14 +2507,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.1 app:rake db:setup + sameersbn/gitlab:16.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:16.8.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2572,7 +2572,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:16.8.1 app:rake gitlab:env:info + sameersbn/gitlab:16.8.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.8.2 app:rake gitlab:import:repos ``` Or @@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.8.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.8.1 +docker pull sameersbn/gitlab:16.8.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2670,7 +2670,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:16.8.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.8.2 ``` ### Shell Access @@ -2708,7 +2708,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.8.1 + image: sameersbn/gitlab:16.8.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index f49d56fbb..46d096593 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.8.1 +16.8.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 4fa2d8f19..1fb6f2dc5 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.8.1 + image: sameersbn/gitlab:16.8.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index d814f6fd7..209e3a6db 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.8.1 + image: sameersbn/gitlab:16.8.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 3213e612e..8031dd331 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.8.1 + image: sameersbn/gitlab:16.8.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index bd4d20918..b69a23c29 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.8.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.8.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.8.1 +docker pull sameersbn/gitlab:16.8.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.8.1 +sameersbn/gitlab:16.8.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 80ad32d73..9377ff6ca 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.8.1 + image: sameersbn/gitlab:16.8.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 6cb4b7649..8bc2ad6b0 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.8.1 + image: sameersbn/gitlab:16.8.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index ec7670255..d82e37a94 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.8.1 + image: sameersbn/gitlab:16.8.2 env: - name: TZ value: Asia/Kolkata From d5bc564601ed198d7e2b850db0c5527382deba05 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 15 Feb 2024 17:30:11 +0100 Subject: [PATCH 374/522] Upgrade GitLab CE to 16.9.0 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index b4763c4fe..01b6de3ff 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**16.9.0** + +- gitlab: upgrade CE to v16.9.0 +- gitaly: upgrade to v16.9.0 +- gitlab-pages: upgrade to v16.9.0 + **16.8.2** - gitlab: upgrade CE to v16.8.2 diff --git a/Dockerfile b/Dockerfile index 096231618..4d4a914d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20240123 -ARG VERSION=16.8.2 +ARG VERSION=16.9.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.3 \ RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \ GOLANG_VERSION=1.22.0 \ GITLAB_SHELL_VERSION=14.33.0 \ - GITLAB_PAGES_VERSION=16.8.2 \ - GITALY_SERVER_VERSION=16.8.2 \ + GITLAB_PAGES_VERSION=16.9.0 \ + GITALY_SERVER_VERSION=16.9.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 8f2fa3389..cd02fb33d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.8.2 +# sameersbn/gitlab:16.9.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.8.2 +docker pull sameersbn/gitlab:16.9.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.8.2 + sameersbn/gitlab:16.9.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.8.2 + sameersbn/gitlab:16.9.0 ``` ### Database @@ -287,7 +287,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:16.8.2 + sameersbn/gitlab:16.9.0 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.8.2 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.8.2 + sameersbn/gitlab:16.9.0 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.8.2 + sameersbn/gitlab:16.9.0 ``` #### Mail @@ -410,7 +410,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:16.8.2 + sameersbn/gitlab:16.9.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.8.2 + sameersbn/gitlab:16.9.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.8.2 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.8.2 + sameersbn/gitlab:16.9.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.8.2 + sameersbn/gitlab:16.9.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.8.2 + sameersbn/gitlab:16.9.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:16.8.2 + sameersbn/gitlab:16.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:16.8.2 app:sanitize + sameersbn/gitlab:16.9.0 app:sanitize ``` #### Piwik @@ -2472,7 +2472,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.2 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2507,14 +2507,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.2 app:rake db:setup + sameersbn/gitlab:16.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:16.8.2 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2572,7 +2572,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:16.8.2 app:rake gitlab:env:info + sameersbn/gitlab:16.9.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.2 app:rake gitlab:import:repos + sameersbn/gitlab:16.9.0 app:rake gitlab:import:repos ``` Or @@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.2 app:rake gitlab:import:repos + sameersbn/gitlab:16.9.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.8.2 +docker pull sameersbn/gitlab:16.9.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2670,7 +2670,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:16.8.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.9.0 ``` ### Shell Access @@ -2708,7 +2708,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.8.2 + image: sameersbn/gitlab:16.9.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 46d096593..bda6c1083 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.8.2 +16.9.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 1fb6f2dc5..6ba329927 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.8.2 + image: sameersbn/gitlab:16.9.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 209e3a6db..9e1be5dc3 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.8.2 + image: sameersbn/gitlab:16.9.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 8031dd331..b45e51e23 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.8.2 + image: sameersbn/gitlab:16.9.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index b69a23c29..a7ffb81d5 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.2 app:rake gitlab:backup:create + sameersbn/gitlab:16.9.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.2 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.8.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.9.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.8.2 +docker pull sameersbn/gitlab:16.9.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.8.2 +sameersbn/gitlab:16.9.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 9377ff6ca..5277457fd 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.8.2 + image: sameersbn/gitlab:16.9.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 8bc2ad6b0..fa7f43148 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.8.2 + image: sameersbn/gitlab:16.9.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index d82e37a94..7fe0a756c 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.8.2 + image: sameersbn/gitlab:16.9.0 env: - name: TZ value: Asia/Kolkata From 9b9b83db4e10ed2ada4beaf0bbfa531fc2ad1528 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 15 Feb 2024 17:52:51 +0100 Subject: [PATCH 375/522] Update orbs of CircleCI configuration --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4bafdaecf..a048814b7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,9 +1,9 @@ version: 2.1 orbs: - shellcheck: circleci/shellcheck@3.1.1 - docker: circleci/docker@2.4.0 - go: circleci/go@1.7.1 + shellcheck: circleci/shellcheck@3.2.0 + docker: circleci/docker@2.5.0 + go: circleci/go@1.11.0 commands: docker-build: From a9451704ad3f67dbbea875e7bf745a1cd59e86fd Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 21 Feb 2024 21:52:08 +0100 Subject: [PATCH 376/522] Upgrade GitLab CE to 16.9.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 01b6de3ff..3f1fcad8c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**16.9.1** + +- gitlab: upgrade CE to v16.9.1 +- gitaly: upgrade to v16.9.1 +- gitlab-pages: upgrade to v16.9.1 + **16.9.0** - gitlab: upgrade CE to v16.9.0 diff --git a/Dockerfile b/Dockerfile index 4d4a914d3..a30618537 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20240123 -ARG VERSION=16.9.0 +ARG VERSION=16.9.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.3 \ RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \ GOLANG_VERSION=1.22.0 \ GITLAB_SHELL_VERSION=14.33.0 \ - GITLAB_PAGES_VERSION=16.9.0 \ - GITALY_SERVER_VERSION=16.9.0 \ + GITLAB_PAGES_VERSION=16.9.1 \ + GITALY_SERVER_VERSION=16.9.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index cd02fb33d..066d33dcd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.9.0 +# sameersbn/gitlab:16.9.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.9.0 +docker pull sameersbn/gitlab:16.9.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.9.0 + sameersbn/gitlab:16.9.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.9.0 + sameersbn/gitlab:16.9.1 ``` ### Database @@ -287,7 +287,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:16.9.0 + sameersbn/gitlab:16.9.1 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.9.0 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.9.0 + sameersbn/gitlab:16.9.1 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.9.0 + sameersbn/gitlab:16.9.1 ``` #### Mail @@ -410,7 +410,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:16.9.0 + sameersbn/gitlab:16.9.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.9.0 + sameersbn/gitlab:16.9.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.9.0 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.9.0 + sameersbn/gitlab:16.9.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.9.0 + sameersbn/gitlab:16.9.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.9.0 + sameersbn/gitlab:16.9.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:16.9.0 + sameersbn/gitlab:16.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:16.9.0 app:sanitize + sameersbn/gitlab:16.9.1 app:sanitize ``` #### Piwik @@ -2472,7 +2472,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2507,14 +2507,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.0 app:rake db:setup + sameersbn/gitlab:16.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:16.9.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2572,7 +2572,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:16.9.0 app:rake gitlab:env:info + sameersbn/gitlab:16.9.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.9.1 app:rake gitlab:import:repos ``` Or @@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.9.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.9.0 +docker pull sameersbn/gitlab:16.9.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2670,7 +2670,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:16.9.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.9.1 ``` ### Shell Access @@ -2708,7 +2708,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.9.0 + image: sameersbn/gitlab:16.9.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index bda6c1083..06e751596 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.9.0 +16.9.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 6ba329927..23c6fcf4a 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.9.0 + image: sameersbn/gitlab:16.9.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 9e1be5dc3..cf7824a67 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.9.0 + image: sameersbn/gitlab:16.9.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index b45e51e23..303c830f0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.9.0 + image: sameersbn/gitlab:16.9.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index a7ffb81d5..5b117e0f9 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.9.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.9.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.9.0 +docker pull sameersbn/gitlab:16.9.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.9.0 +sameersbn/gitlab:16.9.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 5277457fd..2f8cd4cde 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.9.0 + image: sameersbn/gitlab:16.9.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index fa7f43148..41dc8e75b 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.9.0 + image: sameersbn/gitlab:16.9.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 7fe0a756c..40ac42da9 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.9.0 + image: sameersbn/gitlab:16.9.1 env: - name: TZ value: Asia/Kolkata From 689751cb916dd805197d09aeea58e360a4457bfb Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 7 Mar 2024 18:56:27 +0100 Subject: [PATCH 377/522] Upgrade GitLab CE to 16.9.2 --- Changelog.md | 8 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index 3f1fcad8c..f3a2df488 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,14 @@ 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. +**16.9.2** + +- gitlab: upgrade CE to v16.9.2 +- gitaly: upgrade to v16.9.2 +- gitlab-pages: upgrade to v16.9.2 +- golang: upgrade to v1.22.1 +- ubuntu: upgrade to focal-20240216 + **16.9.1** - gitlab: upgrade CE to v16.9.1 diff --git a/Dockerfile b/Dockerfile index a30618537..807ba99ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20240123 +FROM ubuntu:focal-20240216 -ARG VERSION=16.9.1 +ARG VERSION=16.9.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.3 \ RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \ - GOLANG_VERSION=1.22.0 \ + GOLANG_VERSION=1.22.1 \ GITLAB_SHELL_VERSION=14.33.0 \ - GITLAB_PAGES_VERSION=16.9.1 \ - GITALY_SERVER_VERSION=16.9.1 \ + GITLAB_PAGES_VERSION=16.9.2 \ + GITALY_SERVER_VERSION=16.9.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 066d33dcd..b38c15409 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.9.1 +# sameersbn/gitlab:16.9.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.9.1 +docker pull sameersbn/gitlab:16.9.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.9.1 + sameersbn/gitlab:16.9.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.9.1 + sameersbn/gitlab:16.9.2 ``` ### Database @@ -287,7 +287,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:16.9.1 + sameersbn/gitlab:16.9.2 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.9.1 + sameersbn/gitlab:16.9.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: @@ -370,7 +370,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:16.9.1 + sameersbn/gitlab:16.9.2 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.9.1 + sameersbn/gitlab:16.9.2 ``` #### Mail @@ -410,7 +410,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:16.9.1 + sameersbn/gitlab:16.9.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.9.1 + sameersbn/gitlab:16.9.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.9.1 + sameersbn/gitlab:16.9.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. @@ -530,7 +530,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:16.9.1 + sameersbn/gitlab:16.9.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.9.1 + sameersbn/gitlab:16.9.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.9.1 + sameersbn/gitlab:16.9.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:16.9.1 + sameersbn/gitlab:16.9.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:16.9.1 app:sanitize + sameersbn/gitlab:16.9.2 app:sanitize ``` #### Piwik @@ -2472,7 +2472,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.9.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. @@ -2507,14 +2507,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.1 app:rake db:setup + sameersbn/gitlab:16.9.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:16.9.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.9.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. @@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2572,7 +2572,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:16.9.1 app:rake gitlab:env:info + sameersbn/gitlab:16.9.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.9.2 app:rake gitlab:import:repos ``` Or @@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.9.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.9.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:16.9.1 +docker pull sameersbn/gitlab:16.9.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2670,7 +2670,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:16.9.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.9.2 ``` ### Shell Access @@ -2708,7 +2708,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.9.1 + image: sameersbn/gitlab:16.9.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 06e751596..1a63fd567 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.9.1 +16.9.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 23c6fcf4a..de36bda31 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.9.1 + image: sameersbn/gitlab:16.9.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index cf7824a67..aaccbb198 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.9.1 + image: sameersbn/gitlab:16.9.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 303c830f0..908b22bf6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.9.1 + image: sameersbn/gitlab:16.9.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 5b117e0f9..ba8c8a284 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.9.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.9.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.9.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.9.1 +docker pull sameersbn/gitlab:16.9.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.9.1 +sameersbn/gitlab:16.9.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 2f8cd4cde..1862df9f0 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.9.1 + image: sameersbn/gitlab:16.9.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 41dc8e75b..a6d4dd2ef 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.9.1 + image: sameersbn/gitlab:16.9.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 40ac42da9..1c1aeb3e3 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.9.1 + image: sameersbn/gitlab:16.9.2 env: - name: TZ value: Asia/Kolkata From 12c97f194a13a351951dda9aa5107ec5f65b53d0 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 21 Mar 2024 21:39:44 +0100 Subject: [PATCH 378/522] Upgrade GitLab CE to 16.10.0 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index f3a2df488..25a08c61b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**16.10.0** + +- gitlab: upgrade CE to v16.10.0 +- gitaly: upgrade to v16.10.0 +- gitlab-pages: upgrade to v16.10.0 +- gitlab-shell: upgrade to v14.34.0 + **16.9.2** - gitlab: upgrade CE to v16.9.2 diff --git a/Dockerfile b/Dockerfile index 807ba99ec..65d9a2456 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20240216 -ARG VERSION=16.9.2 +ARG VERSION=16.10.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.3 \ RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \ GOLANG_VERSION=1.22.1 \ - GITLAB_SHELL_VERSION=14.33.0 \ - GITLAB_PAGES_VERSION=16.9.2 \ - GITALY_SERVER_VERSION=16.9.2 \ + GITLAB_SHELL_VERSION=14.34.0 \ + GITLAB_PAGES_VERSION=16.10.0 \ + GITALY_SERVER_VERSION=16.10.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index b38c15409..dec41d512 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.9.2 +# sameersbn/gitlab:16.10.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -125,7 +125,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.9.2 +docker pull sameersbn/gitlab:16.10.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -194,7 +194,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.9.2 + sameersbn/gitlab:16.10.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -229,7 +229,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:16.9.2 + sameersbn/gitlab:16.10.0 ``` ### Database @@ -287,7 +287,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:16.9.2 + sameersbn/gitlab:16.10.0 ``` ##### Linking to PostgreSQL Container @@ -331,7 +331,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:16.9.2 + sameersbn/gitlab:16.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: @@ -370,7 +370,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:16.9.2 + sameersbn/gitlab:16.10.0 ``` #### Linking to Redis Container @@ -397,7 +397,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.9.2 + sameersbn/gitlab:16.10.0 ``` #### Mail @@ -410,7 +410,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:16.9.2 + sameersbn/gitlab:16.10.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -430,7 +430,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:16.9.2 + sameersbn/gitlab:16.10.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -514,7 +514,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:16.9.2 + sameersbn/gitlab:16.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. @@ -530,7 +530,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:16.9.2 + sameersbn/gitlab:16.10.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:16.9.2 + sameersbn/gitlab:16.10.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:16.9.2 + sameersbn/gitlab:16.10.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:16.9.2 + sameersbn/gitlab:16.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:16.9.2 app:sanitize + sameersbn/gitlab:16.10.0 app:sanitize ``` #### Piwik @@ -2472,7 +2472,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.2 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2507,14 +2507,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.2 app:rake db:setup + sameersbn/gitlab:16.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:16.9.2 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2523,7 +2523,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2572,7 +2572,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:16.9.2 app:rake gitlab:env:info + sameersbn/gitlab:16.10.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2585,7 +2585,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.2 app:rake gitlab:import:repos + sameersbn/gitlab:16.10.0 app:rake gitlab:import:repos ``` Or @@ -2616,7 +2616,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.2 app:rake gitlab:import:repos + sameersbn/gitlab:16.10.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2640,12 +2640,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.9.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:16.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:16.9.2 +docker pull sameersbn/gitlab:16.10.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2670,7 +2670,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:16.9.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.10.0 ``` ### Shell Access @@ -2708,7 +2708,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.9.2 + image: sameersbn/gitlab:16.10.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 1a63fd567..3027af39c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.9.2 +16.10.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index de36bda31..aa04d5d35 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.9.2 + image: sameersbn/gitlab:16.10.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index aaccbb198..cc8c83ea3 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.9.2 + image: sameersbn/gitlab:16.10.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 908b22bf6..016f5aa54 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.9.2 + image: sameersbn/gitlab:16.10.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index ba8c8a284..45f2b901a 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.2 app:rake gitlab:backup:create + sameersbn/gitlab:16.10.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.2 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.9.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.10.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.9.2 +docker pull sameersbn/gitlab:16.10.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.9.2 +sameersbn/gitlab:16.10.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 1862df9f0..e6cdd48da 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.9.2 + image: sameersbn/gitlab:16.10.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index a6d4dd2ef..6256cad3d 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.9.2 + image: sameersbn/gitlab:16.10.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 1c1aeb3e3..6e27c01e3 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.9.2 + image: sameersbn/gitlab:16.10.0 env: - name: TZ value: Asia/Kolkata From 846a051bbeb3a702ca0c443c5b8c4ad4a610d7c2 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Thu, 29 Feb 2024 11:21:22 +0900 Subject: [PATCH 379/522] Allow additional configurations after DB migration Such as feature flags (which is stored to database, application_settings table) At this commit, it does nothing (no operation `:`) --- assets/runtime/functions | 4 ++++ entrypoint.sh | 1 + 2 files changed, 5 insertions(+) diff --git a/assets/runtime/functions b/assets/runtime/functions index 42ce83b9b..3268d1831 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -2006,6 +2006,10 @@ configure_gitlab() { rm -rf ${GITLAB_INSTALL_DIR}/tmp/sockets/gitlab.socket } +configure_gitlab_requires_db() { + : +} + configure_gitlab_shell() { echo "Configuring gitlab-shell..." update_template ${GITLAB_SHELL_CONFIG} \ diff --git a/entrypoint.sh b/entrypoint.sh index 1d9bc107c..c5a4e3536 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -21,6 +21,7 @@ case ${1} in /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf & SUPERVISOR_PID=$! migrate_database + configure_gitlab_requires_db kill -15 $SUPERVISOR_PID if ps h -p $SUPERVISOR_PID > /dev/null ; then wait $SUPERVISOR_PID || true From 05794a2b478e2efa28b9898d69cd3e8f57690fd5 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Thu, 29 Feb 2024 11:23:19 +0900 Subject: [PATCH 380/522] Allow setting feature flags via configuration parameter - It requires database is set up because feature flags are stored to DB (table `application_settings`) - Add configuration parameter GITLAB_FEATURE_FLAGS_ENABLE_TARGETS and GITLAB_FEATURE_FLAGS_DISABLE_TARGETS - Add ruby script to configure feature flags from command line and invoke runtime (from configure_gitlab()) --- README.md | 58 ++++++++++++ assets/runtime/env-defaults | 4 + assets/runtime/functions | 49 +++++++++- .../scripts/configure_feature_flags.rb | 90 +++++++++++++++++++ entrypoint.sh | 2 +- 5 files changed, 201 insertions(+), 2 deletions(-) create mode 100644 assets/runtime/scripts/configure_feature_flags.rb diff --git a/README.md b/README.md index dec41d512..59392261d 100644 --- a/README.md +++ b/README.md @@ -50,6 +50,7 @@ - [External Issue Trackers](#external-issue-trackers) - [Host UID / GID Mapping](#host-uid--gid-mapping) - [Piwik](#piwik) + - [Feature flags](#feature-flags) - [Exposing ssh port in dockerized gitlab-ce](docs/exposing-ssh-port.md) - [Available Configuration Parameters](#available-configuration-parameters) - [Maintenance](#maintenance) @@ -801,6 +802,52 @@ These options should contain something like: - `PIWIK_URL=piwik.example.org` - `PIWIK_SITE_ID=42` +#### Feature flags + +In this section, we talk about feature flags that administrators can change the state (See ). If you are looking for documentation for "Feature flags" that configured on project deploy settings, see + +GitLab adopted feature flags strategies to deploy features in an early stage of development so that they can be incrementally rolled out. GitLab administrators with access to the [Rails console](https://docs.gitlab.com/ee/administration/feature_flags.html#how-to-enable-and-disable-features-behind-flags) or the [Feature flags API](https://docs.gitlab.com/ee/api/features.html) can control them (note that `sameersbn/gitlab` is a container image that provides GitLab installations from the source). +You can see all feature flags in GitLab at corresponding version of documentation: + +For `sameersbn/gitlab`, you can control them via environment parameter [`GITLAB_FEATURE_FLAGS_DISABLE_TARGETS`](#gitlab_feature_flags_disable_targets) and [`GITLAB_FEATURE_FLAGS_ENABLE_TARGETS`](#gitlab_feature_flags_enable_targets) in addition to the above methods. +This image searches yml files in [`${GITLAB_INSTALL_DIR}/config/feature_flags`](https://gitlab.com/gitlab-org/gitlab-foss/-/tree/master/config/feature_flags) (typically `/home/git/gitlab/config/feature_flags/`) recursively and use the file list as a source of active feature flags. + +Here is a part of example `docker-compose.yml`: + +````yml +services: + gitlab: + image: sameersbn/gitlab:latest + environment: + - GITLAB_FEATURE_FLAGS_DISABLE_TARGETS=auto_devops_banner_disabled,ci_enable_live_trace + - GITLAB_FEATURE_FLAGS_ENABLE_TARGETS=git_push_create_all_pipelines,build_service_proxy +```` + +Once the container up, you can see following messages in container log like below. + +````sh +... +Configuring gitlab::feature_flags... +- specified feature flags: {:to_be_disabled=>["auto_devops_banner_disabled", "ci_enable_live_trace"], :to_be_enabled=>["git_push_create_all_pipelines", "build_service_proxy"]} +- auto_devops_banner_disabled : off +- ci_enable_live_trace : off +- git_push_create_all_pipelines : on +- build_service_proxy : on +... +```` + +If specified flag names are not included in the list, they will be ignored and appears to container log like below: + +````sh +... +Configuring gitlab::feature_flags... +- specified feature flags: {:to_be_disabled=>["auto_devops_banner_disabled", "invalid_flag_name"], :to_be_enabled=>["git_push_create_all_pipelines", "another_invalid_flag_name"]} +- Following flags are probably invalid and have been ignored: invalid_flag_name,another_invalid_flag_name +- auto_devops_banner_disabled : off +- git_push_create_all_pipelines : on +... +```` + #### 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)* @@ -1619,6 +1666,17 @@ The value of the `worker-src` directive in the `Content-Security-Policy` header. The value of the `report-uri` directive in the `Content-Security-Policy` header +##### `GITLAB_FEATURE_FLAGS_DISABLE_TARGETS` + +Comma separated list of feature flag names to be disabled. No whitespace is allowed. +You can see all feature flags in GitLab at corresponding version of documentation: +Feature flags name and its statement will be appear to container log. Note that some of the feature flags are implicitly enabled or disabled by GitLab itself, and are not appear to container log. +No defaults. + +##### `GITLAB_FEATURE_FLAGS_ENABLE_TARGETS` + +This parameter is the same as [`GITLAB_FEATURE_FLAGS_DISABLE_TARGETS`](#gitlab_feature_flags_enable_targets), except its purpose is to enable the feature flag. No defaults. + ##### `SSL_SELF_SIGNED` Set to `true` when using self signed ssl certificates. `false` by default. diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 4c0a529f2..86e0bd833 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -637,3 +637,7 @@ GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_SCRIPT_SRC=${GITLAB_CONTENT_SECURITY_P GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_STYLE_SRC:-"'self' 'unsafe-inline'"} GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_WORKER_SRC:-"'self' blob:"} GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI=${GITLAB_CONTENT_SECURITY_POLICY_DIRECTIVES_REPORT_URI:-} + +## Feature Flags +GITLAB_FEATURE_FLAGS_DISABLE_TARGETS=${GITLAB_FEATURE_FLAGS_DISABLE_TARGETS:-} +GITLAB_FEATURE_FLAGS_ENABLE_TARGETS=${GITLAB_FEATURE_FLAGS_ENABLE_TARGETS:-} diff --git a/assets/runtime/functions b/assets/runtime/functions index 3268d1831..4a3759a68 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -2006,8 +2006,55 @@ configure_gitlab() { rm -rf ${GITLAB_INSTALL_DIR}/tmp/sockets/gitlab.socket } +# feature flags are recorded to database (schema "application_settings") so requires DB is (at least) initialized +gitlab_configure_feature_flags() { + echo "Configuring gitlab::feature_flags..." + + if [[ -z "${GITLAB_FEATURE_FLAGS_ENABLE_TARGETS}" && -z "${GITLAB_FEATURE_FLAGS_ENABLE_TARGETS}" ]]; then + # Do nothing and reports no error if no targets specified + echo "- No targets specified. skipping..." + return 0 + fi + + # Build command line argument for script only when target is specified + # If not, scripts fails because option specifier is recognized as feature flags for example + # like "--disable --enable" : for this case, --disable is recognized as a value of option "--enable" + if [[ -n "${GITLAB_FEATURE_FLAGS_DISABLE_TARGETS}" ]]; then + GITLAB_FEATURE_FLAGS_DISABLE_TARGETS="--disable ${GITLAB_FEATURE_FLAGS_DISABLE_TARGETS}" + fi + # The same goes for --enable (this is the last option passed to "rails runner" that will be run below) + # For this case (final option), it throws "missing argument" error for execution like: + # like "--disable feature1,feature2 --enable" + if [[ -n "${GITLAB_FEATURE_FLAGS_ENABLE_TARGETS}" ]]; then + GITLAB_FEATURE_FLAGS_ENABLE_TARGETS="--enable ${GITLAB_FEATURE_FLAGS_ENABLE_TARGETS}" + fi + + PWD_ORG=${PWD} + cd "${GITLAB_INSTALL_DIR}" + + # copy the script to temporal directory : to avoid permission issue + cp "${GITLAB_RUNTIME_DIR}/scripts/configure_feature_flags.rb" "${GITLAB_TEMP_DIR}/" + chown "${GITLAB_USER}:" "${GITLAB_TEMP_DIR}/configure_feature_flags.rb" + + echo "- Launching rails runner to set feature flags. This will take some time...." + + # If arguments are empty, the script will do nothing and print object dump like below: + # - specified feature flags: {:to_be_disabled=>[], :to_be_enabled=>[]} + # DO NOT qupte variables : word splitting must be enabled. + # If disabled, whole string like '--disable feature_name_1,feature_name_2' + # will be recognized as single option and results to invalid argument error + # + # shellcheck disable=SC2086 + exec_as_git bundle exec rails runner "${GITLAB_TEMP_DIR}/configure_feature_flags.rb" \ + ${GITLAB_FEATURE_FLAGS_DISABLE_TARGETS} \ + ${GITLAB_FEATURE_FLAGS_ENABLE_TARGETS} + + rm "${GITLAB_TEMP_DIR}/configure_feature_flags.rb" + cd "${PWD_ORG}" +} + configure_gitlab_requires_db() { - : + gitlab_configure_feature_flags } configure_gitlab_shell() { diff --git a/assets/runtime/scripts/configure_feature_flags.rb b/assets/runtime/scripts/configure_feature_flags.rb new file mode 100644 index 000000000..484cf62ee --- /dev/null +++ b/assets/runtime/scripts/configure_feature_flags.rb @@ -0,0 +1,90 @@ +#!/usr/bin/env ruby + +require "optparse" +require "set" + +# sameersbn/docker-gitlab +# Ruby script to configure feature flags via CLI +# Intended to be executed in the context of Rails Runner of Gitlab application +# (to get valid "Feature" module, defined in (gitlab root)/lib/feature.rb) +# https://guides.rubyonrails.org/command_line.html#bin-rails-runner +# bundle exec rails runner -- --enable --disable + +class FeatureFlagCLI + def available_feature_flags() + # Feature flag lists are stored in (Gitlab root directory)/config/feature_flags/ + # We can get the directory by accessing "root" property of "Gitlab" Module + # (may returns /home/git/gitlab for sameersbn/docker-gitlab) + feature_flag_yamls = Dir.glob("#{Gitlab.root}/config/feature_flags/**/*.yml") + + if Gitlab.ee? + feature_flag_yamls.concat(Dir.glob("#{Gitlab.root}/ee/config/feature_flags/**/*.yml")) + end if + + list = feature_flag_yamls.map { |p| File.basename(p, File.extname(p)) } + list + end + + def parse_options(argv = ARGV) + op = OptionParser.new + + opts = { + to_be_disabled: [], + to_be_enabled: [], + # TODO support "opt out", "opt out removed" + # to_be_opted_out: [], + # opt_out_removed: [], + } + + op.on("-d", "--disable feature_a,feature_b,feature_c", Array, "comma-separated list of feature flags to be disabled (defaults: ${opts[:to_be_disabled]})") { |v| + opts[:to_be_disabled] = v.uniq + } + op.on("-e", "--enable feature_a,feature_b,feature_c", Array, "comma-separated list of feature flags to be enabled (defaults: ${opts[:to_be_enabled]})") { |v| + opts[:to_be_enabled] = v.uniq + } + + begin + args = op.parse(argv) + succeed = true + rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e + puts e.message + puts op.help + succeed = false + end + + [succeed, opts, args] + end + + def run + succeed, opts, args = parse_options + if succeed + puts "- specified feature flags: #{opts.to_s}" + + available_flags = self.available_feature_flags + disable_targets = available_flags & opts[:to_be_disabled] + enable_targets = available_flags & opts[:to_be_disabled] + + disable_targets.each do |feature| + Feature.disable(feature) + end + + enable_targets.each do |feature| + Feature.enable(feature) + end + + invalid_enable_targets = opts[:to_be_enabled] - enable_targets + invalid_disable_targets = opts[:to_be_disabled] - disable_targets + invalid_targets = invalid_disable_targets | invalid_enable_targets + if invalid_targets.length > 0 + puts "- Following flags are probably invalid and have been ignored: #{invalid_enable_targets.to_a.join(",")}" + end + end + + Feature.all + end +end + +features = FeatureFlagCLI.new.run +puts features.map { |f| + format("- feature %s : %s", name: f.name, state: f.state) +} diff --git a/entrypoint.sh b/entrypoint.sh index c5a4e3536..2f3b15959 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -21,12 +21,12 @@ case ${1} in /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf & SUPERVISOR_PID=$! migrate_database - configure_gitlab_requires_db kill -15 $SUPERVISOR_PID if ps h -p $SUPERVISOR_PID > /dev/null ; then wait $SUPERVISOR_PID || true fi rm -rf /var/run/supervisor.sock + configure_gitlab_requires_db exec /usr/bin/supervisord -nc /etc/supervisor/supervisord.conf ;; app:init) From 351711c4ccbf8ced1438805b3fc2a5cd06a44381 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Fri, 22 Mar 2024 18:32:35 +0900 Subject: [PATCH 381/522] Simplify message on feature flag target specified as reviewed like below: ```` Configuring gitlab::feature_flags... - Launching rails runner to set feature flags. This will take some time.... - Specified feature flags to be disabled: --- "auto_devops_banner_disabled" --- "invalid_flag_name" - Specified feature flags to be enabled --- "git_push_create_all_pipelines" --- "another_invalid_flag_name" - Following flags are probably invalid and have been ignored --- invalid_flag_name --- another_invalid_flag_name - Apply user defined feature flags: --- auto_devops_banner_disabled : off --- git_push_create_all_pipelines : on ```` - Do not `puts` parsed options (formatted by ruby's `.to_s`), `puts` each specified target with three hyphens instead - `puts` each ignored target on each line with three hyphens instead of single line csv --- assets/runtime/scripts/configure_feature_flags.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/assets/runtime/scripts/configure_feature_flags.rb b/assets/runtime/scripts/configure_feature_flags.rb index 484cf62ee..90ccd2dce 100644 --- a/assets/runtime/scripts/configure_feature_flags.rb +++ b/assets/runtime/scripts/configure_feature_flags.rb @@ -38,9 +38,13 @@ def parse_options(argv = ARGV) op.on("-d", "--disable feature_a,feature_b,feature_c", Array, "comma-separated list of feature flags to be disabled (defaults: ${opts[:to_be_disabled]})") { |v| opts[:to_be_disabled] = v.uniq + puts "- Specified feature flags to be disabled" + puts opts[:to_be_disabled].map { |f| format("--- %s", opt: f) } } op.on("-e", "--enable feature_a,feature_b,feature_c", Array, "comma-separated list of feature flags to be enabled (defaults: ${opts[:to_be_enabled]})") { |v| opts[:to_be_enabled] = v.uniq + puts "- Specified feature flags to be enabled" + puts opts[:to_be_enabled].map { |f| format("--- %s", opt: f) } } begin @@ -58,8 +62,6 @@ def parse_options(argv = ARGV) def run succeed, opts, args = parse_options if succeed - puts "- specified feature flags: #{opts.to_s}" - available_flags = self.available_feature_flags disable_targets = available_flags & opts[:to_be_disabled] enable_targets = available_flags & opts[:to_be_disabled] @@ -76,7 +78,8 @@ def run invalid_disable_targets = opts[:to_be_disabled] - disable_targets invalid_targets = invalid_disable_targets | invalid_enable_targets if invalid_targets.length > 0 - puts "- Following flags are probably invalid and have been ignored: #{invalid_enable_targets.to_a.join(",")}" + puts "- Following flags are probably invalid and have been ignored" + puts invalid_targets.map { |f| format("--- %s", name: f) } end end From b8e299afb96bec62202f9b879b305abc342da0a6 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 28 Mar 2024 16:22:48 +0100 Subject: [PATCH 382/522] Upgrade GitLab CE to 16.10.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 25a08c61b..300133068 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**16.10.1** + +- gitlab: upgrade CE to v16.10.1 +- gitaly: upgrade to v16.10.1 +- gitlab-pages: upgrade to v16.10.1 + **16.10.0** - gitlab: upgrade CE to v16.10.0 diff --git a/Dockerfile b/Dockerfile index 65d9a2456..1b8f71c69 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20240216 -ARG VERSION=16.10.0 +ARG VERSION=16.10.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.3 \ RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \ GOLANG_VERSION=1.22.1 \ GITLAB_SHELL_VERSION=14.34.0 \ - GITLAB_PAGES_VERSION=16.10.0 \ - GITALY_SERVER_VERSION=16.10.0 \ + GITLAB_PAGES_VERSION=16.10.1 \ + GITALY_SERVER_VERSION=16.10.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 59392261d..b74a3f5df 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.10.0 +# sameersbn/gitlab:16.10.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.10.0 +docker pull sameersbn/gitlab:16.10.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:16.10.0 + sameersbn/gitlab:16.10.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:16.10.0 + sameersbn/gitlab:16.10.1 ``` ### Database @@ -288,7 +288,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:16.10.0 + sameersbn/gitlab:16.10.1 ``` ##### Linking to PostgreSQL Container @@ -332,7 +332,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:16.10.0 + sameersbn/gitlab:16.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: @@ -371,7 +371,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:16.10.0 + sameersbn/gitlab:16.10.1 ``` #### Linking to Redis Container @@ -398,7 +398,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.10.0 + sameersbn/gitlab:16.10.1 ``` #### Mail @@ -411,7 +411,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:16.10.0 + sameersbn/gitlab:16.10.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -431,7 +431,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:16.10.0 + sameersbn/gitlab:16.10.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -515,7 +515,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:16.10.0 + sameersbn/gitlab:16.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. @@ -531,7 +531,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:16.10.0 + sameersbn/gitlab:16.10.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -554,7 +554,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:16.10.0 + sameersbn/gitlab:16.10.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -602,7 +602,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:16.10.0 + sameersbn/gitlab:16.10.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:16.10.0 + sameersbn/gitlab:16.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:16.10.0 app:sanitize + sameersbn/gitlab:16.10.1 app:sanitize ``` #### Piwik @@ -2530,7 +2530,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2565,14 +2565,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.0 app:rake db:setup + sameersbn/gitlab:16.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:16.10.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2581,7 +2581,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2630,7 +2630,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:16.10.0 app:rake gitlab:env:info + sameersbn/gitlab:16.10.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2643,7 +2643,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.10.1 app:rake gitlab:import:repos ``` Or @@ -2674,7 +2674,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.10.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2698,12 +2698,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.10.0 +docker pull sameersbn/gitlab:16.10.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2728,7 +2728,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:16.10.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.10.1 ``` ### Shell Access @@ -2766,7 +2766,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.10.0 + image: sameersbn/gitlab:16.10.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 3027af39c..09df90764 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.10.0 +16.10.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index aa04d5d35..7d8e4b972 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.10.0 + image: sameersbn/gitlab:16.10.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index cc8c83ea3..380e105e5 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.10.0 + image: sameersbn/gitlab:16.10.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 016f5aa54..e51c096f7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.10.0 + image: sameersbn/gitlab:16.10.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 45f2b901a..36304bcb5 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.10.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.10.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.10.0 +docker pull sameersbn/gitlab:16.10.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.10.0 +sameersbn/gitlab:16.10.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index e6cdd48da..e62e8eaf9 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.10.0 + image: sameersbn/gitlab:16.10.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 6256cad3d..e3ada5fa6 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.10.0 + image: sameersbn/gitlab:16.10.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 6e27c01e3..55269386b 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.10.0 + image: sameersbn/gitlab:16.10.1 env: - name: TZ value: Asia/Kolkata From afdb3d50981c128592652f8e3fe01b30dd705122 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 11 Apr 2024 17:41:23 +0200 Subject: [PATCH 383/522] Upgrade GitLab CE to 16.10.2 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 300133068..e6059612f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**16.10.2** + +- gitlab: upgrade CE to v16.10.2 +- gitaly: upgrade to v16.10.2 +- gitlab-pages: upgrade to v16.10.2 +- golang: upgrade to v1.22.2 + **16.10.1** - gitlab: upgrade CE to v16.10.1 diff --git a/Dockerfile b/Dockerfile index 1b8f71c69..d4b368c82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20240216 -ARG VERSION=16.10.1 +ARG VERSION=16.10.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.3 \ RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \ - GOLANG_VERSION=1.22.1 \ + GOLANG_VERSION=1.22.2 \ GITLAB_SHELL_VERSION=14.34.0 \ - GITLAB_PAGES_VERSION=16.10.1 \ - GITALY_SERVER_VERSION=16.10.1 \ + GITLAB_PAGES_VERSION=16.10.2 \ + GITALY_SERVER_VERSION=16.10.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index b74a3f5df..ff8b95fe6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.10.1 +# sameersbn/gitlab:16.10.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.10.1 +docker pull sameersbn/gitlab:16.10.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:16.10.1 + sameersbn/gitlab:16.10.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:16.10.1 + sameersbn/gitlab:16.10.2 ``` ### Database @@ -288,7 +288,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:16.10.1 + sameersbn/gitlab:16.10.2 ``` ##### Linking to PostgreSQL Container @@ -332,7 +332,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:16.10.1 + sameersbn/gitlab:16.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: @@ -371,7 +371,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:16.10.1 + sameersbn/gitlab:16.10.2 ``` #### Linking to Redis Container @@ -398,7 +398,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.10.1 + sameersbn/gitlab:16.10.2 ``` #### Mail @@ -411,7 +411,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:16.10.1 + sameersbn/gitlab:16.10.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -431,7 +431,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:16.10.1 + sameersbn/gitlab:16.10.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -515,7 +515,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:16.10.1 + sameersbn/gitlab:16.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. @@ -531,7 +531,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:16.10.1 + sameersbn/gitlab:16.10.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -554,7 +554,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:16.10.1 + sameersbn/gitlab:16.10.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -602,7 +602,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:16.10.1 + sameersbn/gitlab:16.10.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:16.10.1 + sameersbn/gitlab:16.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:16.10.1 app:sanitize + sameersbn/gitlab:16.10.2 app:sanitize ``` #### Piwik @@ -2530,7 +2530,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2565,14 +2565,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.1 app:rake db:setup + sameersbn/gitlab:16.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:16.10.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2581,7 +2581,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.10.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2630,7 +2630,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:16.10.1 app:rake gitlab:env:info + sameersbn/gitlab:16.10.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2643,7 +2643,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.10.2 app:rake gitlab:import:repos ``` Or @@ -2674,7 +2674,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.10.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2698,12 +2698,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.10.1 +docker pull sameersbn/gitlab:16.10.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2728,7 +2728,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:16.10.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.10.2 ``` ### Shell Access @@ -2766,7 +2766,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.10.1 + image: sameersbn/gitlab:16.10.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 09df90764..0a080902a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.10.1 +16.10.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 7d8e4b972..345e9374a 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.10.1 + image: sameersbn/gitlab:16.10.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 380e105e5..a41541af3 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.10.1 + image: sameersbn/gitlab:16.10.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index e51c096f7..d5619900f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.10.1 + image: sameersbn/gitlab:16.10.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 36304bcb5..c70c61caa 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.10.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.10.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.10.1 +docker pull sameersbn/gitlab:16.10.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.10.1 +sameersbn/gitlab:16.10.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index e62e8eaf9..5e44f1487 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.10.1 + image: sameersbn/gitlab:16.10.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index e3ada5fa6..44c6cb558 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.10.1 + image: sameersbn/gitlab:16.10.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 55269386b..c3eeab721 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.10.1 + image: sameersbn/gitlab:16.10.2 env: - name: TZ value: Asia/Kolkata From 18ad32c96215b6f3098f95388aba64c1c1b6a54d Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Mon, 22 Apr 2024 21:16:16 +0200 Subject: [PATCH 384/522] Upgrade GitLab CE to 16.10.3 --- Changelog.md | 7 +++++++ Dockerfile | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Changelog.md b/Changelog.md index e6059612f..31260d467 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**16.10.3** + +- gitlab: upgrade CE to v16.10.3 +- gitaly: upgrade to v16.10.3 +- gitlab-pages: upgrade to v16.10.3 +- ubuntu: upgrade to focal-20240410 + **16.10.2** - gitlab: upgrade CE to v16.10.2 diff --git a/Dockerfile b/Dockerfile index d4b368c82..a17fb30d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20240216 +FROM ubuntu:focal-20240410 -ARG VERSION=16.10.2 +ARG VERSION=16.10.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.3 \ RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \ GOLANG_VERSION=1.22.2 \ GITLAB_SHELL_VERSION=14.34.0 \ - GITLAB_PAGES_VERSION=16.10.2 \ - GITALY_SERVER_VERSION=16.10.2 \ + GITLAB_PAGES_VERSION=16.10.3 \ + GITALY_SERVER_VERSION=16.10.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From 6ec7387704f95429fa063f4fd66f986d2f9a2085 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 23 Apr 2024 06:42:08 +0200 Subject: [PATCH 385/522] Update version information --- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 9 files changed, 39 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index ff8b95fe6..b87bcd310 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.10.2 +# sameersbn/gitlab:16.10.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.10.2 +docker pull sameersbn/gitlab:16.10.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:16.10.2 + sameersbn/gitlab:16.10.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:16.10.2 + sameersbn/gitlab:16.10.3 ``` ### Database @@ -288,7 +288,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:16.10.2 + sameersbn/gitlab:16.10.3 ``` ##### Linking to PostgreSQL Container @@ -332,7 +332,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:16.10.2 + sameersbn/gitlab:16.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: @@ -371,7 +371,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:16.10.2 + sameersbn/gitlab:16.10.3 ``` #### Linking to Redis Container @@ -398,7 +398,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.10.2 + sameersbn/gitlab:16.10.3 ``` #### Mail @@ -411,7 +411,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:16.10.2 + sameersbn/gitlab:16.10.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -431,7 +431,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:16.10.2 + sameersbn/gitlab:16.10.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -515,7 +515,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:16.10.2 + sameersbn/gitlab:16.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. @@ -531,7 +531,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:16.10.2 + sameersbn/gitlab:16.10.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -554,7 +554,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:16.10.2 + sameersbn/gitlab:16.10.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -602,7 +602,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:16.10.2 + sameersbn/gitlab:16.10.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:16.10.2 + sameersbn/gitlab:16.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:16.10.2 app:sanitize + sameersbn/gitlab:16.10.3 app:sanitize ``` #### Piwik @@ -2530,7 +2530,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.2 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2565,14 +2565,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.2 app:rake db:setup + sameersbn/gitlab:16.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:16.10.2 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2581,7 +2581,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2630,7 +2630,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:16.10.2 app:rake gitlab:env:info + sameersbn/gitlab:16.10.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2643,7 +2643,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.2 app:rake gitlab:import:repos + sameersbn/gitlab:16.10.3 app:rake gitlab:import:repos ``` Or @@ -2674,7 +2674,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.2 app:rake gitlab:import:repos + sameersbn/gitlab:16.10.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2698,12 +2698,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.10.2 +docker pull sameersbn/gitlab:16.10.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2728,7 +2728,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:16.10.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.10.3 ``` ### Shell Access @@ -2766,7 +2766,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.10.2 + image: sameersbn/gitlab:16.10.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 0a080902a..5c6cfac3e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.10.2 +16.10.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 345e9374a..084012e6d 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.10.2 + image: sameersbn/gitlab:16.10.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index a41541af3..6bd6b35b1 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.10.2 + image: sameersbn/gitlab:16.10.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index d5619900f..dc1a1fbc1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.10.2 + image: sameersbn/gitlab:16.10.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index c70c61caa..70d68c4d5 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.2 app:rake gitlab:backup:create + sameersbn/gitlab:16.10.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.2 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.10.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.10.2 +docker pull sameersbn/gitlab:16.10.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.10.2 +sameersbn/gitlab:16.10.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 5e44f1487..1e0d7cb29 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.10.2 + image: sameersbn/gitlab:16.10.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 44c6cb558..cd8f0d0b5 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.10.2 + image: sameersbn/gitlab:16.10.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index c3eeab721..a21eb5daf 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.10.2 + image: sameersbn/gitlab:16.10.3 env: - name: TZ value: Asia/Kolkata From 9f0a0d268b73f006396d28e5114de7b064511a97 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 23 Apr 2024 16:51:58 +0200 Subject: [PATCH 386/522] Upgrade GitLab CE to 16.11.0 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 31260d467..0252b37d3 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**16.11.0** + +- gitlab: upgrade CE to v16.11.0 +- gitaly: upgrade to v16.11.0 +- gitlab-pages: upgrade to v16.11.0 +- gitlab-shell: upgrade to v14.35.0 + **16.10.3** - gitlab: upgrade CE to v16.10.3 diff --git a/Dockerfile b/Dockerfile index a17fb30d9..32c90d767 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20240410 -ARG VERSION=16.10.3 +ARG VERSION=16.11.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.3 \ RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \ GOLANG_VERSION=1.22.2 \ - GITLAB_SHELL_VERSION=14.34.0 \ - GITLAB_PAGES_VERSION=16.10.3 \ - GITALY_SERVER_VERSION=16.10.3 \ + GITLAB_SHELL_VERSION=14.35.0 \ + GITLAB_PAGES_VERSION=16.11.0 \ + GITALY_SERVER_VERSION=16.11.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index b87bcd310..383ecad7d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.10.3 +# sameersbn/gitlab:16.11.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.10.3 +docker pull sameersbn/gitlab:16.11.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:16.10.3 + sameersbn/gitlab:16.11.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:16.10.3 + sameersbn/gitlab:16.11.0 ``` ### Database @@ -288,7 +288,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:16.10.3 + sameersbn/gitlab:16.11.0 ``` ##### Linking to PostgreSQL Container @@ -332,7 +332,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:16.10.3 + sameersbn/gitlab:16.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: @@ -371,7 +371,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:16.10.3 + sameersbn/gitlab:16.11.0 ``` #### Linking to Redis Container @@ -398,7 +398,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.10.3 + sameersbn/gitlab:16.11.0 ``` #### Mail @@ -411,7 +411,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:16.10.3 + sameersbn/gitlab:16.11.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -431,7 +431,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:16.10.3 + sameersbn/gitlab:16.11.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -515,7 +515,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:16.10.3 + sameersbn/gitlab:16.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. @@ -531,7 +531,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:16.10.3 + sameersbn/gitlab:16.11.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -554,7 +554,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:16.10.3 + sameersbn/gitlab:16.11.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -602,7 +602,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:16.10.3 + sameersbn/gitlab:16.11.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:16.10.3 + sameersbn/gitlab:16.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:16.10.3 app:sanitize + sameersbn/gitlab:16.11.0 app:sanitize ``` #### Piwik @@ -2530,7 +2530,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.3 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2565,14 +2565,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.3 app:rake db:setup + sameersbn/gitlab:16.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:16.10.3 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2581,7 +2581,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2630,7 +2630,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:16.10.3 app:rake gitlab:env:info + sameersbn/gitlab:16.11.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2643,7 +2643,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.3 app:rake gitlab:import:repos + sameersbn/gitlab:16.11.0 app:rake gitlab:import:repos ``` Or @@ -2674,7 +2674,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.3 app:rake gitlab:import:repos + sameersbn/gitlab:16.11.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2698,12 +2698,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.10.3 +docker pull sameersbn/gitlab:16.11.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2728,7 +2728,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:16.10.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.11.0 ``` ### Shell Access @@ -2766,7 +2766,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.10.3 + image: sameersbn/gitlab:16.11.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 5c6cfac3e..c723e938e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.10.3 +16.11.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 084012e6d..011d919c2 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.10.3 + image: sameersbn/gitlab:16.11.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 6bd6b35b1..a46dad164 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.10.3 + image: sameersbn/gitlab:16.11.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index dc1a1fbc1..fe8255ee2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.10.3 + image: sameersbn/gitlab:16.11.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 70d68c4d5..4beda76b7 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.3 app:rake gitlab:backup:create + sameersbn/gitlab:16.11.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.3 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.10.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.11.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.10.3 +docker pull sameersbn/gitlab:16.11.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.10.3 +sameersbn/gitlab:16.11.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 1e0d7cb29..58fd448d7 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.10.3 + image: sameersbn/gitlab:16.11.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index cd8f0d0b5..0913a2680 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.10.3 + image: sameersbn/gitlab:16.11.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index a21eb5daf..5b558df7a 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.10.3 + image: sameersbn/gitlab:16.11.0 env: - name: TZ value: Asia/Kolkata From 33e112e8cb34052c52c5ee295e8e77d09b3fbd7a Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 26 Apr 2024 22:29:35 +0200 Subject: [PATCH 387/522] Upgrade GitLab CE to 16.11.1 --- Changelog.md | 8 ++++ Dockerfile | 12 +++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 53 insertions(+), 45 deletions(-) diff --git a/Changelog.md b/Changelog.md index 0252b37d3..5f7aed1ed 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,14 @@ 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. +**16.11.1** + +- gitlab: upgrade CE to v16.11.1 +- gitaly: upgrade to v16.11.1 +- gitlab-pages: upgrade to v16.11.1 +- ruby: upgrade to v3.2.4 +- ubuntu: upgrade to focal-20240416 + **16.11.0** - gitlab: upgrade CE to v16.11.0 diff --git a/Dockerfile b/Dockerfile index 32c90d767..57bc4426a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20240410 +FROM ubuntu:focal-20240416 -ARG VERSION=16.11.0 +ARG VERSION=16.11.1 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=3.2.3 \ - RUBY_SOURCE_SHA256SUM="af7f1757d9ddb630345988139211f1fd570ff5ba830def1cc7c468ae9b65c9ba" \ + RUBY_VERSION=3.2.4 \ + RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \ GOLANG_VERSION=1.22.2 \ GITLAB_SHELL_VERSION=14.35.0 \ - GITLAB_PAGES_VERSION=16.11.0 \ - GITALY_SERVER_VERSION=16.11.0 \ + GITLAB_PAGES_VERSION=16.11.1 \ + GITALY_SERVER_VERSION=16.11.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 383ecad7d..5208423de 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.11.0 +# sameersbn/gitlab:16.11.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.11.0 +docker pull sameersbn/gitlab:16.11.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:16.11.0 + sameersbn/gitlab:16.11.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:16.11.0 + sameersbn/gitlab:16.11.1 ``` ### Database @@ -288,7 +288,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:16.11.0 + sameersbn/gitlab:16.11.1 ``` ##### Linking to PostgreSQL Container @@ -332,7 +332,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:16.11.0 + sameersbn/gitlab:16.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: @@ -371,7 +371,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:16.11.0 + sameersbn/gitlab:16.11.1 ``` #### Linking to Redis Container @@ -398,7 +398,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.11.0 + sameersbn/gitlab:16.11.1 ``` #### Mail @@ -411,7 +411,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:16.11.0 + sameersbn/gitlab:16.11.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -431,7 +431,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:16.11.0 + sameersbn/gitlab:16.11.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -515,7 +515,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:16.11.0 + sameersbn/gitlab:16.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. @@ -531,7 +531,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:16.11.0 + sameersbn/gitlab:16.11.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -554,7 +554,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:16.11.0 + sameersbn/gitlab:16.11.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -602,7 +602,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:16.11.0 + sameersbn/gitlab:16.11.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:16.11.0 + sameersbn/gitlab:16.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:16.11.0 app:sanitize + sameersbn/gitlab:16.11.1 app:sanitize ``` #### Piwik @@ -2530,7 +2530,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2565,14 +2565,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.0 app:rake db:setup + sameersbn/gitlab:16.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:16.11.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2581,7 +2581,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.11.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2630,7 +2630,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:16.11.0 app:rake gitlab:env:info + sameersbn/gitlab:16.11.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2643,7 +2643,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.11.1 app:rake gitlab:import:repos ``` Or @@ -2674,7 +2674,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.0 app:rake gitlab:import:repos + sameersbn/gitlab:16.11.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2698,12 +2698,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.11.0 +docker pull sameersbn/gitlab:16.11.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2728,7 +2728,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:16.11.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.11.1 ``` ### Shell Access @@ -2766,7 +2766,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.11.0 + image: sameersbn/gitlab:16.11.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index c723e938e..141e9a2a2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.11.0 +16.11.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 011d919c2..247411923 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.11.0 + image: sameersbn/gitlab:16.11.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index a46dad164..e8b62533b 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.11.0 + image: sameersbn/gitlab:16.11.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index fe8255ee2..99108b7a6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.11.0 + image: sameersbn/gitlab:16.11.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 4beda76b7..618e01ef1 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.0 app:rake gitlab:backup:create + sameersbn/gitlab:16.11.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.0 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.11.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.11.0 +docker pull sameersbn/gitlab:16.11.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.11.0 +sameersbn/gitlab:16.11.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 58fd448d7..17a6dff27 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.11.0 + image: sameersbn/gitlab:16.11.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 0913a2680..ff050ffc0 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.11.0 + image: sameersbn/gitlab:16.11.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 5b558df7a..0ccd9950b 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.11.0 + image: sameersbn/gitlab:16.11.1 env: - name: TZ value: Asia/Kolkata From ab5faa4a6c842a5e45925e9cdaf65b4be791f33d Mon Sep 17 00:00:00 2001 From: Filipe Roque Date: Mon, 29 Apr 2024 10:21:21 +0100 Subject: [PATCH 388/522] Update redis image to use latest patch and not a hardcoded patch Current latest patch is 6.2.14 --- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/redis-rc.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 247411923..4760ca6f2 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: redis:6.2.6 + image: redis:6.2 command: - --loglevel warning volumes: diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index e8b62533b..bf550131c 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -1,7 +1,7 @@ version: '3.4' services: redis: - image: redis:6.2.6 + image: redis:6.2 command: - --loglevel warning volumes: diff --git a/docker-compose.yml b/docker-compose.yml index 99108b7a6..7e24c771c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2.3' services: redis: restart: always - image: redis:6.2.6 + image: redis:6.2 command: - --loglevel warning volumes: diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 17a6dff27..20976a6fb 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -3,7 +3,7 @@ version: '2' services: redis: restart: always - image: redis:6.2.6 + image: redis:6.2 command: - --loglevel warning volumes: diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index ff050ffc0..40f30c3d4 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -3,7 +3,7 @@ version: '2' services: redis: restart: always - image: redis:6.2.6 + image: redis:6.2 command: - --loglevel warning volumes: diff --git a/kubernetes/redis-rc.yml b/kubernetes/redis-rc.yml index be3351246..b42b387b4 100644 --- a/kubernetes/redis-rc.yml +++ b/kubernetes/redis-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: redis - image: redis:6.2.6 + image: redis:6.2 ports: - name: redis containerPort: 6379 From c9973b4ba6b97584138bf8395f64cd6d83b566fa Mon Sep 17 00:00:00 2001 From: Filipe Roque Date: Tue, 30 Apr 2024 09:26:00 +0100 Subject: [PATCH 389/522] Fix recompile spelling --- assets/runtime/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index 4a3759a68..8c6aad290 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -2221,7 +2221,7 @@ migrate_database() { mkdir -p ${GITLAB_HOME}/gitlab/node_modules chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules fi - echo "Prepare recomplie assets... Installing missing node_modules for assets" + echo "Prepare recompile assets... Installing missing node_modules for assets" chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules exec_as_git yarn install --production --pure-lockfile echo "Recompiling assets (relative_url in use), this could take a while..." From f2e5c71294133edf99b7160fd15ba6aa976a7b58 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 9 May 2024 00:06:44 +0200 Subject: [PATCH 390/522] Upgrade GitLab CE to 16.11.2 --- Changelog.md | 8 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index 5f7aed1ed..34814eeb6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,14 @@ 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. +**16.11.2** + +- gitlab: upgrade CE to v16.11.2 +- gitaly: upgrade to v16.11.2 +- gitlab-pages: upgrade to v16.11.2 +- golang: upgrade to v1.223 +- ubuntu: upgrade to focal-20240427 + **16.11.1** - gitlab: upgrade CE to v16.11.1 diff --git a/Dockerfile b/Dockerfile index 57bc4426a..50b1b1355 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20240416 +FROM ubuntu:focal-20240427 -ARG VERSION=16.11.1 +ARG VERSION=16.11.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.4 \ RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \ - GOLANG_VERSION=1.22.2 \ + GOLANG_VERSION=1.22.3 \ GITLAB_SHELL_VERSION=14.35.0 \ - GITLAB_PAGES_VERSION=16.11.1 \ - GITALY_SERVER_VERSION=16.11.1 \ + GITLAB_PAGES_VERSION=16.11.2 \ + GITALY_SERVER_VERSION=16.11.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 5208423de..5fb83ef77 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.11.1 +# sameersbn/gitlab:16.11.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.11.1 +docker pull sameersbn/gitlab:16.11.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:16.11.1 + sameersbn/gitlab:16.11.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:16.11.1 + sameersbn/gitlab:16.11.2 ``` ### Database @@ -288,7 +288,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:16.11.1 + sameersbn/gitlab:16.11.2 ``` ##### Linking to PostgreSQL Container @@ -332,7 +332,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:16.11.1 + sameersbn/gitlab:16.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: @@ -371,7 +371,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:16.11.1 + sameersbn/gitlab:16.11.2 ``` #### Linking to Redis Container @@ -398,7 +398,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.11.1 + sameersbn/gitlab:16.11.2 ``` #### Mail @@ -411,7 +411,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:16.11.1 + sameersbn/gitlab:16.11.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -431,7 +431,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:16.11.1 + sameersbn/gitlab:16.11.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -515,7 +515,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:16.11.1 + sameersbn/gitlab:16.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. @@ -531,7 +531,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:16.11.1 + sameersbn/gitlab:16.11.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -554,7 +554,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:16.11.1 + sameersbn/gitlab:16.11.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -602,7 +602,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:16.11.1 + sameersbn/gitlab:16.11.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:16.11.1 + sameersbn/gitlab:16.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:16.11.1 app:sanitize + sameersbn/gitlab:16.11.2 app:sanitize ``` #### Piwik @@ -2530,7 +2530,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.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. @@ -2565,14 +2565,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.1 app:rake db:setup + sameersbn/gitlab:16.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:16.11.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -2581,7 +2581,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:16.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2630,7 +2630,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:16.11.1 app:rake gitlab:env:info + sameersbn/gitlab:16.11.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2643,7 +2643,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.11.2 app:rake gitlab:import:repos ``` Or @@ -2674,7 +2674,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.1 app:rake gitlab:import:repos + sameersbn/gitlab:16.11.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2698,12 +2698,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:16.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:16.11.1 +docker pull sameersbn/gitlab:16.11.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2728,7 +2728,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:16.11.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:16.11.2 ``` ### Shell Access @@ -2766,7 +2766,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.11.1 + image: sameersbn/gitlab:16.11.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 141e9a2a2..746cb1a5b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.11.1 +16.11.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 4760ca6f2..7ffccb110 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.11.1 + image: sameersbn/gitlab:16.11.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index bf550131c..698185020 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.11.1 + image: sameersbn/gitlab:16.11.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 7e24c771c..84acbe55a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.11.1 + image: sameersbn/gitlab:16.11.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 618e01ef1..1fa8bad10 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.1 app:rake gitlab:backup:create + sameersbn/gitlab:16.11.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.1 app:rake gitlab:backup:restore + sameersbn/gitlab:16.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:16.11.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.11.1 +docker pull sameersbn/gitlab:16.11.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.11.1 +sameersbn/gitlab:16.11.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 20976a6fb..a258ce03e 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.11.1 + image: sameersbn/gitlab:16.11.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 40f30c3d4..6bf213b1d 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.11.1 + image: sameersbn/gitlab:16.11.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 0ccd9950b..5fe09e8b6 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.11.1 + image: sameersbn/gitlab:16.11.2 env: - name: TZ value: Asia/Kolkata From 544d17841f933966a6e3cf0950ebe2ca4fb367f6 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 19 May 2024 21:28:47 +0200 Subject: [PATCH 391/522] Upgrade GitLab CE to 17.0.0 --- Changelog.md | 9 ++++- Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 34814eeb6..4de154180 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,12 +2,19 @@ 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. +**17.0.0** + +- gitlab: upgrade CE to v17.0.0 +- gitaly: upgrade to v17.0.0 +- gitlab-pages: upgrade to v17.0.0 +- gitlab-shell: upgrade to v14.35.0 + **16.11.2** - gitlab: upgrade CE to v16.11.2 - gitaly: upgrade to v16.11.2 - gitlab-pages: upgrade to v16.11.2 -- golang: upgrade to v1.223 +- golang: upgrade to v1.22.3 - ubuntu: upgrade to focal-20240427 **16.11.1** diff --git a/Dockerfile b/Dockerfile index 50b1b1355..45eb1acff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20240427 -ARG VERSION=16.11.2 +ARG VERSION=17.0.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.4 \ RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \ GOLANG_VERSION=1.22.3 \ GITLAB_SHELL_VERSION=14.35.0 \ - GITLAB_PAGES_VERSION=16.11.2 \ - GITALY_SERVER_VERSION=16.11.2 \ + GITLAB_PAGES_VERSION=17.0.0 \ + GITALY_SERVER_VERSION=17.0.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 5fb83ef77..57f9e48c0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:16.11.2 +# sameersbn/gitlab:17.0.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:16.11.2 +docker pull sameersbn/gitlab:17.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:16.11.2 + sameersbn/gitlab:17.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:16.11.2 + sameersbn/gitlab:17.0.0 ``` ### Database @@ -288,7 +288,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:16.11.2 + sameersbn/gitlab:17.0.0 ``` ##### Linking to PostgreSQL Container @@ -332,7 +332,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:16.11.2 + sameersbn/gitlab:17.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: @@ -371,7 +371,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:16.11.2 + sameersbn/gitlab:17.0.0 ``` #### Linking to Redis Container @@ -398,7 +398,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:16.11.2 + sameersbn/gitlab:17.0.0 ``` #### Mail @@ -411,7 +411,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:16.11.2 + sameersbn/gitlab:17.0.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -431,7 +431,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:16.11.2 + sameersbn/gitlab:17.0.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -515,7 +515,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:16.11.2 + sameersbn/gitlab:17.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. @@ -531,7 +531,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:16.11.2 + sameersbn/gitlab:17.0.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -554,7 +554,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:16.11.2 + sameersbn/gitlab:17.0.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -602,7 +602,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:16.11.2 + sameersbn/gitlab:17.0.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:16.11.2 + sameersbn/gitlab:17.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:16.11.2 app:sanitize + sameersbn/gitlab:17.0.0 app:sanitize ``` #### Piwik @@ -2530,7 +2530,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2565,14 +2565,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.2 app:rake db:setup + sameersbn/gitlab:17.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:16.11.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2581,7 +2581,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2630,7 +2630,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:16.11.2 app:rake gitlab:env:info + sameersbn/gitlab:17.0.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2643,7 +2643,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.0.0 app:rake gitlab:import:repos ``` Or @@ -2674,7 +2674,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.0.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2698,12 +2698,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:16.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:17.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:16.11.2 +docker pull sameersbn/gitlab:17.0.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2728,7 +2728,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:16.11.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.0.0 ``` ### Shell Access @@ -2766,7 +2766,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:16.11.2 + image: sameersbn/gitlab:17.0.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 746cb1a5b..aac58983e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -16.11.2 +17.0.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 7ffccb110..5d33f1d26 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.11.2 + image: sameersbn/gitlab:17.0.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 698185020..6c21a2853 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:16.11.2 + image: sameersbn/gitlab:17.0.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 84acbe55a..376d3c9f8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.11.2 + image: sameersbn/gitlab:17.0.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 1fa8bad10..73628ce9d 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.0.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:16.11.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.0.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:16.11.2 +docker pull sameersbn/gitlab:17.0.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:16.11.2 +sameersbn/gitlab:17.0.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index a258ce03e..1a4f572e3 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.11.2 + image: sameersbn/gitlab:17.0.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 6bf213b1d..30e35d408 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:16.11.2 + image: sameersbn/gitlab:17.0.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 5fe09e8b6..1e166b7e1 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:16.11.2 + image: sameersbn/gitlab:17.0.0 env: - name: TZ value: Asia/Kolkata From 07db6ad5fab967d81213e8080ee056444e479db6 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 24 May 2024 17:55:42 +0200 Subject: [PATCH 392/522] Upgrade GitLab CE to 17.0.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 4de154180..ce7616db5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**17.0.1** + +- gitlab: upgrade CE to v17.0.1 +- gitaly: upgrade to v17.0.1 +- gitlab-pages: upgrade to v17.0.1 + **17.0.0** - gitlab: upgrade CE to v17.0.0 diff --git a/Dockerfile b/Dockerfile index 45eb1acff..966e7f38f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ FROM ubuntu:focal-20240427 -ARG VERSION=17.0.0 +ARG VERSION=17.0.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.4 \ RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \ GOLANG_VERSION=1.22.3 \ GITLAB_SHELL_VERSION=14.35.0 \ - GITLAB_PAGES_VERSION=17.0.0 \ - GITALY_SERVER_VERSION=17.0.0 \ + GITLAB_PAGES_VERSION=17.0.1 \ + GITALY_SERVER_VERSION=17.0.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 57f9e48c0..aa990f09f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.0.0 +# sameersbn/gitlab:17.0.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.0.0 +docker pull sameersbn/gitlab:17.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:17.0.0 + sameersbn/gitlab:17.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:17.0.0 + sameersbn/gitlab:17.0.1 ``` ### Database @@ -288,7 +288,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:17.0.0 + sameersbn/gitlab:17.0.1 ``` ##### Linking to PostgreSQL Container @@ -332,7 +332,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:17.0.0 + sameersbn/gitlab:17.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: @@ -371,7 +371,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:17.0.0 + sameersbn/gitlab:17.0.1 ``` #### Linking to Redis Container @@ -398,7 +398,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.0.0 + sameersbn/gitlab:17.0.1 ``` #### Mail @@ -411,7 +411,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:17.0.0 + sameersbn/gitlab:17.0.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -431,7 +431,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:17.0.0 + sameersbn/gitlab:17.0.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -515,7 +515,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:17.0.0 + sameersbn/gitlab:17.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. @@ -531,7 +531,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:17.0.0 + sameersbn/gitlab:17.0.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -554,7 +554,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:17.0.0 + sameersbn/gitlab:17.0.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -602,7 +602,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:17.0.0 + sameersbn/gitlab:17.0.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:17.0.0 + sameersbn/gitlab:17.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:17.0.0 app:sanitize + sameersbn/gitlab:17.0.1 app:sanitize ``` #### Piwik @@ -2530,7 +2530,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2565,14 +2565,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.0 app:rake db:setup + sameersbn/gitlab:17.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:17.0.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2581,7 +2581,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2630,7 +2630,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:17.0.0 app:rake gitlab:env:info + sameersbn/gitlab:17.0.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2643,7 +2643,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.0.1 app:rake gitlab:import:repos ``` Or @@ -2674,7 +2674,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.0.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2698,12 +2698,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.0.0 +docker pull sameersbn/gitlab:17.0.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2728,7 +2728,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:17.0.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.0.1 ``` ### Shell Access @@ -2766,7 +2766,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.0.0 + image: sameersbn/gitlab:17.0.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index aac58983e..3e17df028 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.0.0 +17.0.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 5d33f1d26..0dc5f9b3c 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.0.0 + image: sameersbn/gitlab:17.0.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 6c21a2853..f2336334c 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.0.0 + image: sameersbn/gitlab:17.0.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 376d3c9f8..195b951e0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.0.0 + image: sameersbn/gitlab:17.0.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 73628ce9d..fd2dd9149 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.0.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.0.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.0.0 +docker pull sameersbn/gitlab:17.0.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.0.0 +sameersbn/gitlab:17.0.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 1a4f572e3..cc34a3f1a 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.0.0 + image: sameersbn/gitlab:17.0.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 30e35d408..1112ec87c 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.0.0 + image: sameersbn/gitlab:17.0.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 1e166b7e1..b03ca8d4f 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.0.0 + image: sameersbn/gitlab:17.0.1 env: - name: TZ value: Asia/Kolkata From 5204971ce003f5c0ce6b1c06b533b5cf9a0dd53f Mon Sep 17 00:00:00 2001 From: Yannis Mazzer Date: Mon, 5 Sep 2022 11:13:53 +0200 Subject: [PATCH 393/522] #2420 Handle encrypted_settings_key_base variable to allow restoring backups from gitlab instances not running from this image and using encrypted settings feature. --- README.md | 9 ++++++++- assets/runtime/config/gitlabhq/secrets.yml | 1 + assets/runtime/env-defaults | 1 + assets/runtime/functions | 3 ++- contrib/docker-swarm/docker-compose.yml | 1 + docker-compose.swarm.yml | 1 + docs/docker-compose-keycloak.yml | 1 + docs/docker-compose-registry.yml | 1 + docs/docker-swarm-traefik-registry.md | 1 + docs/s3_compatible_storage.md | 1 + kubernetes/gitlab-rc.yml | 2 ++ 11 files changed, 20 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index aa990f09f..fe5d50757 100644 --- a/README.md +++ b/README.md @@ -149,11 +149,12 @@ The quickest way to get started is using [docker-compose](https://docs.docker.co wget https://raw.githubusercontent.com/sameersbn/docker-gitlab/master/docker-compose.yml ``` -Generate random strings that are at least `64` characters long for each of `GITLAB_SECRETS_OTP_KEY_BASE`, `GITLAB_SECRETS_DB_KEY_BASE`, and `GITLAB_SECRETS_SECRET_KEY_BASE`. These values are used for the following: +Generate random strings that are at least `64` characters long for each of `GITLAB_SECRETS_OTP_KEY_BASE`, `GITLAB_SECRETS_DB_KEY_BASE`, `GITLAB_SECRETS_SECRET_KEY_BASE`, `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE`. These values are used for the following: - `GITLAB_SECRETS_OTP_KEY_BASE` is used to encrypt 2FA secrets in the database. If you lose or rotate this secret, none of your users will be able to log in using 2FA. - `GITLAB_SECRETS_DB_KEY_BASE` is used to encrypt CI secret variables, as well as import credentials, in the database. If you lose or rotate this secret, you will not be able to use existing CI secrets. - `GITLAB_SECRETS_SECRET_KEY_BASE` is used for password reset links, and other 'standard' auth features. If you lose or rotate this secret, password reset tokens in emails will reset. +- `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` is used for reading settings from encrypted files such as SMTP or LDAP credentials. > **Tip**: You can generate a random string using `pwgen -Bsv1 64` and assign it as the value of `GITLAB_SECRETS_DB_KEY_BASE`. @@ -194,6 +195,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ + --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ sameersbn/gitlab:17.0.1 ``` @@ -886,6 +888,10 @@ Encryption key for session secrets. Ensure that your key is at least 64 characte Encryption key for OTP related stuff with GitLab. Ensure that your key is at least 64 characters long and that you don't lose it. **If you lose or change this secret, 2FA will stop working for all users.** You can generate one using `pwgen -Bsv1 64`. No defaults. +##### `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` + + Encryption key for encrypted settings related stuff with GitLab. Ensure that your key is at least 64 characters long and that you don't lose it. **If you lose or change this secret, encrypted settings will not work and might cause errors in merge requests and so on** You can generate one using `pwgen -Bsv1 64`. No defaults. + ##### `GITLAB_TIMEZONE` Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`. See the list of [acceptable values](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html). For settings the container timezone which will effect cron, see variable `TZ` @@ -2726,6 +2732,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.0.0` you need to provide the `GITLAB_SECRETS_DB_KEY_BASE` parameter while starting the image. > **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. +> **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.0.1 diff --git a/assets/runtime/config/gitlabhq/secrets.yml b/assets/runtime/config/gitlabhq/secrets.yml index 769d956a2..eae882dca 100644 --- a/assets/runtime/config/gitlabhq/secrets.yml +++ b/assets/runtime/config/gitlabhq/secrets.yml @@ -6,6 +6,7 @@ production: db_key_base: {{GITLAB_SECRETS_DB_KEY_BASE}} secret_key_base: {{GITLAB_SECRETS_SECRET_KEY_BASE}} otp_key_base: {{GITLAB_SECRETS_OTP_KEY_BASE}} + encrypted_settings_key_base: {{GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE}} development: db_key_base: development diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 86e0bd833..2484a1429 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -254,6 +254,7 @@ GITLAB_MATTERMOST_URL=${GITLAB_MATTERMOST_URL:-https://mattermost.example.com} GITLAB_SECRETS_DB_KEY_BASE=${GITLAB_SECRETS_DB_KEY_BASE:-} GITLAB_SECRETS_SECRET_KEY_BASE=${GITLAB_SECRETS_SECRET_KEY_BASE:-} GITLAB_SECRETS_OTP_KEY_BASE=${GITLAB_SECRETS_OTP_KEY_BASE:-} +GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=${GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE:-} GITLAB_NOTIFY_ON_BROKEN_BUILDS=${GITLAB_NOTIFY_ON_BROKEN_BUILDS:-true} GITLAB_NOTIFY_PUSHER=${GITLAB_NOTIFY_PUSHER:-false} diff --git a/assets/runtime/functions b/assets/runtime/functions index 8c6aad290..5a24e9bc1 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -858,7 +858,8 @@ gitlab_configure_secrets() { update_template ${GITLAB_SECRETS_CONFIG} \ GITLAB_SECRETS_DB_KEY_BASE \ GITLAB_SECRETS_SECRET_KEY_BASE \ - GITLAB_SECRETS_OTP_KEY_BASE + GITLAB_SECRETS_OTP_KEY_BASE \ + GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE local shell_secret="${GITLAB_INSTALL_DIR}/.gitlab_shell_secret" if [[ ! -f "${shell_secret}" ]]; then diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 0dc5f9b3c..4ec1365bd 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -61,6 +61,7 @@ services: - 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_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string - GITLAB_ROOT_PASSWORD= - GITLAB_ROOT_EMAIL= diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index f2336334c..a3c462439 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -123,6 +123,7 @@ services: - 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_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string - GITLAB_ROOT_PASSWORD= - GITLAB_ROOT_EMAIL= diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index cc34a3f1a..b12fdb479 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -57,6 +57,7 @@ services: - 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_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string - GITLAB_ROOT_PASSWORD= - GITLAB_ROOT_EMAIL= diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 1112ec87c..a6984ef62 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -58,6 +58,7 @@ services: - GITLAB_SECRETS_DB_KEY_BASE=secret - GITLAB_SECRETS_SECRET_KEY_BASE=secret - GITLAB_SECRETS_OTP_KEY_BASE=secret + - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=secret - GITLAB_REGISTRY_ENABLED=true - GITLAB_REGISTRY_HOST=registry.example.com diff --git a/docs/docker-swarm-traefik-registry.md b/docs/docker-swarm-traefik-registry.md index 7f941efba..62384b64d 100644 --- a/docs/docker-swarm-traefik-registry.md +++ b/docs/docker-swarm-traefik-registry.md @@ -151,6 +151,7 @@ You can copy it and set it in the file like: - 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_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string ``` There are several other settings that you might want to configure, like email accounts for notifications, SMTP credentials to send emails, etc. diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md index b6e9f3db8..ca281b709 100644 --- a/docs/s3_compatible_storage.md +++ b/docs/s3_compatible_storage.md @@ -122,6 +122,7 @@ services: - 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_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string - GITLAB_ROOT_PASSWORD= - GITLAB_ROOT_EMAIL= - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index b03ca8d4f..d2cf16297 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -27,6 +27,8 @@ spec: value: long-and-random-alpha-numeric-string - name: GITLAB_SECRETS_OTP_KEY_BASE value: long-and-random-alpha-numeric-string + - name: GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE + value: long-and-random-alpha-numeric-string - name: GITLAB_ROOT_PASSWORD value: From 0ddf45a5283c9301f40d1811fb441c748e0f44f8 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 13 Jun 2024 20:11:10 +0200 Subject: [PATCH 394/522] Upgrade GitLab CE to 17.0.2 --- Changelog.md | 8 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index ce7616db5..2065b58e6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,14 @@ 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. +**17.0.2** + +- gitlab: upgrade CE to v17.0.2 +- gitaly: upgrade to v17.0.2 +- gitlab-pages: upgrade to v17.0.2 +- golang: upgrade to v1.22.4 +- ubuntu: upgrade to focal-20240530 + **17.0.1** - gitlab: upgrade CE to v17.0.1 diff --git a/Dockerfile b/Dockerfile index 966e7f38f..a746c8756 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM ubuntu:focal-20240427 +FROM ubuntu:focal-20240530 -ARG VERSION=17.0.1 +ARG VERSION=17.0.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.4 \ RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \ - GOLANG_VERSION=1.22.3 \ + GOLANG_VERSION=1.22.4 \ GITLAB_SHELL_VERSION=14.35.0 \ - GITLAB_PAGES_VERSION=17.0.1 \ - GITALY_SERVER_VERSION=17.0.1 \ + GITLAB_PAGES_VERSION=17.0.2 \ + GITALY_SERVER_VERSION=17.0.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index aa990f09f..c66d93fb7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.0.1 +# sameersbn/gitlab:17.0.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.0.1 +docker pull sameersbn/gitlab:17.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:17.0.1 + sameersbn/gitlab:17.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:17.0.1 + sameersbn/gitlab:17.0.2 ``` ### Database @@ -288,7 +288,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:17.0.1 + sameersbn/gitlab:17.0.2 ``` ##### Linking to PostgreSQL Container @@ -332,7 +332,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:17.0.1 + sameersbn/gitlab:17.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: @@ -371,7 +371,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:17.0.1 + sameersbn/gitlab:17.0.2 ``` #### Linking to Redis Container @@ -398,7 +398,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.0.1 + sameersbn/gitlab:17.0.2 ``` #### Mail @@ -411,7 +411,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:17.0.1 + sameersbn/gitlab:17.0.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -431,7 +431,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:17.0.1 + sameersbn/gitlab:17.0.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -515,7 +515,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:17.0.1 + sameersbn/gitlab:17.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. @@ -531,7 +531,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:17.0.1 + sameersbn/gitlab:17.0.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -554,7 +554,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:17.0.1 + sameersbn/gitlab:17.0.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -602,7 +602,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:17.0.1 + sameersbn/gitlab:17.0.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:17.0.1 + sameersbn/gitlab:17.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:17.0.1 app:sanitize + sameersbn/gitlab:17.0.2 app:sanitize ``` #### Piwik @@ -2530,7 +2530,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2565,14 +2565,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.1 app:rake db:setup + sameersbn/gitlab:17.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:17.0.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2581,7 +2581,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2630,7 +2630,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:17.0.1 app:rake gitlab:env:info + sameersbn/gitlab:17.0.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2643,7 +2643,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.0.2 app:rake gitlab:import:repos ``` Or @@ -2674,7 +2674,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.0.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2698,12 +2698,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.0.1 +docker pull sameersbn/gitlab:17.0.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2728,7 +2728,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:17.0.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.0.2 ``` ### Shell Access @@ -2766,7 +2766,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.0.1 + image: sameersbn/gitlab:17.0.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 3e17df028..c57cf9a9d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.0.1 +17.0.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 0dc5f9b3c..87eb3efad 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.0.1 + image: sameersbn/gitlab:17.0.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index f2336334c..a44999e5c 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.0.1 + image: sameersbn/gitlab:17.0.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 195b951e0..7be086aac 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.0.1 + image: sameersbn/gitlab:17.0.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index fd2dd9149..35c99848d 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.0.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.0.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.0.1 +docker pull sameersbn/gitlab:17.0.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.0.1 +sameersbn/gitlab:17.0.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index cc34a3f1a..091797361 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.0.1 + image: sameersbn/gitlab:17.0.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 1112ec87c..42639f8d1 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.0.1 + image: sameersbn/gitlab:17.0.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index b03ca8d4f..b7f3122c5 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.0.1 + image: sameersbn/gitlab:17.0.2 env: - name: TZ value: Asia/Kolkata From f30613b19229c96f959c69204420a699ee0d67a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moln=C3=A1r=20P=C3=A9ter?= Date: Tue, 18 Jun 2024 21:37:37 +0200 Subject: [PATCH 395/522] Add support for Omniauth OpenID Connect login. --- README.md | 25 +++++++++++++++++++++ assets/runtime/config/gitlabhq/gitlab.yml | 17 ++++++++++++++ assets/runtime/env-defaults | 22 ++++++++++++++++++ assets/runtime/functions | 27 ++++++++++++++++++++++- 4 files changed, 90 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f46aa79d0..a8e871a1c 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,7 @@ - [Crowd](#crowd) - [Microsoft Azure](#microsoft-azure) - [Generic OAuth2](#Generic-OAuth2) + - [OpenID Connect](#OpenID-Connect) - [Gitlab Pages](#gitlab-pages) - [External Issue Trackers](#external-issue-trackers) - [Host UID / GID Mapping](#host-uid--gid-mapping) @@ -725,6 +726,30 @@ As an example this code has been tested with Keycloak, with the following variab See [GitLab documentation](https://docs.gitlab.com/ee/integration/oauth2_generic.html#sign-into-gitlab-with-almost-any-oauth2-provider) and [Omniauth-oauth2-generic documentation](https://gitlab.com/satorix/omniauth-oauth2-generic) for more details. +##### OpenID Connect + +To enable OpenID Connect provider, you must register your application with your provider. You also need to confirm OpenID Connect provider app's ID and secret, the client options and the user's response structure. + +To use OIDC set at least `OAUTH_OIDC_ISSUER` and `OAUTH_OIDC_CLIENT_ID`. + +| GitLab setting | environment variable | +|----------------|----------------------| +| `label` | `OAUTH_OIDC_LABEL` | +| `icon` | `OAUTH_OIDC_ICON` | +| `scope`| `OAUTH_OIDC_SCOPE` | +| `response_type` | `OAUTH_OIDC_RESPONSE_TYPE` | +| `issuer` | `OAUTH_OIDC_ISSUER` | +| `discovery` | `OAUTH_OIDC_DISCOVERY` | +| `client_auth_method` | `OAUTH_OIDC_CLIENT_AUTH_METHOD` | +| `uid_field` | `OAUTH_OIDC_UID_FIELD` | +| `send_scope_to_token_endpoint` | `OAUTH_OIDC_SEND_SCOPE_TO_TOKEN_EP` | +| `pkce` | `OAUTH_OIDC_PKCE` | +| `client_options.identifier` | `OAUTH_OIDC_CLIENT_ID` | +| `client_options.secret` | `OAUTH_OIDC_CLIENT_SECRET` | +| `client_options.redirect_uri` | `OAUTH_OIDC_REDIRECT_URI` | + +See [GitLab OIDC documentation](https://docs.gitlab.com/ee/administration/auth/oidc.html) and [OmniAuth OpenID Connect documentation](https://github.com/omniauth/omniauth_openid_connect/). + #### 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`. diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index 226ced2e8..f828dd6f5 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -1031,6 +1031,23 @@ production: &base client_id: '{{OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_ID}}', client_secret: '{{OAUTH_AZURE_ACTIVEDIRECTORY_V2_CLIENT_SECRET}}', tenant_id: '{{OAUTH_AZURE_ACTIVEDIRECTORY_V2_TENANT_ID}}' } } + - { name: 'openid_connect', + label: '{{OAUTH_OIDC_LABEL}}', + icon: '{{OAUTH_OIDC_ICON}}', + args: { + name: 'openid_connect', + scope: {{OAUTH_OIDC_SCOPE}}, + response_type: '{{OAUTH_OIDC_RESPONSE_TYPE}}', + issuer: '{{OAUTH_OIDC_ISSUER}}', + discovery: {{OAUTH_OIDC_DISCOVERY}}, + client_auth_method: '{{OAUTH_OIDC_CLIENT_AUTH_METHOD}}', + uid_field: '{{OAUTH_OIDC_UID_FIELD}}', + send_scope_to_token_endpoint: {{OAUTH_OIDC_SEND_SCOPE_TO_TOKEN_EP}}, + pkce: {{OAUTH_OIDC_PKCE}}, + client_options: { + identifier: '{{OAUTH_OIDC_CLIENT_ID}}', + secret: '{{OAUTH_OIDC_CLIENT_SECRET}}', + redirect_uri: '{{OAUTH_OIDC_REDIRECT_URI}}' } } } # SSO maximum session duration in seconds. Defaults to CAS default of 8 hours. # cas3: diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 2484a1429..8b2e256be 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -537,6 +537,28 @@ OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE=${OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE:-} OAUTH2_GENERIC_LABEL=${OAUTH2_GENERIC_LABEL:-} OAUTH2_GENERIC_NAME=${OAUTH2_GENERIC_NAME:-} +### OpenID Connect +OAUTH_OIDC_LABEL=${OAUTH_OIDC_LABEL:-'OpenID Connect'} +OAUTH_OIDC_ICON=${OAUTH_OIDC_ICON:-} +OAUTH_OIDC_SCOPE=${OAUTH_OIDC_SCOPE:-"['openid','profile','email']"} +OAUTH_OIDC_RESPONSE_TYPE=${OAUTH_OIDC_RESPONSE_TYPE:-'code'} +OAUTH_OIDC_ISSUER=${OAUTH_OIDC_ISSUER:-} +OAUTH_OIDC_DISCOVERY=${OAUTH_OIDC_DISCOVERY:-true} +OAUTH_OIDC_CLIENT_AUTH_METHOD=${OAUTH_OIDC_CLIENT_AUTH_METHOD:-'query'} +OAUTH_OIDC_UID_FIELD=${OAUTH_OIDC_UID_FIELD:-sub} +OAUTH_OIDC_SEND_SCOPE_TO_TOKEN_EP=${OAUTH_OIDC_SEND_SCOPE_TO_TOKEN_EP:-false} +OAUTH_OIDC_PKCE=${OAUTH_OIDC_PKCE:-true} +OAUTH_OIDC_CLIENT_ID=${OAUTH_OIDC_CLIENT_ID:-} +OAUTH_OIDC_CLIENT_SECRET=${OAUTH_OIDC_CLIENT_SECRET:-'secret'} +case $GITLAB_HTTPS in + true) + OAUTH_OIDC_REDIRECT_URI=${OAUTH_OIDC_REDIRECT_URI:-https://${GITLAB_HOST}/users/auth/openid_connect/callback} + ;; + false) + OAUTH_OIDC_REDIRECT_URI=${OAUTH_OIDC_REDIRECT_URI:-http://${GITLAB_HOST}/users/auth/openid_connect/callback} + ;; +esac + ## ANALYTICS ### GOOGLE diff --git a/assets/runtime/functions b/assets/runtime/functions index 5a24e9bc1..b23d6f461 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -793,6 +793,30 @@ gitlab_configure_oauth_azure_ad_v2() { fi } +gitlab_configure_oauth_oidc() { + if [[ -n ${OAUTH_OIDC_ISSUER} && \ + -n ${OAUTH_OIDC_CLIENT_ID} ]]; then + echo "Configuring gitlab::oauth::oidc..." + OAUTH_ENABLED=${OAUTH_ENABLED:-true} + update_template ${GITLAB_CONFIG} \ + OAUTH_OIDC_LABEL \ + OAUTH_OIDC_ICON \ + OAUTH_OIDC_SCOPE \ + OAUTH_OIDC_RESPONSE_TYPE \ + OAUTH_OIDC_ISSUER \ + OAUTH_OIDC_DISCOVERY \ + OAUTH_OIDC_CLIENT_AUTH_METHOD \ + OAUTH_OIDC_UID_FIELD \ + OAUTH_OIDC_SEND_SCOPE_TO_TOKEN_EP \ + OAUTH_OIDC_PKCE \ + OAUTH_OIDC_CLIENT_ID \ + OAUTH_OIDC_CLIENT_SECRET \ + OAUTH_OIDC_REDIRECT_URI + else + exec_as_git sed -i "/name: 'openid_connect'/,/{{OAUTH_OIDC_REDIRECT_URI}}/d" ${GITLAB_CONFIG} + fi +} + gitlab_configure_oauth() { echo "Configuring gitlab::oauth..." @@ -810,6 +834,7 @@ gitlab_configure_oauth() { gitlab_configure_oauth_auth0 gitlab_configure_oauth_azure gitlab_configure_oauth_azure_ad_v2 + gitlab_configure_oauth_oidc OAUTH_ENABLED=${OAUTH_ENABLED:-false} update_template ${GITLAB_CONFIG} \ @@ -823,7 +848,7 @@ gitlab_configure_oauth() { OAUTH_ALLOW_BYPASS_TWO_FACTOR case ${OAUTH_AUTO_SIGN_IN_WITH_PROVIDER} in - cas3|google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd|azure_oauth2|azure_activedirectory_v2|oauth2_generic|$OAUTH2_GENERIC_NAME) + cas3|google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd|azure_oauth2|azure_activedirectory_v2|oauth2_generic|$OAUTH2_GENERIC_NAME|oidc) update_template ${GITLAB_CONFIG} OAUTH_AUTO_SIGN_IN_WITH_PROVIDER ;; *) From de8d0d52a9749f83c42115f2b71f2a9bbc0604b3 Mon Sep 17 00:00:00 2001 From: molnarpe Date: Wed, 19 Jun 2024 15:25:46 +0200 Subject: [PATCH 396/522] Update env-defaults Value for client_auth_method is 'query' in the example, but default value is 'basic' as described in [GitLab OmniAuth OIDC documentation, step 4.](https://docs.gitlab.com/ee/administration/auth/oidc.html). --- 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 8b2e256be..7c6de6d97 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -544,7 +544,7 @@ OAUTH_OIDC_SCOPE=${OAUTH_OIDC_SCOPE:-"['openid','profile','email']"} OAUTH_OIDC_RESPONSE_TYPE=${OAUTH_OIDC_RESPONSE_TYPE:-'code'} OAUTH_OIDC_ISSUER=${OAUTH_OIDC_ISSUER:-} OAUTH_OIDC_DISCOVERY=${OAUTH_OIDC_DISCOVERY:-true} -OAUTH_OIDC_CLIENT_AUTH_METHOD=${OAUTH_OIDC_CLIENT_AUTH_METHOD:-'query'} +OAUTH_OIDC_CLIENT_AUTH_METHOD=${OAUTH_OIDC_CLIENT_AUTH_METHOD:-'basic'} OAUTH_OIDC_UID_FIELD=${OAUTH_OIDC_UID_FIELD:-sub} OAUTH_OIDC_SEND_SCOPE_TO_TOKEN_EP=${OAUTH_OIDC_SEND_SCOPE_TO_TOKEN_EP:-false} OAUTH_OIDC_PKCE=${OAUTH_OIDC_PKCE:-true} From f647f3b058feaa9a14db404ef5e10fd69bf616ed Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sat, 15 Jun 2024 11:59:49 +0900 Subject: [PATCH 397/522] Upgrade nodejs apt source repo from 18.x to 20.x Required version is updated from v18.16.x to v20.13.x with GitLab v17.0.0 release. Documentation: - "Bump required Node.js version to 20 in installation guide" https://gitlab.com/gitlab-org/gitlab/-/merge_requests/154523 .tool-versions: - "Update .tool-versions and .nvmrc to use nodejs v20.12.2" https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149615 - Set distro to "nodistro" for nodejs to get later updates GitLab v17.0.0 or later requires (grants) nodejs v20.13.x or later, but nodejs v20.5.1 is installed for focal even later LTS are released. To avoid this issue, official installer script uses "nodistro" instead of specific distribution. See: https://github.com/nodesource/distributions/blob/83867e0fdde8ebb17f5f83644f00c4bb180a4568/scripts/deb/setup_20.x#L74 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a746c8756..f4ef78225 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ RUN set -ex && \ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ && echo 'deb http://apt.postgresql.org/pub/repos/apt/ focal-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_18.x focal main' > /etc/apt/sources.list.d/nodesource.list \ + && echo 'deb https://deb.nodesource.com/node_20.x nodistro 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 \ From d3501eb023527966873893ea819e398ee7a23ec9 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Fri, 21 Jun 2024 19:44:29 +0900 Subject: [PATCH 398/522] Update gpg key source for nodejs as original one caused following error: W: GPG error: https://deb.nodesource.com/node_20.x nodistro InRelease: The following signatures couldn't be verified because the public key is not available: NO_PUBKEY 2F59B5F99B1BE0B4 E: The repository 'https://deb.nodesource.com/node_20.x%20nodistro%20InRelease' is not signed. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f4ef78225..392bc49b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ RUN set -ex && \ && echo "deb http://ppa.launchpad.net/nginx/stable/ubuntu focal 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/ focal-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ - && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ + && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | apt-key add - \ && echo 'deb https://deb.nodesource.com/node_20.x nodistro 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 \ From 3c0be758cb3aed0b9f1ac2e8f7eea30fa7aaef21 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sat, 15 Jun 2024 11:59:25 +0900 Subject: [PATCH 399/522] Add ENV RUBYGEMS_VERSION and set to latest 3.5.x that is GitLab v17.0 recommendation MR that updates docs/install/installation.md: - "Bump version of rubygems in installation instructions" https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149976 There is no entry in .tools-version --- Dockerfile | 1 + assets/build/install.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index a746c8756..a29ea8046 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ ARG VERSION=17.0.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.4 \ RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \ + RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.22.4 \ GITLAB_SHELL_VERSION=14.35.0 \ GITLAB_PAGES_VERSION=17.0.2 \ diff --git a/assets/build/install.sh b/assets/build/install.sh index 31a23b691..47fc46202 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -56,6 +56,9 @@ make -j"$(nproc)" make install cd "$PWD_ORG" && rm -rf /tmp/ruby +# upgrade rubygems on demand +gem update --no-document --system "${RUBYGEMS_VERSION}" + # 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 eeedd79a003ded408cd3bd84633cb01dd6c6614c Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 21 Jun 2024 21:18:51 +0200 Subject: [PATCH 400/522] Upgrade GitLab CE to 17.1.0 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 2065b58e6..3d0bdfdc6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**17.1.0** + +- gitlab: upgrade CE to v17.1.0 +- gitaly: upgrade to v17.1.0 +- gitlab-pages: upgrade to v17.1.0 +- gitlab-shell: upgrade to v14.36.0 + **17.0.2** - gitlab: upgrade CE to v17.0.2 diff --git a/Dockerfile b/Dockerfile index ae245443f..2d919ba27 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ FROM ubuntu:focal-20240530 -ARG VERSION=17.0.2 +ARG VERSION=17.1.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.4 \ RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \ RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.22.4 \ - GITLAB_SHELL_VERSION=14.35.0 \ - GITLAB_PAGES_VERSION=17.0.2 \ - GITALY_SERVER_VERSION=17.0.2 \ + GITLAB_SHELL_VERSION=14.36.0 \ + GITLAB_PAGES_VERSION=17.1.0 \ + GITALY_SERVER_VERSION=17.1.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index f46aa79d0..66dc6b3d0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.0.2 +# sameersbn/gitlab:17.1.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.0.2 +docker pull sameersbn/gitlab:17.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_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.0.2 + sameersbn/gitlab:17.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:17.0.2 + sameersbn/gitlab:17.1.0 ``` ### Database @@ -290,7 +290,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:17.0.2 + sameersbn/gitlab:17.1.0 ``` ##### Linking to PostgreSQL Container @@ -334,7 +334,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:17.0.2 + sameersbn/gitlab:17.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: @@ -373,7 +373,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:17.0.2 + sameersbn/gitlab:17.1.0 ``` #### Linking to Redis Container @@ -400,7 +400,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.0.2 + sameersbn/gitlab:17.1.0 ``` #### Mail @@ -413,7 +413,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:17.0.2 + sameersbn/gitlab:17.1.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -433,7 +433,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:17.0.2 + sameersbn/gitlab:17.1.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -517,7 +517,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:17.0.2 + sameersbn/gitlab:17.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. @@ -533,7 +533,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:17.0.2 + sameersbn/gitlab:17.1.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -556,7 +556,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:17.0.2 + sameersbn/gitlab:17.1.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -604,7 +604,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:17.0.2 + sameersbn/gitlab:17.1.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -786,14 +786,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:17.0.2 + sameersbn/gitlab:17.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:17.0.2 app:sanitize + sameersbn/gitlab:17.1.0 app:sanitize ``` #### Piwik @@ -2536,7 +2536,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2571,14 +2571,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.2 app:rake db:setup + sameersbn/gitlab:17.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:17.0.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2587,7 +2587,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2636,7 +2636,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:17.0.2 app:rake gitlab:env:info + sameersbn/gitlab:17.1.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2649,7 +2649,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.1.0 app:rake gitlab:import:repos ``` Or @@ -2680,7 +2680,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.1.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2704,12 +2704,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.0.2 +docker pull sameersbn/gitlab:17.1.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2735,7 +2735,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.0.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.1.0 ``` ### Shell Access @@ -2773,7 +2773,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.0.2 + image: sameersbn/gitlab:17.1.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index c57cf9a9d..d9e58927a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.0.2 +17.1.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index b5d8fbdd8..5337b9fd7 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.0.2 + image: sameersbn/gitlab:17.1.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 05a250b0f..6384484fc 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.0.2 + image: sameersbn/gitlab:17.1.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 7be086aac..c0e526765 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.0.2 + image: sameersbn/gitlab:17.1.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 35c99848d..8e0f232eb 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.1.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.0.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.1.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.0.2 +docker pull sameersbn/gitlab:17.1.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.0.2 +sameersbn/gitlab:17.1.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index cf868d3c6..3e36dd0c6 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.0.2 + image: sameersbn/gitlab:17.1.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index f7fc213e2..2a2640ea5 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.0.2 + image: sameersbn/gitlab:17.1.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index eaa4097df..f550ddfaf 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.0.2 + image: sameersbn/gitlab:17.1.0 env: - name: TZ value: Asia/Kolkata From 8b477f07c15d6cebcd383bef70ed4737f039a6d2 Mon Sep 17 00:00:00 2001 From: molnarpe Date: Sun, 23 Jun 2024 07:02:15 +0200 Subject: [PATCH 401/522] Default values for OmniAuth OpenID Connect environment variables are now listed in README.md. --- README.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index a8e871a1c..0d4f5af30 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ - [Crowd](#crowd) - [Microsoft Azure](#microsoft-azure) - [Generic OAuth2](#Generic-OAuth2) - - [OpenID Connect](#OpenID-Connect) + - [OpenID Connect](#openid-connect) - [Gitlab Pages](#gitlab-pages) - [External Issue Trackers](#external-issue-trackers) - [Host UID / GID Mapping](#host-uid--gid-mapping) @@ -732,21 +732,21 @@ To enable OpenID Connect provider, you must register your application with your To use OIDC set at least `OAUTH_OIDC_ISSUER` and `OAUTH_OIDC_CLIENT_ID`. -| GitLab setting | environment variable | -|----------------|----------------------| -| `label` | `OAUTH_OIDC_LABEL` | -| `icon` | `OAUTH_OIDC_ICON` | -| `scope`| `OAUTH_OIDC_SCOPE` | -| `response_type` | `OAUTH_OIDC_RESPONSE_TYPE` | -| `issuer` | `OAUTH_OIDC_ISSUER` | -| `discovery` | `OAUTH_OIDC_DISCOVERY` | -| `client_auth_method` | `OAUTH_OIDC_CLIENT_AUTH_METHOD` | -| `uid_field` | `OAUTH_OIDC_UID_FIELD` | -| `send_scope_to_token_endpoint` | `OAUTH_OIDC_SEND_SCOPE_TO_TOKEN_EP` | -| `pkce` | `OAUTH_OIDC_PKCE` | -| `client_options.identifier` | `OAUTH_OIDC_CLIENT_ID` | -| `client_options.secret` | `OAUTH_OIDC_CLIENT_SECRET` | -| `client_options.redirect_uri` | `OAUTH_OIDC_REDIRECT_URI` | +| GitLab setting | environment variable | default value | +|--------------------------------|-------------------------------------|--------------------------------| +| `label` | `OAUTH_OIDC_LABEL` | `OpenID Connect` | +| `icon` | `OAUTH_OIDC_ICON` | | +| `scope` | `OAUTH_OIDC_SCOPE` | `['openid','profile','email']` | +| `response_type` | `OAUTH_OIDC_RESPONSE_TYPE` | `code` | +| `issuer` | `OAUTH_OIDC_ISSUER` | | +| `discovery` | `OAUTH_OIDC_DISCOVERY` | `true` | +| `client_auth_method` | `OAUTH_OIDC_CLIENT_AUTH_METHOD` | `basic` | +| `uid_field` | `OAUTH_OIDC_UID_FIELD` | `sub` | +| `send_scope_to_token_endpoint` | `OAUTH_OIDC_SEND_SCOPE_TO_TOKEN_EP` | `false` | +| `pkce` | `OAUTH_OIDC_PKCE` | `true` | +| `client_options.identifier` | `OAUTH_OIDC_CLIENT_ID` | | +| `client_options.secret` | `OAUTH_OIDC_CLIENT_SECRET` | `secret` | +| `client_options.redirect_uri` | `OAUTH_OIDC_REDIRECT_URI` | `http://${GITLAB_HOST}/users/auth/openid_connect/callback` or `https://${GITLAB_HOST}/users/auth/openid_connect/callback` depending on the value of `GITLAB_HTTPS` | See [GitLab OIDC documentation](https://docs.gitlab.com/ee/administration/auth/oidc.html) and [OmniAuth OpenID Connect documentation](https://github.com/omniauth/omniauth_openid_connect/). From a5ef262bf0dcaae8af598aaa50b010b37a1bdf78 Mon Sep 17 00:00:00 2001 From: Patrick Remy Date: Thu, 27 Jun 2024 08:39:51 +0200 Subject: [PATCH 402/522] Upgrade GitLab CE to 17.1.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 72 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++-- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 57 insertions(+), 51 deletions(-) diff --git a/Changelog.md b/Changelog.md index 3d0bdfdc6..24409abc3 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**17.1.1** + +- gitlab: upgrade CE to v17.1.1 +- gitaly: upgrade to v17.1.1 +- gitlab-pages: upgrade to v17.1.1 + **17.1.0** - gitlab: upgrade CE to v17.1.0 diff --git a/Dockerfile b/Dockerfile index 2d919ba27..41a7e0e71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20240530 -ARG VERSION=17.1.0 +ARG VERSION=17.1.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.4 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.22.4 \ GITLAB_SHELL_VERSION=14.36.0 \ - GITLAB_PAGES_VERSION=17.1.0 \ - GITALY_SERVER_VERSION=17.1.0 \ + GITLAB_PAGES_VERSION=17.1.1 \ + GITALY_SERVER_VERSION=17.1.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 66dc6b3d0..2a3d4febe 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.1.0 +# sameersbn/gitlab:17.1.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.1.0 +docker pull sameersbn/gitlab:17.1.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_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.1.0 + sameersbn/gitlab:17.1.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:17.1.0 + sameersbn/gitlab:17.1.1 ``` ### Database @@ -290,7 +290,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:17.1.0 + sameersbn/gitlab:17.1.1 ``` ##### Linking to PostgreSQL Container @@ -334,7 +334,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:17.1.0 + sameersbn/gitlab:17.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: @@ -373,7 +373,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:17.1.0 + sameersbn/gitlab:17.1.1 ``` #### Linking to Redis Container @@ -400,7 +400,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.1.0 + sameersbn/gitlab:17.1.1 ``` #### Mail @@ -413,7 +413,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:17.1.0 + sameersbn/gitlab:17.1.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -433,7 +433,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:17.1.0 + sameersbn/gitlab:17.1.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -517,7 +517,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:17.1.0 + sameersbn/gitlab:17.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. @@ -533,7 +533,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:17.1.0 + sameersbn/gitlab:17.1.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -556,7 +556,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:17.1.0 + sameersbn/gitlab:17.1.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -604,7 +604,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:17.1.0 + sameersbn/gitlab:17.1.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -786,14 +786,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:17.1.0 + sameersbn/gitlab:17.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:17.1.0 app:sanitize + sameersbn/gitlab:17.1.1 app:sanitize ``` #### Piwik @@ -808,10 +808,10 @@ These options should contain something like: In this section, we talk about feature flags that administrators can change the state (See ). If you are looking for documentation for "Feature flags" that configured on project deploy settings, see -GitLab adopted feature flags strategies to deploy features in an early stage of development so that they can be incrementally rolled out. GitLab administrators with access to the [Rails console](https://docs.gitlab.com/ee/administration/feature_flags.html#how-to-enable-and-disable-features-behind-flags) or the [Feature flags API](https://docs.gitlab.com/ee/api/features.html) can control them (note that `sameersbn/gitlab` is a container image that provides GitLab installations from the source). -You can see all feature flags in GitLab at corresponding version of documentation: +GitLab adopted feature flags strategies to deploy features in an early stage of development so that they can be incrementally rolled out. GitLab administrators with access to the [Rails console](https://docs.gitlab.com/ee/administration/feature_flags.html#how-to-enable-and-disable-features-behind-flags) or the [Feature flags API](https://docs.gitlab.com/ee/api/features.html) can control them (note that `sameersbn/gitlab` is a container image that provides GitLab installations from the source). +You can see all feature flags in GitLab at corresponding version of documentation: -For `sameersbn/gitlab`, you can control them via environment parameter [`GITLAB_FEATURE_FLAGS_DISABLE_TARGETS`](#gitlab_feature_flags_disable_targets) and [`GITLAB_FEATURE_FLAGS_ENABLE_TARGETS`](#gitlab_feature_flags_enable_targets) in addition to the above methods. +For `sameersbn/gitlab`, you can control them via environment parameter [`GITLAB_FEATURE_FLAGS_DISABLE_TARGETS`](#gitlab_feature_flags_disable_targets) and [`GITLAB_FEATURE_FLAGS_ENABLE_TARGETS`](#gitlab_feature_flags_enable_targets) in addition to the above methods. This image searches yml files in [`${GITLAB_INSTALL_DIR}/config/feature_flags`](https://gitlab.com/gitlab-org/gitlab-foss/-/tree/master/config/feature_flags) (typically `/home/git/gitlab/config/feature_flags/`) recursively and use the file list as a source of active feature flags. Here is a part of example `docker-compose.yml`: @@ -825,7 +825,7 @@ services: - GITLAB_FEATURE_FLAGS_ENABLE_TARGETS=git_push_create_all_pipelines,build_service_proxy ```` -Once the container up, you can see following messages in container log like below. +Once the container up, you can see following messages in container log like below. ````sh ... @@ -1674,9 +1674,9 @@ The value of the `report-uri` directive in the `Content-Security-Policy` header ##### `GITLAB_FEATURE_FLAGS_DISABLE_TARGETS` -Comma separated list of feature flag names to be disabled. No whitespace is allowed. -You can see all feature flags in GitLab at corresponding version of documentation: -Feature flags name and its statement will be appear to container log. Note that some of the feature flags are implicitly enabled or disabled by GitLab itself, and are not appear to container log. +Comma separated list of feature flag names to be disabled. No whitespace is allowed. +You can see all feature flags in GitLab at corresponding version of documentation: +Feature flags name and its statement will be appear to container log. Note that some of the feature flags are implicitly enabled or disabled by GitLab itself, and are not appear to container log. No defaults. ##### `GITLAB_FEATURE_FLAGS_ENABLE_TARGETS` @@ -2457,8 +2457,8 @@ Enable/disable rack middleware for blocking & throttling abusive requests Defaul ##### `RACK_ATTACK_WHITELIST` -Always allow requests from whitelisted host. -This should be a valid yaml sequence of host address. Each host address string must be a valid IP address that can be passed to `IPAddr.new` of ruby. See [ruby-lang reference](https://docs.ruby-lang.org/en/3.0/IPAddr.html#method-c-new) for detail. +Always allow requests from whitelisted host. +This should be a valid yaml sequence of host address. Each host address string must be a valid IP address that can be passed to `IPAddr.new` of ruby. See [ruby-lang reference](https://docs.ruby-lang.org/en/3.0/IPAddr.html#method-c-new) for detail. If you need to set multiple hosts, set this parameter like `["1.1.1.1","192.168.0.0/24"]` for example. In docker-compose.yml, you have to quote whole value like below: ````yaml @@ -2536,7 +2536,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2571,14 +2571,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.0 app:rake db:setup + sameersbn/gitlab:17.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:17.1.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2587,7 +2587,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2636,7 +2636,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:17.1.0 app:rake gitlab:env:info + sameersbn/gitlab:17.1.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2649,7 +2649,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.1.1 app:rake gitlab:import:repos ``` Or @@ -2680,7 +2680,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.1.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2704,12 +2704,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.1.0 +docker pull sameersbn/gitlab:17.1.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2735,7 +2735,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.1.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.1.1 ``` ### Shell Access @@ -2773,7 +2773,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.1.0 + image: sameersbn/gitlab:17.1.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index d9e58927a..6f9c209b3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.1.0 +17.1.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 5337b9fd7..0a867c4df 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.1.0 + image: sameersbn/gitlab:17.1.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 6384484fc..245cc23f7 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.1.0 + image: sameersbn/gitlab:17.1.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index c0e526765..85f1dc82c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.1.0 + image: sameersbn/gitlab:17.1.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 8e0f232eb..74d881c92 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.1.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.1.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.1.0 +docker pull sameersbn/gitlab:17.1.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.1.0 +sameersbn/gitlab:17.1.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 3e36dd0c6..50982b02d 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.1.0 + image: sameersbn/gitlab:17.1.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 2a2640ea5..cc28f4974 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.1.0 + image: sameersbn/gitlab:17.1.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index f550ddfaf..05e54ddfe 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.1.0 + image: sameersbn/gitlab:17.1.1 env: - name: TZ value: Asia/Kolkata From 882ab1eac23fac10e1890fb68aa7ed13b82d439a Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sat, 29 Jun 2024 00:31:48 +0900 Subject: [PATCH 403/522] CI: bump jobs.release.executor to go/default:1.22 sameersbn/docker-gitlab#2962 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a048814b7..b72efbdaf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -269,12 +269,12 @@ jobs: release: executor: name: go/default - tag: '1.14' + tag: '1.22' steps: - checkout - run: name: Installing github-release tool - command: go get github.com/meterup/github-release + command: go install github.com/meterup/github-release@latest - run: name: Creating github release command: | From 0431ba5ace26d336b1c4617520e0a4fc3f7ef51d Mon Sep 17 00:00:00 2001 From: Sebastian Toll Date: Wed, 10 Jul 2024 21:35:43 +0200 Subject: [PATCH 404/522] Create external-diffs directory if missing, closes #2965 --- assets/runtime/functions | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/assets/runtime/functions b/assets/runtime/functions index 5a24e9bc1..c603adb09 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1665,6 +1665,11 @@ initialize_datadir() { chmod u+rwX ${GITLAB_SHARED_DIR}/ci_secure_files chown ${GITLAB_USER}: ${GITLAB_SHARED_DIR}/ci_secure_files + # create external-diffs dir + mkdir -p ${GITLAB_SHARED_DIR}/external-diffs + chmod u+rwX ${GITLAB_SHARED_DIR}/external-diffs + chown ${GITLAB_USER}: ${GITLAB_SHARED_DIR}/external-diffs + # create artifacts dir mkdir -p ${GITLAB_ARTIFACTS_DIR} chmod u+rwX ${GITLAB_ARTIFACTS_DIR} From d8ff73a52a2fc1533b0f69d9c2859e17e698099e Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 11 Jul 2024 21:50:24 +0200 Subject: [PATCH 405/522] Upgrade GitLab CE to 17.1.2 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 24409abc3..a0420eadd 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**17.1.2** + +- gitlab: upgrade CE to v17.1.2 +- gitaly: upgrade to v17.1.2 +- gitlab-pages: upgrade to v17.1.2 +- golang: upgrade to v1.22.5 + **17.1.1** - gitlab: upgrade CE to v17.1.1 diff --git a/Dockerfile b/Dockerfile index 41a7e0e71..13dafbc3b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ FROM ubuntu:focal-20240530 -ARG VERSION=17.1.1 +ARG VERSION=17.1.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.4 \ RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \ RUBYGEMS_VERSION=3.5.14 \ - GOLANG_VERSION=1.22.4 \ + GOLANG_VERSION=1.22.5 \ GITLAB_SHELL_VERSION=14.36.0 \ - GITLAB_PAGES_VERSION=17.1.1 \ - GITALY_SERVER_VERSION=17.1.1 \ + GITLAB_PAGES_VERSION=17.1.2 \ + GITALY_SERVER_VERSION=17.1.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 2a3d4febe..faf00be78 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.1.1 +# sameersbn/gitlab:17.1.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -126,7 +126,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.1.1 +docker pull sameersbn/gitlab:17.1.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_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.1.1 + sameersbn/gitlab:17.1.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:17.1.1 + sameersbn/gitlab:17.1.2 ``` ### Database @@ -290,7 +290,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:17.1.1 + sameersbn/gitlab:17.1.2 ``` ##### Linking to PostgreSQL Container @@ -334,7 +334,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:17.1.1 + sameersbn/gitlab:17.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: @@ -373,7 +373,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:17.1.1 + sameersbn/gitlab:17.1.2 ``` #### Linking to Redis Container @@ -400,7 +400,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.1.1 + sameersbn/gitlab:17.1.2 ``` #### Mail @@ -413,7 +413,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:17.1.1 + sameersbn/gitlab:17.1.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -433,7 +433,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:17.1.1 + sameersbn/gitlab:17.1.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -517,7 +517,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:17.1.1 + sameersbn/gitlab:17.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. @@ -533,7 +533,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:17.1.1 + sameersbn/gitlab:17.1.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -556,7 +556,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:17.1.1 + sameersbn/gitlab:17.1.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -604,7 +604,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:17.1.1 + sameersbn/gitlab:17.1.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -786,14 +786,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:17.1.1 + sameersbn/gitlab:17.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:17.1.1 app:sanitize + sameersbn/gitlab:17.1.2 app:sanitize ``` #### Piwik @@ -2536,7 +2536,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2571,14 +2571,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.1 app:rake db:setup + sameersbn/gitlab:17.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:17.1.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2587,7 +2587,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2636,7 +2636,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:17.1.1 app:rake gitlab:env:info + sameersbn/gitlab:17.1.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2649,7 +2649,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.1.2 app:rake gitlab:import:repos ``` Or @@ -2680,7 +2680,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.1.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2704,12 +2704,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.1.1 +docker pull sameersbn/gitlab:17.1.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2735,7 +2735,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.1.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.1.2 ``` ### Shell Access @@ -2773,7 +2773,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.1.1 + image: sameersbn/gitlab:17.1.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 6f9c209b3..59a75133a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.1.1 +17.1.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 0a867c4df..3ae7c2425 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.1.1 + image: sameersbn/gitlab:17.1.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 245cc23f7..d419abeed 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.1.1 + image: sameersbn/gitlab:17.1.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 85f1dc82c..d4a284740 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.1.1 + image: sameersbn/gitlab:17.1.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 74d881c92..133440671 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.1.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.1.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.1.1 +docker pull sameersbn/gitlab:17.1.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.1.1 +sameersbn/gitlab:17.1.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 50982b02d..76b59a5a7 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.1.1 + image: sameersbn/gitlab:17.1.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index cc28f4974..21f8fc987 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.1.1 + image: sameersbn/gitlab:17.1.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 05e54ddfe..0b9192931 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.1.1 + image: sameersbn/gitlab:17.1.2 env: - name: TZ value: Asia/Kolkata From 6c2b6631fc44fc11b3c44e0509b01982fe11be0b Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 21 Jul 2024 14:31:54 +0200 Subject: [PATCH 406/522] Upgrade GitLab CE to 17.2.0 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index a0420eadd..353aea8b2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**17.2.0** + +- gitlab: upgrade CE to v17.2.0 +- gitaly: upgrade to v17.2.0 +- gitlab-pages: upgrade to v17.2.0 +- gitlab-shell: upgrade to v14.37.0 + **17.1.2** - gitlab: upgrade CE to v17.1.2 diff --git a/Dockerfile b/Dockerfile index 13dafbc3b..35536a7a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ FROM ubuntu:focal-20240530 -ARG VERSION=17.1.2 +ARG VERSION=17.2.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.4 \ RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \ RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.22.5 \ - GITLAB_SHELL_VERSION=14.36.0 \ - GITLAB_PAGES_VERSION=17.1.2 \ - GITALY_SERVER_VERSION=17.1.2 \ + GITLAB_SHELL_VERSION=14.37.0 \ + GITLAB_PAGES_VERSION=17.2.0 \ + GITALY_SERVER_VERSION=17.2.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index e95ad7a1a..87e59ccff 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.1.2 +# sameersbn/gitlab:17.2.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.1.2 +docker pull sameersbn/gitlab:17.2.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.1.2 + sameersbn/gitlab:17.2.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.1.2 + sameersbn/gitlab:17.2.0 ``` ### Database @@ -291,7 +291,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:17.1.2 + sameersbn/gitlab:17.2.0 ``` ##### Linking to PostgreSQL Container @@ -335,7 +335,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:17.1.2 + sameersbn/gitlab:17.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: @@ -374,7 +374,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:17.1.2 + sameersbn/gitlab:17.2.0 ``` #### Linking to Redis Container @@ -401,7 +401,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.1.2 + sameersbn/gitlab:17.2.0 ``` #### Mail @@ -414,7 +414,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:17.1.2 + sameersbn/gitlab:17.2.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -434,7 +434,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:17.1.2 + sameersbn/gitlab:17.2.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -518,7 +518,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:17.1.2 + sameersbn/gitlab:17.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. @@ -534,7 +534,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:17.1.2 + sameersbn/gitlab:17.2.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -557,7 +557,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:17.1.2 + sameersbn/gitlab:17.2.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -605,7 +605,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:17.1.2 + sameersbn/gitlab:17.2.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -811,14 +811,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:17.1.2 + sameersbn/gitlab:17.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:17.1.2 app:sanitize + sameersbn/gitlab:17.2.0 app:sanitize ``` #### Piwik @@ -2561,7 +2561,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2596,14 +2596,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.2 app:rake db:setup + sameersbn/gitlab:17.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:17.1.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2612,7 +2612,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2661,7 +2661,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:17.1.2 app:rake gitlab:env:info + sameersbn/gitlab:17.2.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2674,7 +2674,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.2.0 app:rake gitlab:import:repos ``` Or @@ -2705,7 +2705,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.2.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2729,12 +2729,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.1.2 +docker pull sameersbn/gitlab:17.2.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2760,7 +2760,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.1.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.2.0 ``` ### Shell Access @@ -2798,7 +2798,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.1.2 + image: sameersbn/gitlab:17.2.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 59a75133a..290a3f36d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.1.2 +17.2.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 3ae7c2425..4ef52f7f9 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.1.2 + image: sameersbn/gitlab:17.2.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index d419abeed..b4fb75277 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.1.2 + image: sameersbn/gitlab:17.2.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index d4a284740..8367f63fc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.1.2 + image: sameersbn/gitlab:17.2.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 133440671..7633ed22a 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.2.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.1.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.2.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.1.2 +docker pull sameersbn/gitlab:17.2.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.1.2 +sameersbn/gitlab:17.2.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 76b59a5a7..a85aaaa2a 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.1.2 + image: sameersbn/gitlab:17.2.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 21f8fc987..b9df439a8 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.1.2 + image: sameersbn/gitlab:17.2.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 0b9192931..aede83741 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.1.2 + image: sameersbn/gitlab:17.2.0 env: - name: TZ value: Asia/Kolkata From 7fa534a1c1a0adbf8e5c476f620c1aab7e00eeec Mon Sep 17 00:00:00 2001 From: Katrin Leinweber <9948149+katrinleinweber@users.noreply.github.com> Date: Fri, 26 Jul 2024 17:09:36 +0200 Subject: [PATCH 407/522] Fix typos --- CONTRIBUTING.md | 4 +- Changelog.md | 10 ++--- README.md | 70 +++++++++++++++++------------------ docs/container_registry.md | 6 +-- docs/keycloak-idp.md | 4 +- docs/s3_compatible_storage.md | 4 +- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dbb5cdb4d..1ec790677 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # 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 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`. @@ -9,4 +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 | -| `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 automatically be overriden by the running GitLab instance with the `${CI_PROJECT_PATH}` variable. This will cause the image to be uploaded to the local registry of the project within GitLab. | diff --git a/Changelog.md b/Changelog.md index 353aea8b2..943922b96 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1754,7 +1754,7 @@ This file only reflects the changes that are made in this image. Please refer to - gitlab: upgrade CE to v10.4.3 **10.4.2-1** -- FIXED SSH Host Key generation through droping the support for rsa1 +- FIXED SSH Host Key generation through dropping the support for rsa1 **10.4.2** - gitlab: upgrade CE to v10.4.2 @@ -1888,7 +1888,7 @@ This file only reflects the changes that are made in this image. Please refer to **9.4.0** - gitlab: upgrade to CE v9.4.0 - Added support for nginx_real_ip module ([#1137](https://github.com/sameersbn/docker-gitlab/pull/1137)) -- Added more security for regenarting certs ([#1288](https://github.com/sameersbn/docker-gitlab/pull/1288)) +- Added more security for regenerating certs ([#1288](https://github.com/sameersbn/docker-gitlab/pull/1288)) **9.3.9** - gitlab: upgrade to CE v9.3.9 @@ -1946,7 +1946,7 @@ This file only reflects the changes that are made in this image. Please refer to - gitlab: upgrade to CE v9.2.1 **9.2.0** -- gilab: upgrade to CE v9.2.0 +- gitlab: upgrade to CE v9.2.0 - Add flexibility to use versions committed into gitlab-ce **9.1.4** @@ -2019,7 +2019,7 @@ This file only reflects the changes that are made in this image. Please refer to - added `GITLAB_PAGES_EXTERNAL_HTTPS` - added `SSL_PAGES_KEY_PATH` - added `SSL_PAGES_CERT_PATH` -- added nodejs 7.x as core dependencie +- added nodejs 7.x as core dependencies - added gitlab-pages daemon **8.16.6** @@ -2706,7 +2706,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ **7.2.0-1** - fix nginx static route handling when GITLAB_RELATIVE_URL_ROOT is used. - fix relative root access without the trailing '/' character -- added seperate server block for http config in gitlab.https.permissive. Fixes #127 +- added separate server block for http config in gitlab.https.permissive. Fixes #127 - added OAUTH_GOOGLE_RESTRICT_DOMAIN config option. **7.2.0** diff --git a/README.md b/README.md index 87e59ccff..690655c60 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ 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://docs.gitlab.com/ce/install/installation.html) 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 official GitLab documentation. 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/). @@ -107,9 +107,9 @@ wget -qO- https://get.docker.com/ | sh Fedora and RHEL/CentOS users should try disabling selinux with `setenforce 0` and check if resolves the issue. If it does than there is not much that I can help you with. You can either stick with selinux disabled (not recommended by redhat) or switch to using ubuntu. -You may also set `DEBUG=true` to enable debugging of the entrypoint script, which could help you pin point any configuration issues. +You may also set `DEBUG=true` to enable debugging of the entrypoint script, which could help you pinpoint any configuration issues. -If using the latest docker version and/or disabling selinux does not fix the issue then please file a issue request on the [issues](https://github.com/sameersbn/docker-gitlab/issues) page. +If using the latest docker version and/or disabling selinux does not fix the issue then please file an issue request on the [issues](https://github.com/sameersbn/docker-gitlab/issues) page. In your issue report please make sure you provide the following information: @@ -246,7 +246,7 @@ GitLab uses a database backend to store its data. You can configure this image t **Important note:** This image is shipped with different versions of the `postgresql-client`. -During the startup of the container, the major version of the database system is checked based on the specified connection destination. Only the version of the `postgresql-client`, that matches the major version of the Postgres database is used. If the major version of any version of the included clients does not match, the latest client is used (but may causes issues). All other versions of the `postgresql-client` are deleted at runtime. +During the startup of the container, the major version of the database system is checked based on the specified connection destination. Only the version of the `postgresql-client`, that matches the major version of the Postgres database is used. If the major version of any version of the included clients does not match, the latest client is used (but may cause issues). All other versions of the `postgresql-client` are deleted at runtime. This behavior can be checked using the command `docker logs` and an output like the following should be available: @@ -261,7 +261,7 @@ Configuring gitlab::database … ```` -Please note furthermore, that only compatible versions of the `postgresql-client` to GitLab are shipped with this image. Currently these belong to +Please note furthermore, that only compatible versions of the `postgresql-client` to GitLab are shipped with this image. Currently, these belong to - `postgresql-client-13`, - `postgresql-client-14`, @@ -279,7 +279,7 @@ CREATE DATABASE gitlabhq_production; GRANT ALL PRIVILEGES ON DATABASE gitlabhq_production to gitlab; ``` -Additionally since GitLab `8.6.0` the `pg_trgm` extension should also be loaded for the `gitlabhq_production` database. +Additionally, since GitLab `8.6.0` the `pg_trgm` extension should also be loaded for the `gitlabhq_production` database. We are now ready to start the GitLab application. @@ -302,7 +302,7 @@ If a postgresql container is linked, only the `DB_HOST` and `DB_PORT` settings a 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. -First, lets pull the postgresql image from the docker index. +First, let's pull the postgresql image from the docker index. ```bash docker pull sameersbn/postgresql:14-20230628 @@ -383,7 +383,7 @@ You can link this image with a redis container to satisfy gitlab's redis require To illustrate linking with a redis container, we will use the [redis](https://github.com/docker-library/redis) image. Please refer the [README](https://github.com/docker-library/docs/blob/master/redis/README.md) for details. -First, lets pull the redis image from the docker index. +First, let's pull the redis image from the docker index. ```bash docker pull redis:6.2 @@ -441,7 +441,7 @@ Please refer the [Available Configuration Parameters](#available-configuration-p #### SSL -Access to the gitlab application can be secured using SSL so as to prevent unauthorized access to the data in your repositories. While a CA certified SSL certificate allows for verification of trust via the CA, a self signed certificate can also provide an equal level of trust verification as long as each client takes some additional steps to verify the identity of your website. I will provide instructions on achieving this towards the end of this section. +Access to the gitlab application can be secured using SSL so as to prevent unauthorized access to the data in your repositories. While a CA certified SSL certificate allows for verification of trust via the CA, a self-signed certificate can also provide an equal level of trust verification as long as each client takes some additional steps to verify the identity of your website. I will provide instructions on achieving this towards the end of this section. Jump to the [Using HTTPS with a load balancer](#using-https-with-a-load-balancer) section if you are using a load balancer such as hipache, haproxy or nginx. @@ -496,7 +496,7 @@ In case use of docker-compose ... ```$>docker volume inspect``` -look for "< user >_gitlab-data" and copy the "certs" directory into the "Mountpoint" +Look for "< user >_gitlab-data" and copy the "certs" directory into the "Mountpoint" ```bash mkdir -p /srv/docker/gitlab/gitlab/certs @@ -506,7 +506,7 @@ cp dhparam.pem /srv/docker/gitlab/gitlab/certs/ chmod 400 /srv/docker/gitlab/gitlab/certs/gitlab.key ``` -Great! we are now just one step away from having our application secured. +Great! We are now just one step away from having our application secured. ##### Enabling HTTPS support @@ -527,7 +527,7 @@ In this configuration, any requests made over the plain http protocol will autom HSTS if supported by the browsers makes sure that your users will only reach your sever via HTTPS. When the user comes for the first time it sees a header from the server which states for how long from now this site should only be reachable via HTTPS - that's the HSTS max-age value. -With `NGINX_HSTS_MAXAGE` you can configure that value. The default value is `31536000` seconds. If you want to disable a already sent HSTS MAXAGE value, set it to `0`. +With `NGINX_HSTS_MAXAGE` you can configure that value. The default value is `31536000` seconds. If you want to disable an already sent HSTS MAXAGE value, set it to `0`. ```bash docker run --name gitlab -d \ @@ -543,7 +543,7 @@ If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. Load balancers like nginx/haproxy/hipache talk to backend applications over plain http and as such the installation of ssl keys and certificates are not required and should **NOT** be installed in the container. The SSL configuration has to instead be done at the load balancer. -However, when using a load balancer you **MUST** set `GITLAB_HTTPS` to `true`. Additionally you will need to set the `SSL_SELF_SIGNED` option to `true` if self signed SSL certificates are in use. +However, when using a load balancer you **MUST** set `GITLAB_HTTPS` to `true`. Additionally, you will need to set the `SSL_SELF_SIGNED` option to `true` if self-signed SSL certificates are in use. With this in place, you should configure the load balancer to support handling of https requests. But that is out of the scope of this document. Please refer to [Using SSL/HTTPS with HAProxy](http://seanmcgary.com/posts/using-sslhttps-with-haproxy) for information on the subject. @@ -568,7 +568,7 @@ In case GitLab responds to any kind of POST request (login, OAUTH, changing sett ##### Establishing trust with your server -This section deals will self-signed ssl certificates. If you are using CA certified certificates, your done. +This section deals will self-signed ssl certificates. If you are using CA certified certificates, you're done. This section is more of a client side configuration so as to add a level of confidence at the client to be 100 percent sure they are communicating with whom they think they. @@ -597,7 +597,7 @@ By default, our own server certificate [gitlab.crt](#generation-of-self-signed-c #### Deploy to a subdirectory (relative url root) -By default GitLab expects that your application is running at the root (eg. /). This section explains how to run your application inside a directory. +By default, GitLab expects that your application is running at the root e.g.. /). This section explains how to run your application inside a directory. Let's assume we want to deploy our application to '/git'. GitLab needs to know this directory to generate the appropriate routes. This can be specified using the `GITLAB_RELATIVE_URL_ROOT` configuration option like so: @@ -646,7 +646,7 @@ You can also restrict logins to a single domain by adding `--env "OAUTH_GOOGLE_R ##### Facebook -To enable the Facebook OAuth2 OmniAuth provider you must register your application with Facebook. Facebook will generate a API key and secret for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/facebook.html) for the procedure to generate the API key and secret. +To enable the Facebook OAuth2 OmniAuth provider you must register your application with Facebook. Facebook will generate an API key and secret for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/facebook.html) for the procedure to generate the API key and secret. Once you have the API key and secret generated, configure them using the `OAUTH_FACEBOOK_API_KEY` and `OAUTH_FACEBOOK_APP_SECRET` environment variables respectively. @@ -654,7 +654,7 @@ For example, if your API key is `xxx` and the API secret key is `yyy`, then addi ##### Twitter -To enable the Twitter OAuth2 OmniAuth provider you must register your application with Twitter. Twitter will generate a API key and secret for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/twitter.html) for the procedure to generate the API key and secret with twitter. +To enable the Twitter OAuth2 OmniAuth provider you must register your application with Twitter. Twitter will generate an API key and secret for you to use. Please refer to the GitLab [documentation](http://doc.gitlab.com/ce/integration/twitter.html) for the procedure to generate the API key and secret with twitter. Once you have the API key and secret generated, configure them using the `OAUTH_TWITTER_API_KEY` and `OAUTH_TWITTER_APP_SECRET` environment variables respectively. @@ -752,7 +752,7 @@ See [GitLab OIDC documentation](https://docs.gitlab.com/ee/administration/auth/o #### 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 allows a user to host static websites from a project. Gitlab pages can be enabled with setting the environment variable `GITLAB_PAGES_ENABLED` to `true`. #### Gitlab Pages Access Control @@ -760,7 +760,7 @@ Since version `11.5.0` Gitlab pages supports access control. This allows only ac 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. +GitLab pages access control makes use of the Gitlab OAuth Module. - Goto the Gitlab Admin area - Select `Applications` in the menu @@ -771,11 +771,11 @@ Gitab pages access control makes use of the Gitlab OAuth Module. - 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. +Note about the `Redirect URI`; this can be tricky to configure or figure out, What needs to be achieved is the 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. +This means that if you run your gitlab pages at domain `pages.example.io` this will be a wildcard 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. +In the example above; the pages domain `projects` has been chosen. This will cause the nginx, either the built in or your own load balancer 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. @@ -789,10 +789,10 @@ Add to following environment variables to your Gitlab Container. | 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_CLIENT_SECRET | Required | Client Secret from earlier generated 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. +After you have enabled the gitlab pages access control. When you go to a project `General Settings` -> `Permissions` you can choose the pages permission level for the project. #### External Issue Trackers @@ -919,7 +919,7 @@ Encryption key for session secrets. Ensure that your key is at least 64 characte ##### `GITLAB_TIMEZONE` -Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`. See the list of [acceptable values](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html). For settings the container timezone which will effect cron, see variable `TZ` +Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`. See the list of [acceptable values](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html). For settings the container timezone which will affect cron, see variable `TZ` ##### `GITLAB_ROOT_PASSWORD` @@ -1255,7 +1255,7 @@ Default Google key file. Defaults to `$GITLAB_OBJECT_STORE_CONNECTION_GOOGLE_JSO ##### `GITLAB_PACKAGES_ENABLED` -Enable/Disable Pakages support. Defaults to `true`. +Enable/Disable Packages support. Defaults to `true`. ##### `GITLAB_PACKAGES_DIR` @@ -1551,7 +1551,7 @@ Sets GitLab Pages to HTTPS and the gitlab-pages-ssl config will be used. Default ##### `GITLAB_PAGES_ARTIFACTS_SERVER` -Set to `true` to enable pages artifactsserver, enabled by default. +Set to `true` to enable pages artifacts server, enabled by default. ##### `GITLAB_PAGES_ARTIFACTS_SERVER_URL` @@ -1559,11 +1559,11 @@ If `GITLAB_PAGES_ARTIFACTS_SERVER` is enabled, set to API endpoint for GitLab Pa ##### `GITLAB_PAGES_EXTERNAL_HTTP` -Sets GitLab Pages external http to receive request on an independen port. Disabled by default +Sets GitLab Pages external http to receive request on an independent port. Disabled by default ##### `GITLAB_PAGES_EXTERNAL_HTTPS` -Sets GitLab Pages external https to receive request on an independen port. Disabled by default +Sets GitLab Pages external https to receive request on an independent port. Disabled by default ##### `GITLAB_PAGES_ACCESS_CONTROL` @@ -1587,7 +1587,7 @@ Client ID from earlier generated OAuth application ##### `GITLAB_PAGES_ACCESS_CLIENT_SECRET` -Client Secret from earlier genereated OAuth application +Client Secret from earlier generated OAuth application ##### `GITLAB_PAGES_ACCESS_REDIRECT_URI` @@ -1710,7 +1710,7 @@ This parameter is the same as [`GITLAB_FEATURE_FLAGS_DISABLE_TARGETS`](#gitlab_f ##### `SSL_SELF_SIGNED` -Set to `true` when using self signed ssl certificates. `false` by default. +Set to `true` when using self-signed ssl certificates. `false` by default. ##### `SSL_CERTIFICATE_PATH` @@ -1898,7 +1898,7 @@ 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/) +Whether to use database prepared statements. No defaults. But set to `false` if you want to use with [PgBouncer](https://pgbouncer.github.io/) ##### `SMTP_ENABLED` @@ -2062,7 +2062,7 @@ Attribute fields for the shown mail address. Default to `['mail', 'email', 'user ##### `LDAP_USER_ATTRIBUTE_NAME` -Attribute field for the used username of a user. Default to `cn`. +Attribute field for the used username of a user. Defaults to `cn`. ##### `LDAP_USER_ATTRIBUTE_FIRSTNAME` @@ -2442,7 +2442,7 @@ AWS bucket for backup uploads. No defaults. ##### `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) +Enables multipart 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` @@ -2642,7 +2642,7 @@ The image can be configured to automatically upload the backups to an AWS S3 buc More details about the appropriate IAM user properties can found on [doc.gitlab.com](http://doc.gitlab.com/ce/raketasks/backup_restore.html#upload-backups-to-remote-cloud-storage) -For remote backup to selfhosted s3 compatible storage, use `AWS_BACKUP_ENDPOINT`. +For remote backup to self-hosted s3 compatible storage, use `AWS_BACKUP_ENDPOINT`. AWS uploads are performed alongside normal backups, both through the appropriate `app:rake` command and when an automatic backup is performed. diff --git a/docs/container_registry.md b/docs/container_registry.md index 7633ed22a..e2a4b68de 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -36,7 +36,7 @@ the GitLab installation and the registry are: GitLab needs a certificate ("auth token") to talk to the registry API. The tokens must be provided in the `/certs` directory of your container. You could -use an existing domain ceritificate or create your own with a very long +use an existing domain certificate or create your own with a very long lifetime like this: ```bash @@ -224,7 +224,7 @@ Read more about the individual driver's config options in the > **Warning** GitLab will not backup Docker images that are not stored on the filesystem. Remember to enable backups with your object storage provider if desired. > > If you use **filesystem** as storage driver you need to mount the path from `GITLAB_REGISTRY_DIR` of the GitLab container in the registry container. So both container can access the registry data. -> If you don't change `GITLAB_REGISTRY_DIR` you will find your registry data in the mounted volume from the GitLab Container under `./gitlab/shared/registry`. This don't need to be seprated mounted because `./gitlab` is already mounted in the GitLab Container. If it will be mounted seperated the whole restoring proccess of GitLab backup won't work because gitlab try to create an folder under `./gitlab/shared/registry` /`GITLAB_REGISTRY_DIR` and GitLab can't delete/remove the mount point inside the container so the restoring process of the backup will fail. +> If you don't change `GITLAB_REGISTRY_DIR` you will find your registry data in the mounted volume from the GitLab Container under `./gitlab/shared/registry`. This don't need to be separated mounted because `./gitlab` is already mounted in the GitLab Container. If it will be mounted separated the whole restoring process of GitLab backup won't work because gitlab try to create an folder under `./gitlab/shared/registry` /`GITLAB_REGISTRY_DIR` and GitLab can't delete/remove the mount point inside the container so the restoring process of the backup will fail. > An example how it works is in the `docker-compose`. ### Example for Amazon Simple Storage Service (s3) @@ -265,7 +265,7 @@ storage: - REGISTRY_STORAGE_DELETE_ENABLED=true ``` -Generaly for more information about the configuration of the registry container you can find it under [registry configuration](https://docs.docker.com/registry/configuration). +Generally for more information about the configuration of the registry container you can find it under [registry configuration](https://docs.docker.com/registry/configuration). ## Storage limitations diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md index b3aff53c3..61f76ce65 100644 --- a/docs/keycloak-idp.md +++ b/docs/keycloak-idp.md @@ -1,4 +1,4 @@ -# Integrate Keycloak as a IDP with GitLab +# Integrate Keycloak as an IDP with GitLab In this document, we will explain how to set up Keycloak and integrate it into GitLab. @@ -73,7 +73,7 @@ Visit the `Users` tab and click on `View all users` to modify the Admin user. Modify the `Email`, `First name` and `Last Name` fields. ![admin-account](images/keycloak-admin-acc.png) -Deploy GitLab, Reddis and PostgreSQL by running the following command: `docker-compose up -d gitlab redis postgresql`. +Deploy GitLab, Redis and PostgreSQL by running the following command: `docker-compose up -d gitlab redis postgresql`. You can now login on the local GitLab instance with with Keycloak on your [local IP](http://localhost:10080). diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md index ca281b709..ed815750e 100644 --- a/docs/s3_compatible_storage.md +++ b/docs/s3_compatible_storage.md @@ -1,7 +1,7 @@ GitLab Backup to s3 compatible storage ================================================= -Enables automatic backups to selfhosted s3 compatible storage like minio (https://minio.io/) and others. +Enables automatic backups to self-hosted s3 compatible storage like minio (https://minio.io/) and others. This is an extend of AWS Remote Backups. As explained in [doc.gitlab.com](https://docs.gitlab.com/ce/raketasks/backup_restore.html#upload-backups-to-remote-cloud-storage), it uses [Fog library](http://fog.io) and the module fog-aws. More details on [s3 supported parameters](https://github.com/fog/fog-aws/blob/master/lib/fog/aws/storage.rb) @@ -41,7 +41,7 @@ where: | `AWS_BACKUP_ACCESS_KEY_ID` | AWS access key id. No defaults. | | `AWS_BACKUP_SECRET_ACCESS_KEY` | AWS secret access key. No defaults. | | `AWS_BACKUP_BUCKET` | AWS bucket for backup uploads. No defaults. | -| `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_MULTIPART_CHUNK_SIZE` | Enables multipart uploads when file size reaches a defined size. See at [AWS S3 Docs](http://docs.aws.amazon.com/AmazonS3/latest/dev/uploadobjusingmpu.html) | For more info look at [Available Configuration Parameters](https://github.com/sameersbn/docker-gitlab#available-configuration-parameters). From 46fcdf14299ef36000a715334564c18ae829e8e1 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 28 Jul 2024 21:26:48 +0200 Subject: [PATCH 408/522] Upgrade GitLab CE to 17.2.1 --- Changelog.md | 7 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 51 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index 943922b96..c0cac4678 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**17.2.1** + +- gitlab: upgrade CE to v17.2.1 +- gitaly: upgrade to v17.2.1 +- gitlab-pages: upgrade to v17.2.1 +- ruby: upgrade to v3.2.5 + **17.2.0** - gitlab: upgrade CE to v17.2.0 diff --git a/Dockerfile b/Dockerfile index 35536a7a6..53a41ccd2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ FROM ubuntu:focal-20240530 -ARG VERSION=17.2.0 +ARG VERSION=17.2.1 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=3.2.4 \ - RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \ + RUBY_VERSION=3.2.5 \ + RUBY_SOURCE_SHA256SUM="ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16" \ RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.22.5 \ GITLAB_SHELL_VERSION=14.37.0 \ - GITLAB_PAGES_VERSION=17.2.0 \ - GITALY_SERVER_VERSION=17.2.0 \ + GITLAB_PAGES_VERSION=17.2.1 \ + GITALY_SERVER_VERSION=17.2.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 690655c60..40b56e457 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.2.0 +# sameersbn/gitlab:17.2.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.2.0 +docker pull sameersbn/gitlab:17.2.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.2.0 + sameersbn/gitlab:17.2.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.2.0 + sameersbn/gitlab:17.2.1 ``` ### Database @@ -291,7 +291,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:17.2.0 + sameersbn/gitlab:17.2.1 ``` ##### Linking to PostgreSQL Container @@ -335,7 +335,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:17.2.0 + sameersbn/gitlab:17.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: @@ -374,7 +374,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:17.2.0 + sameersbn/gitlab:17.2.1 ``` #### Linking to Redis Container @@ -401,7 +401,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.2.0 + sameersbn/gitlab:17.2.1 ``` #### Mail @@ -414,7 +414,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:17.2.0 + sameersbn/gitlab:17.2.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -434,7 +434,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:17.2.0 + sameersbn/gitlab:17.2.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -518,7 +518,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:17.2.0 + sameersbn/gitlab:17.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. @@ -534,7 +534,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:17.2.0 + sameersbn/gitlab:17.2.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -557,7 +557,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:17.2.0 + sameersbn/gitlab:17.2.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -605,7 +605,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:17.2.0 + sameersbn/gitlab:17.2.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -811,14 +811,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:17.2.0 + sameersbn/gitlab:17.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:17.2.0 app:sanitize + sameersbn/gitlab:17.2.1 app:sanitize ``` #### Piwik @@ -2561,7 +2561,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2596,14 +2596,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.0 app:rake db:setup + sameersbn/gitlab:17.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:17.2.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2612,7 +2612,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2661,7 +2661,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:17.2.0 app:rake gitlab:env:info + sameersbn/gitlab:17.2.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2674,7 +2674,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.2.1 app:rake gitlab:import:repos ``` Or @@ -2705,7 +2705,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.2.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2729,12 +2729,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.2.0 +docker pull sameersbn/gitlab:17.2.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2760,7 +2760,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.2.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.2.1 ``` ### Shell Access @@ -2798,7 +2798,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.2.0 + image: sameersbn/gitlab:17.2.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 290a3f36d..7c95a0759 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.2.0 +17.2.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 4ef52f7f9..e5abf0b92 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.2.0 + image: sameersbn/gitlab:17.2.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index b4fb75277..929c1ce47 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.2.0 + image: sameersbn/gitlab:17.2.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 8367f63fc..73abfd9a3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.2.0 + image: sameersbn/gitlab:17.2.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index e2a4b68de..caa28f029 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.2.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.2.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.2.0 +docker pull sameersbn/gitlab:17.2.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.2.0 +sameersbn/gitlab:17.2.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index a85aaaa2a..7e54e43f8 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.2.0 + image: sameersbn/gitlab:17.2.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index b9df439a8..47dbb2e03 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.2.0 + image: sameersbn/gitlab:17.2.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index aede83741..3696a9e50 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.2.0 + image: sameersbn/gitlab:17.2.1 env: - name: TZ value: Asia/Kolkata From 1a3722c6c0b9bd76cedee65708d7b092d70b6c37 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 8 Aug 2024 19:35:29 +0200 Subject: [PATCH 409/522] Upgrade GitLab CE to 17.2.2 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index c0cac4678..404cb83f9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**17.2.2** + +- gitlab: upgrade CE to v17.2.2 +- gitaly: upgrade to v17.2.2 +- gitlab-pages: upgrade to v17.2.2 +- golang: upgrade to v1.22.6 + **17.2.1** - gitlab: upgrade CE to v17.2.1 diff --git a/Dockerfile b/Dockerfile index 53a41ccd2..5959c105a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ FROM ubuntu:focal-20240530 -ARG VERSION=17.2.1 +ARG VERSION=17.2.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.5 \ RUBY_SOURCE_SHA256SUM="ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16" \ RUBYGEMS_VERSION=3.5.14 \ - GOLANG_VERSION=1.22.5 \ + GOLANG_VERSION=1.22.6 \ GITLAB_SHELL_VERSION=14.37.0 \ - GITLAB_PAGES_VERSION=17.2.1 \ - GITALY_SERVER_VERSION=17.2.1 \ + GITLAB_PAGES_VERSION=17.2.2 \ + GITALY_SERVER_VERSION=17.2.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 40b56e457..92719bd5d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.2.1 +# sameersbn/gitlab:17.2.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.2.1 +docker pull sameersbn/gitlab:17.2.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.2.1 + sameersbn/gitlab:17.2.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.2.1 + sameersbn/gitlab:17.2.2 ``` ### Database @@ -291,7 +291,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:17.2.1 + sameersbn/gitlab:17.2.2 ``` ##### Linking to PostgreSQL Container @@ -335,7 +335,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:17.2.1 + sameersbn/gitlab:17.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: @@ -374,7 +374,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:17.2.1 + sameersbn/gitlab:17.2.2 ``` #### Linking to Redis Container @@ -401,7 +401,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.2.1 + sameersbn/gitlab:17.2.2 ``` #### Mail @@ -414,7 +414,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:17.2.1 + sameersbn/gitlab:17.2.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -434,7 +434,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:17.2.1 + sameersbn/gitlab:17.2.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -518,7 +518,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:17.2.1 + sameersbn/gitlab:17.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. @@ -534,7 +534,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:17.2.1 + sameersbn/gitlab:17.2.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -557,7 +557,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:17.2.1 + sameersbn/gitlab:17.2.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -605,7 +605,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:17.2.1 + sameersbn/gitlab:17.2.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -811,14 +811,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:17.2.1 + sameersbn/gitlab:17.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:17.2.1 app:sanitize + sameersbn/gitlab:17.2.2 app:sanitize ``` #### Piwik @@ -2561,7 +2561,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2596,14 +2596,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.1 app:rake db:setup + sameersbn/gitlab:17.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:17.2.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2612,7 +2612,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2661,7 +2661,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:17.2.1 app:rake gitlab:env:info + sameersbn/gitlab:17.2.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2674,7 +2674,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.2.2 app:rake gitlab:import:repos ``` Or @@ -2705,7 +2705,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.2.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2729,12 +2729,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.2.1 +docker pull sameersbn/gitlab:17.2.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2760,7 +2760,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.2.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.2.2 ``` ### Shell Access @@ -2798,7 +2798,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.2.1 + image: sameersbn/gitlab:17.2.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 7c95a0759..d3b2c4f0d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.2.1 +17.2.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index e5abf0b92..e69db32b8 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.2.1 + image: sameersbn/gitlab:17.2.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 929c1ce47..1fdc00f5d 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.2.1 + image: sameersbn/gitlab:17.2.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 73abfd9a3..52b04d433 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.2.1 + image: sameersbn/gitlab:17.2.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index caa28f029..1bf54801e 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.2.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.2.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.2.1 +docker pull sameersbn/gitlab:17.2.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.2.1 +sameersbn/gitlab:17.2.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 7e54e43f8..612a48423 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.2.1 + image: sameersbn/gitlab:17.2.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 47dbb2e03..380d7064d 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.2.1 + image: sameersbn/gitlab:17.2.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 3696a9e50..2258ef63f 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.2.1 + image: sameersbn/gitlab:17.2.2 env: - name: TZ value: Asia/Kolkata From dabfd42eaccd7307e45590bcf634ae665110995c Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Wed, 14 Aug 2024 00:50:24 +0900 Subject: [PATCH 410/522] fix script to configure feature flags that cannot enable flags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When generating the list of flags that would actually be enabled, the value specified in the option was ANDed with the list of flags that actually existed. At this time, I mistakenly performed a logical AND with the list of "values ​​to invalidate" specified in the option. This mistake caused a problem in which some flags could not be enabled. This commit fixes this to AND with the list of values ​​you want to enable. --- assets/runtime/scripts/configure_feature_flags.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/scripts/configure_feature_flags.rb b/assets/runtime/scripts/configure_feature_flags.rb index 90ccd2dce..efe1368a5 100644 --- a/assets/runtime/scripts/configure_feature_flags.rb +++ b/assets/runtime/scripts/configure_feature_flags.rb @@ -64,7 +64,7 @@ def run if succeed available_flags = self.available_feature_flags disable_targets = available_flags & opts[:to_be_disabled] - enable_targets = available_flags & opts[:to_be_disabled] + enable_targets = available_flags & opts[:to_be_enabled] disable_targets.each do |feature| Feature.disable(feature) From b3b09c619c316ba34b0668457f6b74c91b3ac43e Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Wed, 14 Aug 2024 00:51:49 +0900 Subject: [PATCH 411/522] fix indent in script configure_feature_flags.rb --- assets/runtime/scripts/configure_feature_flags.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/scripts/configure_feature_flags.rb b/assets/runtime/scripts/configure_feature_flags.rb index efe1368a5..72197a99d 100644 --- a/assets/runtime/scripts/configure_feature_flags.rb +++ b/assets/runtime/scripts/configure_feature_flags.rb @@ -21,7 +21,7 @@ def available_feature_flags() feature_flag_yamls.concat(Dir.glob("#{Gitlab.root}/ee/config/feature_flags/**/*.yml")) end if - list = feature_flag_yamls.map { |p| File.basename(p, File.extname(p)) } + list = feature_flag_yamls.map { |p| File.basename(p, File.extname(p)) } list end From a1753e383c634c5128ad9d44c38ed7af26c5b306 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 15 Aug 2024 20:08:18 +0200 Subject: [PATCH 412/522] Upgrade GitLab CE to 17.3.0 --- Changelog.md | 8 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index 404cb83f9..241802f3d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,14 @@ 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. +**17.3.0** + +- gitlab: upgrade CE to v17.3.0 +- gitaly: upgrade to v17.3.0 +- gitlab-pages: upgrade to v17.3.0 +- gitlab-shell: upgrade to v14.38.0 +- golang: upgrade to v1.23.0 + **17.2.2** - gitlab: upgrade CE to v17.2.2 diff --git a/Dockerfile b/Dockerfile index 5959c105a..06a325f8a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ FROM ubuntu:focal-20240530 -ARG VERSION=17.2.2 +ARG VERSION=17.3.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.5 \ RUBY_SOURCE_SHA256SUM="ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16" \ RUBYGEMS_VERSION=3.5.14 \ - GOLANG_VERSION=1.22.6 \ - GITLAB_SHELL_VERSION=14.37.0 \ - GITLAB_PAGES_VERSION=17.2.2 \ - GITALY_SERVER_VERSION=17.2.2 \ + GOLANG_VERSION=1.23.0 \ + GITLAB_SHELL_VERSION=14.38.0 \ + GITLAB_PAGES_VERSION=17.3.0 \ + GITALY_SERVER_VERSION=17.3.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 92719bd5d..e2e03cec5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.2.2 +# sameersbn/gitlab:17.3.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.2.2 +docker pull sameersbn/gitlab:17.3.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.2.2 + sameersbn/gitlab:17.3.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.2.2 + sameersbn/gitlab:17.3.0 ``` ### Database @@ -291,7 +291,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:17.2.2 + sameersbn/gitlab:17.3.0 ``` ##### Linking to PostgreSQL Container @@ -335,7 +335,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:17.2.2 + sameersbn/gitlab:17.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: @@ -374,7 +374,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:17.2.2 + sameersbn/gitlab:17.3.0 ``` #### Linking to Redis Container @@ -401,7 +401,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.2.2 + sameersbn/gitlab:17.3.0 ``` #### Mail @@ -414,7 +414,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:17.2.2 + sameersbn/gitlab:17.3.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -434,7 +434,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:17.2.2 + sameersbn/gitlab:17.3.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -518,7 +518,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:17.2.2 + sameersbn/gitlab:17.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. @@ -534,7 +534,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:17.2.2 + sameersbn/gitlab:17.3.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -557,7 +557,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:17.2.2 + sameersbn/gitlab:17.3.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -605,7 +605,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:17.2.2 + sameersbn/gitlab:17.3.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -811,14 +811,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:17.2.2 + sameersbn/gitlab:17.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:17.2.2 app:sanitize + sameersbn/gitlab:17.3.0 app:sanitize ``` #### Piwik @@ -2561,7 +2561,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2596,14 +2596,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.2 app:rake db:setup + sameersbn/gitlab:17.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:17.2.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2612,7 +2612,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2661,7 +2661,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:17.2.2 app:rake gitlab:env:info + sameersbn/gitlab:17.3.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2674,7 +2674,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.3.0 app:rake gitlab:import:repos ``` Or @@ -2705,7 +2705,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.3.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2729,12 +2729,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.2.2 +docker pull sameersbn/gitlab:17.3.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2760,7 +2760,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.2.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.3.0 ``` ### Shell Access @@ -2798,7 +2798,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.2.2 + image: sameersbn/gitlab:17.3.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index d3b2c4f0d..5aadcd3f2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.2.2 +17.3.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index e69db32b8..cdb261bca 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.2.2 + image: sameersbn/gitlab:17.3.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 1fdc00f5d..ba1f72588 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.2.2 + image: sameersbn/gitlab:17.3.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 52b04d433..3dd1c2828 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.2.2 + image: sameersbn/gitlab:17.3.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 1bf54801e..d4465c78f 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.3.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.2.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.3.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.2.2 +docker pull sameersbn/gitlab:17.3.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.2.2 +sameersbn/gitlab:17.3.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 612a48423..3824a232c 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.2.2 + image: sameersbn/gitlab:17.3.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 380d7064d..0c75e0abb 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.2.2 + image: sameersbn/gitlab:17.3.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 2258ef63f..30f6cfc11 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.2.2 + image: sameersbn/gitlab:17.3.0 env: - name: TZ value: Asia/Kolkata From 4b82b80d531ee6ccd818df438906e158b57e7017 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 25 Aug 2024 17:08:24 +0200 Subject: [PATCH 413/522] Upgrade GitLab CE to 17.3.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 241802f3d..93f00e3f2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**17.3.1** + +- gitlab: upgrade CE to v17.3.1 +- gitaly: upgrade to v17.3.1 +- gitlab-pages: upgrade to v17.3.1 + **17.3.0** - gitlab: upgrade CE to v17.3.0 diff --git a/Dockerfile b/Dockerfile index 06a325f8a..b5536f032 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20240530 -ARG VERSION=17.3.0 +ARG VERSION=17.3.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.5 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.23.0 \ GITLAB_SHELL_VERSION=14.38.0 \ - GITLAB_PAGES_VERSION=17.3.0 \ - GITALY_SERVER_VERSION=17.3.0 \ + GITLAB_PAGES_VERSION=17.3.1 \ + GITALY_SERVER_VERSION=17.3.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index e2e03cec5..9b2f997a1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.3.0 +# sameersbn/gitlab:17.3.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.3.0 +docker pull sameersbn/gitlab:17.3.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.3.0 + sameersbn/gitlab:17.3.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.3.0 + sameersbn/gitlab:17.3.1 ``` ### Database @@ -291,7 +291,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:17.3.0 + sameersbn/gitlab:17.3.1 ``` ##### Linking to PostgreSQL Container @@ -335,7 +335,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:17.3.0 + sameersbn/gitlab:17.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: @@ -374,7 +374,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:17.3.0 + sameersbn/gitlab:17.3.1 ``` #### Linking to Redis Container @@ -401,7 +401,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.3.0 + sameersbn/gitlab:17.3.1 ``` #### Mail @@ -414,7 +414,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:17.3.0 + sameersbn/gitlab:17.3.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -434,7 +434,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:17.3.0 + sameersbn/gitlab:17.3.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -518,7 +518,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:17.3.0 + sameersbn/gitlab:17.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. @@ -534,7 +534,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:17.3.0 + sameersbn/gitlab:17.3.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -557,7 +557,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:17.3.0 + sameersbn/gitlab:17.3.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -605,7 +605,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:17.3.0 + sameersbn/gitlab:17.3.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -811,14 +811,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:17.3.0 + sameersbn/gitlab:17.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:17.3.0 app:sanitize + sameersbn/gitlab:17.3.1 app:sanitize ``` #### Piwik @@ -2561,7 +2561,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2596,14 +2596,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.0 app:rake db:setup + sameersbn/gitlab:17.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:17.3.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2612,7 +2612,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2661,7 +2661,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:17.3.0 app:rake gitlab:env:info + sameersbn/gitlab:17.3.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2674,7 +2674,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.3.1 app:rake gitlab:import:repos ``` Or @@ -2705,7 +2705,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.3.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2729,12 +2729,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.3.0 +docker pull sameersbn/gitlab:17.3.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2760,7 +2760,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.3.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.3.1 ``` ### Shell Access @@ -2798,7 +2798,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.3.0 + image: sameersbn/gitlab:17.3.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 5aadcd3f2..1f33a6f48 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.3.0 +17.3.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index cdb261bca..d9a333967 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.3.0 + image: sameersbn/gitlab:17.3.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index ba1f72588..8458f5ce8 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.3.0 + image: sameersbn/gitlab:17.3.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 3dd1c2828..4f0bc06ee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.3.0 + image: sameersbn/gitlab:17.3.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index d4465c78f..6f44f6b1a 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.3.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.3.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.3.0 +docker pull sameersbn/gitlab:17.3.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.3.0 +sameersbn/gitlab:17.3.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 3824a232c..cd0092d54 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.3.0 + image: sameersbn/gitlab:17.3.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 0c75e0abb..d7cb255ac 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.3.0 + image: sameersbn/gitlab:17.3.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 30f6cfc11..827aec021 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.3.0 + image: sameersbn/gitlab:17.3.1 env: - name: TZ value: Asia/Kolkata From 6f43b19d65496df823cf7fff48ab9471199fda4f Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Tue, 3 Sep 2024 17:28:31 +0900 Subject: [PATCH 414/522] Docs: bump minimum required PostgreSQL to 14 (gitlab 17.x) Also bump the requirement note in release notes --- README.md | 6 +++--- scripts/release-notes.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9b2f997a1..1bcee60b7 100644 --- a/README.md +++ b/README.md @@ -267,7 +267,7 @@ Please note furthermore, that only compatible versions of the `postgresql-client - `postgresql-client-14`, - and `postgresql-client-15`. -*NOTE:* Version 13.7.0 and later requires PostgreSQL version 12.x. Version 16.0.0 and later requires PostgreSQL version 13.x +*NOTE:* Version 13.7.0 and later requires PostgreSQL version 12.x. Version 16.0.0 and later requires PostgreSQL version 13.x. Version 17.0.0 and later requires PostgreSQL version 14.x. ##### External PostgreSQL Server @@ -1866,7 +1866,7 @@ 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`. +The database type. Currently only postgresql is supported. Possible values: `postgresql`. Defaults to `postgresql`. ##### `DB_ENCODING` @@ -2721,7 +2721,7 @@ Usage when using `docker-compose` can also be found there. > > If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:14-20230628` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: ). > -> As of version 13.7.0, the required PostgreSQL is version 12.x. As of version 16.0.0, the required PostgreSQL is version 13.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql). +> As of version 13.7.0, the required PostgreSQL is version 12.x. As of version 16.0.0, the required PostgreSQL is version 13.x. As of version 17.0.0, the required PostgreSQL is version 14.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql). GitLabHQ releases new versions on the 22nd of every month, bugfix releases immediately follow. I update this project almost immediately when a release is made (at least it has been the case so far). If you are using the image in production environments I recommend that you delay updates by a couple of days after the gitlab release, allowing some time for the dust to settle down. diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh index 42ee9ef7f..418a6dcf4 100755 --- a/scripts/release-notes.sh +++ b/scripts/release-notes.sh @@ -41,8 +41,8 @@ Please note that this version does not yet include any rework as a consequence o Don't forget to consider the version specific upgrading instructions for [GitLab CE](https://docs.gitlab.com/ee/update/) **before** upgrading your GitLab CE instance! Please note: -- GitLab 16.6.x requires at least PostgreSQL 13. -- As of GitLab 16.7, PostgreSQL 14 is the default version. However, PostgreSQL 14 isn't supported on Geo deployments and is planned for future releases (see ). +- GitLab 17.x requires at least PostgreSQL 14. +- See issues to be aware of when upgrading to 17.x : ## Contributing From 2232e7e3a7361b975c9a301d3dfd69e05cb562e6 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 13 Sep 2024 06:55:53 +0200 Subject: [PATCH 415/522] Upgrade GitLab CE to 17.3.2 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 93f00e3f2..97db985a5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**17.3.2** + +- gitlab: upgrade CE to v17.3.2 +- gitaly: upgrade to v17.3.2 +- gitlab-pages: upgrade to v17.3.2 +- golang: upgrade to v1.23.1 + **17.3.1** - gitlab: upgrade CE to v17.3.1 diff --git a/Dockerfile b/Dockerfile index b5536f032..09c706692 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ FROM ubuntu:focal-20240530 -ARG VERSION=17.3.1 +ARG VERSION=17.3.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.5 \ RUBY_SOURCE_SHA256SUM="ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16" \ RUBYGEMS_VERSION=3.5.14 \ - GOLANG_VERSION=1.23.0 \ + GOLANG_VERSION=1.23.1 \ GITLAB_SHELL_VERSION=14.38.0 \ - GITLAB_PAGES_VERSION=17.3.1 \ - GITALY_SERVER_VERSION=17.3.1 \ + GITLAB_PAGES_VERSION=17.3.2 \ + GITALY_SERVER_VERSION=17.3.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 9b2f997a1..1580c3faa 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.3.1 +# sameersbn/gitlab:17.3.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.3.1 +docker pull sameersbn/gitlab:17.3.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.3.1 + sameersbn/gitlab:17.3.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.3.1 + sameersbn/gitlab:17.3.2 ``` ### Database @@ -291,7 +291,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:17.3.1 + sameersbn/gitlab:17.3.2 ``` ##### Linking to PostgreSQL Container @@ -335,7 +335,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:17.3.1 + sameersbn/gitlab:17.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: @@ -374,7 +374,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:17.3.1 + sameersbn/gitlab:17.3.2 ``` #### Linking to Redis Container @@ -401,7 +401,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.3.1 + sameersbn/gitlab:17.3.2 ``` #### Mail @@ -414,7 +414,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:17.3.1 + sameersbn/gitlab:17.3.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -434,7 +434,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:17.3.1 + sameersbn/gitlab:17.3.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -518,7 +518,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:17.3.1 + sameersbn/gitlab:17.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. @@ -534,7 +534,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:17.3.1 + sameersbn/gitlab:17.3.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -557,7 +557,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:17.3.1 + sameersbn/gitlab:17.3.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -605,7 +605,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:17.3.1 + sameersbn/gitlab:17.3.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -811,14 +811,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:17.3.1 + sameersbn/gitlab:17.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:17.3.1 app:sanitize + sameersbn/gitlab:17.3.2 app:sanitize ``` #### Piwik @@ -2561,7 +2561,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2596,14 +2596,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.1 app:rake db:setup + sameersbn/gitlab:17.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:17.3.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2612,7 +2612,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2661,7 +2661,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:17.3.1 app:rake gitlab:env:info + sameersbn/gitlab:17.3.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2674,7 +2674,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.3.2 app:rake gitlab:import:repos ``` Or @@ -2705,7 +2705,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.3.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2729,12 +2729,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.3.1 +docker pull sameersbn/gitlab:17.3.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2760,7 +2760,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.3.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.3.2 ``` ### Shell Access @@ -2798,7 +2798,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.3.1 + image: sameersbn/gitlab:17.3.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 1f33a6f48..fd9b308ed 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.3.1 +17.3.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index d9a333967..43e801847 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.3.1 + image: sameersbn/gitlab:17.3.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 8458f5ce8..6c525fe00 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.3.1 + image: sameersbn/gitlab:17.3.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 4f0bc06ee..1e7b4615e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.3.1 + image: sameersbn/gitlab:17.3.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 6f44f6b1a..0adc7a72f 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.3.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.3.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.3.1 +docker pull sameersbn/gitlab:17.3.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.3.1 +sameersbn/gitlab:17.3.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index cd0092d54..bed699c51 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.3.1 + image: sameersbn/gitlab:17.3.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index d7cb255ac..74709a267 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.3.1 + image: sameersbn/gitlab:17.3.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 827aec021..268b08ff6 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.3.1 + image: sameersbn/gitlab:17.3.2 env: - name: TZ value: Asia/Kolkata From e7f4f4678332374cbce82b2ef1fa26d77067248b Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 18 Sep 2024 22:42:00 +0200 Subject: [PATCH 416/522] Upgrade GitLab CE to 17.3.3 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 97db985a5..91146254f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**17.3.3** + +- gitlab: upgrade CE to v17.3.3 +- gitaly: upgrade to v17.3.3 +- gitlab-pages: upgrade to v17.3.3 + **17.3.2** - gitlab: upgrade CE to v17.3.2 diff --git a/Dockerfile b/Dockerfile index 09c706692..82bc05091 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20240530 -ARG VERSION=17.3.2 +ARG VERSION=17.3.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.5 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.23.1 \ GITLAB_SHELL_VERSION=14.38.0 \ - GITLAB_PAGES_VERSION=17.3.2 \ - GITALY_SERVER_VERSION=17.3.2 \ + GITLAB_PAGES_VERSION=17.3.3 \ + GITALY_SERVER_VERSION=17.3.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index ec4c2d9fd..6a6e243a8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.3.2 +# sameersbn/gitlab:17.3.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.3.2 +docker pull sameersbn/gitlab:17.3.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.3.2 + sameersbn/gitlab:17.3.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.3.2 + sameersbn/gitlab:17.3.3 ``` ### Database @@ -291,7 +291,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:17.3.2 + sameersbn/gitlab:17.3.3 ``` ##### Linking to PostgreSQL Container @@ -335,7 +335,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:17.3.2 + sameersbn/gitlab:17.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: @@ -374,7 +374,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:17.3.2 + sameersbn/gitlab:17.3.3 ``` #### Linking to Redis Container @@ -401,7 +401,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.3.2 + sameersbn/gitlab:17.3.3 ``` #### Mail @@ -414,7 +414,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:17.3.2 + sameersbn/gitlab:17.3.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -434,7 +434,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:17.3.2 + sameersbn/gitlab:17.3.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -518,7 +518,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:17.3.2 + sameersbn/gitlab:17.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. @@ -534,7 +534,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:17.3.2 + sameersbn/gitlab:17.3.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -557,7 +557,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:17.3.2 + sameersbn/gitlab:17.3.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -605,7 +605,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:17.3.2 + sameersbn/gitlab:17.3.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -811,14 +811,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:17.3.2 + sameersbn/gitlab:17.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:17.3.2 app:sanitize + sameersbn/gitlab:17.3.3 app:sanitize ``` #### Piwik @@ -2561,7 +2561,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2596,14 +2596,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.2 app:rake db:setup + sameersbn/gitlab:17.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:17.3.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2612,7 +2612,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.3.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2661,7 +2661,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:17.3.2 app:rake gitlab:env:info + sameersbn/gitlab:17.3.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2674,7 +2674,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.3.3 app:rake gitlab:import:repos ``` Or @@ -2705,7 +2705,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.3.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2729,12 +2729,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.3.2 +docker pull sameersbn/gitlab:17.3.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2760,7 +2760,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.3.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.3.3 ``` ### Shell Access @@ -2798,7 +2798,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.3.2 + image: sameersbn/gitlab:17.3.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index fd9b308ed..d1c738c5f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.3.2 +17.3.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 43e801847..315d6cf5e 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.3.2 + image: sameersbn/gitlab:17.3.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 6c525fe00..236137000 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.3.2 + image: sameersbn/gitlab:17.3.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 1e7b4615e..302801a36 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.3.2 + image: sameersbn/gitlab:17.3.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 0adc7a72f..0d1a54c43 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.3.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.3.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.3.2 +docker pull sameersbn/gitlab:17.3.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.3.2 +sameersbn/gitlab:17.3.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index bed699c51..07eebde50 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.3.2 + image: sameersbn/gitlab:17.3.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 74709a267..190dafbc2 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.3.2 + image: sameersbn/gitlab:17.3.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 268b08ff6..ab1ea55f2 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.3.2 + image: sameersbn/gitlab:17.3.3 env: - name: TZ value: Asia/Kolkata From 38be108bc083cee041e616d49fc4f6c4108e1ff0 Mon Sep 17 00:00:00 2001 From: Joerg Stoever Date: Fri, 20 Sep 2024 12:03:31 +0900 Subject: [PATCH 417/522] health check: use https only when https enabled with non-self signed cert --- assets/runtime/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index a9a778c53..2a9cfe0b3 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1855,7 +1855,7 @@ generate_healthcheck_script() { # configure healthcheck script ## https://docs.gitlab.com/ee/user/admin_area/monitoring/health_check.html local HEALTHCHECK_PROTOCOL="http" - if [[ "${GITLAB_HTTPS}" == true ]]; then + if [[ "${GITLAB_HTTPS}" == true && "${SSL_SELF_SIGNED}" == false ]]; then HEALTHCHECK_PROTOCOL="${HEALTHCHECK_PROTOCOL}s" fi cat > /usr/local/sbin/healthcheck < Date: Fri, 20 Sep 2024 12:03:42 +0900 Subject: [PATCH 418/522] health check: remove curl's --location option When the healthcheck feature introduced, the script were generated on build time and url was fixed to "http://localhost/-/liveness". See pull request #2102 nginx is configured to redirect all http traffic to https when `GITLAB_HTTPS` is enabled. (see https://github.com/sameersbn/docker-gitlab/blob/ac9e1fe/assets/runtime/config/nginx/gitlab-ssl#L41-L54), `--location` option is set to follow the redirection. See pull request #2165 Health check script generation has been ported to the runtime, allowing us to dynamically generate health check URLs while referencing configuration parameters. See #2338 If configured correctly, the redirect will not occur and the option can be removed. Original removal suggestion by @Gaibhne , additional (historical) research by @kkimurak. Co-authored-by: Kazunori Kimura --- assets/runtime/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index 2a9cfe0b3..4f7908bb2 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1861,7 +1861,7 @@ generate_healthcheck_script() { cat > /usr/local/sbin/healthcheck < Date: Fri, 20 Sep 2024 12:03:56 +0900 Subject: [PATCH 419/522] Unset default value for GITLAB_MONITORING_IP_WHITELIST On upstream, expected default value is `127.0.0.1/8` and it is already listed in corresponding configuration. `GITLAB_MONITORING_IP_WHITELIST` is used to allow monitoring from hosts other than loopback (localhost). So just unset default value for it. If the value is not set, the line specifying this "additional" IP range will be removed. --- README.md | 2 +- assets/runtime/env-defaults | 2 +- assets/runtime/functions | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6a6e243a8..43ed70669 100644 --- a/README.md +++ b/README.md @@ -1611,7 +1611,7 @@ Time between sampling of unicorn socket metrics, in seconds, defaults to `10` ##### `GITLAB_MONITORING_IP_WHITELIST` -IP whitelist to access monitoring endpoints, defaults to `0.0.0.0/8` +IP whitelist to access monitoring endpoints. No defaults. ##### `GITLAB_MONITORING_SIDEKIQ_EXPORTER_ENABLED` diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 7c6de6d97..14e0ccc16 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -629,7 +629,7 @@ GITLAB_SHELL_CUSTOM_HOOKS_DIR=${GITLAB_SHELL_CUSTOM_HOOKS_DIR:-"$GITLAB_SHELL_IN ## MONITORING GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL=${GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL:-10} -GITLAB_MONITORING_IP_WHITELIST=${GITLAB_MONITORING_IP_WHITELIST:-"0.0.0.0/8"} +GITLAB_MONITORING_IP_WHITELIST=${GITLAB_MONITORING_IP_WHITELIST:-} 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 4f7908bb2..be6a0133c 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -351,6 +351,10 @@ gitlab_configure_gitaly() { gitlab_configure_monitoring() { echo "Configuring gitlab::monitoring..." + if [ "${GITLAB_MONITORING_IP_WHITELIST}" == "" ]; then + exec_as_git sed -i "/{{GITLAB_MONITORING_IP_WHITELIST}}/d" ${GITLAB_CONFIG} + fi + update_template ${GITLAB_CONFIG} \ GITLAB_MONITORING_UNICORN_SAMPLER_INTERVAL \ GITLAB_MONITORING_IP_WHITELIST \ From e5dc2dd5b675f686db85905ce8ab0b478fec7e3d Mon Sep 17 00:00:00 2001 From: Joerg Stoever Date: Fri, 30 Aug 2024 18:52:12 +0900 Subject: [PATCH 420/522] healthcheck: Use IPv4 loopback address instead of localhost Access to health check resources such as /-/liveness is restricted to IPs specified in gitlab.monitoring.ip_whitelist (`GITLAB_MONITORING_IP_WHITELIST`). The name `localhost` is solved to IPv6 loopback address (::1) that is not listed in the whitelist by default. Possible alternate designs: - Add IPv6 loopback to whitelist - Disable IPv6 for gitlab container by specifying `net.ipv6.conf.all.disable_ipv6=1` in docker-compose.yml for example See https://github.com/sameersbn/docker-gitlab/issues/2766#issuecomment-2098030791 --- assets/runtime/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index be6a0133c..67750f2f7 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1864,7 +1864,7 @@ generate_healthcheck_script() { fi cat > /usr/local/sbin/healthcheck < Date: Wed, 25 Sep 2024 21:50:48 +0200 Subject: [PATCH 421/522] Upgrade GitLab CE to 17.4.0 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 91146254f..45cc52b77 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**17.4.0** + +- gitlab: upgrade CE to v17.4.0 +- gitaly: upgrade to v17.4.0 +- gitlab-pages: upgrade to v17.4.0 +- gitlab-shell: upgrade to v14.39.0 + **17.3.3** - gitlab: upgrade CE to v17.3.3 diff --git a/Dockerfile b/Dockerfile index 82bc05091..f84f95c9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ FROM ubuntu:focal-20240530 -ARG VERSION=17.3.3 +ARG VERSION=17.4.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.5 \ RUBY_SOURCE_SHA256SUM="ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16" \ RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.23.1 \ - GITLAB_SHELL_VERSION=14.38.0 \ - GITLAB_PAGES_VERSION=17.3.3 \ - GITALY_SERVER_VERSION=17.3.3 \ + GITLAB_SHELL_VERSION=14.39.0 \ + GITLAB_PAGES_VERSION=17.4.0 \ + GITALY_SERVER_VERSION=17.4.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 43ed70669..e876f2bf5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.3.3 +# sameersbn/gitlab:17.4.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.3.3 +docker pull sameersbn/gitlab:17.4.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.3.3 + sameersbn/gitlab:17.4.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.3.3 + sameersbn/gitlab:17.4.0 ``` ### Database @@ -291,7 +291,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:17.3.3 + sameersbn/gitlab:17.4.0 ``` ##### Linking to PostgreSQL Container @@ -335,7 +335,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:17.3.3 + sameersbn/gitlab:17.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: @@ -374,7 +374,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:17.3.3 + sameersbn/gitlab:17.4.0 ``` #### Linking to Redis Container @@ -401,7 +401,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.3.3 + sameersbn/gitlab:17.4.0 ``` #### Mail @@ -414,7 +414,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:17.3.3 + sameersbn/gitlab:17.4.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -434,7 +434,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:17.3.3 + sameersbn/gitlab:17.4.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -518,7 +518,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:17.3.3 + sameersbn/gitlab:17.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. @@ -534,7 +534,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:17.3.3 + sameersbn/gitlab:17.4.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -557,7 +557,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:17.3.3 + sameersbn/gitlab:17.4.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -605,7 +605,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:17.3.3 + sameersbn/gitlab:17.4.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -811,14 +811,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:17.3.3 + sameersbn/gitlab:17.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:17.3.3 app:sanitize + sameersbn/gitlab:17.4.0 app:sanitize ``` #### Piwik @@ -2561,7 +2561,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.3 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2596,14 +2596,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.3 app:rake db:setup + sameersbn/gitlab:17.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:17.3.3 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2612,7 +2612,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2661,7 +2661,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:17.3.3 app:rake gitlab:env:info + sameersbn/gitlab:17.4.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2674,7 +2674,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.3 app:rake gitlab:import:repos + sameersbn/gitlab:17.4.0 app:rake gitlab:import:repos ``` Or @@ -2705,7 +2705,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.3 app:rake gitlab:import:repos + sameersbn/gitlab:17.4.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2729,12 +2729,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.3.3 +docker pull sameersbn/gitlab:17.4.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2760,7 +2760,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.3.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.4.0 ``` ### Shell Access @@ -2798,7 +2798,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.3.3 + image: sameersbn/gitlab:17.4.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index d1c738c5f..e64ad13cb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.3.3 +17.4.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 315d6cf5e..5185c13a4 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.3.3 + image: sameersbn/gitlab:17.4.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 236137000..4f23018ef 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.3.3 + image: sameersbn/gitlab:17.4.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 302801a36..dd044f216 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.3.3 + image: sameersbn/gitlab:17.4.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 0d1a54c43..74d50442d 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.3 app:rake gitlab:backup:create + sameersbn/gitlab:17.4.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.3 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.3.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.3.3 +docker pull sameersbn/gitlab:17.4.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.3.3 +sameersbn/gitlab:17.4.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 07eebde50..c1c67b68e 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.3.3 + image: sameersbn/gitlab:17.4.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 190dafbc2..fd134dc99 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.3.3 + image: sameersbn/gitlab:17.4.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index ab1ea55f2..8d0c13e57 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.3.3 + image: sameersbn/gitlab:17.4.0 env: - name: TZ value: Asia/Kolkata From d08a6ec2a9f2f02f309fce9efe0e880dcf53fadd Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 26 Sep 2024 20:38:43 +0200 Subject: [PATCH 422/522] Upgrade GitLab CE to 17.4.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 45cc52b77..4096b1239 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**17.4.1** + +- gitlab: upgrade CE to v17.4.1 +- gitaly: upgrade to v17.4.1 +- gitlab-pages: upgrade to v17.4.1 + **17.4.0** - gitlab: upgrade CE to v17.4.0 diff --git a/Dockerfile b/Dockerfile index f84f95c9b..89f6c729a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20240530 -ARG VERSION=17.4.0 +ARG VERSION=17.4.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.5 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.23.1 \ GITLAB_SHELL_VERSION=14.39.0 \ - GITLAB_PAGES_VERSION=17.4.0 \ - GITALY_SERVER_VERSION=17.4.0 \ + GITLAB_PAGES_VERSION=17.4.1 \ + GITALY_SERVER_VERSION=17.4.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index e876f2bf5..876092305 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.4.0 +# sameersbn/gitlab:17.4.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.4.0 +docker pull sameersbn/gitlab:17.4.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.4.0 + sameersbn/gitlab:17.4.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.4.0 + sameersbn/gitlab:17.4.1 ``` ### Database @@ -291,7 +291,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:17.4.0 + sameersbn/gitlab:17.4.1 ``` ##### Linking to PostgreSQL Container @@ -335,7 +335,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:17.4.0 + sameersbn/gitlab:17.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: @@ -374,7 +374,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:17.4.0 + sameersbn/gitlab:17.4.1 ``` #### Linking to Redis Container @@ -401,7 +401,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.4.0 + sameersbn/gitlab:17.4.1 ``` #### Mail @@ -414,7 +414,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:17.4.0 + sameersbn/gitlab:17.4.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -434,7 +434,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:17.4.0 + sameersbn/gitlab:17.4.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -518,7 +518,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:17.4.0 + sameersbn/gitlab:17.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. @@ -534,7 +534,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:17.4.0 + sameersbn/gitlab:17.4.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -557,7 +557,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:17.4.0 + sameersbn/gitlab:17.4.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -605,7 +605,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:17.4.0 + sameersbn/gitlab:17.4.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -811,14 +811,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:17.4.0 + sameersbn/gitlab:17.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:17.4.0 app:sanitize + sameersbn/gitlab:17.4.1 app:sanitize ``` #### Piwik @@ -2561,7 +2561,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2596,14 +2596,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.0 app:rake db:setup + sameersbn/gitlab:17.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:17.4.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2612,7 +2612,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2661,7 +2661,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:17.4.0 app:rake gitlab:env:info + sameersbn/gitlab:17.4.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2674,7 +2674,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.4.1 app:rake gitlab:import:repos ``` Or @@ -2705,7 +2705,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.4.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2729,12 +2729,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.4.0 +docker pull sameersbn/gitlab:17.4.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2760,7 +2760,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.4.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.4.1 ``` ### Shell Access @@ -2798,7 +2798,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.4.0 + image: sameersbn/gitlab:17.4.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index e64ad13cb..ae704d6db 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.4.0 +17.4.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 5185c13a4..50364adf0 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.4.0 + image: sameersbn/gitlab:17.4.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 4f23018ef..2ca8570fc 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.4.0 + image: sameersbn/gitlab:17.4.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index dd044f216..7ab59af08 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.4.0 + image: sameersbn/gitlab:17.4.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 74d50442d..bc8152c56 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.4.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.4.0 +docker pull sameersbn/gitlab:17.4.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.4.0 +sameersbn/gitlab:17.4.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index c1c67b68e..210364133 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.4.0 + image: sameersbn/gitlab:17.4.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index fd134dc99..419d8df97 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.4.0 + image: sameersbn/gitlab:17.4.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 8d0c13e57..998c777a1 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.4.0 + image: sameersbn/gitlab:17.4.1 env: - name: TZ value: Asia/Kolkata From 64e862524ce8816b2cac42c1f69f79792bc34df1 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Mon, 30 Sep 2024 06:59:16 +0900 Subject: [PATCH 423/522] Add postgresql-client-16 --- Dockerfile | 2 +- README.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 89f6c729a..95bc361b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ RUN set -ex && \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ sudo supervisor logrotate locales curl \ nginx openssh-server postgresql-contrib redis-tools \ - postgresql-client-13 postgresql-client-14 postgresql-client-15 \ + postgresql-client-13 postgresql-client-14 postgresql-client-15 postgresql-client-16 \ python3 python3-docutils nodejs yarn gettext-base graphicsmagick \ libpq5 zlib1g libyaml-0-2 libssl1.1 \ libgdbm6 libreadline8 libncurses5 libffi7 \ diff --git a/README.md b/README.md index 876092305..f87c98d1b 100644 --- a/README.md +++ b/README.md @@ -265,7 +265,8 @@ Please note furthermore, that only compatible versions of the `postgresql-client - `postgresql-client-13`, - `postgresql-client-14`, -- and `postgresql-client-15`. +- `postgresql-client-15`. +- and `postgresql-client-16`. *NOTE:* Version 13.7.0 and later requires PostgreSQL version 12.x. Version 16.0.0 and later requires PostgreSQL version 13.x. Version 17.0.0 and later requires PostgreSQL version 14.x. From 5ce84968a6dd2a5bf48da330e2b15cce66cd46aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Marten=20Br=C3=BCggemann?= Date: Thu, 10 Oct 2024 15:28:04 +0200 Subject: [PATCH 424/522] Upgrade GitLab CE to 17.4.2 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 4096b1239..1c29183a5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**17.4.2** + +- gitlab: upgrade CE to v17.4.2 +- gitaly: upgrade to v17.4.2 +- gitlab-pages: upgrade to v17.4.2 + **17.4.1** - gitlab: upgrade CE to v17.4.1 diff --git a/Dockerfile b/Dockerfile index 95bc361b7..95f7f1e92 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20240530 -ARG VERSION=17.4.1 +ARG VERSION=17.4.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.5 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.23.1 \ GITLAB_SHELL_VERSION=14.39.0 \ - GITLAB_PAGES_VERSION=17.4.1 \ - GITALY_SERVER_VERSION=17.4.1 \ + GITLAB_PAGES_VERSION=17.4.2 \ + GITALY_SERVER_VERSION=17.4.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index f87c98d1b..11e1406fe 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.4.1 +# sameersbn/gitlab:17.4.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.4.1 +docker pull sameersbn/gitlab:17.4.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.4.1 + sameersbn/gitlab:17.4.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.4.1 + sameersbn/gitlab:17.4.2 ``` ### Database @@ -292,7 +292,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:17.4.1 + sameersbn/gitlab:17.4.2 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.4.1 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.4.1 + sameersbn/gitlab:17.4.2 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.4.1 + sameersbn/gitlab:17.4.2 ``` #### Mail @@ -415,7 +415,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:17.4.1 + sameersbn/gitlab:17.4.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.4.1 + sameersbn/gitlab:17.4.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.4.1 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.4.1 + sameersbn/gitlab:17.4.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.4.1 + sameersbn/gitlab:17.4.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.4.1 + sameersbn/gitlab:17.4.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.4.1 + sameersbn/gitlab:17.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:17.4.1 app:sanitize + sameersbn/gitlab:17.4.2 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.1 app:rake db:setup + sameersbn/gitlab:17.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:17.4.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.4.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.4.1 app:rake gitlab:env:info + sameersbn/gitlab:17.4.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.4.2 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.4.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.4.1 +docker pull sameersbn/gitlab:17.4.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.4.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.4.2 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.4.1 + image: sameersbn/gitlab:17.4.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index ae704d6db..d68ad08bf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.4.1 +17.4.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 50364adf0..4f7139664 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.4.1 + image: sameersbn/gitlab:17.4.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 2ca8570fc..924d8e210 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.4.1 + image: sameersbn/gitlab:17.4.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 7ab59af08..5841f186f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.4.1 + image: sameersbn/gitlab:17.4.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index bc8152c56..624ad6ca0 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.4.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.4.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.4.1 +docker pull sameersbn/gitlab:17.4.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.4.1 +sameersbn/gitlab:17.4.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 210364133..1063af3d1 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.4.1 + image: sameersbn/gitlab:17.4.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 419d8df97..a9d5fea45 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.4.1 + image: sameersbn/gitlab:17.4.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 998c777a1..3f4aec22e 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.4.1 + image: sameersbn/gitlab:17.4.2 env: - name: TZ value: Asia/Kolkata From db212908ec25bbd21300ab3319f4ca85a2aa2eff Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 10 Oct 2024 19:57:54 +0200 Subject: [PATCH 425/522] Upgrade golang and baseimage --- Changelog.md | 2 ++ Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index 1c29183a5..ba2808d7d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,8 @@ This file only reflects the changes that are made in this image. Please refer to - gitlab: upgrade CE to v17.4.2 - gitaly: upgrade to v17.4.2 - gitlab-pages: upgrade to v17.4.2 +- golang: upgrade to v1.23.2 +- ubuntu: upgrade to focal-20240918 **17.4.1** diff --git a/Dockerfile b/Dockerfile index 95f7f1e92..1d1ed93c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20240530 +FROM ubuntu:focal-20240918 ARG VERSION=17.4.2 @@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.5 \ RUBY_SOURCE_SHA256SUM="ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16" \ RUBYGEMS_VERSION=3.5.14 \ - GOLANG_VERSION=1.23.1 \ + GOLANG_VERSION=1.23.2 \ GITLAB_SHELL_VERSION=14.39.0 \ GITLAB_PAGES_VERSION=17.4.2 \ GITALY_SERVER_VERSION=17.4.2 \ From 94a616c74135fa82cfd5d234e123b303433a62fe Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 18 Oct 2024 18:03:00 +0200 Subject: [PATCH 426/522] Upgrade GitLab CE to 17.5.0 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index ba2808d7d..50697d5ce 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**17.5.0** + +- gitlab: upgrade CE to v17.5.0 +- gitaly: upgrade to v17.5.0 +- gitlab-pages: upgrade to v17.5.0 +- ubuntu: upgrade to focal-20241011 + **17.4.2** - gitlab: upgrade CE to v17.4.2 diff --git a/Dockerfile b/Dockerfile index 1d1ed93c8..7c2ce43e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:focal-20240918 +FROM ubuntu:focal-20241011 -ARG VERSION=17.4.2 +ARG VERSION=17.5.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.5 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.23.2 \ GITLAB_SHELL_VERSION=14.39.0 \ - GITLAB_PAGES_VERSION=17.4.2 \ - GITALY_SERVER_VERSION=17.4.2 \ + GITLAB_PAGES_VERSION=17.5.0 \ + GITALY_SERVER_VERSION=17.5.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 11e1406fe..b9bdc77bd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.4.2 +# sameersbn/gitlab:17.5.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.4.2 +docker pull sameersbn/gitlab:17.5.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.4.2 + sameersbn/gitlab:17.5.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.4.2 + sameersbn/gitlab:17.5.0 ``` ### Database @@ -292,7 +292,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:17.4.2 + sameersbn/gitlab:17.5.0 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.4.2 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.4.2 + sameersbn/gitlab:17.5.0 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.4.2 + sameersbn/gitlab:17.5.0 ``` #### Mail @@ -415,7 +415,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:17.4.2 + sameersbn/gitlab:17.5.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.4.2 + sameersbn/gitlab:17.5.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.4.2 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.4.2 + sameersbn/gitlab:17.5.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.4.2 + sameersbn/gitlab:17.5.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.4.2 + sameersbn/gitlab:17.5.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.4.2 + sameersbn/gitlab:17.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:17.4.2 app:sanitize + sameersbn/gitlab:17.5.0 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.2 app:rake db:setup + sameersbn/gitlab:17.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:17.4.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.4.2 app:rake gitlab:env:info + sameersbn/gitlab:17.5.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.5.0 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.5.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.4.2 +docker pull sameersbn/gitlab:17.5.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.4.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.5.0 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.4.2 + image: sameersbn/gitlab:17.5.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index d68ad08bf..6f0844e02 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.4.2 +17.5.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 4f7139664..9e28bfe59 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.4.2 + image: sameersbn/gitlab:17.5.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 924d8e210..e5c6e10dd 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.4.2 + image: sameersbn/gitlab:17.5.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 5841f186f..81f3f6602 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.4.2 + image: sameersbn/gitlab:17.5.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 624ad6ca0..7cb8db746 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.5.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.4.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.4.2 +docker pull sameersbn/gitlab:17.5.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.4.2 +sameersbn/gitlab:17.5.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 1063af3d1..41db7954d 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.4.2 + image: sameersbn/gitlab:17.5.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index a9d5fea45..fdb8376f6 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.4.2 + image: sameersbn/gitlab:17.5.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 3f4aec22e..8af6c5b2c 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.4.2 + image: sameersbn/gitlab:17.5.0 env: - name: TZ value: Asia/Kolkata From 199070bec90104994ec5ebec45fbe00b989f7485 Mon Sep 17 00:00:00 2001 From: yam Date: Thu, 24 Oct 2024 10:02:49 +0200 Subject: [PATCH 427/522] fix(#3010) Add symbolic link to the correct location of ca-cert file --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 7c2ce43e7..47c0071ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -82,6 +82,8 @@ LABEL \ EXPOSE 22/tcp 80/tcp 443/tcp +RUN ln -s /etc/ssl/certs/ca-certificates.crt /usr/lib/ssl/cert.pem + VOLUME ["${GITLAB_DATA_DIR}", "${GITLAB_LOG_DIR}","${GITLAB_HOME}/gitlab/node_modules"] WORKDIR ${GITLAB_INSTALL_DIR} ENTRYPOINT ["/sbin/entrypoint.sh"] From 3b310bcd41c95089e1b7149b5953cd77367a7982 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 25 Oct 2024 18:06:00 +0200 Subject: [PATCH 428/522] Upgrade GitLab CE to 17.5.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 50697d5ce..d5ff4cef0 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**17.5.1** + +- gitlab: upgrade CE to v17.5.1 +- gitaly: upgrade to v17.5.1 +- gitlab-pages: upgrade to v17.5.1 + **17.5.0** - gitlab: upgrade CE to v17.5.0 diff --git a/Dockerfile b/Dockerfile index 47c0071ef..db4178b0c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20241011 -ARG VERSION=17.5.0 +ARG VERSION=17.5.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.5 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.23.2 \ GITLAB_SHELL_VERSION=14.39.0 \ - GITLAB_PAGES_VERSION=17.5.0 \ - GITALY_SERVER_VERSION=17.5.0 \ + GITLAB_PAGES_VERSION=17.5.1 \ + GITALY_SERVER_VERSION=17.5.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index b9bdc77bd..c52414412 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.5.0 +# sameersbn/gitlab:17.5.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.5.0 +docker pull sameersbn/gitlab:17.5.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.5.0 + sameersbn/gitlab:17.5.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.5.0 + sameersbn/gitlab:17.5.1 ``` ### Database @@ -292,7 +292,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:17.5.0 + sameersbn/gitlab:17.5.1 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.5.0 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.5.0 + sameersbn/gitlab:17.5.1 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.5.0 + sameersbn/gitlab:17.5.1 ``` #### Mail @@ -415,7 +415,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:17.5.0 + sameersbn/gitlab:17.5.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.5.0 + sameersbn/gitlab:17.5.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.5.0 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.5.0 + sameersbn/gitlab:17.5.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.5.0 + sameersbn/gitlab:17.5.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.5.0 + sameersbn/gitlab:17.5.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.5.0 + sameersbn/gitlab:17.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:17.5.0 app:sanitize + sameersbn/gitlab:17.5.1 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.0 app:rake db:setup + sameersbn/gitlab:17.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:17.5.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.5.0 app:rake gitlab:env:info + sameersbn/gitlab:17.5.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.5.1 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.5.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.5.0 +docker pull sameersbn/gitlab:17.5.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.5.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.5.1 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.5.0 + image: sameersbn/gitlab:17.5.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 6f0844e02..9cbaf2372 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.5.0 +17.5.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 9e28bfe59..b574fe5cd 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.5.0 + image: sameersbn/gitlab:17.5.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index e5c6e10dd..e8a995bb1 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.5.0 + image: sameersbn/gitlab:17.5.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 81f3f6602..65f5144c1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.5.0 + image: sameersbn/gitlab:17.5.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 7cb8db746..d84ab8264 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.5.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.5.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.5.0 +docker pull sameersbn/gitlab:17.5.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.5.0 +sameersbn/gitlab:17.5.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 41db7954d..d1e2b7a50 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.5.0 + image: sameersbn/gitlab:17.5.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index fdb8376f6..ff31ba787 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.5.0 + image: sameersbn/gitlab:17.5.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 8af6c5b2c..c9e34f194 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.5.0 + image: sameersbn/gitlab:17.5.1 env: - name: TZ value: Asia/Kolkata From 87761d553e4e0b0f8e243b291e5cde5b346df04b Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 14 Nov 2024 21:05:30 +0100 Subject: [PATCH 429/522] Upgrade GitLab CE to 17.5.2 --- Changelog.md | 8 ++++ Dockerfile | 12 +++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 53 insertions(+), 45 deletions(-) diff --git a/Changelog.md b/Changelog.md index d5ff4cef0..9e1644972 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,14 @@ 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. +**17.5.2** + +- gitlab: upgrade CE to v17.5.2 +- gitaly: upgrade to v17.5.2 +- gitlab-pages: upgrade to v17.5.2 +- golang: upgrade to v1.23.2 +- ruby: upgrade to v3.2.6 + **17.5.1** - gitlab: upgrade CE to v17.5.1 diff --git a/Dockerfile b/Dockerfile index db4178b0c..ef4b9d58a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ FROM ubuntu:focal-20241011 -ARG VERSION=17.5.1 +ARG VERSION=17.5.2 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=3.2.5 \ - RUBY_SOURCE_SHA256SUM="ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16" \ + RUBY_VERSION=3.2.6 \ + RUBY_SOURCE_SHA256SUM="d9cb65ecdf3f18669639f2638b63379ed6fbb17d93ae4e726d4eb2bf68a48370" \ RUBYGEMS_VERSION=3.5.14 \ - GOLANG_VERSION=1.23.2 \ + GOLANG_VERSION=1.23.3 \ GITLAB_SHELL_VERSION=14.39.0 \ - GITLAB_PAGES_VERSION=17.5.1 \ - GITALY_SERVER_VERSION=17.5.1 \ + GITLAB_PAGES_VERSION=17.5.2 \ + GITALY_SERVER_VERSION=17.5.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index c52414412..a323c8a81 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.5.1 +# sameersbn/gitlab:17.5.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.5.1 +docker pull sameersbn/gitlab:17.5.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.5.1 + sameersbn/gitlab:17.5.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.5.1 + sameersbn/gitlab:17.5.2 ``` ### Database @@ -292,7 +292,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:17.5.1 + sameersbn/gitlab:17.5.2 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.5.1 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.5.1 + sameersbn/gitlab:17.5.2 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.5.1 + sameersbn/gitlab:17.5.2 ``` #### Mail @@ -415,7 +415,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:17.5.1 + sameersbn/gitlab:17.5.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.5.1 + sameersbn/gitlab:17.5.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.5.1 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.5.1 + sameersbn/gitlab:17.5.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.5.1 + sameersbn/gitlab:17.5.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.5.1 + sameersbn/gitlab:17.5.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.5.1 + sameersbn/gitlab:17.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:17.5.1 app:sanitize + sameersbn/gitlab:17.5.2 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.1 app:rake db:setup + sameersbn/gitlab:17.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:17.5.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.5.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.5.1 app:rake gitlab:env:info + sameersbn/gitlab:17.5.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.5.2 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.5.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.5.1 +docker pull sameersbn/gitlab:17.5.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.5.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.5.2 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.5.1 + image: sameersbn/gitlab:17.5.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 9cbaf2372..808ab16be 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.5.1 +17.5.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index b574fe5cd..5b6da82d8 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.5.1 + image: sameersbn/gitlab:17.5.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index e8a995bb1..d7943286b 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.5.1 + image: sameersbn/gitlab:17.5.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 65f5144c1..5bfb1a5d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.5.1 + image: sameersbn/gitlab:17.5.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index d84ab8264..1bf3a638f 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.5.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.5.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.5.1 +docker pull sameersbn/gitlab:17.5.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.5.1 +sameersbn/gitlab:17.5.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index d1e2b7a50..6e7b6eb63 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.5.1 + image: sameersbn/gitlab:17.5.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index ff31ba787..e2784034d 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.5.1 + image: sameersbn/gitlab:17.5.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index c9e34f194..3d534c662 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.5.1 + image: sameersbn/gitlab:17.5.2 env: - name: TZ value: Asia/Kolkata From 41ad9da1b2d33b070e63c7898cf1ccd416423ee6 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 22 Nov 2024 23:05:01 +0100 Subject: [PATCH 430/522] Upgrade GitLab CE to 17.6.0 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 9e1644972..f83883450 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**17.6.0** + +- gitlab: upgrade CE to v17.6.0 +- gitaly: upgrade to v17.6.0 +- gitlab-pages: upgrade to v17.6.0 + **17.5.2** - gitlab: upgrade CE to v17.5.2 diff --git a/Dockerfile b/Dockerfile index ef4b9d58a..718121b7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20241011 -ARG VERSION=17.5.2 +ARG VERSION=17.6.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.6 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.23.3 \ GITLAB_SHELL_VERSION=14.39.0 \ - GITLAB_PAGES_VERSION=17.5.2 \ - GITALY_SERVER_VERSION=17.5.2 \ + GITLAB_PAGES_VERSION=17.6.0 \ + GITALY_SERVER_VERSION=17.6.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index a323c8a81..60df0cdea 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.5.2 +# sameersbn/gitlab:17.6.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.5.2 +docker pull sameersbn/gitlab:17.6.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.5.2 + sameersbn/gitlab:17.6.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.5.2 + sameersbn/gitlab:17.6.0 ``` ### Database @@ -292,7 +292,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:17.5.2 + sameersbn/gitlab:17.6.0 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.5.2 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.5.2 + sameersbn/gitlab:17.6.0 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.5.2 + sameersbn/gitlab:17.6.0 ``` #### Mail @@ -415,7 +415,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:17.5.2 + sameersbn/gitlab:17.6.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.5.2 + sameersbn/gitlab:17.6.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.5.2 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.5.2 + sameersbn/gitlab:17.6.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.5.2 + sameersbn/gitlab:17.6.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.5.2 + sameersbn/gitlab:17.6.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.5.2 + sameersbn/gitlab:17.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:17.5.2 app:sanitize + sameersbn/gitlab:17.6.0 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.2 app:rake db:setup + sameersbn/gitlab:17.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:17.5.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.5.2 app:rake gitlab:env:info + sameersbn/gitlab:17.6.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.6.0 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.6.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.5.2 +docker pull sameersbn/gitlab:17.6.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.5.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.6.0 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.5.2 + image: sameersbn/gitlab:17.6.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 808ab16be..ea3bf215c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.5.2 +17.6.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 5b6da82d8..383a26112 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.5.2 + image: sameersbn/gitlab:17.6.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index d7943286b..04f0f2bf0 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.5.2 + image: sameersbn/gitlab:17.6.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 5bfb1a5d8..f37870d35 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.5.2 + image: sameersbn/gitlab:17.6.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 1bf3a638f..b1544804a 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.6.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.5.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.6.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.5.2 +docker pull sameersbn/gitlab:17.6.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.5.2 +sameersbn/gitlab:17.6.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 6e7b6eb63..f5ab8beca 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.5.2 + image: sameersbn/gitlab:17.6.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index e2784034d..e288fbba1 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.5.2 + image: sameersbn/gitlab:17.6.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 3d534c662..12baa0c99 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.5.2 + image: sameersbn/gitlab:17.6.0 env: - name: TZ value: Asia/Kolkata From 98235b9d0962293d1b43aba2ed3f62b283ded506 Mon Sep 17 00:00:00 2001 From: Thomas Hiller Date: Tue, 7 Jan 2025 22:14:24 +0100 Subject: [PATCH 431/522] set larger resource class; change to buildx; all for th-2021 --- .circleci/config.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b72efbdaf..47204bf3d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 orbs: shellcheck: circleci/shellcheck@3.2.0 - docker: circleci/docker@2.5.0 + docker: circleci/docker@2.8.1 go: circleci/go@1.11.0 commands: @@ -11,7 +11,7 @@ commands: Build and optionally deploy a Docker images parameters: dockerfile: - default: Dockerfile + default: Dockerfile.multistage description: 'Name of dockerfile to use, defaults to Dockerfile' type: string extra_build_args: @@ -50,6 +50,11 @@ commands: description: | No output timeout for build step type: string + use-buildkit: + default: false + description: | + Use buildkit to build the image. Available on Docker >= 18.09.0 https://docs.docker.com/develop/develop-images/build_enhancements/ + type: boolean steps: - when: condition: <> @@ -76,7 +81,7 @@ commands: done done - docker build + docker buildx build <<#parameters.extra_build_args>><><> \ --cache-from <> \ @@ -102,7 +107,7 @@ commands: done done - docker build + docker buildx build <<#parameters.extra_build_args>><><> \ -f <>/<> \ @@ -198,7 +203,9 @@ commands: jobs: build: - executor: docker/machine + machine: + image: ubuntu-2404:edge + resource_class: large steps: - checkout - docker-build: @@ -208,6 +215,7 @@ jobs: cache_from: docker.io/sameersbn/gitlab:latest extra_build_args: '--build-arg VCS_REF=${CIRCLE_TAG:-${CIRCLE_SHA1}} --build-arg BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")"' no_output_timeout: 45m + use-buildkit: true - docker-save: registry: docker.io,quay.io image: sameersbn/gitlab From 1b0604aa6ed1e16259bd83ee2e7c15d2ea4c7cac Mon Sep 17 00:00:00 2001 From: Thomas Hiller Date: Tue, 14 Jan 2025 17:25:55 +0100 Subject: [PATCH 432/522] fix Dockerfile name --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 47204bf3d..747df192c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ commands: Build and optionally deploy a Docker images parameters: dockerfile: - default: Dockerfile.multistage + default: Dockerfile description: 'Name of dockerfile to use, defaults to Dockerfile' type: string extra_build_args: From a7c29209ca8ac79e876fba8cce70ccf6f2b095fa Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 18 Jan 2025 16:29:33 +0100 Subject: [PATCH 433/522] Upgrade GitLab CE to 17.6.1 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index f83883450..846cef675 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ 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. +**17.6.1** + +- gitlab: upgrade CE to v17.6.1 +- gitlab-pages: upgrade to v17.6.1 +- gitaly: upgrade to v17.6.1 +- golang: upgrade to v1.23.5 + **17.6.0** - gitlab: upgrade CE to v17.6.0 diff --git a/Dockerfile b/Dockerfile index 718121b7d..dea8fc385 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ FROM ubuntu:focal-20241011 -ARG VERSION=17.6.0 +ARG VERSION=17.6.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.6 \ RUBY_SOURCE_SHA256SUM="d9cb65ecdf3f18669639f2638b63379ed6fbb17d93ae4e726d4eb2bf68a48370" \ RUBYGEMS_VERSION=3.5.14 \ - GOLANG_VERSION=1.23.3 \ + GOLANG_VERSION=1.23.5 \ GITLAB_SHELL_VERSION=14.39.0 \ - GITLAB_PAGES_VERSION=17.6.0 \ - GITALY_SERVER_VERSION=17.6.0 \ + GITLAB_PAGES_VERSION=17.6.1 \ + GITALY_SERVER_VERSION=17.6.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 60df0cdea..90b3d0116 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.6.0 +# sameersbn/gitlab:17.6.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.6.0 +docker pull sameersbn/gitlab:17.6.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.6.0 + sameersbn/gitlab:17.6.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.6.0 + sameersbn/gitlab:17.6.1 ``` ### Database @@ -292,7 +292,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:17.6.0 + sameersbn/gitlab:17.6.1 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.6.0 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.6.0 + sameersbn/gitlab:17.6.1 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.6.0 + sameersbn/gitlab:17.6.1 ``` #### Mail @@ -415,7 +415,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:17.6.0 + sameersbn/gitlab:17.6.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.6.0 + sameersbn/gitlab:17.6.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.6.0 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.6.0 + sameersbn/gitlab:17.6.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.6.0 + sameersbn/gitlab:17.6.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.6.0 + sameersbn/gitlab:17.6.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.6.0 + sameersbn/gitlab:17.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:17.6.0 app:sanitize + sameersbn/gitlab:17.6.1 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.0 app:rake db:setup + sameersbn/gitlab:17.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:17.6.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.6.0 app:rake gitlab:env:info + sameersbn/gitlab:17.6.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.6.1 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.6.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.6.0 +docker pull sameersbn/gitlab:17.6.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.6.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.6.1 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.6.0 + image: sameersbn/gitlab:17.6.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index ea3bf215c..473655ef2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.6.0 +17.6.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 383a26112..62a7c6445 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.6.0 + image: sameersbn/gitlab:17.6.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 04f0f2bf0..44809832b 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.6.0 + image: sameersbn/gitlab:17.6.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index f37870d35..261a08872 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.6.0 + image: sameersbn/gitlab:17.6.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index b1544804a..cb35f12ab 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.6.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.6.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.6.0 +docker pull sameersbn/gitlab:17.6.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.6.0 +sameersbn/gitlab:17.6.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index f5ab8beca..809fb24b6 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.6.0 + image: sameersbn/gitlab:17.6.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index e288fbba1..87a7cb28d 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.6.0 + image: sameersbn/gitlab:17.6.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 12baa0c99..e9e4f0ea7 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.6.0 + image: sameersbn/gitlab:17.6.1 env: - name: TZ value: Asia/Kolkata From e69b6250f76217b65f61335c64a32139e4248937 Mon Sep 17 00:00:00 2001 From: Patrick Remy Date: Tue, 17 Dec 2024 10:29:06 +0100 Subject: [PATCH 434/522] Upgrade GitLab CE to 17.6.2 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 846cef675..463e4d689 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**17.6.2** + +- gitlab: upgrade CE to v17.6.2 +- gitaly: upgrade to v17.6.2 +- gitlab-pages: upgrade to v17.6.2 + **17.6.1** - gitlab: upgrade CE to v17.6.1 diff --git a/Dockerfile b/Dockerfile index dea8fc385..f8ca610f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20241011 -ARG VERSION=17.6.1 +ARG VERSION=17.6.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.6 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.23.5 \ GITLAB_SHELL_VERSION=14.39.0 \ - GITLAB_PAGES_VERSION=17.6.1 \ - GITALY_SERVER_VERSION=17.6.1 \ + GITLAB_PAGES_VERSION=17.6.2 \ + GITALY_SERVER_VERSION=17.6.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 90b3d0116..a30b7f7fb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.6.1 +# sameersbn/gitlab:17.6.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.6.1 +docker pull sameersbn/gitlab:17.6.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.6.1 + sameersbn/gitlab:17.6.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.6.1 + sameersbn/gitlab:17.6.2 ``` ### Database @@ -292,7 +292,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:17.6.1 + sameersbn/gitlab:17.6.2 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.6.1 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.6.1 + sameersbn/gitlab:17.6.2 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.6.1 + sameersbn/gitlab:17.6.2 ``` #### Mail @@ -415,7 +415,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:17.6.1 + sameersbn/gitlab:17.6.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.6.1 + sameersbn/gitlab:17.6.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.6.1 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.6.1 + sameersbn/gitlab:17.6.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.6.1 + sameersbn/gitlab:17.6.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.6.1 + sameersbn/gitlab:17.6.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.6.1 + sameersbn/gitlab:17.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:17.6.1 app:sanitize + sameersbn/gitlab:17.6.2 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.1 app:rake db:setup + sameersbn/gitlab:17.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:17.6.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.6.1 app:rake gitlab:env:info + sameersbn/gitlab:17.6.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.6.2 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.6.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.6.1 +docker pull sameersbn/gitlab:17.6.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.6.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.6.2 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.6.1 + image: sameersbn/gitlab:17.6.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 473655ef2..b3b459a89 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.6.1 +17.6.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 62a7c6445..c18c41c67 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.6.1 + image: sameersbn/gitlab:17.6.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 44809832b..a05bfa390 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.6.1 + image: sameersbn/gitlab:17.6.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 261a08872..6df46d388 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.6.1 + image: sameersbn/gitlab:17.6.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index cb35f12ab..9242557c1 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.6.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.6.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.6.1 +docker pull sameersbn/gitlab:17.6.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.6.1 +sameersbn/gitlab:17.6.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 809fb24b6..cf6380ad7 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.6.1 + image: sameersbn/gitlab:17.6.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 87a7cb28d..c9903c2a9 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.6.1 + image: sameersbn/gitlab:17.6.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index e9e4f0ea7..e62ac07b3 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.6.1 + image: sameersbn/gitlab:17.6.2 env: - name: TZ value: Asia/Kolkata From 6a2e2356c78ebdab2c8b9d5284af543fb5847e92 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 18 Jan 2025 18:22:08 +0100 Subject: [PATCH 435/522] Upgrade GitLab CE to 17.6.3 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 463e4d689..f334ad496 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,12 @@ 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. +**17.6.3** + +- gitlab: upgrade CE to v17.6.3 +- gitaly: upgrade to v17.6.3 +- gitlab-pages: upgrade to v17.6.3 + **17.6.2** - gitlab: upgrade CE to v17.6.2 diff --git a/Dockerfile b/Dockerfile index f8ca610f3..38576edc6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20241011 -ARG VERSION=17.6.2 +ARG VERSION=17.6.3 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.6 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.23.5 \ GITLAB_SHELL_VERSION=14.39.0 \ - GITLAB_PAGES_VERSION=17.6.2 \ - GITALY_SERVER_VERSION=17.6.2 \ + GITLAB_PAGES_VERSION=17.6.3 \ + GITALY_SERVER_VERSION=17.6.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index a30b7f7fb..e36dc245a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.6.2 +# sameersbn/gitlab:17.6.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.6.2 +docker pull sameersbn/gitlab:17.6.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.6.2 + sameersbn/gitlab:17.6.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.6.2 + sameersbn/gitlab:17.6.3 ``` ### Database @@ -292,7 +292,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:17.6.2 + sameersbn/gitlab:17.6.3 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.6.2 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.6.2 + sameersbn/gitlab:17.6.3 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.6.2 + sameersbn/gitlab:17.6.3 ``` #### Mail @@ -415,7 +415,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:17.6.2 + sameersbn/gitlab:17.6.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.6.2 + sameersbn/gitlab:17.6.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.6.2 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.6.2 + sameersbn/gitlab:17.6.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.6.2 + sameersbn/gitlab:17.6.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.6.2 + sameersbn/gitlab:17.6.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.6.2 + sameersbn/gitlab:17.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:17.6.2 app:sanitize + sameersbn/gitlab:17.6.3 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.2 app:rake db:setup + sameersbn/gitlab:17.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:17.6.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.6.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.6.2 app:rake gitlab:env:info + sameersbn/gitlab:17.6.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.6.3 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.6.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.6.2 +docker pull sameersbn/gitlab:17.6.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.6.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.6.3 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.6.2 + image: sameersbn/gitlab:17.6.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index b3b459a89..a58b3b812 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.6.2 +17.6.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index c18c41c67..0d0790bd3 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.6.2 + image: sameersbn/gitlab:17.6.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index a05bfa390..25ddf4bce 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.6.2 + image: sameersbn/gitlab:17.6.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 6df46d388..d99548015 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.6.2 + image: sameersbn/gitlab:17.6.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 9242557c1..b72f8c4c9 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.6.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.6.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.6.2 +docker pull sameersbn/gitlab:17.6.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.6.2 +sameersbn/gitlab:17.6.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index cf6380ad7..3dda67056 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.6.2 + image: sameersbn/gitlab:17.6.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index c9903c2a9..8b5637059 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.6.2 + image: sameersbn/gitlab:17.6.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index e62ac07b3..21056bc81 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.6.2 + image: sameersbn/gitlab:17.6.3 env: - name: TZ value: Asia/Kolkata From 0b9455326491c7076f74c2be158e2659de055ef8 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 18 Jan 2025 23:19:05 +0100 Subject: [PATCH 436/522] Upgrade GitLab CE to 17.7.0 --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 38576edc6..7169f984b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal-20241011 -ARG VERSION=17.6.3 +ARG VERSION=17.7.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.6 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.23.5 \ GITLAB_SHELL_VERSION=14.39.0 \ - GITLAB_PAGES_VERSION=17.6.3 \ - GITALY_SERVER_VERSION=17.6.3 \ + GITLAB_PAGES_VERSION=17.7.0 \ + GITALY_SERVER_VERSION=17.7.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ From b95972568aa7a93768f9fa0ef62c64ba47a6a030 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 18 Jan 2025 23:28:39 +0100 Subject: [PATCH 437/522] Change base image from focal to jammy --- Dockerfile | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7169f984b..ccfef2e7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20241011 +FROM ubuntu:jammy-20240911.1 ARG VERSION=17.7.0 @@ -32,11 +32,11 @@ RUN apt-get update \ RUN set -ex && \ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \ - && echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu focal 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 focal main" >> /etc/apt/sources.list \ + && echo "deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu jammy main" >> /etc/apt/sources.list \ + && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv ABF5BD827BD9BF62 \ + && echo "deb http://nginx.org/packages/ubuntu/ jammy nginx" >> /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/ focal-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ + && echo 'deb http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | apt-key add - \ && echo 'deb https://deb.nodesource.com/node_20.x nodistro main' > /etc/apt/sources.list.d/nodesource.list \ && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ @@ -46,12 +46,13 @@ RUN set -ex && \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ sudo supervisor logrotate locales curl \ nginx openssh-server postgresql-contrib redis-tools \ - postgresql-client-13 postgresql-client-14 postgresql-client-15 postgresql-client-16 \ + postgresql-client-13 postgresql-client-14 postgresql-client-15 postgresql-client-16 postgresql-client-17 \ python3 python3-docutils nodejs yarn gettext-base graphicsmagick \ - libpq5 zlib1g libyaml-0-2 libssl1.1 \ - libgdbm6 libreadline8 libncurses5 libffi7 \ - libxml2 libxslt1.1 libcurl4 libicu66 libre2-dev tzdata unzip libimage-exiftool-perl \ - libmagic1 \ + libpq5 zlib1g libyaml-dev libssl-dev libgdbm-dev libre2-dev \ + libreadline-dev libncurses5-dev libffi-dev curl openssh-server libxml2-dev libxslt-dev \ + libcurl4-openssl-dev libicu-dev libkrb5-dev rsync python3-docutils pkg-config cmake \ + runit-systemd \ + tzdata unzip libimage-exiftool-perl libmagic1 \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \ From 3cde3caf984e6baead98465ef61726765795ae22 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sun, 19 Jan 2025 17:57:48 +0900 Subject: [PATCH 438/522] update patch 0003-fix_preinstall.mjs-to-avoid-removing-node_modules-dir.patch File updated No changes to the scripts we want to modify - Simplify fileURLToPath usage in scripts https://gitlab.com/gitlab-org/gitlab/-/merge_requests/173402 especially in commit https://gitlab.com/gitlab-org/gitlab/-/commit/462273d2ba17d2a506caf962830344798b1598cc first contained in : v17.7.0-ee --- ...stall.mjs-to-avoid-removing-node_modules_dir.patch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch b/assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch index a5646ff38..3aba9e8f6 100644 --- a/assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch +++ b/assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch @@ -1,16 +1,15 @@ diff --git a/scripts/frontend/preinstall.mjs b/scripts/frontend/preinstall.mjs -index 09d980344eac..b1514e803b75 100644 +index e86525cd20d2..f849c423f1b6 100644 --- a/scripts/frontend/preinstall.mjs +++ b/scripts/frontend/preinstall.mjs -@@ -1,6 +1,6 @@ - import { dirname, join } from 'node:path'; - import { fileURLToPath } from 'node:url'; +@@ -1,5 +1,5 @@ + import { join } from 'node:path'; -import { readFile, rm } from 'node:fs/promises'; +import { readdir, readFile, rm, stat } from 'node:fs/promises'; - const ROOT_PATH = join(dirname(fileURLToPath(import.meta.url)), '..', '..'); + const ROOT_PATH = join(import.meta.dirname, '..', '..'); const NODE_MODULES = join(ROOT_PATH, 'node_modules'); -@@ -55,5 +55,14 @@ if (!arraysHaveSameItems(prevTopLevelPatterns, currentTopLevelPatterns)) { +@@ -54,5 +54,14 @@ if (!arraysHaveSameItems(prevTopLevelPatterns, currentTopLevelPatterns)) { console.error( '[WARNING] package.json changed significantly. Removing node_modules to be sure there are no problems.', ); From 32b38f464d8fc863b01415046369f1cc002ee66d Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sun, 19 Jan 2025 21:42:44 +0900 Subject: [PATCH 439/522] delete additional nginx repo as default ppa repository for ubuntu jammy provides suitable version of nginx ( >= 1.12.1) --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ccfef2e7b..e3a3ef38f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,8 +33,6 @@ RUN apt-get update \ RUN set -ex && \ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \ && echo "deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu jammy main" >> /etc/apt/sources.list \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv ABF5BD827BD9BF62 \ - && echo "deb http://nginx.org/packages/ubuntu/ jammy nginx" >> /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/ jammy-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | apt-key add - \ From d7c39972853659ae7fa330a678fe147133e4642d Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sun, 19 Jan 2025 22:39:12 +0900 Subject: [PATCH 440/522] remove libyaml-dev from BUILD_DEPENDENCIES Because this is required on runtime and BUILD_DEPENDENCIES will be removed at the end of installation Installation of `libyaml-dev` is written in Dockerfile so additional installation is not reeded if not, following error reported on runtime > LoadError: libyaml-0.so.2: cannot open shared object file: No such or directory - /usr/local/lib/ruby/3.2.0/x86_64-linux/psych.so This is because Ruby 3.2.0 (psych 5.0.0) or later does not contain libyaml any more https://github.com/ruby/psych/pull/541 --- 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 47fc46202..e76c823f0 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -21,7 +21,7 @@ export GOROOT PATH BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \ libc6-dev \ - libpq-dev zlib1g-dev libyaml-dev libssl-dev \ + libpq-dev zlib1g-dev libssl-dev \ libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \ libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev \ gettext libkrb5-dev \ From 049df9a1200a1dea4b95a892ca05db5ff4c0b1b9 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sun, 19 Jan 2025 22:47:47 +0900 Subject: [PATCH 441/522] Just use result of $(command -v pg_isready) instead of `find /usr/lib/postgresql -name pg_isready | sort | tail -n1` for db readiness query command To solve following error: find /var/lib/postgresql : No such file or directory I'm sure the directory is exists so I'm not sure why the error reported --- assets/runtime/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index 67750f2f7..9bf91bbb1 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -149,7 +149,7 @@ gitlab_finalize_database_parameters() { gitlab_check_database_connection() { - prog=$(find /usr/lib/postgresql/ -name pg_isready -type f | sort | tail -n1) + prog=$(command -v pg_isready) prog="${prog} -h ${DB_HOST} -p ${DB_PORT} -U ${DB_USER} -d ${DB_NAME} -t 1" timeout=60 From 6021babd92202cee45230b6ddd4f0483cbff47e5 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 21 Jan 2025 19:27:03 +0100 Subject: [PATCH 442/522] Update documentation --- Changelog.md | 11 ++++- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 10 files changed, 49 insertions(+), 40 deletions(-) diff --git a/Changelog.md b/Changelog.md index f334ad496..1a1801617 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,15 @@ # 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-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab. +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. + +**17.7.0** + +- gitlab: upgrade CE to v17.7.0 +- gitaly: upgrade to v17.7.0 +- gitlab-pages: upgrade to v17.7.0 +- ubuntu: upgrade to jammy-20240911.1 +- update healthcheck for postgresql **17.6.3** diff --git a/README.md b/README.md index e36dc245a..3320c41a7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.6.3 +# sameersbn/gitlab:17.7.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.6.3 +docker pull sameersbn/gitlab:17.7.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.6.3 + sameersbn/gitlab:17.7.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.6.3 + sameersbn/gitlab:17.7.0 ``` ### Database @@ -292,7 +292,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:17.6.3 + sameersbn/gitlab:17.7.0 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.6.3 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.6.3 + sameersbn/gitlab:17.7.0 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.6.3 + sameersbn/gitlab:17.7.0 ``` #### Mail @@ -415,7 +415,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:17.6.3 + sameersbn/gitlab:17.7.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.6.3 + sameersbn/gitlab:17.7.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.6.3 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.6.3 + sameersbn/gitlab:17.7.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.6.3 + sameersbn/gitlab:17.7.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.6.3 + sameersbn/gitlab:17.7.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.6.3 + sameersbn/gitlab:17.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:17.6.3 app:sanitize + sameersbn/gitlab:17.7.0 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.3 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.3 app:rake db:setup + sameersbn/gitlab:17.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:17.6.3 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.6.3 app:rake gitlab:env:info + sameersbn/gitlab:17.7.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.3 app:rake gitlab:import:repos + sameersbn/gitlab:17.7.0 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.3 app:rake gitlab:import:repos + sameersbn/gitlab:17.7.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.6.3 +docker pull sameersbn/gitlab:17.7.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.6.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.7.0 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.6.3 + image: sameersbn/gitlab:17.7.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index a58b3b812..2d573323c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.6.3 +17.7.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 0d0790bd3..43c957c71 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.6.3 + image: sameersbn/gitlab:17.7.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 25ddf4bce..acc107ec1 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.6.3 + image: sameersbn/gitlab:17.7.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index d99548015..a0120696f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.6.3 + image: sameersbn/gitlab:17.7.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index b72f8c4c9..c77785779 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.3 app:rake gitlab:backup:create + sameersbn/gitlab:17.7.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.3 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.6.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.7.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.6.3 +docker pull sameersbn/gitlab:17.7.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.6.3 +sameersbn/gitlab:17.7.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 3dda67056..777e75e44 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.6.3 + image: sameersbn/gitlab:17.7.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 8b5637059..6cb2e715c 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.6.3 + image: sameersbn/gitlab:17.7.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 21056bc81..42fdabf2d 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.6.3 + image: sameersbn/gitlab:17.7.0 env: - name: TZ value: Asia/Kolkata From ccd752499a76b2bf7ec16ab557cf2a9444d17b5d Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 21 Jan 2025 21:25:04 +0100 Subject: [PATCH 443/522] Upgrade GitLab CE to 17.7.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 1a1801617..d93035fc8 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ 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. +**17.7.1** + +- gitlab: upgrade CE to v17.7.1 +- gitaly: upgrade to v17.7.1 +- gitlab-pages: upgrade to v17.7.1 + **17.7.0** - gitlab: upgrade CE to v17.7.0 diff --git a/Dockerfile b/Dockerfile index e3a3ef38f..a2685ff02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:jammy-20240911.1 -ARG VERSION=17.7.0 +ARG VERSION=17.7.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.6 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.23.5 \ GITLAB_SHELL_VERSION=14.39.0 \ - GITLAB_PAGES_VERSION=17.7.0 \ - GITALY_SERVER_VERSION=17.7.0 \ + GITLAB_PAGES_VERSION=17.7.1 \ + GITALY_SERVER_VERSION=17.7.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 3320c41a7..ddf711291 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.7.0 +# sameersbn/gitlab:17.7.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.7.0 +docker pull sameersbn/gitlab:17.7.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.7.0 + sameersbn/gitlab:17.7.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.7.0 + sameersbn/gitlab:17.7.1 ``` ### Database @@ -292,7 +292,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:17.7.0 + sameersbn/gitlab:17.7.1 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.7.0 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.7.0 + sameersbn/gitlab:17.7.1 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.7.0 + sameersbn/gitlab:17.7.1 ``` #### Mail @@ -415,7 +415,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:17.7.0 + sameersbn/gitlab:17.7.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.7.0 + sameersbn/gitlab:17.7.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.7.0 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.7.0 + sameersbn/gitlab:17.7.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.7.0 + sameersbn/gitlab:17.7.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.7.0 + sameersbn/gitlab:17.7.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.7.0 + sameersbn/gitlab:17.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:17.7.0 app:sanitize + sameersbn/gitlab:17.7.1 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.7.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.7.0 app:rake db:setup + sameersbn/gitlab:17.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:17.7.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.7.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.7.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.7.0 app:rake gitlab:env:info + sameersbn/gitlab:17.7.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.7.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.7.1 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.7.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.7.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.7.0 +docker pull sameersbn/gitlab:17.7.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.7.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.7.1 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.7.0 + image: sameersbn/gitlab:17.7.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 2d573323c..c15d655d4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.7.0 +17.7.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 43c957c71..173e6e9d6 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.7.0 + image: sameersbn/gitlab:17.7.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index acc107ec1..eba79c490 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.7.0 + image: sameersbn/gitlab:17.7.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index a0120696f..7e12df333 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.7.0 + image: sameersbn/gitlab:17.7.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index c77785779..1981e0acc 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.7.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.7.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.7.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.7.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.7.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.7.0 +docker pull sameersbn/gitlab:17.7.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.7.0 +sameersbn/gitlab:17.7.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 777e75e44..a227852a3 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.7.0 + image: sameersbn/gitlab:17.7.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 6cb2e715c..56f3bd918 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.7.0 + image: sameersbn/gitlab:17.7.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 42fdabf2d..014a956aa 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.7.0 + image: sameersbn/gitlab:17.7.1 env: - name: TZ value: Asia/Kolkata From aec6003457368c5fd6232936d5b810b68d63a137 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Tue, 21 Jan 2025 22:41:45 +0100 Subject: [PATCH 444/522] Upgrade GitLab CE to 17.8.0 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index d93035fc8..267b1aecc 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ 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. +**17.8.0** + +- gitlab: upgrade CE to v17.8.0 +- gitaly: upgrade to v17.8.0 +- gitlab-pages: upgrade to v17.8.0 + **17.7.1** - gitlab: upgrade CE to v17.7.1 diff --git a/Dockerfile b/Dockerfile index a2685ff02..c871b288f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:jammy-20240911.1 -ARG VERSION=17.7.1 +ARG VERSION=17.8.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.6 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.23.5 \ GITLAB_SHELL_VERSION=14.39.0 \ - GITLAB_PAGES_VERSION=17.7.1 \ - GITALY_SERVER_VERSION=17.7.1 \ + GITLAB_PAGES_VERSION=17.8.0 \ + GITALY_SERVER_VERSION=17.8.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index ddf711291..2eccf411e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.7.1 +# sameersbn/gitlab:17.8.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.7.1 +docker pull sameersbn/gitlab:17.8.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.7.1 + sameersbn/gitlab:17.8.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.7.1 + sameersbn/gitlab:17.8.0 ``` ### Database @@ -292,7 +292,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:17.7.1 + sameersbn/gitlab:17.8.0 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.7.1 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.7.1 + sameersbn/gitlab:17.8.0 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.7.1 + sameersbn/gitlab:17.8.0 ``` #### Mail @@ -415,7 +415,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:17.7.1 + sameersbn/gitlab:17.8.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.7.1 + sameersbn/gitlab:17.8.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.7.1 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.7.1 + sameersbn/gitlab:17.8.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.7.1 + sameersbn/gitlab:17.8.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.7.1 + sameersbn/gitlab:17.8.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.7.1 + sameersbn/gitlab:17.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:17.7.1 app:sanitize + sameersbn/gitlab:17.8.0 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.7.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.7.1 app:rake db:setup + sameersbn/gitlab:17.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:17.7.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.7.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.7.1 app:rake gitlab:env:info + sameersbn/gitlab:17.8.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.7.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.8.0 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.7.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.8.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.7.1 +docker pull sameersbn/gitlab:17.8.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.7.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.8.0 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.7.1 + image: sameersbn/gitlab:17.8.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index c15d655d4..6fb9581dc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.7.1 +17.8.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 173e6e9d6..ede243831 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.7.1 + image: sameersbn/gitlab:17.8.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index eba79c490..19045a4ad 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.7.1 + image: sameersbn/gitlab:17.8.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 7e12df333..685ed8439 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.7.1 + image: sameersbn/gitlab:17.8.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 1981e0acc..a23150422 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.7.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.8.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.7.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.7.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.8.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.7.1 +docker pull sameersbn/gitlab:17.8.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.7.1 +sameersbn/gitlab:17.8.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index a227852a3..c7e8b302f 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.7.1 + image: sameersbn/gitlab:17.8.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 56f3bd918..1eb007416 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.7.1 + image: sameersbn/gitlab:17.8.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 014a956aa..ac329921a 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.7.1 + image: sameersbn/gitlab:17.8.0 env: - name: TZ value: Asia/Kolkata From 3cac65dd8849e44b1285b921329e75efa10018c0 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Wed, 27 Nov 2024 02:50:14 +0900 Subject: [PATCH 445/522] use `wget | gpg` instead of `apt-key` warning: `apt-key` is deprecated --- Dockerfile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index c871b288f..893db3f70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,14 +31,15 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* RUN set -ex && \ - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv E1DD270288B4E6030699E45FA1715D88E1DF1F24 \ - && echo "deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu jammy 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/ jammy-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ - && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | apt-key add - \ - && echo 'deb https://deb.nodesource.com/node_20.x nodistro 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 \ + mkdir -p /etc/apt/keyrings \ + && wget --quiet -O - https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0xe1dd270288b4e6030699e45fa1715d88e1df1f24 | gpg --dearmor -o /etc/apt/keyrings/git-core.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/git-core.gpg] http://ppa.launchpad.net/git-core/ppa/ubuntu jammy main" >> /etc/apt/sources.list \ + && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/keyrings/postgres.gpg \ + && echo 'deb [signed-by=/etc/apt/keyrings/postgres.gpg] http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ + && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ + && echo 'deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main' > /etc/apt/sources.list.d/nodesource.list \ + && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \ + && echo 'deb [signed-by=/etc/apt/keyrings/yarn.gpg] 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 \ From f5e2572d7df80a4acaf49b0572972f883ae40dd0 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 22 Jan 2025 23:27:15 +0100 Subject: [PATCH 446/522] Upgrade GitLab CE to 17.8.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 267b1aecc..650fb6424 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ 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. +**17.8.1** + +- gitlab: upgrade CE to v17.8.1 +- gitaly: upgrade to v17.8.1 +- gitlab-pages: upgrade to v17.8.1 + **17.8.0** - gitlab: upgrade CE to v17.8.0 diff --git a/Dockerfile b/Dockerfile index 893db3f70..eb612ce4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:jammy-20240911.1 -ARG VERSION=17.8.0 +ARG VERSION=17.8.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.6 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.5.14 \ GOLANG_VERSION=1.23.5 \ GITLAB_SHELL_VERSION=14.39.0 \ - GITLAB_PAGES_VERSION=17.8.0 \ - GITALY_SERVER_VERSION=17.8.0 \ + GITLAB_PAGES_VERSION=17.8.1 \ + GITALY_SERVER_VERSION=17.8.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 2eccf411e..ad9c9927b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.8.0 +# sameersbn/gitlab:17.8.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.8.0 +docker pull sameersbn/gitlab:17.8.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.8.0 + sameersbn/gitlab:17.8.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.8.0 + sameersbn/gitlab:17.8.1 ``` ### Database @@ -292,7 +292,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:17.8.0 + sameersbn/gitlab:17.8.1 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.8.0 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.8.0 + sameersbn/gitlab:17.8.1 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.8.0 + sameersbn/gitlab:17.8.1 ``` #### Mail @@ -415,7 +415,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:17.8.0 + sameersbn/gitlab:17.8.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.8.0 + sameersbn/gitlab:17.8.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.8.0 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.8.0 + sameersbn/gitlab:17.8.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.8.0 + sameersbn/gitlab:17.8.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.8.0 + sameersbn/gitlab:17.8.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.8.0 + sameersbn/gitlab:17.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:17.8.0 app:sanitize + sameersbn/gitlab:17.8.1 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.0 app:rake db:setup + sameersbn/gitlab:17.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:17.8.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.8.0 app:rake gitlab:env:info + sameersbn/gitlab:17.8.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.8.1 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.8.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.8.0 +docker pull sameersbn/gitlab:17.8.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.8.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.8.1 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.8.0 + image: sameersbn/gitlab:17.8.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 6fb9581dc..d54380cde 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.8.0 +17.8.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index ede243831..daee04686 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.8.0 + image: sameersbn/gitlab:17.8.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 19045a4ad..52bd5502d 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.8.0 + image: sameersbn/gitlab:17.8.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 685ed8439..b193943e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.8.0 + image: sameersbn/gitlab:17.8.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index a23150422..2e73c4254 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.8.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.8.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.8.0 +docker pull sameersbn/gitlab:17.8.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.8.0 +sameersbn/gitlab:17.8.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index c7e8b302f..04d2ad5a9 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.8.0 + image: sameersbn/gitlab:17.8.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 1eb007416..dfcdd4839 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.8.0 + image: sameersbn/gitlab:17.8.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index ac329921a..550e08906 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.8.0 + image: sameersbn/gitlab:17.8.1 env: - name: TZ value: Asia/Kolkata From c938f39377cf1d9f9c3cd095d38d4a833cfe0bd2 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 12 Feb 2025 23:09:44 +0100 Subject: [PATCH 447/522] Upgrade GitLab CE to 17.8.2 --- Changelog.md | 8 ++++ Dockerfile | 12 +++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 53 insertions(+), 45 deletions(-) diff --git a/Changelog.md b/Changelog.md index 650fb6424..8e0aa6aee 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,14 @@ 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. +**17.8.2** + +- gitlab: upgrade CE to v17.8.2 +- gitaly: upgrade to v17.8.2 +- gitlab-pages: upgrade to v17.8.2 +- golang: upgrade to v1.23.6 +- ruby: upgrade to v3.2.7 + **17.8.1** - gitlab: upgrade CE to v17.8.1 diff --git a/Dockerfile b/Dockerfile index eb612ce4d..d9d2ee771 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ FROM ubuntu:jammy-20240911.1 -ARG VERSION=17.8.1 +ARG VERSION=17.8.2 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=3.2.6 \ - RUBY_SOURCE_SHA256SUM="d9cb65ecdf3f18669639f2638b63379ed6fbb17d93ae4e726d4eb2bf68a48370" \ + RUBY_VERSION=3.2.7 \ + RUBY_SOURCE_SHA256SUM="8488fa620ff0333c16d437f2b890bba3b67f8745fdecb1472568a6114aad9741" \ RUBYGEMS_VERSION=3.5.14 \ - GOLANG_VERSION=1.23.5 \ + GOLANG_VERSION=1.23.6 \ GITLAB_SHELL_VERSION=14.39.0 \ - GITLAB_PAGES_VERSION=17.8.1 \ - GITALY_SERVER_VERSION=17.8.1 \ + GITLAB_PAGES_VERSION=17.8.2 \ + GITALY_SERVER_VERSION=17.8.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index ad9c9927b..43aedfed6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.8.1 +# sameersbn/gitlab:17.8.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.8.1 +docker pull sameersbn/gitlab:17.8.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.8.1 + sameersbn/gitlab:17.8.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.8.1 + sameersbn/gitlab:17.8.2 ``` ### Database @@ -292,7 +292,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:17.8.1 + sameersbn/gitlab:17.8.2 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.8.1 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.8.1 + sameersbn/gitlab:17.8.2 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.8.1 + sameersbn/gitlab:17.8.2 ``` #### Mail @@ -415,7 +415,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:17.8.1 + sameersbn/gitlab:17.8.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.8.1 + sameersbn/gitlab:17.8.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.8.1 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.8.1 + sameersbn/gitlab:17.8.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.8.1 + sameersbn/gitlab:17.8.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.8.1 + sameersbn/gitlab:17.8.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.8.1 + sameersbn/gitlab:17.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:17.8.1 app:sanitize + sameersbn/gitlab:17.8.2 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.1 app:rake db:setup + sameersbn/gitlab:17.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:17.8.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.8.1 app:rake gitlab:env:info + sameersbn/gitlab:17.8.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.8.2 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.8.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.8.1 +docker pull sameersbn/gitlab:17.8.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.8.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.8.2 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.8.1 + image: sameersbn/gitlab:17.8.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index d54380cde..0806c19f6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.8.1 +17.8.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index daee04686..ca4f7bdc5 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.8.1 + image: sameersbn/gitlab:17.8.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 52bd5502d..d074b3a2b 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.8.1 + image: sameersbn/gitlab:17.8.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index b193943e8..24a4fed92 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.8.1 + image: sameersbn/gitlab:17.8.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 2e73c4254..840ff7324 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.8.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.8.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.8.1 +docker pull sameersbn/gitlab:17.8.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.8.1 +sameersbn/gitlab:17.8.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 04d2ad5a9..bca464a4a 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.8.1 + image: sameersbn/gitlab:17.8.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index dfcdd4839..ceb5e62c2 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.8.1 + image: sameersbn/gitlab:17.8.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 550e08906..d8018c9ed 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.8.1 + image: sameersbn/gitlab:17.8.2 env: - name: TZ value: Asia/Kolkata From b59c07574f71e7e92afe7bf54010be1125cbb84a Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Thu, 23 Jan 2025 08:49:37 +0900 Subject: [PATCH 448/522] Use official nginx repository Set a higher priority so that it is used in preference to the nginx packages provided by the ubuntu repository --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index d9d2ee771..2985dfe47 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,6 +40,9 @@ RUN set -ex && \ && echo 'deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main' > /etc/apt/sources.list.d/nodesource.list \ && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \ && echo 'deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \ + && wget --quiet -O - https://nginx.org/keys/nginx_signing.key | gpg --dearmor -o /etc/apt/keyrings/nginx-archive-keyring.gpg \ + && echo "deb [signed-by=/etc/apt/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/ubuntu jammy nginx" >> /etc/apt/sources.list.d/nginx.list \ + && printf "Package: *\nPin: origin nginx.org\nPin: release o=nginx\nPin-Priority: 900\n" >> /etc/apt/preferences.d/99nginx \ && set -ex \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ From 9dff930f5f6facfdfbcf3046c99617f9b2e119df Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Thu, 23 Jan 2025 08:52:22 +0900 Subject: [PATCH 449/522] Change path to install nginx configuration Directories such as /etc/nginx/sites-{enabled, available and similar} are not available for nginx package comes from official nginx repository. Ubuntu source may create this directory refer1 : ubuntu distributes nginx with a file "nginx-common.dirs" which lists these directories https://git.launchpad.net/ubuntu/+source/nginx/tree/debian/nginx-common.dirs?h=ubuntu/jammy-updates By default, nginx recognizes configuration files in /etc/nginx/conf.d/ Just change the destination path to install nginx configuration files --- assets/runtime/functions | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index 9bf91bbb1..b32048fb8 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -23,10 +23,10 @@ GITLAB_ACTIONCABLE_CONFIG="${GITLAB_INSTALL_DIR}/config/cable.yml" GITLAB_SECRETS_CONFIG="${GITLAB_INSTALL_DIR}/config/secrets.yml" GITLAB_ROBOTS_CONFIG="${GITLAB_INSTALL_DIR}/public/robots.txt" GITLAB_SHELL_CONFIG="${GITLAB_SHELL_INSTALL_DIR}/config.yml" -GITLAB_NGINX_CONFIG="/etc/nginx/sites-enabled/gitlab" -GITLAB_CI_NGINX_CONFIG="/etc/nginx/sites-enabled/gitlab_ci" -GITLAB_REGISTRY_NGINX_CONFIG="/etc/nginx/sites-enabled/gitlab-registry" -GITLAB_PAGES_NGINX_CONFIG="/etc/nginx/sites-enabled/gitlab-pages" +GITLAB_NGINX_CONFIG="/etc/nginx/conf.d/gitlab.conf" +GITLAB_CI_NGINX_CONFIG="/etc/nginx/conf.d/gitlab_ci.conf" +GITLAB_REGISTRY_NGINX_CONFIG="/etc/nginx/conf.d/gitlab-registry.conf" +GITLAB_PAGES_NGINX_CONFIG="/etc/nginx/conf.d/gitlab-pages.conf" GITLAB_PAGES_CONFIG="${GITLAB_INSTALL_DIR}/gitlab-pages-config" GITLAB_GITALY_CONFIG="${GITLAB_GITALY_INSTALL_DIR}/config.toml" From fc0012a696fd8acabbd09a73e3c811981b25a930 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Wed, 22 Jan 2025 19:47:20 +0900 Subject: [PATCH 450/522] Change nginx log format name from main it reports error as it is duplicated --- assets/runtime/config/nginx/gitlab | 4 ++-- assets/runtime/config/nginx/gitlab-registry | 4 ++-- assets/runtime/config/nginx/gitlab-ssl | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/runtime/config/nginx/gitlab b/assets/runtime/config/nginx/gitlab index c2e22a297..75001235e 100644 --- a/assets/runtime/config/nginx/gitlab +++ b/assets/runtime/config/nginx/gitlab @@ -30,7 +30,7 @@ map $request_uri $obfuscated_request_uri { ~(.+\?)(.*&)?(private_token=|access_token=)[^&]*(&.*|$) $1$2$3****$4; default $request_uri; } -log_format main '$remote_addr - $remote_user [$time_local] ' +log_format gitlab_access '$remote_addr - $remote_user [$time_local] ' '"$request_method $obfuscated_request_uri $server_protocol" $status $body_bytes_sent ' '"$http_referer" "$http_user_agent"'; @@ -58,7 +58,7 @@ server { add_header Strict-Transport-Security "max-age={{NGINX_HSTS_MAXAGE}};"; ## Individual nginx logs for this GitLab vhost - access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log main; + access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log gitlab_access; error_log {{GITLAB_LOG_DIR}}/nginx/gitlab_error.log; location / { diff --git a/assets/runtime/config/nginx/gitlab-registry b/assets/runtime/config/nginx/gitlab-registry index 280436561..b37aac542 100644 --- a/assets/runtime/config/nginx/gitlab-registry +++ b/assets/runtime/config/nginx/gitlab-registry @@ -11,7 +11,7 @@ server { server_name {{GITLAB_REGISTRY_HOST}}; server_tokens off; ## Don't show the nginx version number, a security best practice return 301 https://$http_host:$request_uri; - access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log; + access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log gitlab_access; error_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_error.log; } @@ -36,7 +36,7 @@ server { ssl_session_cache builtin:1000 shared:SSL:10m; ssl_session_timeout 5m; - access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log; + access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log gitlab_access; error_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_error.log; location / { diff --git a/assets/runtime/config/nginx/gitlab-ssl b/assets/runtime/config/nginx/gitlab-ssl index 893232b72..df349ec9b 100644 --- a/assets/runtime/config/nginx/gitlab-ssl +++ b/assets/runtime/config/nginx/gitlab-ssl @@ -34,7 +34,7 @@ map $request_uri $obfuscated_request_uri { ~(.+\?)(.*&)?(private_token=|access_token=)[^&]*(&.*|$) $1$2$3****$4; default $request_uri; } -log_format main '$remote_addr - $remote_user [$time_local] ' +log_format gitlab_ssl_access '$remote_addr - $remote_user [$time_local] ' '"$request_method $obfuscated_request_uri $server_protocol" $status $body_bytes_sent ' '"$http_referer" "$http_user_agent"'; @@ -49,7 +49,7 @@ server { server_name _; ## Replace this with something like gitlab.example.com server_tokens off; ## Don't show the nginx version number, a security best practice return 301 https://$host:{{GITLAB_PORT}}$request_uri; - access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log main; + access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log gitlab_ssl_access; error_log {{GITLAB_LOG_DIR}}/nginx/gitlab_error.log; } @@ -103,7 +103,7 @@ server { ssl_dhparam {{SSL_DHPARAM_PATH}}; ## Individual nginx logs for this GitLab vhost - access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log main; + access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_access.log gitlab_ssl_access; error_log {{GITLAB_LOG_DIR}}/nginx/gitlab_error.log; location / { From 928fc104d264075eb2885da8b91f938f5ccbe794 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Sat, 25 Jan 2025 00:30:02 +0900 Subject: [PATCH 451/522] Remove default nginx conf after installation --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2985dfe47..98dc8d680 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,7 @@ RUN set -ex && \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ && DEBIAN_FRONTEND=noninteractive dpkg-reconfigure locales \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* /etc/nginx/conf.d/default.conf COPY assets/build/ ${GITLAB_BUILD_DIR}/ RUN bash ${GITLAB_BUILD_DIR}/install.sh From 2f38d3e57b729f803d130f5241aa63f81a86bf24 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 22 Feb 2025 16:50:33 +0100 Subject: [PATCH 452/522] Upgrade GitLab CE to 17.9.0 --- Changelog.md | 10 +++++ Dockerfile | 14 +++---- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 56 insertions(+), 46 deletions(-) diff --git a/Changelog.md b/Changelog.md index 8e0aa6aee..64898e287 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,16 @@ 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. +**17.9.0** + +- gitlab: upgrade CE to v17.9.0 +- gitaly: upgrade to v17.9.0 +- gitlab-pages: upgrade to v17.9.0 +- gitlab-shell: upgrade to v14.40.0 +- golang: upgrade to v1.24.0 +- rubygems: upgrade to v3.5.23 +- ubuntu: upgrade to jammy-20250126 + **17.8.2** - gitlab: upgrade CE to v17.8.2 diff --git a/Dockerfile b/Dockerfile index 98dc8d680..b318584e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM ubuntu:jammy-20240911.1 +FROM ubuntu:jammy-20250126 -ARG VERSION=17.8.2 +ARG VERSION=17.9.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.7 \ RUBY_SOURCE_SHA256SUM="8488fa620ff0333c16d437f2b890bba3b67f8745fdecb1472568a6114aad9741" \ - RUBYGEMS_VERSION=3.5.14 \ - GOLANG_VERSION=1.23.6 \ - GITLAB_SHELL_VERSION=14.39.0 \ - GITLAB_PAGES_VERSION=17.8.2 \ - GITALY_SERVER_VERSION=17.8.2 \ + RUBYGEMS_VERSION=3.5.23 \ + GOLANG_VERSION=1.24.0 \ + GITLAB_SHELL_VERSION=14.40.0 \ + GITLAB_PAGES_VERSION=17.9.0 \ + GITALY_SERVER_VERSION=17.9.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 43aedfed6..c22ff6a0b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.8.2 +# sameersbn/gitlab:17.9.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.8.2 +docker pull sameersbn/gitlab:17.9.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.8.2 + sameersbn/gitlab:17.9.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.8.2 + sameersbn/gitlab:17.9.0 ``` ### Database @@ -292,7 +292,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:17.8.2 + sameersbn/gitlab:17.9.0 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.8.2 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.8.2 + sameersbn/gitlab:17.9.0 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.8.2 + sameersbn/gitlab:17.9.0 ``` #### Mail @@ -415,7 +415,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:17.8.2 + sameersbn/gitlab:17.9.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.8.2 + sameersbn/gitlab:17.9.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.8.2 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.8.2 + sameersbn/gitlab:17.9.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.8.2 + sameersbn/gitlab:17.9.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.8.2 + sameersbn/gitlab:17.9.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.8.2 + sameersbn/gitlab:17.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:17.8.2 app:sanitize + sameersbn/gitlab:17.9.0 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.2 app:rake db:setup + sameersbn/gitlab:17.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:17.8.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.8.2 app:rake gitlab:env:info + sameersbn/gitlab:17.9.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.9.0 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.9.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.8.2 +docker pull sameersbn/gitlab:17.9.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.8.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.9.0 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.8.2 + image: sameersbn/gitlab:17.9.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 0806c19f6..297e3ef06 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.8.2 +17.9.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index ca4f7bdc5..61d8adf80 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.8.2 + image: sameersbn/gitlab:17.9.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index d074b3a2b..869525e0e 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.8.2 + image: sameersbn/gitlab:17.9.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 24a4fed92..9a67575d6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.8.2 + image: sameersbn/gitlab:17.9.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 840ff7324..c4026834f 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.9.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.8.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.9.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.8.2 +docker pull sameersbn/gitlab:17.9.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.8.2 +sameersbn/gitlab:17.9.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index bca464a4a..5026de2c5 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.8.2 + image: sameersbn/gitlab:17.9.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index ceb5e62c2..78aeebe88 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.8.2 + image: sameersbn/gitlab:17.9.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index d8018c9ed..ba4b32dcf 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.8.2 + image: sameersbn/gitlab:17.9.0 env: - name: TZ value: Asia/Kolkata From b9f87199195d0ba7f078e31c26557a8ffd421501 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 22 Feb 2025 20:09:00 +0100 Subject: [PATCH 453/522] Fix nginx configuration --- assets/runtime/config/nginx/gitlab-pages-ssl | 3 ++- assets/runtime/config/nginx/gitlab-registry | 7 ++++--- assets/runtime/config/nginx/gitlab-ssl | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/assets/runtime/config/nginx/gitlab-pages-ssl b/assets/runtime/config/nginx/gitlab-pages-ssl index d18956d3c..8563c1a92 100644 --- a/assets/runtime/config/nginx/gitlab-pages-ssl +++ b/assets/runtime/config/nginx/gitlab-pages-ssl @@ -23,7 +23,8 @@ server { ## Pages serving host server { listen 0.0.0.0:443 ssl; - listen [::]:443 ssl http2; + listen [::]:443 ssl; + http2 on; ## Replace this with something like pages.gitlab.com server_name ~^.*{{GITLAB_PAGES_DOMAIN}}; diff --git a/assets/runtime/config/nginx/gitlab-registry b/assets/runtime/config/nginx/gitlab-registry index b37aac542..ce98d045f 100644 --- a/assets/runtime/config/nginx/gitlab-registry +++ b/assets/runtime/config/nginx/gitlab-registry @@ -11,14 +11,15 @@ server { server_name {{GITLAB_REGISTRY_HOST}}; server_tokens off; ## Don't show the nginx version number, a security best practice return 301 https://$http_host:$request_uri; - access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log gitlab_access; + access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log; error_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_error.log; } server { # 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; + listen *:{{GITLAB_REGISTRY_PORT}} ssl; + http2 on; server_name {{GITLAB_REGISTRY_HOST}}; server_tokens off; ## Don't show the nginx version number, a security best practice @@ -36,7 +37,7 @@ server { ssl_session_cache builtin:1000 shared:SSL:10m; ssl_session_timeout 5m; - access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log gitlab_access; + access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log; error_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_error.log; location / { diff --git a/assets/runtime/config/nginx/gitlab-ssl b/assets/runtime/config/nginx/gitlab-ssl index df349ec9b..1057e0926 100644 --- a/assets/runtime/config/nginx/gitlab-ssl +++ b/assets/runtime/config/nginx/gitlab-ssl @@ -55,8 +55,9 @@ server { ## HTTPS host server { - listen 0.0.0.0:443 ssl http2; - listen [::]:443 ipv6only=on ssl http2 default_server; + listen 0.0.0.0:443 ssl; + listen [::]:443 ipv6only=on ssl default_server; + http2 on; server_name {{GITLAB_HOST}}; ## Replace this with something like gitlab.example.com server_tokens off; ## Don't show the nginx version number, a security best practice From 967e018156280cade71abb7fb19acfff73116298 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 27 Feb 2025 11:34:56 +0100 Subject: [PATCH 454/522] Upgrade GitLab CE to 17.9.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 64898e287..627e155ad 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ 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. +**17.9.1** + +- gitlab: upgrade CE to v17.9.1 +- gitaly: upgrade to v17.9.1 +- gitlab-pages: upgrade to v17.9.1 + **17.9.0** - gitlab: upgrade CE to v17.9.0 diff --git a/Dockerfile b/Dockerfile index b318584e8..fc79313ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:jammy-20250126 -ARG VERSION=17.9.0 +ARG VERSION=17.9.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.7 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.5.23 \ GOLANG_VERSION=1.24.0 \ GITLAB_SHELL_VERSION=14.40.0 \ - GITLAB_PAGES_VERSION=17.9.0 \ - GITALY_SERVER_VERSION=17.9.0 \ + GITLAB_PAGES_VERSION=17.9.1 \ + GITALY_SERVER_VERSION=17.9.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index c22ff6a0b..87baee611 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.9.0 +# sameersbn/gitlab:17.9.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.9.0 +docker pull sameersbn/gitlab:17.9.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.9.0 + sameersbn/gitlab:17.9.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.9.0 + sameersbn/gitlab:17.9.1 ``` ### Database @@ -292,7 +292,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:17.9.0 + sameersbn/gitlab:17.9.1 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.9.0 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.9.0 + sameersbn/gitlab:17.9.1 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.9.0 + sameersbn/gitlab:17.9.1 ``` #### Mail @@ -415,7 +415,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:17.9.0 + sameersbn/gitlab:17.9.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.9.0 + sameersbn/gitlab:17.9.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.9.0 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.9.0 + sameersbn/gitlab:17.9.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.9.0 + sameersbn/gitlab:17.9.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.9.0 + sameersbn/gitlab:17.9.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.9.0 + sameersbn/gitlab:17.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:17.9.0 app:sanitize + sameersbn/gitlab:17.9.1 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.0 app:rake db:setup + sameersbn/gitlab:17.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:17.9.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.9.0 app:rake gitlab:env:info + sameersbn/gitlab:17.9.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.9.1 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.9.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.9.0 +docker pull sameersbn/gitlab:17.9.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.9.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.9.1 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.9.0 + image: sameersbn/gitlab:17.9.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 297e3ef06..8c1fac2ac 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.9.0 +17.9.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 61d8adf80..1ab9faec0 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.9.0 + image: sameersbn/gitlab:17.9.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 869525e0e..c4209cbea 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.9.0 + image: sameersbn/gitlab:17.9.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 9a67575d6..639c24302 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.9.0 + image: sameersbn/gitlab:17.9.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index c4026834f..944374676 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.9.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.9.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.9.0 +docker pull sameersbn/gitlab:17.9.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.9.0 +sameersbn/gitlab:17.9.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 5026de2c5..aa183177d 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.9.0 + image: sameersbn/gitlab:17.9.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 78aeebe88..61f99d5e2 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.9.0 + image: sameersbn/gitlab:17.9.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index ba4b32dcf..b90358558 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.9.0 + image: sameersbn/gitlab:17.9.1 env: - name: TZ value: Asia/Kolkata From ef8807ec90242446026cf563f267256a1979e5e9 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 13 Mar 2025 18:23:42 +0800 Subject: [PATCH 455/522] Upgrade GitLab CE to 17.9.2 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/docker-compose-registry.yml | 2 +- 8 files changed, 41 insertions(+), 35 deletions(-) diff --git a/Changelog.md b/Changelog.md index 627e155ad..e90e97bf0 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ 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. +**17.9.2** + +- gitlab: upgrade CE to v17.9.2 +- gitaly: upgrade to v17.9.2 +- gitlab-pages: upgrade to v17.9.2 + **17.9.1** - gitlab: upgrade CE to v17.9.1 diff --git a/Dockerfile b/Dockerfile index fc79313ae..fe516d8c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:jammy-20250126 -ARG VERSION=17.9.1 +ARG VERSION=17.9.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.7 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.5.23 \ GOLANG_VERSION=1.24.0 \ GITLAB_SHELL_VERSION=14.40.0 \ - GITLAB_PAGES_VERSION=17.9.1 \ - GITALY_SERVER_VERSION=17.9.1 \ + GITLAB_PAGES_VERSION=17.9.2 \ + GITALY_SERVER_VERSION=17.9.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 87baee611..02d6b0b53 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.9.1 +# sameersbn/gitlab:17.9.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.9.1 +docker pull sameersbn/gitlab:17.9.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.9.1 + sameersbn/gitlab:17.9.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.9.1 + sameersbn/gitlab:17.9.2 ``` ### Database @@ -292,7 +292,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:17.9.1 + sameersbn/gitlab:17.9.2 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.9.1 + sameersbn/gitlab:17.9.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: @@ -375,7 +375,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:17.9.1 + sameersbn/gitlab:17.9.2 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.9.1 + sameersbn/gitlab:17.9.2 ``` #### Mail @@ -415,7 +415,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:17.9.1 + sameersbn/gitlab:17.9.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.9.1 + sameersbn/gitlab:17.9.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.9.1 + sameersbn/gitlab:17.9.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. @@ -535,7 +535,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:17.9.1 + sameersbn/gitlab:17.9.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.9.1 + sameersbn/gitlab:17.9.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.9.1 + sameersbn/gitlab:17.9.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.9.1 + sameersbn/gitlab:17.9.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:17.9.1 app:sanitize + sameersbn/gitlab:17.9.2 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.9.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.1 app:rake db:setup + sameersbn/gitlab:17.9.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:17.9.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.9.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.9.1 app:rake gitlab:env:info + sameersbn/gitlab:17.9.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.9.2 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.9.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.9.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:17.9.1 +docker pull sameersbn/gitlab:17.9.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.9.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.9.2 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.9.1 + image: sameersbn/gitlab:17.9.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 8c1fac2ac..b2a95e29c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.9.1 +17.9.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 1ab9faec0..61b9c77c7 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.9.1 + image: sameersbn/gitlab:17.9.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index c4209cbea..221d816c1 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.9.1 + image: sameersbn/gitlab:17.9.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 639c24302..cc1affe1f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.9.1 + image: sameersbn/gitlab:17.9.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 61f99d5e2..cbf30e533 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.9.1 + image: sameersbn/gitlab:17.9.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab From 76c336c02ca1e9b5987e9b330d2090c2f18dc6c3 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 20 Mar 2025 16:26:21 +0100 Subject: [PATCH 456/522] Upgrade GitLab CE to 17.10.0 --- Changelog.md | 8 ++++ Dockerfile | 12 +++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 53 insertions(+), 45 deletions(-) diff --git a/Changelog.md b/Changelog.md index e90e97bf0..076c55f79 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,14 @@ 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. +**17.10.0** + +- gitlab: upgrade CE to v17.10.0 +- gitaly: upgrade to v17.10.0 +- gitlab-pages: upgrade to v17.10.0 +- golang: upgrade to v1.24.1 +- rubygems: upgrade to v3.6.6 + **17.9.2** - gitlab: upgrade CE to v17.9.2 diff --git a/Dockerfile b/Dockerfile index fe516d8c3..978f94d04 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ FROM ubuntu:jammy-20250126 -ARG VERSION=17.9.2 +ARG VERSION=17.10.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.7 \ RUBY_SOURCE_SHA256SUM="8488fa620ff0333c16d437f2b890bba3b67f8745fdecb1472568a6114aad9741" \ - RUBYGEMS_VERSION=3.5.23 \ - GOLANG_VERSION=1.24.0 \ - GITLAB_SHELL_VERSION=14.40.0 \ - GITLAB_PAGES_VERSION=17.9.2 \ - GITALY_SERVER_VERSION=17.9.2 \ + RUBYGEMS_VERSION=3.6.6 \ + GOLANG_VERSION=1.24.1 \ + GITLAB_SHELL_VERSION=14.41.0 \ + GITLAB_PAGES_VERSION=17.10.0 \ + GITALY_SERVER_VERSION=17.10.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 02d6b0b53..76b80f022 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.9.2 +# sameersbn/gitlab:17.10.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.9.2 +docker pull sameersbn/gitlab:17.10.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.9.2 + sameersbn/gitlab:17.10.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.9.2 + sameersbn/gitlab:17.10.0 ``` ### Database @@ -292,7 +292,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:17.9.2 + sameersbn/gitlab:17.10.0 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.9.2 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.9.2 + sameersbn/gitlab:17.10.0 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.9.2 + sameersbn/gitlab:17.10.0 ``` #### Mail @@ -415,7 +415,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:17.9.2 + sameersbn/gitlab:17.10.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.9.2 + sameersbn/gitlab:17.10.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.9.2 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.9.2 + sameersbn/gitlab:17.10.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.9.2 + sameersbn/gitlab:17.10.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.9.2 + sameersbn/gitlab:17.10.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.9.2 + sameersbn/gitlab:17.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:17.9.2 app:sanitize + sameersbn/gitlab:17.10.0 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.2 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.2 app:rake db:setup + sameersbn/gitlab:17.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:17.9.2 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.9.2 app:rake gitlab:env:info + sameersbn/gitlab:17.10.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.10.0 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.2 app:rake gitlab:import:repos + sameersbn/gitlab:17.10.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.9.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:17.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:17.9.2 +docker pull sameersbn/gitlab:17.10.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.9.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.10.0 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.9.2 + image: sameersbn/gitlab:17.10.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index b2a95e29c..d30bd38d6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.9.2 +17.10.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 61b9c77c7..1a6b63b84 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.9.2 + image: sameersbn/gitlab:17.10.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 221d816c1..3880ffdba 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.9.2 + image: sameersbn/gitlab:17.10.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index cc1affe1f..ddc5b607f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.9.2 + image: sameersbn/gitlab:17.10.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 944374676..fcd6f26da 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.10.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.9.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.10.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.9.1 +docker pull sameersbn/gitlab:17.10.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.9.1 +sameersbn/gitlab:17.10.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index aa183177d..35a8734d3 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.9.1 + image: sameersbn/gitlab:17.10.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index cbf30e533..bdd2d528d 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.9.2 + image: sameersbn/gitlab:17.10.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index b90358558..d18666c07 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.9.1 + image: sameersbn/gitlab:17.10.0 env: - name: TZ value: Asia/Kolkata From 8d1e4bafcd93e11f6b5a511f3eddafe7a214dede Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 30 Mar 2025 10:35:12 +0200 Subject: [PATCH 457/522] Upgrade GitLab CE to 17.10.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 076c55f79..17d5bf9f2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ 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. +**17.10.1** + +- gitlab: upgrade CE to v17.10.1 +- gitaly: upgrade to v17.10.1 +- gitlab-pages: upgrade to v17.10.1 + **17.10.0** - gitlab: upgrade CE to v17.10.0 diff --git a/Dockerfile b/Dockerfile index 978f94d04..b9ba847a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:jammy-20250126 -ARG VERSION=17.10.0 +ARG VERSION=17.10.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.7 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.6.6 \ GOLANG_VERSION=1.24.1 \ GITLAB_SHELL_VERSION=14.41.0 \ - GITLAB_PAGES_VERSION=17.10.0 \ - GITALY_SERVER_VERSION=17.10.0 \ + GITLAB_PAGES_VERSION=17.10.1 \ + GITALY_SERVER_VERSION=17.10.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 76b80f022..798a81b3d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.10.0 +# sameersbn/gitlab:17.10.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.10.0 +docker pull sameersbn/gitlab:17.10.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.10.0 + sameersbn/gitlab:17.10.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.10.0 + sameersbn/gitlab:17.10.1 ``` ### Database @@ -292,7 +292,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:17.10.0 + sameersbn/gitlab:17.10.1 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.10.0 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.10.0 + sameersbn/gitlab:17.10.1 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.10.0 + sameersbn/gitlab:17.10.1 ``` #### Mail @@ -415,7 +415,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:17.10.0 + sameersbn/gitlab:17.10.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.10.0 + sameersbn/gitlab:17.10.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.10.0 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.10.0 + sameersbn/gitlab:17.10.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.10.0 + sameersbn/gitlab:17.10.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.10.0 + sameersbn/gitlab:17.10.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.10.0 + sameersbn/gitlab:17.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:17.10.0 app:sanitize + sameersbn/gitlab:17.10.1 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.0 app:rake db:setup + sameersbn/gitlab:17.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:17.10.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.10.0 app:rake gitlab:env:info + sameersbn/gitlab:17.10.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.10.1 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.10.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.10.0 +docker pull sameersbn/gitlab:17.10.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.10.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.10.1 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.10.0 + image: sameersbn/gitlab:17.10.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index d30bd38d6..60d8373f8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.10.0 +17.10.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 1a6b63b84..935de890b 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.10.0 + image: sameersbn/gitlab:17.10.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 3880ffdba..6e358024f 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.10.0 + image: sameersbn/gitlab:17.10.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index ddc5b607f..d0d1dd86d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.10.0 + image: sameersbn/gitlab:17.10.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index fcd6f26da..3f753c4ba 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.10.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.10.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.10.0 +docker pull sameersbn/gitlab:17.10.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.10.0 +sameersbn/gitlab:17.10.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 35a8734d3..3305d94ac 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.10.0 + image: sameersbn/gitlab:17.10.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index bdd2d528d..0a3c67c8a 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.10.0 + image: sameersbn/gitlab:17.10.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index d18666c07..dacf83b72 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.10.0 + image: sameersbn/gitlab:17.10.1 env: - name: TZ value: Asia/Kolkata From dec08eeff24cdf8297eeadfe53a7f3ecdd1d1c36 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 3 Apr 2025 05:21:45 +0200 Subject: [PATCH 458/522] Upgrade GitLab CE to 17.10.3 --- Changelog.md | 8 ++++ Dockerfile | 12 +++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 53 insertions(+), 45 deletions(-) diff --git a/Changelog.md b/Changelog.md index 17d5bf9f2..22d7e5435 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,14 @@ 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. +**17.10.3** + +- gitlab: upgrade CE to v17.10.3 +- gitaly: upgrade to v17.10.3 +- gitlab-pages: upgrade to v17.10.3 +- golang: upgrade to v1.24.2 +- ruby: upgrade to v3.2.8 + **17.10.1** - gitlab: upgrade CE to v17.10.1 diff --git a/Dockerfile b/Dockerfile index b9ba847a0..181fbe3c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ FROM ubuntu:jammy-20250126 -ARG VERSION=17.10.1 +ARG VERSION=17.10.3 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=3.2.7 \ - RUBY_SOURCE_SHA256SUM="8488fa620ff0333c16d437f2b890bba3b67f8745fdecb1472568a6114aad9741" \ + RUBY_VERSION=3.2.8 \ + RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \ RUBYGEMS_VERSION=3.6.6 \ - GOLANG_VERSION=1.24.1 \ + GOLANG_VERSION=1.24.2 \ GITLAB_SHELL_VERSION=14.41.0 \ - GITLAB_PAGES_VERSION=17.10.1 \ - GITALY_SERVER_VERSION=17.10.1 \ + GITLAB_PAGES_VERSION=17.10.3 \ + GITALY_SERVER_VERSION=17.10.3 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 798a81b3d..542839c3f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.10.1 +# sameersbn/gitlab:17.10.3 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.10.1 +docker pull sameersbn/gitlab:17.10.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.10.1 + sameersbn/gitlab:17.10.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.10.1 + sameersbn/gitlab:17.10.3 ``` ### Database @@ -292,7 +292,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:17.10.1 + sameersbn/gitlab:17.10.3 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.10.1 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.10.1 + sameersbn/gitlab:17.10.3 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.10.1 + sameersbn/gitlab:17.10.3 ``` #### Mail @@ -415,7 +415,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:17.10.1 + sameersbn/gitlab:17.10.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.10.1 + sameersbn/gitlab:17.10.3 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.10.1 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.10.1 + sameersbn/gitlab:17.10.3 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.10.1 + sameersbn/gitlab:17.10.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.10.1 + sameersbn/gitlab:17.10.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.10.1 + sameersbn/gitlab:17.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:17.10.1 app:sanitize + sameersbn/gitlab:17.10.3 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.1 app:rake db:setup + sameersbn/gitlab:17.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:17.10.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.10.1 app:rake gitlab:env:info + sameersbn/gitlab:17.10.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.10.3 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.10.3 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.10.1 +docker pull sameersbn/gitlab:17.10.3 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.10.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.10.3 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.10.1 + image: sameersbn/gitlab:17.10.3 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 60d8373f8..76df87fc2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.10.1 +17.10.3 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 935de890b..a6bd345ad 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.10.1 + image: sameersbn/gitlab:17.10.3 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 6e358024f..13f8e1ebc 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.10.1 + image: sameersbn/gitlab:17.10.3 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index d0d1dd86d..129119099 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.10.1 + image: sameersbn/gitlab:17.10.3 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 3f753c4ba..6b21a68b2 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.10.3 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.10.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.10.1 +docker pull sameersbn/gitlab:17.10.3 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.10.1 +sameersbn/gitlab:17.10.3 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 3305d94ac..942116a2b 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.10.1 + image: sameersbn/gitlab:17.10.3 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 0a3c67c8a..43cc4e44c 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.10.1 + image: sameersbn/gitlab:17.10.3 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index dacf83b72..3a265500e 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.10.1 + image: sameersbn/gitlab:17.10.3 env: - name: TZ value: Asia/Kolkata From 1dc3980701d4de31249f6c1ab7a72dac762c1ae6 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 11 Apr 2025 05:05:46 +0200 Subject: [PATCH 459/522] Upgrade GitLab CE to 17.10.4 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 22d7e5435..96aa33ae4 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,13 @@ 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. +**17.10.4** + +- gitlab: upgrade CE to v17.10.4 +- gitaly: upgrade to v17.10.4 +- gitlab-pages: upgrade to v17.10.4 +- ubuntu: upgrade to jammy-20250404 + **17.10.3** - gitlab: upgrade CE to v17.10.3 diff --git a/Dockerfile b/Dockerfile index 181fbe3c6..931e1a99a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:jammy-20250126 +FROM ubuntu:jammy-20250404 -ARG VERSION=17.10.3 +ARG VERSION=17.10.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.8 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.6.6 \ GOLANG_VERSION=1.24.2 \ GITLAB_SHELL_VERSION=14.41.0 \ - GITLAB_PAGES_VERSION=17.10.3 \ - GITALY_SERVER_VERSION=17.10.3 \ + GITLAB_PAGES_VERSION=17.10.4 \ + GITALY_SERVER_VERSION=17.10.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 542839c3f..3d07517c3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.10.3 +# sameersbn/gitlab:17.10.4 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.10.3 +docker pull sameersbn/gitlab:17.10.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.10.3 + sameersbn/gitlab:17.10.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.10.3 + sameersbn/gitlab:17.10.4 ``` ### Database @@ -292,7 +292,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:17.10.3 + sameersbn/gitlab:17.10.4 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.10.3 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.10.3 + sameersbn/gitlab:17.10.4 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.10.3 + sameersbn/gitlab:17.10.4 ``` #### Mail @@ -415,7 +415,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:17.10.3 + sameersbn/gitlab:17.10.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.10.3 + sameersbn/gitlab:17.10.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.10.3 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.10.3 + sameersbn/gitlab:17.10.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.10.3 + sameersbn/gitlab:17.10.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.10.3 + sameersbn/gitlab:17.10.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.10.3 + sameersbn/gitlab:17.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:17.10.3 app:sanitize + sameersbn/gitlab:17.10.4 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.3 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.3 app:rake db:setup + sameersbn/gitlab:17.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:17.10.3 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.10.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.10.3 app:rake gitlab:env:info + sameersbn/gitlab:17.10.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.3 app:rake gitlab:import:repos + sameersbn/gitlab:17.10.4 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.3 app:rake gitlab:import:repos + sameersbn/gitlab:17.10.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.10.3 +docker pull sameersbn/gitlab:17.10.4 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.10.3 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.10.4 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.10.3 + image: sameersbn/gitlab:17.10.4 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 76df87fc2..2ba03104f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.10.3 +17.10.4 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index a6bd345ad..de7be74b8 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.10.3 + image: sameersbn/gitlab:17.10.4 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 13f8e1ebc..42f3fb206 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.10.3 + image: sameersbn/gitlab:17.10.4 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 129119099..4280864b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.10.3 + image: sameersbn/gitlab:17.10.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 6b21a68b2..965bb0feb 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.3 app:rake gitlab:backup:create + sameersbn/gitlab:17.10.4 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.3 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.3 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.10.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.10.3 +docker pull sameersbn/gitlab:17.10.4 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.10.3 +sameersbn/gitlab:17.10.4 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 942116a2b..7d67551f2 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.10.3 + image: sameersbn/gitlab:17.10.4 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 43cc4e44c..0d921783e 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.10.3 + image: sameersbn/gitlab:17.10.4 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 3a265500e..40fb80d2b 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.10.3 + image: sameersbn/gitlab:17.10.4 env: - name: TZ value: Asia/Kolkata From 2d9b5fd8ca3d7f4a9d304b1a60b4945f00eb6026 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 18 Apr 2025 20:00:47 +0200 Subject: [PATCH 460/522] Upgrade GitLab CE to 17.11.0 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 96aa33ae4..5317cd06d 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ 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. +**17.11.0** + +- gitlab: upgrade CE to v17.11.0 +- gitaly: upgrade to v17.11.0 +- gitlab-pages: upgrade to v17.11.0 + **17.10.4** - gitlab: upgrade CE to v17.10.4 diff --git a/Dockerfile b/Dockerfile index 931e1a99a..723448b80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:jammy-20250404 -ARG VERSION=17.10.4 +ARG VERSION=17.11.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.8 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.6.6 \ GOLANG_VERSION=1.24.2 \ GITLAB_SHELL_VERSION=14.41.0 \ - GITLAB_PAGES_VERSION=17.10.4 \ - GITALY_SERVER_VERSION=17.10.4 \ + GITLAB_PAGES_VERSION=17.11.0 \ + GITALY_SERVER_VERSION=17.11.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 3d07517c3..bfca86cf8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.10.4 +# sameersbn/gitlab:17.11.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.10.4 +docker pull sameersbn/gitlab:17.11.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.10.4 + sameersbn/gitlab:17.11.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.10.4 + sameersbn/gitlab:17.11.0 ``` ### Database @@ -292,7 +292,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:17.10.4 + sameersbn/gitlab:17.11.0 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.10.4 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.10.4 + sameersbn/gitlab:17.11.0 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.10.4 + sameersbn/gitlab:17.11.0 ``` #### Mail @@ -415,7 +415,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:17.10.4 + sameersbn/gitlab:17.11.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.10.4 + sameersbn/gitlab:17.11.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.10.4 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.10.4 + sameersbn/gitlab:17.11.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.10.4 + sameersbn/gitlab:17.11.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.10.4 + sameersbn/gitlab:17.11.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.10.4 + sameersbn/gitlab:17.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:17.10.4 app:sanitize + sameersbn/gitlab:17.11.0 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.4 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.4 app:rake db:setup + sameersbn/gitlab:17.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:17.10.4 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.10.4 app:rake gitlab:env:info + sameersbn/gitlab:17.11.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.4 app:rake gitlab:import:repos + sameersbn/gitlab:17.11.0 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.4 app:rake gitlab:import:repos + sameersbn/gitlab:17.11.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.10.4 +docker pull sameersbn/gitlab:17.11.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.10.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.11.0 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.10.4 + image: sameersbn/gitlab:17.11.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 2ba03104f..903f9e3b7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.10.4 +17.11.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index de7be74b8..da4975a46 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.10.4 + image: sameersbn/gitlab:17.11.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 42f3fb206..73a7733a0 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.10.4 + image: sameersbn/gitlab:17.11.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 4280864b3..edc89a8ba 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.10.4 + image: sameersbn/gitlab:17.11.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 965bb0feb..73c3633f6 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.4 app:rake gitlab:backup:create + sameersbn/gitlab:17.11.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.4 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.10.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.11.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.10.4 +docker pull sameersbn/gitlab:17.11.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.10.4 +sameersbn/gitlab:17.11.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 7d67551f2..158d327fe 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.10.4 + image: sameersbn/gitlab:17.11.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 0d921783e..4704c996c 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.10.4 + image: sameersbn/gitlab:17.11.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 40fb80d2b..210b1a038 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.10.4 + image: sameersbn/gitlab:17.11.0 env: - name: TZ value: Asia/Kolkata From 145f1b08d99aeeea84ba00e9f7ff6736559a496f Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 24 Apr 2025 21:16:05 +0200 Subject: [PATCH 461/522] Upgrade GitLab CE to 17.11.1 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index 5317cd06d..5061c2dbb 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,13 @@ 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. +**17.11.1** + +- gitlab: upgrade CE to v17.11.1 +- gitaly: upgrade to v17.11.1 +- gitlab-pages: upgrade to v17.11.1 +- rubygems: upgrade to v3.6.8 + **17.11.0** - gitlab: upgrade CE to v17.11.0 diff --git a/Dockerfile b/Dockerfile index 723448b80..e751c431a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ FROM ubuntu:jammy-20250404 -ARG VERSION=17.11.0 +ARG VERSION=17.11.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.8 \ RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \ - RUBYGEMS_VERSION=3.6.6 \ + RUBYGEMS_VERSION=3.6.8 \ GOLANG_VERSION=1.24.2 \ GITLAB_SHELL_VERSION=14.41.0 \ - GITLAB_PAGES_VERSION=17.11.0 \ - GITALY_SERVER_VERSION=17.11.0 \ + GITLAB_PAGES_VERSION=17.11.1 \ + GITALY_SERVER_VERSION=17.11.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index bfca86cf8..5c457d0fd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.11.0 +# sameersbn/gitlab:17.11.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.11.0 +docker pull sameersbn/gitlab:17.11.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.11.0 + sameersbn/gitlab:17.11.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.11.0 + sameersbn/gitlab:17.11.1 ``` ### Database @@ -292,7 +292,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:17.11.0 + sameersbn/gitlab:17.11.1 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.11.0 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.11.0 + sameersbn/gitlab:17.11.1 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.11.0 + sameersbn/gitlab:17.11.1 ``` #### Mail @@ -415,7 +415,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:17.11.0 + sameersbn/gitlab:17.11.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.11.0 + sameersbn/gitlab:17.11.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.11.0 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.11.0 + sameersbn/gitlab:17.11.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.11.0 + sameersbn/gitlab:17.11.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.11.0 + sameersbn/gitlab:17.11.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.11.0 + sameersbn/gitlab:17.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:17.11.0 app:sanitize + sameersbn/gitlab:17.11.1 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.0 app:rake db:setup + sameersbn/gitlab:17.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:17.11.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.11.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.11.0 app:rake gitlab:env:info + sameersbn/gitlab:17.11.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.11.1 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.0 app:rake gitlab:import:repos + sameersbn/gitlab:17.11.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.11.0 +docker pull sameersbn/gitlab:17.11.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.11.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.11.1 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.11.0 + image: sameersbn/gitlab:17.11.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 903f9e3b7..494afa45c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.11.0 +17.11.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index da4975a46..a148bb6d6 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.11.0 + image: sameersbn/gitlab:17.11.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 73a7733a0..c00189704 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.11.0 + image: sameersbn/gitlab:17.11.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index edc89a8ba..c861f1233 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.11.0 + image: sameersbn/gitlab:17.11.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 73c3633f6..fe4666073 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.0 app:rake gitlab:backup:create + sameersbn/gitlab:17.11.1 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.0 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.11.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.11.0 +docker pull sameersbn/gitlab:17.11.1 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.11.0 +sameersbn/gitlab:17.11.1 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 158d327fe..8272653af 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.11.0 + image: sameersbn/gitlab:17.11.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 4704c996c..f1a2f4517 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.11.0 + image: sameersbn/gitlab:17.11.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 210b1a038..a4892bdf5 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.11.0 + image: sameersbn/gitlab:17.11.1 env: - name: TZ value: Asia/Kolkata From 1b5a27d0d2033829ef95066cd733876c1131f451 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 9 May 2025 22:10:28 +0200 Subject: [PATCH 462/522] Upgrade GitLab CE to 17.11.2 --- Changelog.md | 8 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index 5061c2dbb..f827b48d7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,14 @@ 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. +**17.11.2** + +- gitlab: upgrade CE to v17.11.2 +- gitaly: upgrade to v17.11.2 +- gitlab-pages: upgrade to v17.11.2 +- golang: upgrade to v1.24.3 +- ubuntu: upgrade to jammy-20250415.1 + **17.11.1** - gitlab: upgrade CE to v17.11.1 diff --git a/Dockerfile b/Dockerfile index e751c431a..39e1686fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM ubuntu:jammy-20250404 +FROM ubuntu:jammy-20250415.1 -ARG VERSION=17.11.1 +ARG VERSION=17.11.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.8 \ RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \ RUBYGEMS_VERSION=3.6.8 \ - GOLANG_VERSION=1.24.2 \ + GOLANG_VERSION=1.24.3 \ GITLAB_SHELL_VERSION=14.41.0 \ - GITLAB_PAGES_VERSION=17.11.1 \ - GITALY_SERVER_VERSION=17.11.1 \ + GITLAB_PAGES_VERSION=17.11.2 \ + GITALY_SERVER_VERSION=17.11.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 5c457d0fd..bd02a05c7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.11.1 +# sameersbn/gitlab:17.11.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.11.1 +docker pull sameersbn/gitlab:17.11.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.11.1 + sameersbn/gitlab:17.11.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.11.1 + sameersbn/gitlab:17.11.2 ``` ### Database @@ -292,7 +292,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:17.11.1 + sameersbn/gitlab:17.11.2 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.11.1 + sameersbn/gitlab:17.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: @@ -375,7 +375,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:17.11.1 + sameersbn/gitlab:17.11.2 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.11.1 + sameersbn/gitlab:17.11.2 ``` #### Mail @@ -415,7 +415,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:17.11.1 + sameersbn/gitlab:17.11.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.11.1 + sameersbn/gitlab:17.11.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.11.1 + sameersbn/gitlab:17.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. @@ -535,7 +535,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:17.11.1 + sameersbn/gitlab:17.11.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.11.1 + sameersbn/gitlab:17.11.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.11.1 + sameersbn/gitlab:17.11.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.11.1 + sameersbn/gitlab:17.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:17.11.1 app:sanitize + sameersbn/gitlab:17.11.2 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.1 app:rake db:setup + sameersbn/gitlab:17.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:17.11.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:17.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.11.1 app:rake gitlab:env:info + sameersbn/gitlab:17.11.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.11.2 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.1 app:rake gitlab:import:repos + sameersbn/gitlab:17.11.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:17.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:17.11.1 +docker pull sameersbn/gitlab:17.11.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.11.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.11.2 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.11.1 + image: sameersbn/gitlab:17.11.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 494afa45c..867f790a8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.11.1 +17.11.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index a148bb6d6..5b58b0dbc 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.11.1 + image: sameersbn/gitlab:17.11.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index c00189704..171536157 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.11.1 + image: sameersbn/gitlab:17.11.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index c861f1233..e9687f94a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.11.1 + image: sameersbn/gitlab:17.11.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index fe4666073..13aa87afd 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.1 app:rake gitlab:backup:create + sameersbn/gitlab:17.11.2 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.1 app:rake gitlab:backup:restore + sameersbn/gitlab:17.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:17.11.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.11.1 +docker pull sameersbn/gitlab:17.11.2 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.11.1 +sameersbn/gitlab:17.11.2 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 8272653af..5314cf72a 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.11.1 + image: sameersbn/gitlab:17.11.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index f1a2f4517..f86f9b29b 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.11.1 + image: sameersbn/gitlab:17.11.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index a4892bdf5..c47ce2e61 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.11.1 + image: sameersbn/gitlab:17.11.2 env: - name: TZ value: Asia/Kolkata From 77d781f066d9bdc3f0b4f1348341f374150ea23d Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 15 May 2025 19:57:52 +0200 Subject: [PATCH 463/522] Upgrade GitLab CE to 18.0.0 --- Changelog.md | 8 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- scripts/release-notes.sh | 6 ++- 12 files changed, 56 insertions(+), 46 deletions(-) diff --git a/Changelog.md b/Changelog.md index f827b48d7..9a523e7f5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,14 @@ 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. +**18.0.0** + +- gitlab: upgrade CE to v18.0.0 +- gitaly: upgrade to v18.0.0 +- gitlab-pages: upgrade to v18.0.0 +- rubygems: upgrade to v3.6.9 +- ubuntu: upgrade to noble-20250415.1 + **17.11.2** - gitlab: upgrade CE to v17.11.2 diff --git a/Dockerfile b/Dockerfile index 39e1686fe..9bcff06df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM ubuntu:jammy-20250415.1 +FROM ubuntu:noble-20250415.1 -ARG VERSION=17.11.2 +ARG VERSION=18.0.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.8 \ RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \ - RUBYGEMS_VERSION=3.6.8 \ + RUBYGEMS_VERSION=3.6.9 \ GOLANG_VERSION=1.24.3 \ GITLAB_SHELL_VERSION=14.41.0 \ - GITLAB_PAGES_VERSION=17.11.2 \ - GITALY_SERVER_VERSION=17.11.2 \ + GITLAB_PAGES_VERSION=18.0.0 \ + GITALY_SERVER_VERSION=18.0.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index bd02a05c7..efeff910d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:17.11.2 +# sameersbn/gitlab:18.0.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:17.11.2 +docker pull sameersbn/gitlab:18.0.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:17.11.2 + sameersbn/gitlab:18.0.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:17.11.2 + sameersbn/gitlab:18.0.0 ``` ### Database @@ -292,7 +292,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:17.11.2 + sameersbn/gitlab:18.0.0 ``` ##### Linking to PostgreSQL Container @@ -336,7 +336,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:17.11.2 + sameersbn/gitlab:18.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: @@ -375,7 +375,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:17.11.2 + sameersbn/gitlab:18.0.0 ``` #### Linking to Redis Container @@ -402,7 +402,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:17.11.2 + sameersbn/gitlab:18.0.0 ``` #### Mail @@ -415,7 +415,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:17.11.2 + sameersbn/gitlab:18.0.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -435,7 +435,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:17.11.2 + sameersbn/gitlab:18.0.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -519,7 +519,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:17.11.2 + sameersbn/gitlab:18.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. @@ -535,7 +535,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:17.11.2 + sameersbn/gitlab:18.0.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -558,7 +558,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:17.11.2 + sameersbn/gitlab:18.0.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -606,7 +606,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:17.11.2 + sameersbn/gitlab:18.0.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -812,14 +812,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:17.11.2 + sameersbn/gitlab:18.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:17.11.2 app:sanitize + sameersbn/gitlab:18.0.0 app:sanitize ``` #### Piwik @@ -2562,7 +2562,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.2 app:rake gitlab:backup:create + sameersbn/gitlab:18.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. @@ -2597,14 +2597,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.2 app:rake db:setup + sameersbn/gitlab:18.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:17.11.2 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:18.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2662,7 +2662,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:17.11.2 app:rake gitlab:env:info + sameersbn/gitlab:18.0.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.2 app:rake gitlab:import:repos + sameersbn/gitlab:18.0.0 app:rake gitlab:import:repos ``` Or @@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.2 app:rake gitlab:import:repos + sameersbn/gitlab:18.0.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2730,12 +2730,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:17.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:18.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:17.11.2 +docker pull sameersbn/gitlab:18.0.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.11.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.0.0 ``` ### Shell Access @@ -2799,7 +2799,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:17.11.2 + image: sameersbn/gitlab:18.0.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 867f790a8..7eae4e2e9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -17.11.2 +18.0.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 5b58b0dbc..49df8e03c 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.11.2 + image: sameersbn/gitlab:18.0.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 171536157..706339d2b 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:17.11.2 + image: sameersbn/gitlab:18.0.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index e9687f94a..3e9e4a479 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.11.2 + image: sameersbn/gitlab:18.0.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 13aa87afd..b536dac6b 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.2 app:rake gitlab:backup:create + sameersbn/gitlab:18.0.0 app:rake gitlab:backup:create ``` ## Restoring Backups @@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.2 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -314,7 +314,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:17.11.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:18.0.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` # Upgrading from an existing GitLab installation @@ -325,7 +325,7 @@ If you want enable this feature for an existing instance of GitLab you need to d - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:17.11.2 +docker pull sameersbn/gitlab:18.0.0 ``` - **Step 2**: Stop and remove the currently running image @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ --env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \ --env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \ --link registry:registry -sameersbn/gitlab:17.11.2 +sameersbn/gitlab:18.0.0 ``` diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 5314cf72a..b480118b7 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.11.2 + image: sameersbn/gitlab:18.0.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index f86f9b29b..f879181f5 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:17.11.2 + image: sameersbn/gitlab:18.0.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index c47ce2e61..75988d916 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:17.11.2 + image: sameersbn/gitlab:18.0.0 env: - name: TZ value: Asia/Kolkata diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh index 418a6dcf4..676b86459 100755 --- a/scripts/release-notes.sh +++ b/scripts/release-notes.sh @@ -41,8 +41,10 @@ Please note that this version does not yet include any rework as a consequence o Don't forget to consider the version specific upgrading instructions for [GitLab CE](https://docs.gitlab.com/ee/update/) **before** upgrading your GitLab CE instance! Please note: -- GitLab 17.x requires at least PostgreSQL 14. -- See issues to be aware of when upgrading to 17.x : + +- In GitLab 18.0 and later, [PostgreSQL 16 or later is required](https://docs.gitlab.com/install/installation/#software-requirements). +- See issues to be aware of when upgrading: . + ## Contributing From d03645d1cf254c9ad82cbfb9729051cdafe4a866 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 15 May 2025 20:08:33 +0200 Subject: [PATCH 464/522] Update ppa urls --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9bcff06df..6478597c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,15 +33,15 @@ RUN apt-get update \ RUN set -ex && \ mkdir -p /etc/apt/keyrings \ && wget --quiet -O - https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0xe1dd270288b4e6030699e45fa1715d88e1df1f24 | gpg --dearmor -o /etc/apt/keyrings/git-core.gpg \ - && echo "deb [signed-by=/etc/apt/keyrings/git-core.gpg] http://ppa.launchpad.net/git-core/ppa/ubuntu jammy main" >> /etc/apt/sources.list \ + && echo "deb [signed-by=/etc/apt/keyrings/git-core.gpg] http://ppa.launchpad.net/git-core/ppa/ubuntu noble main" >> /etc/apt/sources.list \ && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/keyrings/postgres.gpg \ - && echo 'deb [signed-by=/etc/apt/keyrings/postgres.gpg] http://apt.postgresql.org/pub/repos/apt/ jammy-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ + && echo 'deb [signed-by=/etc/apt/keyrings/postgres.gpg] http://apt.postgresql.org/pub/repos/apt/ noble-pgdg main' > /etc/apt/sources.list.d/pgdg.list \ && wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \ && echo 'deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main' > /etc/apt/sources.list.d/nodesource.list \ && wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \ && echo 'deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \ && wget --quiet -O - https://nginx.org/keys/nginx_signing.key | gpg --dearmor -o /etc/apt/keyrings/nginx-archive-keyring.gpg \ - && echo "deb [signed-by=/etc/apt/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/ubuntu jammy nginx" >> /etc/apt/sources.list.d/nginx.list \ + && echo "deb [signed-by=/etc/apt/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/ubuntu noble nginx" >> /etc/apt/sources.list.d/nginx.list \ && printf "Package: *\nPin: origin nginx.org\nPin: release o=nginx\nPin-Priority: 900\n" >> /etc/apt/preferences.d/99nginx \ && set -ex \ && apt-get update \ From d7171e5189ae8e011d6ee9b7f4c41b4f7b2e2adf Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 15 May 2025 20:22:54 +0200 Subject: [PATCH 465/522] Remove package 'runit-systemd' --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6478597c5..d56fa8040 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,7 +53,6 @@ RUN set -ex && \ libpq5 zlib1g libyaml-dev libssl-dev libgdbm-dev libre2-dev \ libreadline-dev libncurses5-dev libffi-dev curl openssh-server libxml2-dev libxslt-dev \ libcurl4-openssl-dev libicu-dev libkrb5-dev rsync python3-docutils pkg-config cmake \ - runit-systemd \ tzdata unzip libimage-exiftool-perl libmagic1 \ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \ && locale-gen en_US.UTF-8 \ From 213293b6249113985fe26b6ec5bd17eedbd6a55f Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 15 May 2025 20:26:11 +0200 Subject: [PATCH 466/522] Update orb versions used by circleci --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 747df192c..b23690010 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,8 +1,8 @@ version: 2.1 orbs: - shellcheck: circleci/shellcheck@3.2.0 - docker: circleci/docker@2.8.1 + shellcheck: circleci/shellcheck@3.4.0 + docker: circleci/docker@2.8.2 go: circleci/go@1.11.0 commands: From b3247e4d036a5cdf81e28f21dc3a7f5a116ba93a Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 15 May 2025 20:34:10 +0200 Subject: [PATCH 467/522] Remove package 'paxctl' --- assets/build/install.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index e76c823f0..81b4201a1 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -19,7 +19,9 @@ PATH=${GOROOT}/bin:$PATH export GOROOT PATH -BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \ +# TODO Verify, if this is necessary or not. +# BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake paxctl \ +BUILD_DEPENDENCIES="gcc g++ make patch pkg-config cmake \ libc6-dev \ libpq-dev zlib1g-dev libssl-dev \ libgdbm-dev libreadline-dev libncurses5-dev libffi-dev \ @@ -59,13 +61,14 @@ cd "$PWD_ORG" && rm -rf /tmp/ruby # upgrade rubygems on demand gem update --no-document --system "${RUBYGEMS_VERSION}" -# 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 -# only for simplicity. -paxctl -cvm "$(command -v ruby)" -# https://en.wikibooks.org/wiki/Grsecurity/Application-specific_Settings#Node.js -paxctl -cvm "$(command -v node)" +# TODO Verify, if this is necessary or not. +# # 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 +# # only for simplicity. +# paxctl -cvm "$(command -v ruby)" +# # https://en.wikibooks.org/wiki/Grsecurity/Application-specific_Settings#Node.js +# paxctl -cvm "$(command -v node)" # remove the host keys generated during openssh-server installation rm -rf /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub From cde9b4e320849eb4f6f016c30a5eb973a86effef Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 15 May 2025 22:28:17 +0200 Subject: [PATCH 468/522] Increase memory to avoid heap limit allocation failure --- 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 81b4201a1..6163e6120 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -215,7 +215,7 @@ chown ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/config/database.yml exec_as_git yarn install --production --pure-lockfile 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 NODE_OPTIONS="--max-old-space-size=4096" +exec_as_git bundle exec rake gitlab:assets:compile USE_DB=false SKIP_STORAGE_VALIDATION=true NODE_OPTIONS="--max-old-space-size=8192" # remove auto generated ${GITLAB_DATA_DIR}/config/secrets.yml rm -rf ${GITLAB_DATA_DIR}/config/secrets.yml From 3d07804194d6db3d4b04f878503bc053c202fd66 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 15 May 2025 23:29:09 +0200 Subject: [PATCH 469/522] Remove symbolic link to the correct location of ca-cert file - This hack was introduced by #3027 in order to fix #3010. --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d56fa8040..e8956ec88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -84,8 +84,6 @@ LABEL \ EXPOSE 22/tcp 80/tcp 443/tcp -RUN ln -s /etc/ssl/certs/ca-certificates.crt /usr/lib/ssl/cert.pem - VOLUME ["${GITLAB_DATA_DIR}", "${GITLAB_LOG_DIR}","${GITLAB_HOME}/gitlab/node_modules"] WORKDIR ${GITLAB_INSTALL_DIR} ENTRYPOINT ["/sbin/entrypoint.sh"] From 1192a2e210336aa491d4a6548f60f180c1329a8c Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 16 May 2025 23:16:24 +0200 Subject: [PATCH 470/522] Reformat docker-compose files (fix incorrect indentation) --- contrib/docker-swarm/docker-compose.yml | 296 +++++++++++------------ docker-compose.swarm.yml | 286 +++++++++++------------ docker-compose.yml | 262 ++++++++++----------- docs/docker-compose-keycloak.yml | 298 ++++++++++++------------ docs/docker-compose-registry.yml | 108 ++++----- 5 files changed, 625 insertions(+), 625 deletions(-) diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 49df8e03c..21900a08e 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -5,173 +5,173 @@ services: restart: always image: redis:6.2 command: - - --loglevel warning + - --loglevel warning volumes: - - /srv/docker/gitlab/redis:/var/lib/redis:Z + - /srv/docker/gitlab/redis:/var/lib/redis:Z postgresql: restart: always image: sameersbn/postgresql:14-20230628 volumes: - - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z + - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z environment: - - DB_USER=gitlab - - DB_PASS=password - - DB_NAME=gitlabhq_production - - DB_EXTENSION=pg_trgm + - DB_USER=gitlab + - DB_PASS=password + - DB_NAME=gitlabhq_production + - DB_EXTENSION=pg_trgm gitlab: restart: always image: sameersbn/gitlab:18.0.0 depends_on: - - redis - - postgresql + - redis + - postgresql ports: - - "10080:80" - - "10022:22" + - "10080:80" + - "10022:22" volumes: - - /srv/docker/gitlab/gitlab:/home/git/data:Z + - /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_SECRETS_ENCRYPTED_SETTINGS_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_ALLOW_BYPASS_TWO_FACTOR=false - - - 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_BITBUCKET_URL= - - - 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_USERNAME= - - 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_AUTH0_SCOPE= - - - OAUTH2_GENERIC_APP_ID= - - OAUTH2_GENERIC_APP_SECRET= - - OAUTH2_GENERIC_CLIENT_SITE= - - OAUTH2_GENERIC_CLIENT_USER_INFO_URL= - - OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL= - - OAUTH2_GENERIC_CLIENT_TOKEN_URL= - - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT= - - OAUTH2_GENERIC_ID_PATH= - - OAUTH2_GENERIC_USER_UID= - - OAUTH2_GENERIC_USER_NAME= - - OAUTH2_GENERIC_USER_EMAIL= - - OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE= - - OAUTH2_GENERIC_LABEL= - - OAUTH2_GENERIC_NAME= - - - OAUTH_AZURE_API_KEY= - - OAUTH_AZURE_API_SECRET= - - OAUTH_AZURE_TENANT_ID= + - 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_SECRETS_ENCRYPTED_SETTINGS_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_ALLOW_BYPASS_TWO_FACTOR=false + + - 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_BITBUCKET_URL= + + - 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_USERNAME= + - 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_AUTH0_SCOPE= + + - OAUTH2_GENERIC_APP_ID= + - OAUTH2_GENERIC_APP_SECRET= + - OAUTH2_GENERIC_CLIENT_SITE= + - OAUTH2_GENERIC_CLIENT_USER_INFO_URL= + - OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL= + - OAUTH2_GENERIC_CLIENT_TOKEN_URL= + - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT= + - OAUTH2_GENERIC_ID_PATH= + - OAUTH2_GENERIC_USER_UID= + - OAUTH2_GENERIC_USER_NAME= + - OAUTH2_GENERIC_USER_EMAIL= + - OAUTH2_GENERIC_AUTHORIZE_PARAMS_SCOPE= + - OAUTH2_GENERIC_LABEL= + - OAUTH2_GENERIC_NAME= + + - OAUTH_AZURE_API_KEY= + - OAUTH_AZURE_API_SECRET= + - OAUTH_AZURE_TENANT_ID= configs: gitlab-configs: diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 706339d2b..ce615cb21 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -3,9 +3,9 @@ services: redis: image: redis:6.2 command: - - --loglevel warning + - --loglevel warning volumes: - - redis-data:/var/lib/redis:Z + - redis-data:/var/lib/redis:Z deploy: placement: constraints: @@ -14,12 +14,12 @@ services: postgresql: image: sameersbn/postgresql:14-20230628 volumes: - - postgresql-data:/var/lib/postgresql:Z + - postgresql-data:/var/lib/postgresql:Z environment: - - DB_USER=gitlab - - DB_PASS=password - - DB_NAME=gitlabhq_production - - DB_EXTENSION=pg_trgm,btree_gist + - DB_USER=gitlab + - DB_PASS=password + - DB_NAME=gitlabhq_production + - DB_EXTENSION=pg_trgm,btree_gist deploy: placement: constraints: @@ -65,8 +65,8 @@ services: gitlab: image: sameersbn/gitlab:18.0.0 depends_on: - - redis - - postgresql + - redis + - postgresql ports: # Listen on port 22, default for SSH and Git in host mode (only in its host) # So other nodes in the cluster can keep listening on port 22 @@ -74,8 +74,8 @@ services: published: 22 mode: host volumes: - - gitlab-data:/home/git/data:Z - - certs-data:/certs + - gitlab-data:/home/git/data:Z + - certs-data:/certs # healthcheck: # test: ["CMD", "/usr/local/sbin/healthcheck"] # interval: 5m @@ -88,138 +88,138 @@ services: # To be available for the public Traefik - traefik-public environment: - - DEBUG=false - - - GITLAB_REGISTRY_ENABLED=true - - GITLAB_REGISTRY_HOST=${REGISTRY_HOST?Variable not set} - - GITLAB_REGISTRY_PORT=443 - - GITLAB_REGISTRY_API_URL=http://registry:5000 - - GITLAB_REGISTRY_KEY_PATH=/certs/registry.key - - GITLAB_REGISTRY_ISSUER=gitlab-issuer - - GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES=true - - - GITLAB_SIGNUP_ENABLED=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=true - - SSL_SELF_SIGNED=false - - - GITLAB_HOST=${GITLAB_HOST?Variable not set} - - GITLAB_PORT=443 - - GITLAB_SSH_PORT=22 - - 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_SECRETS_ENCRYPTED_SETTINGS_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_BITBUCKET_URL= - - - 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_USERNAME= - - 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_AUTH0_SCOPE= - - - OAUTH_AZURE_API_KEY= - - OAUTH_AZURE_API_SECRET= - - OAUTH_AZURE_TENANT_ID= - - - RACK_ATTACK_ENABLED=false + - DEBUG=false + + - GITLAB_REGISTRY_ENABLED=true + - GITLAB_REGISTRY_HOST=${REGISTRY_HOST?Variable not set} + - GITLAB_REGISTRY_PORT=443 + - GITLAB_REGISTRY_API_URL=http://registry:5000 + - GITLAB_REGISTRY_KEY_PATH=/certs/registry.key + - GITLAB_REGISTRY_ISSUER=gitlab-issuer + - GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES=true + + - GITLAB_SIGNUP_ENABLED=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=true + - SSL_SELF_SIGNED=false + + - GITLAB_HOST=${GITLAB_HOST?Variable not set} + - GITLAB_PORT=443 + - GITLAB_SSH_PORT=22 + - 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_SECRETS_ENCRYPTED_SETTINGS_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_BITBUCKET_URL= + + - 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_USERNAME= + - 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_AUTH0_SCOPE= + + - OAUTH_AZURE_API_KEY= + - OAUTH_AZURE_API_SECRET= + - OAUTH_AZURE_TENANT_ID= + + - RACK_ATTACK_ENABLED=false deploy: placement: constraints: diff --git a/docker-compose.yml b/docker-compose.yml index 3e9e4a479..2eca3b67b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,32 +5,32 @@ services: restart: always image: redis:6.2 command: - - --loglevel warning + - --loglevel warning volumes: - - redis-data:/data:Z + - redis-data:/data:Z postgresql: restart: always image: sameersbn/postgresql:14-20230628 volumes: - - postgresql-data:/var/lib/postgresql:Z + - postgresql-data:/var/lib/postgresql:Z environment: - - DB_USER=gitlab - - DB_PASS=password - - DB_NAME=gitlabhq_production - - DB_EXTENSION=pg_trgm,btree_gist + - DB_USER=gitlab + - DB_PASS=password + - DB_NAME=gitlabhq_production + - DB_EXTENSION=pg_trgm,btree_gist gitlab: restart: always image: sameersbn/gitlab:18.0.0 depends_on: - - redis - - postgresql + - redis + - postgresql ports: - - "10080:80" - - "10022:22" + - "10080:80" + - "10022:22" volumes: - - gitlab-data:/home/git/data:Z + - gitlab-data:/home/git/data:Z healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 5m @@ -38,125 +38,125 @@ services: retries: 3 start_period: 5m 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_BITBUCKET_URL= - - - 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_USERNAME= - - 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_AUTH0_SCOPE= - - - OAUTH_AZURE_API_KEY= - - OAUTH_AZURE_API_SECRET= - - OAUTH_AZURE_TENANT_ID= + - 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_BITBUCKET_URL= + + - 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_USERNAME= + - 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_AUTH0_SCOPE= + + - OAUTH_AZURE_API_KEY= + - OAUTH_AZURE_API_SECRET= + - OAUTH_AZURE_TENANT_ID= volumes: redis-data: diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index b480118b7..eea284f86 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -5,176 +5,176 @@ services: restart: always image: redis:6.2 command: - - --loglevel warning + - --loglevel warning volumes: - - redis-data:/var/lib/redis:Z + - redis-data:/var/lib/redis:Z postgresql: restart: always image: sameersbn/postgresql:14-20230628 volumes: - - postgresql-data:/var/lib/postgresql:Z + - postgresql-data:/var/lib/postgresql:Z environment: - - DB_USER=gitlab - - DB_PASS=password - - DB_NAME=gitlabhq_production - - DB_EXTENSION=pg_trgm,btree_gist + - DB_USER=gitlab + - DB_PASS=password + - DB_NAME=gitlabhq_production + - DB_EXTENSION=pg_trgm,btree_gist gitlab: restart: always image: sameersbn/gitlab:18.0.0 depends_on: - - redis - - postgresql + - redis + - postgresql ports: - - "10080:80" - - "10022:22" + - "10080:80" + - "10022:22" volumes: - - gitlab-data:/home/git/data:Z + - gitlab-data:/home/git/data:Z 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='' - - 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_SECRETS_ENCRYPTED_SETTINGS_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=true - - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=Keycloak - - OAUTH_ALLOW_SSO=Keycloak - - OAUTH_BLOCK_AUTO_CREATED_USERS=false - - OAUTH_AUTO_LINK_LDAP_USER=false - - OAUTH_AUTO_LINK_SAML_USER=false - - OAUTH_EXTERNAL_PROVIDERS=Keycloak - - - 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_BITBUCKET_URL= - - - 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_USERNAME= - - 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_AUTH0_SCOPE= - - - OAUTH_AZURE_API_KEY= - - OAUTH_AZURE_API_SECRET= - - OAUTH_AZURE_TENANT_ID= - - - OAUTH2_GENERIC_APP_ID=git - - OAUTH2_GENERIC_APP_SECRET= - - OAUTH2_GENERIC_CLIENT_SITE=http://:10081 - - OAUTH2_GENERIC_CLIENT_USER_INFO_URL=http://:10081/auth/realms/master/protocol/openid-connect/userinfo - - OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL=http://:10081/auth/realms/master/protocol/openid-connect/auth - - OAUTH2_GENERIC_CLIENT_TOKEN_URL=http://:10081/auth/realms/master/protocol/openid-connect/token - - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=http://:10081/auth/realms/master/protocol/openid-connect/logout - - OAUTH2_GENERIC_ID_PATH=sub - - OAUTH2_GENERIC_USER_UID=sub - - OAUTH2_GENERIC_USER_NAME=preferred_username - - OAUTH2_GENERIC_USER_EMAIL=email - - OAUTH2_GENERIC_NAME=Keycloak + - 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='' + - 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_SECRETS_ENCRYPTED_SETTINGS_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=true + - OAUTH_AUTO_SIGN_IN_WITH_PROVIDER=Keycloak + - OAUTH_ALLOW_SSO=Keycloak + - OAUTH_BLOCK_AUTO_CREATED_USERS=false + - OAUTH_AUTO_LINK_LDAP_USER=false + - OAUTH_AUTO_LINK_SAML_USER=false + - OAUTH_EXTERNAL_PROVIDERS=Keycloak + + - 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_BITBUCKET_URL= + + - 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_USERNAME= + - 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_AUTH0_SCOPE= + + - OAUTH_AZURE_API_KEY= + - OAUTH_AZURE_API_SECRET= + - OAUTH_AZURE_TENANT_ID= + + - OAUTH2_GENERIC_APP_ID=git + - OAUTH2_GENERIC_APP_SECRET= + - OAUTH2_GENERIC_CLIENT_SITE=http://:10081 + - OAUTH2_GENERIC_CLIENT_USER_INFO_URL=http://:10081/auth/realms/master/protocol/openid-connect/userinfo + - OAUTH2_GENERIC_CLIENT_AUTHORIZE_URL=http://:10081/auth/realms/master/protocol/openid-connect/auth + - OAUTH2_GENERIC_CLIENT_TOKEN_URL=http://:10081/auth/realms/master/protocol/openid-connect/token + - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=http://:10081/auth/realms/master/protocol/openid-connect/logout + - OAUTH2_GENERIC_ID_PATH=sub + - OAUTH2_GENERIC_USER_UID=sub + - OAUTH2_GENERIC_USER_NAME=preferred_username + - OAUTH2_GENERIC_USER_EMAIL=email + - OAUTH2_GENERIC_NAME=Keycloak keycloak: restart: always image: jboss/keycloak:8.0.1 ports: - - "10081:8080" + - "10081:8080" environment: - - DEBUG=false - - KEYCLOAK_PASSWORD=admin - - KEYCLOAK_USER=admin + - DEBUG=false + - KEYCLOAK_PASSWORD=admin + - KEYCLOAK_USER=admin volumes: redis-data: diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index f879181f5..49dbc1d56 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -5,89 +5,89 @@ services: restart: always image: redis:6.2 command: - - --loglevel warning + - --loglevel warning volumes: - - redis:/var/lib/redis:Z + - redis:/var/lib/redis:Z postgresql: restart: always image: sameersbn/postgresql:14-20230628 volumes: - - postgresql:/var/lib/postgresql:Z + - postgresql:/var/lib/postgresql:Z environment: - - DB_USER=gitlab - - DB_PASS=password - - DB_NAME=gitlabhq_production - - DB_EXTENSION=pg_trgm,btree_gist + - DB_USER=gitlab + - DB_PASS=password + - DB_NAME=gitlabhq_production + - DB_EXTENSION=pg_trgm,btree_gist gitlab: restart: always image: sameersbn/gitlab:18.0.0 volumes: - - gitlab-data:/home/git/data:Z - - gitlab-logs:/var/log/gitlab - - ./certs:/certs + - gitlab-data:/home/git/data:Z + - gitlab-logs:/var/log/gitlab + - ./certs:/certs depends_on: - - redis - - postgresql + - redis + - postgresql ports: - - "80:80" - - "10022:22" + - "80:80" + - "10022:22" external_links: - - "registry:registry.example.com" + - "registry:registry.example.com" environment: - - DEBUG=false + - DEBUG=false - - DB_ADAPTER=postgresql - - DB_HOST=postgresql - - DB_PORT=5432 - - DB_USER=gitlab - - DB_PASS=password - - DB_NAME=gitlabhq_production + - 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 + - REDIS_HOST=redis + - REDIS_PORT=6379 - - GITLAB_HTTPS=false - - SSL_SELF_SIGNED=false + - GITLAB_HTTPS=false + - SSL_SELF_SIGNED=false - - GITLAB_HOST=gitlab.example.com - - GITLAB_PORT=80 - - GITLAB_SSH_PORT=10022 - - GITLAB_RELATIVE_URL_ROOT= - - GITLAB_SECRETS_DB_KEY_BASE=secret - - GITLAB_SECRETS_SECRET_KEY_BASE=secret - - GITLAB_SECRETS_OTP_KEY_BASE=secret - - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=secret + - GITLAB_HOST=gitlab.example.com + - GITLAB_PORT=80 + - GITLAB_SSH_PORT=10022 + - GITLAB_RELATIVE_URL_ROOT= + - GITLAB_SECRETS_DB_KEY_BASE=secret + - GITLAB_SECRETS_SECRET_KEY_BASE=secret + - GITLAB_SECRETS_OTP_KEY_BASE=secret + - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=secret - - GITLAB_REGISTRY_ENABLED=true - - GITLAB_REGISTRY_HOST=registry.example.com - - GITLAB_REGISTRY_PORT=5000 - - GITLAB_REGISTRY_API_URL=https://registry.example.com:5000 - - GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt - - GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key + - GITLAB_REGISTRY_ENABLED=true + - GITLAB_REGISTRY_HOST=registry.example.com + - GITLAB_REGISTRY_PORT=5000 + - GITLAB_REGISTRY_API_URL=https://registry.example.com:5000 + - GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt + - GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key registry: restart: always image: registry:2.4.1 ports: - - "5000:5000" + - "5000:5000" volumes: - - registry-data:/var/lib/registry - - ./certs:/certs + - registry-data:/var/lib/registry + - ./certs:/certs external_links: - - "gitlab:gitlab.example.com" + - "gitlab:gitlab.example.com" environment: - - REGISTRY_LOG_LEVEL=info - - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/var/lib/registry - - REGISTRY_AUTH_TOKEN_REALM=http://gitlab.example.com/jwt/auth - - REGISTRY_AUTH_TOKEN_SERVICE=container_registry - - REGISTRY_AUTH_TOKEN_ISSUER=gitlab-issuer - - REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=/certs/registry-auth.crt - - REGISTRY_STORAGE_DELETE_ENABLED=true - - REGISTRY_HTTP_TLS_CERTIFICATE=/certs/registry-auth.crt - - REGISTRY_HTTP_TLS_KEY=/certs/registry-auth.key - - REGISTRY_HTTP_SECRET=secret + - REGISTRY_LOG_LEVEL=info + - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/var/lib/registry + - REGISTRY_AUTH_TOKEN_REALM=http://gitlab.example.com/jwt/auth + - REGISTRY_AUTH_TOKEN_SERVICE=container_registry + - REGISTRY_AUTH_TOKEN_ISSUER=gitlab-issuer + - REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE=/certs/registry-auth.crt + - REGISTRY_STORAGE_DELETE_ENABLED=true + - REGISTRY_HTTP_TLS_CERTIFICATE=/certs/registry-auth.crt + - REGISTRY_HTTP_TLS_KEY=/certs/registry-auth.key + - REGISTRY_HTTP_SECRET=secret volumes: gitlab-data: From 54df83058890b107e4fd046ee08cc2dd3a8eccaf Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 17 May 2025 09:02:10 +0200 Subject: [PATCH 471/522] Use docker image by kkimurak for postgresql --- README.md | 8 ++++---- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/postgresql-rc.yml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index efeff910d..50cfefba3 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,btree_gist' \ --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \ - sameersbn/postgresql:14-20230628 + kkimurak/sameersbn-postgresql:16 ``` Step 2. Launch a redis container @@ -306,7 +306,7 @@ To illustrate linking with a postgresql container, we will use the [sameersbn/po First, let's pull the postgresql image from the docker index. ```bash -docker pull sameersbn/postgresql:14-20230628 +docker pull kkimurak/sameersbn-postgresql:16 ``` For data persistence lets create a store for the postgresql and start the container. @@ -326,7 +326,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:14-20230628 + kkimurak/sameersbn-postgresql:16 ``` 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. @@ -2720,7 +2720,7 @@ Usage when using `docker-compose` can also be found there. > > Since GitLab release `8.6.0` PostgreSQL users should enable `pg_trgm` extension on the GitLab database. Refer to GitLab's [Postgresql Requirements](http://doc.gitlab.com/ce/install/requirements.html#postgresql-requirements) for more information > -> If you're using `sameersbn/postgresql` then please upgrade to `sameersbn/postgresql:14-20230628` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: ). +> If you're using `sameersbn/postgresql` then please upgrade to `kkimurak/sameersbn-postgresql:16` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: ). > > As of version 13.7.0, the required PostgreSQL is version 12.x. As of version 16.0.0, the required PostgreSQL is version 13.x. As of version 17.0.0, the required PostgreSQL is version 14.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql). diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 21900a08e..8fb66cb35 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -11,7 +11,7 @@ services: postgresql: restart: always - image: sameersbn/postgresql:14-20230628 + image: kkimurak/sameersbn-postgresql:16 volumes: - /srv/docker/gitlab/postgresql:/var/lib/postgresql:Z environment: diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index ce615cb21..7f8c742d4 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -12,7 +12,7 @@ services: - node.labels.gitlab.redis-data == true postgresql: - image: sameersbn/postgresql:14-20230628 + image: kkimurak/sameersbn-postgresql:16 volumes: - postgresql-data:/var/lib/postgresql:Z environment: diff --git a/docker-compose.yml b/docker-compose.yml index 2eca3b67b..8864abbce 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: postgresql: restart: always - image: sameersbn/postgresql:14-20230628 + image: kkimurak/sameersbn-postgresql:16 volumes: - postgresql-data:/var/lib/postgresql:Z environment: diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index eea284f86..12dea6780 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -11,7 +11,7 @@ services: postgresql: restart: always - image: sameersbn/postgresql:14-20230628 + image: kkimurak/sameersbn-postgresql:16 volumes: - postgresql-data:/var/lib/postgresql:Z environment: diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 49dbc1d56..d8a5b876d 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -11,7 +11,7 @@ services: postgresql: restart: always - image: sameersbn/postgresql:14-20230628 + image: kkimurak/sameersbn-postgresql:16 volumes: - postgresql:/var/lib/postgresql:Z environment: diff --git a/kubernetes/postgresql-rc.yml b/kubernetes/postgresql-rc.yml index 9498d28b0..e6c4adbb3 100644 --- a/kubernetes/postgresql-rc.yml +++ b/kubernetes/postgresql-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: postgresql - image: sameersbn/postgresql:14-20230628 + image: kkimurak/sameersbn-postgresql:16 env: - name: DB_USER value: gitlab From cf154bdf1fecfdb43769eaad256aa5c7eb336ff4 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 17 May 2025 15:09:19 +0200 Subject: [PATCH 472/522] Ensure grants for user gitlab on schema public are correctly set --- assets/runtime/functions | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/assets/runtime/functions b/assets/runtime/functions index b32048fb8..87e59a020 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -252,6 +252,11 @@ gitlab_uninstall_unused_database_client() { fi } +gitlab_apply_dbms_fixes(){ + echo "- Ensure grants for user gitlab on schema public are correctly set" + PGPASSWORD=${DB_PASS} psql -h "${DB_HOST}" -p "${DB_PORT}" -U "${DB_USER}" -d "${DB_NAME}" -Atw -c "GRANT ALL ON SCHEMA public TO gitlab;" +} + gitlab_configure_database() { echo -n "Configuring gitlab::database" @@ -259,6 +264,7 @@ gitlab_configure_database() { gitlab_check_database_connection gitlab_generate_postgresqlrc gitlab_uninstall_unused_database_client + gitlab_apply_dbms_fixes update_template ${GITLAB_DATABASE_CONFIG} \ DB_ENCODING \ From 1bf1c82deb15388043bde559fc36f66312b4a7c1 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 17 May 2025 18:36:58 +0200 Subject: [PATCH 473/522] Revert "Ensure grants for user gitlab on schema public are correctly set" This reverts commit cf154bdf1fecfdb43769eaad256aa5c7eb336ff4. --- assets/runtime/functions | 6 ------ 1 file changed, 6 deletions(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index 87e59a020..b32048fb8 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -252,11 +252,6 @@ gitlab_uninstall_unused_database_client() { fi } -gitlab_apply_dbms_fixes(){ - echo "- Ensure grants for user gitlab on schema public are correctly set" - PGPASSWORD=${DB_PASS} psql -h "${DB_HOST}" -p "${DB_PORT}" -U "${DB_USER}" -d "${DB_NAME}" -Atw -c "GRANT ALL ON SCHEMA public TO gitlab;" -} - gitlab_configure_database() { echo -n "Configuring gitlab::database" @@ -264,7 +259,6 @@ gitlab_configure_database() { gitlab_check_database_connection gitlab_generate_postgresqlrc gitlab_uninstall_unused_database_client - gitlab_apply_dbms_fixes update_template ${GITLAB_DATABASE_CONFIG} \ DB_ENCODING \ From d9566ce0ef12e43d566c709b8dce02efba31d49a Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 17 May 2025 18:47:21 +0200 Subject: [PATCH 474/522] Use redis:7 in docker compose files and kubernetes manifests --- Changelog.md | 1 + README.md | 6 +++--- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- docs/s3_compatible_storage.md | 11 +++++------ kubernetes/redis-rc.yml | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Changelog.md b/Changelog.md index 9a523e7f5..93a427c13 100644 --- a/Changelog.md +++ b/Changelog.md @@ -8,6 +8,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab: upgrade CE to v18.0.0 - gitaly: upgrade to v18.0.0 - gitlab-pages: upgrade to v18.0.0 +- redis: upgrade to v7 - rubygems: upgrade to v3.6.9 - ubuntu: upgrade to noble-20250415.1 diff --git a/README.md b/README.md index 50cfefba3..18a2e00a9 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:/data \ - redis:6.2 + redis:7 ``` Step 3. Launch the gitlab container @@ -387,7 +387,7 @@ To illustrate linking with a redis container, we will use the [redis](https://gi First, let's pull the redis image from the docker index. ```bash -docker pull redis:6.2 +docker pull redis:7 ``` Lets start the redis container @@ -395,7 +395,7 @@ Lets start the redis container ```bash docker run --name gitlab-redis -d \ --volume /srv/docker/gitlab/redis:/data \ - redis:6.2 + redis:7 ``` 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 8fb66cb35..ca6b49145 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: redis:6.2 + image: redis:7 command: - --loglevel warning volumes: diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 7f8c742d4..d33d1dbfc 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -1,7 +1,7 @@ version: '3.4' services: redis: - image: redis:6.2 + image: redis:7 command: - --loglevel warning volumes: diff --git a/docker-compose.yml b/docker-compose.yml index 8864abbce..2ec91a1c0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '2.3' services: redis: restart: always - image: redis:6.2 + image: redis:7 command: - --loglevel warning volumes: diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 12dea6780..e7e45e867 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -3,7 +3,7 @@ version: '2' services: redis: restart: always - image: redis:6.2 + image: redis:7 command: - --loglevel warning volumes: diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index d8a5b876d..2dbd1a3ff 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -3,7 +3,7 @@ version: '2' services: redis: restart: always - image: redis:6.2 + image: redis:7 command: - --loglevel warning volumes: diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md index ed815750e..35a15a0d5 100644 --- a/docs/s3_compatible_storage.md +++ b/docs/s3_compatible_storage.md @@ -6,13 +6,12 @@ This is an extend of AWS Remote Backups. As explained in [doc.gitlab.com](https://docs.gitlab.com/ce/raketasks/backup_restore.html#upload-backups-to-remote-cloud-storage), it uses [Fog library](http://fog.io) and the module fog-aws. More details on [s3 supported parameters](https://github.com/fog/fog-aws/blob/master/lib/fog/aws/storage.rb) - +- [GitLab Backup to s3 compatible storage](#gitlab-backup-to-s3-compatible-storage) - [Available Parameters](#available-parameters) - [Installation](#installation) -- [Maintenance](#maintenance) - - [Creating Backups](#creating-backups) - - [Restoring Backups](#restoring-backups) - + - [Docker Compose](#docker-compose) + - [Creating Backups](#creating-backups) + - [Restoring Backups](#restoring-backups) # Available Parameters @@ -72,7 +71,7 @@ version: '2' services: redis: restart: always - image: sameersbn/redis:6.2 + image: sameersbn/redis:7 command: - --loglevel warning volumes: diff --git a/kubernetes/redis-rc.yml b/kubernetes/redis-rc.yml index b42b387b4..0c7991d65 100644 --- a/kubernetes/redis-rc.yml +++ b/kubernetes/redis-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: redis - image: redis:6.2 + image: redis:7 ports: - name: redis containerPort: 6379 From afee1ae8bd81657d08def74c82303c9b733d14df Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 17 May 2025 18:52:05 +0200 Subject: [PATCH 475/522] Add link to guide to breaking changes to release notes. --- scripts/release-notes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release-notes.sh b/scripts/release-notes.sh index 676b86459..db67c17fd 100755 --- a/scripts/release-notes.sh +++ b/scripts/release-notes.sh @@ -42,10 +42,10 @@ Don't forget to consider the version specific upgrading instructions for [GitLab Please note: +- Before upgrading to GitLab 18 make sure to read and understand the [notes about breaking changes](https://about.gitlab.com/blog/2025/04/18/a-guide-to-the-breaking-changes-in-gitlab-18-0/). - In GitLab 18.0 and later, [PostgreSQL 16 or later is required](https://docs.gitlab.com/install/installation/#software-requirements). - See issues to be aware of when upgrading: . - ## Contributing You are kindly invited to provide contributions. If you find this image useful here's how you can help: From 4ef5a3946b4c36519e9c8e904c9b40ab92694d00 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 17 May 2025 20:16:56 +0200 Subject: [PATCH 476/522] Lint changelog.md --- Changelog.md | 533 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 528 insertions(+), 5 deletions(-) diff --git a/Changelog.md b/Changelog.md index 93a427c13..b4891f8fc 100644 --- a/Changelog.md +++ b/Changelog.md @@ -768,7 +768,6 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitaly: upgrade to v15.5.0 - gitlab-shell: upgrade to v14.12.0 - **15.4.3** - gitlab: upgrade CE to v15.4.3 @@ -857,20 +856,24 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-pages: upgrade to v1.59.0 **15.0.3** + - gitlab: upgrade CE to v15.0.3 - gitaly: upgrade to v15.0.3 **15.0.2** + - gitlab: upgrade CE to v15.0.2 - gitaly: upgrade to v15.0.2 - ubuntu: upgrade to focal-20220531 **15.0.1** + - gitlab: upgrade CE to v15.0.1 - gitaly: upgrade to v15.0.1 - golang: upgrade to v1.17.11 **15.0.0** + - gitlab: upgrade CE to v15.0.0 - gitaly: upgrade to v15.0.0 - golang: upgrade to v1.17.10 @@ -878,26 +881,31 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-pages: upgrade to v1.58.0 **14.10.3** + - gitlab: upgrade CE to v14.10.3 - gitaly: upgrade to v14.10.3 **14.10.2** + - gitlab: upgrade CE to v14.10.2 - gitaly: upgrade to v14.10.2 - ubuntu: upgrade to focal-20220426 **14.10.1** + - gitlab: upgrade CE to v14.10.1 - gitaly: upgrade to v14.10.1 - ubuntu: upgrade to focal-20220426 **14.10.0** + - gitlab: upgrade CE to v14.10.0 - gitaly: upgrade to v14.10.0 - gitlab-shell: upgrade to v13.25.1 - ubuntu: upgrade to focal-20220415 **14.9.3** + - gitlab: upgrade CE to v14.9.3 - gitaly: upgrade to v14.9.3 - golang: upgrade to v1.17.9 @@ -905,137 +913,165 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - ubuntu: upgrade to focal-20220404 **14.9.2** + - gitlab: upgrade CE to v14.9.2 - gitaly: upgrade to v14.9.2 - gitlab-pages: upgrade to v1.56.1 **14.9.1** + - gitlab: upgrade CE to v14.9.1 - gitaly: upgrade to v14.9.1 **14.9.0** + - gitlab: upgrade CE to v14.9.0 - gitaly: upgrade to v14.9.0 - gitlab-pages: upgrade to v1.56.0 - gitlab-shell: upgrade to v13.24.0 **14.8.4** + - gitlab: upgrade CE to v14.8.4 - gitaly: upgrade to v14.8.4 **14.8.3** + - gitlab: upgrade CE to v14.8.3 - gitaly: upgrade to v14.8.3 - golang: upgrade to v1.17.8 - ubuntu: upgrade to focal-20220316 **14.8.2** + - gitlab: upgrade CE to v14.8.2 - gitaly: upgrade to v14.8.2 **14.8.1** + - gitlab: upgrade CE to v14.8.1 - gitaly: upgrade to v14.8.1 **14.8.0** + - gitlab: upgrade CE to v14.8.0 - gitaly: upgrade to v14.8.0 - gitlab-pages: upgrade to v1.54.0 - gitlab-shell: v13.23.2 **14.7.3** + - gitlab: upgrade CE to v14.7.3 - gitaly: upgrade to v14.7.3 - golang: upgrade to v1.17.7 **14.7.2** + - gitlab: upgrade CE to v14.7.2 - gitaly: upgrade to v14.7.2 - ubuntu: upgrade to focal-20220113 **14.7.1** + - gitlab: upgrade CE to v14.7.1 - gitaly: upgrade to v14.7.1 **14.7.0** + - gitlab: upgrade CE to v14.7.0 - gitaly: upgrade to v14.7.0 - gitlab-shell: v13.22.2 - gitlab-pages: upgrade to v1.51.0 **14.6.3** + - gitlab: upgrade CE to v14.6.3 - gitaly: upgrade to v14.6.3 **14.6.2** + - gitlab: upgrade CE to v14.6.2 - gitaly: upgrade to v14.6.2 - golang: upgrade to v1.17.6 - ubuntu: upgrade to focal-20220105 **14.6.1** + - gitlab: upgrade CE to v14.6.1 - gitaly: upgrade to v14.6.1 **14.6.0** + - gitlab: upgrade CE to v14.6.0 - gitaly: upgrade to v14.6.0 - gitlab-pages: upgrade to v1.49.0 **14.5.2** + - gitlab: upgrade CE to v14.5.2 - gitaly: upgrade to v14.5.2 - golang: upgrade to v1.17.5 **14.5.1** + - gitlab: upgrade CE to v14.5.1 - gitaly: upgrade to v14.5.1 - gitlab-shell: v13.22.1 **14.5.0** + - gitlab: upgrade CE to v14.5.0 - gitaly: upgrade to v14.5.0 - gitlab-pages: upgrade to v1.48.0 - gitlab-shell: v13.22.0 **14.4.4** + - gitlab: upgrade CE to v14.4.4 - gitaly: upgrade to v14.4.4 - ruby: upgrade to v2.7.5 **14.4.3** + - gitlab: upgrade CE to v14.4.3 - gitaly: upgrade to v14.4.3 - golang: upgrade to v1.17.4 **14.4.2** + - gitlab: upgrade CE to v14.4.2 - gitaly: upgrade to v14.4.2 - redis: upgrade to v6.2.6 **14.4.1** + - gitlab: upgrade CE to v14.4.1 - gitaly: upgrade to v14.4.1 **14.4.0** + - gitlab: upgrade CE to v14.4.0 - gitaly: upgrade to v14.4.0 - gitlab-pages: upgrade to v1.46.0 **14.3.3** + - gitlab: upgrade CE to v14.3.3 - gitaly: upgrade to v14.3.3 **14.3.2** + - gitlab: upgrade CE to v14.3.2 - gitaly: upgrade to v14.3.2 - gitlab-shell: v13.21.1 **14.3.1** + - gitlab: upgrade CE to v14.3.1 - gitaly: upgrade to v14.3.1 **14.3.0** + - gitlab: upgrade CE to v14.3.0 - gitaly: upgrade to v14.3.0 - gitlab-shell: v13.21.0 @@ -1044,182 +1080,218 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - ubuntu: upgrade to focal-20211006 **14.2.5** + - gitlab: upgrade CE to v14.2.5 - gitaly: upgrade to v14.2.5 **14.2.4** + - gitlab: upgrade CE to v14.2.4 - gitaly: upgrade to v14.2.4 - golang: upgrade to v1.17.1 **14.2.3** + - gitlab: upgrade CE to v14.2.3 - gitaly: upgrade to v14.2.3 **14.2.2** + - gitlab: upgrade CE to v14.2.2 - gitaly: upgrade to v14.2.2 - ubuntu: upgrade to focal-20210827 **14.2.1** + - gitlab: upgrade CE to v14.2.1 - gitaly: upgrade to v14.2.1 **14.2.0** + - gitlab: upgrade CE to v14.2.0 - gitaly: upgrade to v14.2.0 - gitlab-pages: upgrade to v1.42.0 - golang: upgrade to v1.17 **14.1.3** + - gitlab: upgrade CE to v14.1.3 - gitaly: upgrade to v14.1.3 - golang: upgrade to v1.16.7 **14.1.2** + - gitlab: upgrade CE to v14.1.2 - gitaly: upgrade to v14.1.2 - gitlab-shell: upgrade to v13.19.1 **14.1.1** + - gitlab: upgrade CE to v14.1.1 - gitaly: upgrade to v14.1.1 - ubuntu: upgrade to focal-20210723 **14.1.0** + - gitlab: upgrade CE to v14.1.0 - gitaly: upgrade to v14.1.0 **14.0.6** + - gitlab: upgrade CE to v14.0.6 - gitaly: upgrade to v14.0.6 - golang: upgrade to v1.16.6 **14.0.5** + - gitlab: upgrade CE to v14.0.5 - gitaly: upgrade to v14.0.5 **14.0.4** + - gitlab: upgrade CE to v14.0.4 - gitaly: upgrade to v14.0.4 **14.0.3** + - gitlab: upgrade CE to v14.0.3 - gitaly: upgrade to v14.0.3 **14.0.2** + - gitlab: upgrade CE to v14.0.2 - gitaly: upgrade to v14.0.2 **14.0.1** + - gitlab: upgrade CE to v14.0.1 - gitaly: upgrade to v14.0.1 **14.0.0** + - gitlab: upgrade CE to v14.0.0 - gitaly: upgrade to v14.0.0 - gitlab-shell: upgrade to v13.19.0 - gitlab-pages: upgrade to v1.40.0 **13.12.5** + - gitlab: upgrade CE to v13.12.5 - gitaly: upgrade to v13.12.5 - ubuntu: upgrade to focal-20210609 **13.12.4** + - gitlab: upgrade CE to v13.12.4 - gitaly: upgrade to v13.12.4 **13.12.3** + - gitlab: upgrade CE to v13.12.3 - gitaly: upgrade to v13.12.3 - golang: upgrade to v1.16.5 **13.12.2** + - gitlab: upgrade CE to v13.12.2 - gitaly: upgrade to v13.12.2 **13.12.1** + - gitlab: upgrade CE to v13.12.1 - gitaly: upgrade to v13.12.1 **13.12.0** + - gitlab: upgrade CE to v13.12.0 - gitlab-shell: upgrade to v13.18.0 - gitlab-pages: upgrade to v1.39.0 - gitaly: upgrade to v13.12.0 **13.11.4** + - gitlab: upgrade CE to v13.11.4 - gitaly: upgrade to v13.11.4 - golang: upgrade to v1.16.4 - ubuntu: upgrade to focal-20210416 **13.11.3** + - gitlab: upgrade CE to v13.11.3 - gitaly: upgrade to v13.11.3 **13.11.2** + - gitlab: upgrade CE to v13.11.2 - gitaly: upgrade to v13.11.2 **13.11.1** + - gitlab: upgrade CE to v13.11.1 - gitaly: upgrade to v13.11.1 **13.11.0** + - gitlab: upgrade CE to v13.11.0 - gitaly: upgrade to v13.11.0 - gitlab-pages: upgrade to v1.38.0 - ubuntu: upgrade to focal-20210401 **13.10.3** + - gitlab: upgrade CE to v13.10.3 - gitaly: upgrade to v13.10.3 **13.10.2** + - gitlab: upgrade CE to v13.10.2 - gitaly: upgrade to v13.10.2 - golang: upgrade to v1.16.3 - ubuntu: upgrade to bionic-20210325 **13.10.1** + - gitlab: upgrade CE to v13.10.1 - gitaly: upgrade to v13.10.1 - added libmagic1 to fit requirements of ruby-magic-static-0.3.4 (necessary for puma) **13.10.0** + - gitlab: upgrade CE to v13.10.0 - gitaly: upgrade to v13.10.0 - gitlab-pages: upgrade to v1.36.0 **13.9.5** + - gitlab: upgrade CE to v13.9.5 - gitaly: upgrade to v13.9.5 **13.9.4** + - gitlab: upgrade CE to v13.9.4 - gitaly: upgrade to v13.9.4 - golang: upgrade to v1.16.2 - ubuntu: upgrade to bionic-20210222 **13.9.3** + - gitlab: upgrade CE to v13.9.3 - gitaly: upgrade to v13.9.3 - gitlab-shell: upgrade to v13.17.0 **13.9.2** + - gitlab: upgrade CE to v13.9.2 - gitaly: upgrade to v13.9.2 - gitlab-workhorse: upgrade to v8.63.2 - **13.9.1** + - gitlab: upgrade CE to v13.9.1 - gitaly: upgrade to v13.9.1 - **13.9.0** + - gitlab: upgrade CE to v13.9.0 - gitaly: upgrade to v13.9.0 - gitlab-shell: upgrade to v13.16.1 @@ -1228,6 +1300,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - golang: upgrade to v1.16 **13.8.4** + - added `SSL_PROTOCOLS` option to change protocols of the nginx - added `SSL_REGISTRY_CIPHERS` - added `SSL_REGISTRY_PROTOCOLS` @@ -1238,19 +1311,23 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-shell: upgrade to v13.15.1 **13.8.3** + - gitlab: upgrade CE to v13.8.3 - gitaly: upgrade to v13.8.3 - golang: upgrade to v1.15.8 **13.8.2** + - gitlab: upgrade CE to v13.8.2 - gitaly: upgrade to v13.8.2 **13.8.1** + - gitlab: upgrade CE to v13.8.1 - gitaly: upgrade to v13.8.1 **13.8.0** + - gitlab: upgrade CE to v13.8.0 - gitaly: upgrade to v13.8.0 - gitlab-shell: upgrade to v13.15.0 @@ -1260,19 +1337,23 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - ubuntu: upgrade to bionic-20210118 **13.7.4** + - gitlab: upgrade CE to v13.7.4 **13.7.3** + - gitlab: upgrade CE to v13.7.3 - gitlab-pages: upgrade to v1.34.0 - gitlab-shell: upgrade to v13.7.3 - gitlab-workhorse: upgrade to v8.58.2 **13.7.1** + - gitlab: upgrade CE to v13.7.1 - gitaly: upgrade v13.7.1 **13.7.0** + - gitlab: upgrade CE to v13.7.0 - gitaly: upgrade v13.7.0 - gitlab-shell: upgrade to v13.14.0 @@ -1282,18 +1363,22 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - postgresql: upgrade to postgresql 12 **13.6.3** + - gitlab: upgrade CE to v13.6.3 - gitaly: upgrade v13.6.3 **13.6.2** + - gitlab: upgrade CE to v13.6.2 - gitaly: upgrade v13.6.2 **13.6.1** + - gitlab: upgrade CE to v13.6.1 - gitaly: upgrade v13.6.1 **13.6.0** + - gitlab: upgrade CE to v13.6.0 - gitaly: upgrade v13.6.0 - gitlab-shell: upgrade to v13.13.0 @@ -1303,18 +1388,22 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - use ruby 2.7 **13.5.4** + - gitlab: upgrade CE to v13.5.4 - gitaly: upgrade v13.5.4 **13.5.3** + - gitlab: upgrade CE to v13.5.3 - gitaly: upgrade v13.5.3 **13.5.2** + - gitlab: upgrade CE to v13.5.2 - gitaly: upgrade v13.5.2 **13.5.1** + - gitlab: upgrade CE to v13.5.1 - gitaly: upgrade v13.5.1 - gitlab-shell: upgrade to v13.11.0 @@ -1322,14 +1411,17 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-workhorse: upgrade to v8.51.0 **13.4.4** + - gitlab: upgrade CE to v13.4.4 - gitaly: upgrade to v13.4.4 **13.4.3** + - gitlab: upgrade CE to v13.4.3 - gitaly: upgrade to v13.4.3 **13.4.2** + - gitlab: upgrade CE to v13.4.2 - gitaly: upgrade to v13.4.2 - gitlab-pages: upgrade to 1.25.0 @@ -1338,14 +1430,17 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - ubuntu: upgrade to bionic-20200921 **13.3.4** + - gitlab: upgrade CE to v13.3.4 - gitaly: upgrade to v13.3.4 **13.3.1** + - gitlab: upgrade CE to v13.3.1 - gitaly: upgrade to v13.3.1 **13.3.0** + - gitlab: upgrade CE to v13.3.0 - gitaly: upgrade to v13.3.0 - gitlab-pages: upgrade to v1.22.0 @@ -1353,71 +1448,90 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-workhorse: upgrade to v8.39.0 **13.2.6** + - gitlab: upgrade CE to v13.2.6 **13.2.4** + - gitlab: upgrade CE to v13.2.4 - ubuntu: upgrade to bionic-20200713 **13.2.3** + - gitlab: upgrade CE to v13.2.3 - golang: upgrade to 1.14.7 - gitaly: upgrade to 13.2.3 - postgresql: add btree_gist extension **13.2.2** + - gitlab: upgrade CE to v13.2.2 **13.2.1** + - gitlab: upgrade CE to v13.2.1 **13.0.7** + - gitlab: upgrade CE to v13.0.7 **13.0.6** + - gitlab: upgrade CE to v13.0.6 **13.0.5** + - gitlab: upgrade CE to v13.0.5 **13.0.3** + - gitlab: upgrade CE to v13.0.3 **13.0.2** + - gitlab: upgrade CE to v13.0.2 **13.0.1** + - gitlab: upgrade CE to v13.0.1 **13.0.0** + - gitlab: upgrade CE to v13.0.0 **12.10.6** + - gitlab: upgrade CE to v12.10.6 **12.10.4** + - updated to ubuntu:bionic-20200403 - gitlab-workhorse: update to 8.30.1 - sync: upstream configs - gitlab: upgrade to 12.10.4 **12.9.5** + - gitlab: updated to 12.9.5 - gitlab-shell: updated to 12.2.0 - gitaly: updated to 12.10.0 **12.9.4** + - gitlab: upgrade CE to v12.9.4 - Update gitlab-workhorse to 8.25.2 - Update golang to 1.13.10 **12.9.2** + - gitlab: upgrade CE to v12.9.2 **12.9.1** + - gitlab: upgrade CE to v12.9.1 **12.9.0** + - gitlab: upgrade CE to v12.9.0 - replaced unicorn with puma - Removed `UNICORN_WORKERS` @@ -1428,50 +1542,65 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - Added `PUMA_TIMEOUT` **12.8.8** + - gitlab: upgrade CE to v12.8.8 **12.8.7** + - gitlab: upgrade CE to v12.8.7 **12.8.6** + - gitlab: upgrade CE to v12.8.6 **12.8.5** + - gitlab: upgrade CE to v12.8.5 **12.8.4** + - gitlab: upgrade CE to v12.8.4 **12.8.3** + - gitlab: upgrade CE to v12.8.3 **12.8.2** + - gitlab: upgrade CE to v12.8.2 **12.8.1** + - gitlab: upgrade CE to v12.8.1 **12.8.0** + - gitlab: upgrade CE to v12.8.0 - fix: ArgumentError: 'import/{{oauth2_generic_name}}' is not supported [#2101](https://github.com/sameersbn/docker-gitlab/issues/2101) **12.7.8** + - Upgrade GitLab CE to 12.7.8 **12.7.7** + - Upgrade GitLab CE to 12.7.7 - Add Generic OAuth Provider PR#2070 **12.7.7** + - Upgrade GitLab CE to 12.7.7 **12.7.6** + - gitlab: upgrade CE to v12.7.6 **12.7.5** + - gitlab: upgrade CE to v12.7.5 **12.7.4** + - Upgrade GitLab CE to 12.7.4 - Update golang to 1.13.7 - Update gitlab-pages to 1.15.0 @@ -1479,9 +1608,11 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - Update gitaly to 1.85.0 **12.7.2** + - Upgrade GitLab CE to 12.7.2 **12.7.0** + - Update gitlab-shell to 11.0.0 - Upgrade GitLab CE to 12.7.0 - Update golang to 1.13.6 @@ -1490,123 +1621,162 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - Update gitlab-workhorse to 8.19.0 **12.6.4** + - gitlab: upgrade CE to v12.6.4 **12.6.3** + - gitlab: upgrade CE to v12.6.3 **12.6.2** + - gitlab: upgrade CE to v12.6.2 **12.6.1** + - gitlab: upgrade CE to v12.6.1 **12.6.0** + - gitlab: upgrade CE to v12.6.0 **12.5.7** + - gitlab: upgrade CE to v12.5.7 **12.5.6** + - gitlab: upgrade CE to v12.5.6 **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 **12.5.3** + - gitlab: upgrade CE to v12.5.3 **12.5.2** + - gitlab: upgrade CE to v12.5.2 **12.5.1** + - gitlab: upgrade CE to v12.5.1 **12.5.0** + - gitlab: upgrade CE to v12.5.0 **12.4.3** + - gitlab: upgrade CE to v12.4.3 **12.4.2** + - gitlab: upgrade CE to v12.4.2 **12.4.1** + - gitlab: upgrade CE to v12.4.1 **12.4.0** + - gitlab: upgrade CE to v12.4.0 **12.3.5** + - gitlab: upgrade CE to v12.3.5 **12.3.4** + - gitlab: upgrade CE to v12.3.4 **12.3.3** + - gitlab: upgrade CE to v12.3.3 **12.3.2** + - gitlab: upgrade CE to v12.3.2 **12.3.1** + - gitlab: upgrade CE to v12.3.1 **12.3.0** + - gitlab: upgrade CE to v12.3.0 **12.2.5** + - gitlab: upgrade CE to v12.2.5 **12.2.4** + - gitlab: upgrade CE to v12.2.4 **12.2.3** + - gitlab: upgrade CE to v12.2.3 **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 **12.1.6** + - gitlab: upgrade CE to v12.1.6 **12.1.4** + - gitlab: upgrade CE to v12.1.4 **12.1.3** + - gitlab: upgrade CE to v12.1.3 **12.1.2** + - gitlab: upgrade CE to v12.1.2 **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) **12.0.4** + - gitlab: upgrade CE to v12.0.4 **12.0.3** + - gitlab: upgrade CE to v12.0.3 **12.0.2** + - gitlab: upgrade CE to v12.0.2 **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 - Update gitlab-shell to 9.3.0 @@ -1615,105 +1785,134 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - python: update to 3 **11.11.3** + - gitlab: upgrade CE to v11.11.3 - Update gitaly to 1.42.4 - Update golang to 1.12.6 **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 **11.11.0** + - 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 **11.10.3** + - gitlab: upgrade CE to v11.10.3 **11.10.2** + - gitlab: upgrade CE to v11.10.2 **11.10.1** + - gitlab: upgrade CE to v11.10.1 **11.10.0** + - gitlab: upgrade CE to v11.10.0 **11.9.8** + - gitlab: upgrade CE to v11.9.8 **11.9.7** + - gitlab: upgrade CE to v11.9.7 **11.9.6** + - gitlab: upgrade CE to v11.9.6 **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 **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 **11.8.3** + - gitlab: upgrade CE to v11.8.3 **11.8.2** + - gitlab: upgrade CE to v11.8.2 **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 - Update gitaly to 1.20.0 - Update gitlab-pages to 1.5.0 **11.7.5** + - gitlab: upgrade CE to v11.7.5 **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 - Update gitaly to 1.13.0 - Update gitlab-pages to 1.4.0 **11.7.0** + - gitlab: upgrade CE to v11.7.0 **11.6.5** + - gitlab: upgrade CE to v11.6.5 **11.6.4** + - gitlab: upgrade CE to v11.6.4 **11.6.3** + - gitlab: upgrade CE to v11.6.3 **11.6.2** + - gitlab: upgrade CE to v11.6.2 **11.6.1** + - gitlab: upgrade CE to v11.6.1 - Added `GITLAB_IMPERSONATION_ENABLED` - Added `OAUTH_SAML_ATTRIBUTE_STATEMENTS_USERNAME` @@ -1724,6 +1923,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - Added `GITLAB_PAGES_ACCESS_REDIRECT_URI` **11.6.0** + - gitlab: upgrade CE to v11.6.0 - Update gitaly to 1.7.1 - Update gitlab-shell to 8.4.3 @@ -1739,157 +1939,203 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - Added `GITLAB_PAGES_NGINX_PROXY` **11.5.5** + - gitlab: upgrade CE to v11.5.5 **11.5.4** + - gitlab: upgrade CE to v11.5.4 **11.5.3** + - gitlab: upgrade CE to v11.5.3 **11.5.2** + - gitlab: upgrade CE to v11.5.2 **11.5.1-1** + - Fixed GitLab Dependencies **11.5.1** + - gitlab: upgrade CE to v11.5.1 **11.5.0** + - gitlab: upgrade CE to v11.5.0 **11.4.7** + - gitlab: upgrade CE to v11.4.7 **11.4.6** + - gitlab: upgrade CE to v11.4.6 **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 **11.4.3** + - gitlab: upgrade CE to v11.4.3 **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) **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 **11.3.5** + - gitlab: upgrade CE to v11.3.5 **11.3.4** + - gitlab: upgrade CE to v11.3.4 **11.3.3** + - gitlab: upgrade CE to v11.3.3 **11.3.2** + - gitlab: upgrade CE to v11.3.2 **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) - 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 **11.2.2** + - gitlab: upgrade CE to v11.2.2 **11.2.1** + - gitlab: upgrade CE to v11.2.1 **11.2.0** + - gitlab: upgrade CE to v11.2.0 - ADD `GITLAB_DEFAULT_THEME` **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 **11.1.2** + - gitlab: upgrade CE to v11.1.2 **11.1.1** + - gitlab: upgrade CE to v11.1.1 **11.1.0** + - gitlab: upgrade CE to v11.1.0 **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 **11.0.2** + - gitlab: upgrade CE to v11.0.2 **11.0.1** + - gitlab: upgrade CE to v11.0.1 **11.0.0** + - gitlab: upgrade CE to v11.0.0 **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) +- 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) **10.8.2** + - gitlab: upgrade CE to v10.8.2 **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)) **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 **10.7.2** + - gitlab: upgrade CE to v10.7.2 **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` - ADD `GITLAB_ARTIFACTS_OBJECT_STORE_ENABLED` @@ -1931,76 +2177,98 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - ADD `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` **10.6.4** + - gitlab: upgrade CE to v10.6.4 **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 **10.6.1** + - gitlab: upgrade CE to v10.6.1 **10.6.0** + - gitlab: upgrade CE to v10.6.0 **10.5.6** + - gitlab: security upgrade CE to v10.5.6 **10.5.5** + - gitlab: upgrade CE to v10.5.5 **10.5.4** + - gitlab: upgrade CE to v10.5.4 **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` **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` - Add `GITLAB_UPLOADS_BASE_DIR` - Add `LDAP_LOWERCASE_USERNAMES` **10.4.4** + - gitlab: upgrade CE to v10.4.4 **10.4.3** + - gitlab: upgrade CE to v10.4.3 **10.4.2-1** + - FIXED SSH Host Key generation through dropping the support for rsa1 **10.4.2** + - gitlab: upgrade CE to v10.4.2 **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 - golang: update to 1.9.3 **10.3.6** + - gitlab: upgrade CE to v10.3.6 **10.3.5** + - gitlab: upgrade CE to v10.3.5 **10.3.4** + - gitlab: upgrade CE to v10.3.4 **10.3.3** + - gitlab: upgrade CE to v10.3.3 - ADDED `AWS_BACKUP_ENCRYPTION` [1449](https://github.com/sameersbn/docker-gitlab/pull/1449/) - ADDED `AWS_BACKUP_STORAGE_CLASS` [1449](https://github.com/sameersbn/docker-gitlab/pull/1449/) @@ -2008,12 +2276,15 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - Apply PaX mark to ruby [1458](https://github.com/sameersbn/docker-gitlab/pull/1458) **10.3.2** + - gitlab: upgrade CE to v10.3.2 **10.3.1** + - gitlab: upgrade CE to v10.3.1 **10.3.0** + - gitlab: upgrade CE to v10.3.0 - REMOVED `GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_COUNT_THRESHOLD` - REMOVED `GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_WAIT_TIME` @@ -2023,129 +2294,169 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - REMOVED `GITLAB_TIMEOUT` **10.2.5** + - gitlab: upgrade CE to v10.2.5 **10.2.4** + - gitlab: upgrade to CE v10.2.4 **10.2.3** + - gitlab: upgrade to CE v10.2.3 **10.2.2** + - gitlab: upgrade to CE v10.2.2 **10.2.1** + - gitlab: upgrade to CE v10.2.1 **10.2.0** + - gitlab: upgrade to CE v10.2.0 **10.1.4** + - gitlab: upgrade to CE v10.1.4 **10.1.3** + - gitlab: upgrade to CE v10.1.3 **10.1.2** + - gitlab: upgrade to CE v10.1.2 **10.1.1** + - gitlab: upgrade to CE v10.1.1 **10.1.0** + - gitlab: upgrade to CE v10.1.0 - REMOVED `GITALY_ENABLED`` - ADDED `GITALY_ARTIFACTS_SERVER` - ADDED `GITALY_CLIENT_PATH` **10.0.4** + - gitlab: upgrade to CE v10.0.4 **10.0.3** + - gitlab: upgrade to CE v10.0.3 **10.0.2** + - gitlab: upgrade to CE v10.0.2 **10.0.1** + - gitlab: upgrade to CE v10.0.1 **10.0.0** + - gitlab: upgrade to CE v10.0.0 **9.5.5** + - gitlab: upgrade to CE v9.5.5 **9.5.4** + - gitlab: upgrade to CE v9.5.4 **9.5.3** + - gitlab: upgrade to CE v9.5.3 **9.5.2** + - gitlab: upgrade to CE v9.5.2 **9.5.1** + - gitlab: upgrade to CE v9.5.1 **9.5.0** + - gitlab: upgrade to CE v9.5.0 **9.4.5** + - gitlab: upgrade to CE v9.4.5 **9.4.4** + - gitlab: upgrade to CE v9.4.4 **9.4.3** + - gitlab: upgrade to CE v9.4.3 **9.4.2** + - gitlab: upgrade to CE v9.4.2 **9.4.1** + - gitlab: upgrade to CE v9.4.1 **9.4.0-1** + - Fix asset compiling for missing translations **9.4.0** + - gitlab: upgrade to CE v9.4.0 - Added support for nginx_real_ip module ([#1137](https://github.com/sameersbn/docker-gitlab/pull/1137)) - Added more security for regenerating certs ([#1288](https://github.com/sameersbn/docker-gitlab/pull/1288)) **9.3.9** + - gitlab: upgrade to CE v9.3.9 **9.3.8** + - gitlab: upgrade to CE v9.3.8 - 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 **9.3.6** + - gitlab: upgrade to CE v9.3.6 **9.3.5** + - gitlab: upgrade to CE v9.3.5 **9.3.4** + - gitlab: upgrade to CE v9.3.4 **9.3.3** + - gitlab: upgrade to CE v9.3.3 **9.3.2** + - gitlab: upgrade to CE v9.3.2 **9.3.1** + - gitlab: upgrade to CE v9.3.1 **9.3.0-1** + - Add the missing Gitaly config to let git commands over http/https working **9.3.0** + - gitlab: upgrade to CE v9.3.0 - update baseimage to `14.04.20170608` - Add `DB_COLLATION` (For MySQL related doesn't recognize by postgres) @@ -2155,84 +2466,108 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - Add `GITALY_ADDRESS` **9.2.7** + - gitlab: upgrade to CE v9.2.7 **9.2.6** + - gitlab: upgrade to CE v9.2.6 **9.2.5** + - gitlab: upgrade to CE v9.2.5 **9.2.2** + - gitlab: upgrade to CE v9.2.2 **9.2.1** + - gitlab: upgrade to CE v9.2.1 **9.2.0** + - gitlab: upgrade to CE v9.2.0 - Add flexibility to use versions committed into gitlab-ce **9.1.4** + - gitlab: upgrade to CE v9.1.4 **9.1.3** + - gitlab: upgrade to CE v9.1.3 **9.1.2** + - gitlab: upgrade to CE v9.1.2 - update baseimage to `14.04.20170503` **9.1.1** + - gitlab: upgrade to CE v9.1.1 **9.1.0-1** + - Fix gitlab-workhorse version display **9.1.0** + - gitlab: upgrade to CE v9.1.0 - gitlab-shell: upgrade to 5.0.2 - gitlab-workhorse: upgrade to 1.4.3 **9.0.6** + - gitlab: upgrade to CE v9.0.6 **9.0.5** + - gitlab: upgrade to CE v9.0.5 **9.0.4** + - gitlab: upgrade to CE v9.0.4 **9.0.3** + - gitlab: upgrade to CE v9.0.3 **9.0.2** + - gitlab: upgrade to CE v9.0.2 **9.0.1** + - gitlab: upgrade to CE v9.0.1 - gitlab-workhorse 1.4.2 **9.0.0** + - gitlab: upgrade to CE v9.0.0 - gitlab-shell 5.0.0 - gitlab-workhorse 1.4.1 - gitlab-pages 0.4.0 **8.17.4** + - gitlab: upgrade to CE v8.17.4 **8.17.3** + - gitlab: upgrade to CE v8.17.3 **8.17.2** + - gitlab: upgrade to CE v8.17.2 **8.17.1** + - gitlab: upgrade to CE v8.17.1 - fixes first problems with gitlab-pages **8.17.0** + - gitlab: upgrade to CE v8.17.0 - added `GITLAB_PAGES_ENABLED` - added `GITLAB_PAGES_DOMAIN` @@ -2247,40 +2582,52 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - added gitlab-pages daemon **8.16.6** + - gitlab: upgrade to CE v8.16.6 - Fix logical bug of Remote Backup **8.16.5** + - gitlab: upgrade to CE v8.16.5 **8.16.4** + - gitlab: upgrade to CE v8.16.4 **8.16.3** + - gitlab: upgrade to CE v8.16.3 **8.16.2** + - gitlab: upgrade to CE v8.16.2 **8.16.1** + - gitlab: upgrade to CE v8.16.1 **8.16.0** + - gitlab: upgrade to CE v8.16.0 **8.15.4** + - gitlab: upgrade to CE v8.15.4 **8.15.3** + - gitlab: upgrade to CE v8.15.3 **8.15.2** + - gitlab: upgrade to CE v8.15.2 **8.15.1** + - gitlab: upgrade to CE v8.15.1 **8.15.0** + - gitlab: upgrade to CE v8.15.0 - added `GITLAB_MATTERMOST_ENABLED` - added `GITLAB_MATTERMOST_URL` @@ -2290,29 +2637,37 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - added `OAUTH_AUTHENTIQ_REDIRECT_URI` **8.14.5** + - gitlab: upgrade to CE v8.14.5 **8.14.4** + - gitlab: upgrade to CE v8.14.4 **8.14.3** + - gitlab: upgrade to CE v8.14.3 **8.14.2** + - gitlab: upgrade to CE v8.14.2 **8.14.1** + - gitlab: upgrade to CE v8.14.1 **8.14.0** + - gitlab: upgrade to CE v8.14.0 - added `IMAP_TIMEOUT` - update golang to 1.6.3 **8.13.6** + - gitlab: upgrade to CE v8.13.6 **8.13.5** + - gitlab: upgrade to CE v8.13.5 **Important**: @@ -2322,31 +2677,40 @@ information [8.13.4 release](https://about.gitlab.com/2016/11/09/gitlab-8-dot-13 **8.12.1** **8.13.3** + - gitlab: upgrade to CE v8.13.3 **8.13.2** + - gitlab: upgrade to CE v8.13.2 **8.13.1** + - gitlab: upgrade to CE v8.13.1 **8.13.0** + - gitlab: upgrade to CE v8.13.0 - added `GITLAB_EMAIL_SUBJECT_SUFFIX` **8.12.7** + - gitlab: upgrade to CE v8.12.7 **8.12.6** + - gitlab: upgrade to CE v8.12.6 **8.12.5** + - gitlab: upgrade to CE v8.12.5 **8.12.4** + - gitlab: upgrade to CE v8.12.4 **8.12.3** + - gitlab: upgrade to CE v8.12.3 **Important**: @@ -2354,30 +2718,39 @@ We skipped `8.12.2` because it doesn't contain any changes. For more information [8.12.3 release](https://about.gitlab.com/2016/09/29/gitlab-8-12-3-released/) **8.12.1** + - gitlab: upgrade to CE v8.12.1 **8.12.0** + - gitlab: upgrade to CE v8.12.0 **8.11.7** + - gitlab: upgrade to CE v8.11.7 **8.11.6** + - gitlab: upgrade to CE v8.11.6 **8.11.5** + - gitlab: upgrade to CE v8.11.5 **8.11.4** + - gitlab: upgrade to CE v8.11.4 **8.11.3** + - gitlab: upgrade to CE v8.11.3 **8.11.2** + - gitlab: upgrade to CE v8.11.2 **8.11.0** + - gitlab: upgrade to CE v8.11.0 - added `GITLAB_SECRETS_SECRET_KEY_BASE` - added `GITLAB_SECRETS_OTP_KEY_BASE` @@ -2386,94 +2759,123 @@ information [8.12.3 release](https://about.gitlab.com/2016/09/29/gitlab-8-12-3-r When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/.secret` for `GITLAB_SECRETS_OTP_KEY_BASE` otherwise it will break your 2FA . **8.10.7** + - gitlab: upgrade to CE v8.10.7 **8.10.6** + - gitlab: upgrade to CE v8.10.6 **8.10.5** + - gitlab: upgrade to CE v8.10.5 **8.10.4** + - gitlab: upgrade to CE v8.10.4 **8.10.3** + - gitlab: upgrade to CE v8.10.3 **8.10.2-1** + - Fix `OAUTH_GOOGLE_RESTRICT_DOMAIN` **8.10.2** + - gitlab: upgrade to CE v8.10.2 - Improve `OAUTH_GOOGLE_RESTRICT_DOMAIN` for multiple restricted domains **8.10.1** + - gitlab: upgrade to CE v8.10.1 **8.10.0** + - gitlab: upgrade to CE v8.10.0 **8.9.6** + - gitlab: upgrade to CE v8.9.6 **8.9.5** + - gitlab: upgrade to CE v8.9.5 **8.9.4** + - gitlab: upgrade to CE v8.9.4 **8.9.3** + - gitlab: upgrade to CE v8.9.3 **8.9.2** + - gitlab: upgrade to CE v8.9.2 **8.9.1** + - gitlab: upgrade to CE v8.9.1 **8.9.0** + - gitlab: upgrade to CE v8.9.0 **8.8.5-1** + - added GitLab Container Registry support - added `SSL_CIPHERS` option to change ciphers of the nginx **8.8.5** + - gitlab: upgrade to CE v8.8.5 **8.8.4** + - gitlab: upgrade to CE v8.8.4 - added `GITLAB_PROJECTS_LIMIT` configuration option **8.8.3** + - gitlab: upgrade to CE v8.8.3 **8.8.2** + - gitlab: upgrade to CE v8.8.2 **8.8.1** + - gitlab: upgrade to CE v8.8.1 **8.8.0** + - gitlab: upgrade to CE v8.8.0 - oauth: exposed `OAUTH_GITHUB_URL` and `OAUTH_GITHUB_VERIFY_SSL` options for users for GitHub Enterprise. **8.7.6** + - gitlab: upgrade to CE v8.7.6 **8.7.5** + - gitlab: upgrade to CE v8.7.5 **8.7.3** + - gitlab: upgrade to CE v8.7.3 **8.7.2** + - gitlab: upgrade to CE v8.7.2 **8.7.1** + - gitlab: upgrade to CE v8.7.1 **8.7.0** + - gitlab-shell: upgrade to v.2.7.2 - gitlab: upgrade to CE v8.7.0 - SSO: `OAUTH_ALLOW_SSO` now specifies a comma separated list of providers. @@ -2481,29 +2883,37 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - Exposed `GITLAB_TRUSTED_PROXIES` configuration parameter **8.6.7** + - added `GITLAB_SIGNUP_ENABLED` option to enable/disable signups - gitlab: upgrade to CE v8.6.7 **8.6.6** + - gitlab: upgrade to CE v8.6.6 **8.6.5** + - gitlab: upgrade to CE v8.6.5 **8.6.4** + - gitlab: upgrade to CE v8.6.4 **8.6.3** + - gitlab-shell: upgrade to v.2.6.12 - gitlab: upgrade to CE v8.6.3 **8.6.2** + - gitlab: upgrade to CE v8.6.2 **8.6.1** + - gitlab: upgrade to CE v8.6.1 **8.6.0** + - gitlab-shell: upgrade to v.2.6.11 - gitlab-workhorse: upgrade to v0.7.1 - gitlab: upgrade to CE v8.6.0 @@ -2511,46 +2921,59 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - fixed relative_url support **8.5.8** + - gitlab: upgrade to CE v8.5.8 **8.5.7** + - gitlab: upgrade to CE v8.5.7 **8.5.5** + - gitlab: upgrade to CE v8.5.5 **8.5.4** + - gitlab: upgrade to CE v8.5.4 **8.5.3** + - gitlab: upgrade to CE v8.5.3 **8.5.1** + - gitlab: upgrade to CE v8.5.1 **8.5.0** + - gitlab-workhorse: upgrade to v0.6.4 - gitlab: upgrade to CE v8.5.0 - firstrun: expose `GITLAB_ROOT_EMAIL` configuration option - expose `OAUTH_AUTO_LINK_SAML_USER` configuration parameter **8.4.4** + - gitlab: upgrade to CE v8.4.4 **8.4.3** + - gitlab: upgrade to CE v8.4.3 **8.4.2** + - gitlab-workhorse: upgrade to v0.6.2 - gitlab: upgrade to CE v8.4.2 **8.4.1** + - gitlab: upgrade to CE v8.4.1 **8.4.0-1** + - `assets:precompile` moved back to build time **8.4.0** + - gitlab-shell: upgrade to v.2.6.10 - gitlab-workhorse: upgrade to v0.6.1 - gitlab: upgrade to CE v8.4.0 @@ -2559,20 +2982,25 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - `assets:precompile` executed at runtime **8.3.4** + - gitlab-workhorse: upgrade to v0.5.4 - gitlab: upgrade to CE v8.3.4 - expose `LDAP_TIMEOUT` configuration parameter **8.3.2** + - gitlab: upgrade to CE v8.3.2 **8.3.1** + - gitlab: upgrade to CE v8.3.1 **8.3.0-1** + - fixed static asset routing when `GITLAB_RELATIVE_URL_ROOT` is used. **8.3.0** + - `envsubst` is now used for updating the configurations - renamed config `CA_CERTIFICATES_PATH` to `SSL_CA_CERTIFICATES_PATH` - renamed config `GITLAB_HTTPS_HSTS_ENABLED` to `NGINX_HSTS_ENABLED` @@ -2585,20 +3013,24 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - gitlab-shell: upgrade to v.2.6.9 **8.2.3** + - fixed static asset routing when `GITLAB_RELATIVE_URL_ROOT` is used. - added `GITLAB_BACKUP_PG_SCHEMA` configuration parameter - gitlab: upgrade to CE v8.2.3 **8.2.2** + - added `GITLAB_DOWNLOADS_DIR` configuration parameter - `DB_TYPE` parameter renamed to `DB_ADAPTER` with `mysql2` and `postgresql` as accepted values - exposed `DB_ENCODING` parameter - gitlab: upgrade to CE v8.2.2 **8.2.1-1** + - fixed typo while setting the value of `GITLAB_ARTIFACTS_DIR` **8.2.1** + - expose rack_attack configuration options - gitlab-shell: upgrade to v.2.6.8 - gitlab: upgrade to CE v8.2.1 @@ -2606,6 +3038,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - added `GITLAB_ARTIFACTS_DIR` configuration parameter **8.2.0** + - gitlab-shell: upgrade to v.2.6.7 - gitlab-workhorse: upgrade to v.0.4.2 - gitlab: upgrade to CE v8.2.0 @@ -2615,53 +3048,67 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - added `GITLAB_LFS_ENABLED` configuration parameter **8.1.4** + - gitlab: upgrade to CE v8.1.4 **8.1.3** + - proper long-term fix for http/https cloning when `GITLAB_RELATIVE_URL_ROOT` is used - gitlab: upgrade to CE v8.1.3 - Expose Facebook OAUTH configuration parameters **8.1.2** + - gitlab: upgrade to CE v8.1.2 - removed `GITLAB_SATELLITES_TIMEOUT` configuration parameter **8.1.0-2** + - Recompile assets when `GITLAB_RELATIVE_URL_ROOT` is used Fixes #481 **8.1.0-1** + - temporary fix for http/https cloning when `GITLAB_RELATIVE_URL_ROOT` is used **8.1.0** + - gitlab: upgrade to CE v8.1.0 - gitlab-git-http-server: upgrade to v0.3.0 **8.0.5-1** + - speed up container startup by compiling assets at image build time - test connection to redis-server **8.0.5** + - gitlab: upgrade to CE v.8.0.5 **8.0.4-2** + - fix http/https cloning when `GITLAB_RELATIVE_URL_ROOT` is used - allow user to override `OAUTH_ENABLED` setting **8.0.4-1** + - update baseimage to `sameersbn/ubuntu:14.04.20151011` **8.0.4** + - gitlab: upgrade to CE v.8.0.4 **8.0.3** + - gitlab: upgrade to CE v.8.0.3 **8.0.2** + - gitlab: upgrade to CE v.8.0.2 - added `IMAP_STARTTLS` parameter, defaults to `false` - expose oauth parameters for crowd server **8.0.0** + - set default value of `DB_TYPE` to `postgres` - added sample Kubernetes rc and service description files - expose `GITLAB_BACKUP_ARCHIVE_PERMISSIONS` parameter @@ -2674,71 +3121,91 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - added CI redirection using `GITLAB_CI_HOST` parameter **7.14.3** + - gitlab: upgrade to CE v.7.14.3 **7.14.2** + - Apply grsecurity policies to nodejs binary #394 - Fix broken emojis post migration #196 - gitlab-shell: upgrade to v.2.6.5 - gitlab: upgrade to CE v.7.14.2 **7.14.1** + - gitlab: upgrade to CE v.7.14.1 **7.14.0** + - gitlab-shell: upgrade to v.2.6.4 - gitlab: upgrade to CE v.7.14.0 **7.13.5** + - gitlab: upgrade to CE v.7.13.5 **7.13.4** + - gitlab: upgrade to CE v.7.13.4 **7.13.3** + - gitlab: upgrade to CE v.7.13.3 **7.13.2** + - gitlab: upgrade to CE v.7.13.2 **7.13.1** + - gitlab: upgrade to CE v.7.13.1 **7.13.0** + - expose SAML OAuth provider configuration - expose `OAUTH_AUTO_SIGN_IN_WITH_PROVIDER` configuration - gitlab: upgrade to CE v.7.13.0 **7.12.2-2** + - enable persistence `.secret` file used in 2FA **7.12.2-1** + - fixed gitlab:backup:restore raketask **7.12.2** + - gitlab: upgrade to CE v.7.12.2 **7.12.1** + - gitlab: upgrade to CE v.7.12.1 **7.12.0** + - added `SMTP_TLS` configuration parameter - gitlab: upgrade to CE v.7.12.0 - added `OAUTH_AUTO_LINK_LDAP_USER` configuration parameter **7.11.4-1** + - base image update to fix SSL vulnerability **7.11.4** + - gitlab: upgrade to CE v.7.11.4 **7.11.3** + - gitlab: upgrade to CE v.7.11.3 **7.11.2** + - gitlab: upgrade to CE v.7.11.2 **7.11.0** + - init: added `SIDEKIQ_MEMORY_KILLER_MAX_RSS` configuration option - init: added `SIDEKIQ_SHUTDOWN_TIMEOUT` configuration option - gitlab-shell: upgrade to v.2.6.3 @@ -2746,19 +3213,24 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - init: removed `GITLAB_PROJECTS_VISIBILITY` ENV parameter **7.10.4** + - gitlab: upgrade to CE v.7.10.4 **7.10.3** + - gitlab: upgrade to CE v.7.10.3 **7.10.2** + - init: added support for remote AWS backups - gitlab: upgrade to CE v.7.10.2 **7.10.1** + - gitlab: upgrade to CE v.7.10.1 **7.10.0** + - gitlab-shell: upgrade to v.2.6.2 - gitlab: upgrade to CE v.7.10.0 - init: removed ENV variables to configure *External Issue Tracker* integration @@ -2766,9 +3238,11 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - init: added `LDAP_BLOCK_AUTO_CREATED_USERS` configuration option **7.9.4** + - gitlab: upgrade to CE v.7.9.4 **7.9.3** + - added `NGINX_PROXY_BUFFERING` option - added `NGINX_ACCEL_BUFFERING` option - added `GITLAB_GRAVATAR_ENABLED` option @@ -2778,13 +3252,16 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - gitlab: upgrade to CE v.7.9.3 **7.9.2** + - gitlab: upgrade to CE v.7.9.2 **7.9.1** + - init: set default value of `SMTP_OPENSSL_VERIFY_MODE` to `none` - gitlab: upgrade to CE v.7.9.1 **7.9.0** + - gitlab-shell: upgrade to v.2.6.0 - gitlab: upgrade to CE v.7.9.0 - init: set default value of `UNICORN_WORKERS` to `3` @@ -2794,16 +3271,20 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - init: added `GITLAB_EMAIL_DISPLAY_NAME` configuration option **7.8.4** + - gitlab: upgrade to CE v.7.8.4 **7.8.2** + - gitlab: upgrade to CE v.7.8.2 **7.8.1** + - gitlab-shell: upgrade to v.2.5.4 - gitlab: upgrade to CE v.7.8.1 **7.8.0** + - update postgresql client to the latest version, Closes #249 - removed `GITLAB_SIGNUP` configuration option, can be set from gitlab ui - removed `GITLAB_SIGNIN` configuration option, can be set from gitlab ui @@ -2816,13 +3297,16 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - init: added gitlab oauth configuration support **7.7.2** + - gitlab-shell: upgrade to v.2.4.2 - gitlab: upgrade to CE v.7.7.2 **7.7.1** + - gitlab: upgrade to CE v.7.7.1 **7.7.0** + - init: added GOOGLE_ANALYTICS_ID configuration option - added support for mantis issue tracker - fixed log rotation configuration @@ -2830,45 +3314,55 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - gitlab: upgrade to CE v.7.7.0 **7.6.2** + - gitlab: upgrade to CE v.7.6.2 **7.6.1** + - disable nginx ipv6 if host does not support it. - init: added GITLAB_BACKUP_TIME configuration option - gitlab: upgrade to CE v.7.6.1 **7.6.0** + - add support for configuring piwik - gitlab-shell: upgrade to v.2.4.0 - gitlab: upgrade to CE v.7.6.0 **7.5.3** + - accept `BACKUP` parameter while running the restore rake task, closes #220 - init: do not run `gitlab:satellites:create` rake task at startup - gitlab: upgrade to CE v.7.5.3 **7.5.2** + - gitlab: upgrade to CE v.7.5.2 **7.5.1** + - gitlab: upgrade to CE v.7.5.1 - gitlab-shell to v2.2.0 - added `GITLAB_TIMEZONE` configuration option - added `GITLAB_EMAIL_ENABLED` configuration option **7.4.4** + - gitlab: upgrade to CE v.7.4.4 - added `SSL_VERIFY_CLIENT` configuration option - added `NGINX_WORKERS` configuration option - added `USERMAP_UID` and `USERMAP_GID` configuration option **7.4.3** + - gitlab: upgrade to CE v.7.4.3 **7.4.2** + - gitlab: upgrade to CE v.7.4.2 **7.4.0** + - gitlab: upgrade to CE v.7.4.0 - config: added `LDAP_ACTIVE_DIRECTORY` configuration option - added SMTP_OPENSSL_VERIFY_MODE configuration option @@ -2877,9 +3371,11 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - launch all daemons via supervisord **7.3.2-1** + - fix mysql status check **7.3.2** + - upgrade to gitlab-ce 7.3.2 - removed internal mysql server - added support for fetching `DB_NAME`, `DB_USER` and `DB_PASS` from the postgresql linkage @@ -2889,19 +3385,24 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - added fig.yml **7.3.1-3** + - fix mysql command again! **7.3.1-2** + - fix mysql server status check **7.3.1-1** + - plug bash vulnerability by switching to dash shell - automatically run the `gitlab:setup` rake task for new installs **7.3.1** + - upgrade to gitlab-ce 7.3.1 **7.3.0** + - upgrade to gitlab-ce 7.3.0 - added GITLAB_WEBHOOK_TIMEOUT configuration option - upgrade to gitlab-shell 2.0.0 @@ -2909,6 +3410,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - shutdown the container gracefully **7.2.2** + - upgrade to gitlab-ce 7.2.2 - added GITLAB_HTTPS_HSTS_ENABLED configuration option (advanced config) - added GITLAB_HTTPS_HSTS_MAXAGE configuration option (advanced config) @@ -2919,21 +3421,25 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - added GITLAB_USERNAME_CHANGE configuration option **7.2.1-1** + - removed the GITLAB_HTTPS_ONLY configuration option - added NGINX_X_FORWARDED_PROTO configuration option - optimization: talk directly to the unicorn worker from gitlab-shell **7.2.1** + - upgrade to gitlab-ce 7.2.1 - added new SMTP_ENABLED configuration option. **7.2.0-1** + - fix nginx static route handling when GITLAB_RELATIVE_URL_ROOT is used. - fix relative root access without the trailing '/' character - added separate server block for http config in gitlab.https.permissive. Fixes #127 - added OAUTH_GOOGLE_RESTRICT_DOMAIN config option. **7.2.0** + - upgrade to gitlab-ce 7.2.0 - update to the sameersbn/ubuntu:14.04.20140818 baseimage - remove /var/lib/apt/lists to optimize image size. @@ -2949,11 +3455,13 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - update to the sameersbn/ubuntu:14.04.20140812 baseimage **7.1.1** + - removed "add_header X-Frame-Options DENY" setting from the nginx config. fixes #110 - upgrade to gitlab-ce 7.1.1 - run /etc/init.d/gitlab as git user, plays nicely with selinux **7.1.0** + - removed GITLAB_SUPPORT configuration option - upgrade to gitlab-ce 7.1.0 - clone gitlab-ce and gitlab-shell sources from the git repo. @@ -2963,6 +3471,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - upgrade to nginx-1.6.x series from the nginx/stable ppa **7.0.0** + - upgrade to gitlab-7.0.0 - fix repository and gitlab-satellites directory permissions. - added GITLAB_RESTRICTED_VISIBILITY configuration option @@ -2973,17 +3482,21 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - upgrade to gitlab-shell 1.9.5 **6.9.2** + - upgrade to gitlab-ce 6.9.2 **6.9.1** + - upgrade to gitlab-ce 6.9.1 **6.9.0** + - upgrade to gitlab-ce 6.9.0 - added GITLAB_RELATIVE_URL_ROOT configuration option - added NGINX_MAX_UPLOAD_SIZE configuration to specify the maximum acceptable size of attachments. **6.8.2** + - upgrade to gitlab-ce 6.8.2 - renamed configuration option GITLAB_SHELL_SSH_PORT to GITLAB_SSH_PORT - added GITLAB_PROJECTS_VISIBILITY configuration option to specify the default project visibility level. @@ -3005,9 +3518,11 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - fix symlink to uploads directory **6.8.1** + - upgrade to gitlab-ce 6.8.1 **6.8.0** + - upgrade to gitlab-shell 1.9.3 - added GITLAB_SIGNIN setting to enable or disable standard login form - upgraded to gitlab-ce version 6.8.0 @@ -3016,29 +3531,35 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - install postgresql-client to fix restoring backups when used with a postgresql database backend. **6.7.5** + - upgrade gitlab to 6.7.5 - support linking to mysql and postgresql containers - added DEFAULT_PROJECTS_LIMIT configuration option **6.7.4** + - upgrade gitlab to 6.7.4 - added SMTP_AUTHENTICATION configuration option, defaults to :login. - added LDAP configuration options. **6.7.3** + - upgrade gitlab to 6.7.3 - install ruby2.0 from ppa **6.7.2** + - upgrade gitlab to 6.7.2 - upgrade gitlab-shell to 1.9.1 - reorganize repo -- do not perform system upgrades (http://crosbymichael.com/dockerfile-best-practices-take-2.html) +- do not perform system upgrades () **6.6.5** + - upgraded to gitlab-6.6.5 **v6.6.4** + - upgraded to gitlab-6.6.4 - added changelog - removed postfix mail delivery @@ -3049,6 +3570,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - changed backup time to 4am (UTC) **v6.6.2** + - upgraded to gitlab-6.6.2 - added automated daily/monthly backups feature - documented ssh login details for maintenance tasks. @@ -3058,5 +3580,6 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - documented hardware requirements **v6.6.1** + - upgraded to gitlabhq-6.6.1 - reformatted README From 0392d287c1a60f018fdaed035ae61bb9554ecec6 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 17 May 2025 20:25:09 +0200 Subject: [PATCH 477/522] Update and lint Changelog.md --- Changelog.md | 1327 +++++++++++++++++++++++++------------------------- 1 file changed, 661 insertions(+), 666 deletions(-) diff --git a/Changelog.md b/Changelog.md index b4891f8fc..f6dc204e7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,7 +3,7 @@ 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. -**18.0.0** +## 18.0.0 - gitlab: upgrade CE to v18.0.0 - gitaly: upgrade to v18.0.0 @@ -12,7 +12,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - rubygems: upgrade to v3.6.9 - ubuntu: upgrade to noble-20250415.1 -**17.11.2** +## 17.11.2 - gitlab: upgrade CE to v17.11.2 - gitaly: upgrade to v17.11.2 @@ -20,27 +20,27 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - golang: upgrade to v1.24.3 - ubuntu: upgrade to jammy-20250415.1 -**17.11.1** +## 17.11.1 - gitlab: upgrade CE to v17.11.1 - gitaly: upgrade to v17.11.1 - gitlab-pages: upgrade to v17.11.1 - rubygems: upgrade to v3.6.8 -**17.11.0** +## 17.11.0 - gitlab: upgrade CE to v17.11.0 - gitaly: upgrade to v17.11.0 - gitlab-pages: upgrade to v17.11.0 -**17.10.4** +## 17.10.4 - gitlab: upgrade CE to v17.10.4 - gitaly: upgrade to v17.10.4 - gitlab-pages: upgrade to v17.10.4 - ubuntu: upgrade to jammy-20250404 -**17.10.3** +## 17.10.3 - gitlab: upgrade CE to v17.10.3 - gitaly: upgrade to v17.10.3 @@ -48,13 +48,13 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - golang: upgrade to v1.24.2 - ruby: upgrade to v3.2.8 -**17.10.1** +## 17.10.1 - gitlab: upgrade CE to v17.10.1 - gitaly: upgrade to v17.10.1 - gitlab-pages: upgrade to v17.10.1 -**17.10.0** +## 17.10.0 - gitlab: upgrade CE to v17.10.0 - gitaly: upgrade to v17.10.0 @@ -62,19 +62,19 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - golang: upgrade to v1.24.1 - rubygems: upgrade to v3.6.6 -**17.9.2** +## 17.9.2 - gitlab: upgrade CE to v17.9.2 - gitaly: upgrade to v17.9.2 - gitlab-pages: upgrade to v17.9.2 -**17.9.1** +## 17.9.1 - gitlab: upgrade CE to v17.9.1 - gitaly: upgrade to v17.9.1 - gitlab-pages: upgrade to v17.9.1 -**17.9.0** +## 17.9.0 - gitlab: upgrade CE to v17.9.0 - gitaly: upgrade to v17.9.0 @@ -84,7 +84,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - rubygems: upgrade to v3.5.23 - ubuntu: upgrade to jammy-20250126 -**17.8.2** +## 17.8.2 - gitlab: upgrade CE to v17.8.2 - gitaly: upgrade to v17.8.2 @@ -92,25 +92,25 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - golang: upgrade to v1.23.6 - ruby: upgrade to v3.2.7 -**17.8.1** +## 17.8.1 - gitlab: upgrade CE to v17.8.1 - gitaly: upgrade to v17.8.1 - gitlab-pages: upgrade to v17.8.1 -**17.8.0** +## 17.8.0 - gitlab: upgrade CE to v17.8.0 - gitaly: upgrade to v17.8.0 - gitlab-pages: upgrade to v17.8.0 -**17.7.1** +## 17.7.1 - gitlab: upgrade CE to v17.7.1 - gitaly: upgrade to v17.7.1 - gitlab-pages: upgrade to v17.7.1 -**17.7.0** +## 17.7.0 - gitlab: upgrade CE to v17.7.0 - gitaly: upgrade to v17.7.0 @@ -118,32 +118,32 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - ubuntu: upgrade to jammy-20240911.1 - update healthcheck for postgresql -**17.6.3** +## 17.6.3 - gitlab: upgrade CE to v17.6.3 - gitaly: upgrade to v17.6.3 - gitlab-pages: upgrade to v17.6.3 -**17.6.2** +## 17.6.2 - gitlab: upgrade CE to v17.6.2 - gitaly: upgrade to v17.6.2 - gitlab-pages: upgrade to v17.6.2 -**17.6.1** +## 17.6.1 - gitlab: upgrade CE to v17.6.1 - gitlab-pages: upgrade to v17.6.1 - gitaly: upgrade to v17.6.1 - golang: upgrade to v1.23.5 -**17.6.0** +## 17.6.0 - gitlab: upgrade CE to v17.6.0 - gitaly: upgrade to v17.6.0 - gitlab-pages: upgrade to v17.6.0 -**17.5.2** +## 17.5.2 - gitlab: upgrade CE to v17.5.2 - gitaly: upgrade to v17.5.2 @@ -151,20 +151,20 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - golang: upgrade to v1.23.2 - ruby: upgrade to v3.2.6 -**17.5.1** +## 17.5.1 - gitlab: upgrade CE to v17.5.1 - gitaly: upgrade to v17.5.1 - gitlab-pages: upgrade to v17.5.1 -**17.5.0** +## 17.5.0 - gitlab: upgrade CE to v17.5.0 - gitaly: upgrade to v17.5.0 - gitlab-pages: upgrade to v17.5.0 - ubuntu: upgrade to focal-20241011 -**17.4.2** +## 17.4.2 - gitlab: upgrade CE to v17.4.2 - gitaly: upgrade to v17.4.2 @@ -172,39 +172,39 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - golang: upgrade to v1.23.2 - ubuntu: upgrade to focal-20240918 -**17.4.1** +## 17.4.1 - gitlab: upgrade CE to v17.4.1 - gitaly: upgrade to v17.4.1 - gitlab-pages: upgrade to v17.4.1 -**17.4.0** +## 17.4.0 - gitlab: upgrade CE to v17.4.0 - gitaly: upgrade to v17.4.0 - gitlab-pages: upgrade to v17.4.0 - gitlab-shell: upgrade to v14.39.0 -**17.3.3** +## 17.3.3 - gitlab: upgrade CE to v17.3.3 - gitaly: upgrade to v17.3.3 - gitlab-pages: upgrade to v17.3.3 -**17.3.2** +## 17.3.2 - gitlab: upgrade CE to v17.3.2 - gitaly: upgrade to v17.3.2 - gitlab-pages: upgrade to v17.3.2 - golang: upgrade to v1.23.1 -**17.3.1** +## 17.3.1 - gitlab: upgrade CE to v17.3.1 - gitaly: upgrade to v17.3.1 - gitlab-pages: upgrade to v17.3.1 -**17.3.0** +## 17.3.0 - gitlab: upgrade CE to v17.3.0 - gitaly: upgrade to v17.3.0 @@ -212,48 +212,48 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-shell: upgrade to v14.38.0 - golang: upgrade to v1.23.0 -**17.2.2** +## 17.2.2 - gitlab: upgrade CE to v17.2.2 - gitaly: upgrade to v17.2.2 - gitlab-pages: upgrade to v17.2.2 - golang: upgrade to v1.22.6 -**17.2.1** +## 17.2.1 - gitlab: upgrade CE to v17.2.1 - gitaly: upgrade to v17.2.1 - gitlab-pages: upgrade to v17.2.1 - ruby: upgrade to v3.2.5 -**17.2.0** +## 17.2.0 - gitlab: upgrade CE to v17.2.0 - gitaly: upgrade to v17.2.0 - gitlab-pages: upgrade to v17.2.0 - gitlab-shell: upgrade to v14.37.0 -**17.1.2** +## 17.1.2 - gitlab: upgrade CE to v17.1.2 - gitaly: upgrade to v17.1.2 - gitlab-pages: upgrade to v17.1.2 - golang: upgrade to v1.22.5 -**17.1.1** +## 17.1.1 - gitlab: upgrade CE to v17.1.1 - gitaly: upgrade to v17.1.1 - gitlab-pages: upgrade to v17.1.1 -**17.1.0** +## 17.1.0 - gitlab: upgrade CE to v17.1.0 - gitaly: upgrade to v17.1.0 - gitlab-pages: upgrade to v17.1.0 - gitlab-shell: upgrade to v14.36.0 -**17.0.2** +## 17.0.2 - gitlab: upgrade CE to v17.0.2 - gitaly: upgrade to v17.0.2 @@ -261,20 +261,20 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - golang: upgrade to v1.22.4 - ubuntu: upgrade to focal-20240530 -**17.0.1** +## 17.0.1 - gitlab: upgrade CE to v17.0.1 - gitaly: upgrade to v17.0.1 - gitlab-pages: upgrade to v17.0.1 -**17.0.0** +## 17.0.0 - gitlab: upgrade CE to v17.0.0 - gitaly: upgrade to v17.0.0 - gitlab-pages: upgrade to v17.0.0 - gitlab-shell: upgrade to v14.35.0 -**16.11.2** +## 16.11.2 - gitlab: upgrade CE to v16.11.2 - gitaly: upgrade to v16.11.2 @@ -282,7 +282,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - golang: upgrade to v1.22.3 - ubuntu: upgrade to focal-20240427 -**16.11.1** +## 16.11.1 - gitlab: upgrade CE to v16.11.1 - gitaly: upgrade to v16.11.1 @@ -290,41 +290,41 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - ruby: upgrade to v3.2.4 - ubuntu: upgrade to focal-20240416 -**16.11.0** +## 16.11.0 - gitlab: upgrade CE to v16.11.0 - gitaly: upgrade to v16.11.0 - gitlab-pages: upgrade to v16.11.0 - gitlab-shell: upgrade to v14.35.0 -**16.10.3** +## 16.10.3 - gitlab: upgrade CE to v16.10.3 - gitaly: upgrade to v16.10.3 - gitlab-pages: upgrade to v16.10.3 - ubuntu: upgrade to focal-20240410 -**16.10.2** +## 16.10.2 - gitlab: upgrade CE to v16.10.2 - gitaly: upgrade to v16.10.2 - gitlab-pages: upgrade to v16.10.2 - golang: upgrade to v1.22.2 -**16.10.1** +## 16.10.1 - gitlab: upgrade CE to v16.10.1 - gitaly: upgrade to v16.10.1 - gitlab-pages: upgrade to v16.10.1 -**16.10.0** +## 16.10.0 - gitlab: upgrade CE to v16.10.0 - gitaly: upgrade to v16.10.0 - gitlab-pages: upgrade to v16.10.0 - gitlab-shell: upgrade to v14.34.0 -**16.9.2** +## 16.9.2 - gitlab: upgrade CE to v16.9.2 - gitaly: upgrade to v16.9.2 @@ -332,19 +332,19 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - golang: upgrade to v1.22.1 - ubuntu: upgrade to focal-20240216 -**16.9.1** +## 16.9.1 - gitlab: upgrade CE to v16.9.1 - gitaly: upgrade to v16.9.1 - gitlab-pages: upgrade to v16.9.1 -**16.9.0** +## 16.9.0 - gitlab: upgrade CE to v16.9.0 - gitaly: upgrade to v16.9.0 - gitlab-pages: upgrade to v16.9.0 -**16.8.2** +## 16.8.2 - gitlab: upgrade CE to v16.8.2 - gitaly: upgrade to v16.8.2 @@ -352,33 +352,33 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - golang: upgrade to v1.22.0 - ubuntu: upgrade to focal-20240123 -**16.8.1** +## 16.8.1 - gitlab: upgrade CE to v16.8.1 - gitaly: upgrade to v16.8.1 - gitlab-pages: upgrade to v16.8.1 - gitlab-shell: upgrade to v14.33.0 -**16.8.0** +## 16.8.0 - gitlab: upgrade CE to v16.8.0 - gitaly: upgrade to v16.8.0 - gitlab-pages: upgrade to v16.8.0 -**16.7.3** +## 16.7.3 - gitlab: upgrade CE to v16.7.3 - gitaly: upgrade to v16.7.3 - gitlab-pages: upgrade to v16.7.3 -**16.7.2** +## 16.7.2 - gitlab: upgrade CE to v16.7.2 - gitaly: upgrade to v16.7.2 - gitlab-pages: upgrade to v16.7.2 - golang: upgrade to v1.21.6 -**16.7.0** +## 16.7.0 - gitlab: upgrade CE to v16.7.0 - gitaly: upgrade to v16.7.0 @@ -386,7 +386,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-shell: upgrade to v14.32.0 - ruby: upgrade to v3.1.4 -**16.6.2** +## 16.6.2 - gitlab: upgrade CE to v16.6.2 - gitaly: upgrade to v16.6.2 @@ -394,14 +394,14 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - golang: upgrade to v1.21.5 - ubuntu: upgrade to focal-20231211 -**16.6.1** +## 16.6.1 - gitlab: upgrade CE to v16.6.1 - gitaly: upgrade to v16.6.1 - gitlab-pages: upgrade to v16.6.1 - ubuntu: upgrade to focal-20231128 -**16.6.0** +## 16.6.0 - gitlab: upgrade CE to v16.6.0 - gitaly: upgrade to v16.6.0 @@ -409,13 +409,13 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-shell: upgrade to v14.30.0 - golang: upgrade to v1.21.4 -**16.5.1** +## 16.5.1 - gitlab: upgrade CE to v16.5.1 - gitaly: upgrade to v16.5.1 - gitlab-pages: upgrade to v16.5.1 -**16.5.0** +## 16.5.0 - gitlab: upgrade CE to v16.5.0 - gitaly: upgrade to v16.5.0 @@ -424,64 +424,64 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - golang: upgrade to v1.21.3 - ubuntu: upgrade to focal-20231003 -**16.4.1** +## 16.4.1 - gitlab: upgrade CE to v16.4.1 - gitaly: upgrade to v16.4.1 - gitlab-pages: upgrade to v16.4.1 -**16.4.0** +## 16.4.0 - gitlab: upgrade CE to v16.4.0 - gitaly: upgrade to v16.4.0 - gitlab-pages: upgrade to v16.4.0 - gitlab-shell: upgrade to v14.28.0 -**16.3.4** +## 16.3.4 - gitlab: upgrade CE to v16.3.4 - gitaly: upgrade to v16.3.4 - gitlab-pages: upgrade to v16.3.4 -**16.3.3** +## 16.3.3 - gitlab: upgrade CE to v16.3.3 - gitaly: upgrade to v16.3.3 - gitlab-pages: upgrade to v16.3.3 -**16.3.2** +## 16.3.2 - gitlab: upgrade CE to v16.3.2 - gitaly: upgrade to v16.3.2 - gitlab-pages: upgrade to v16.3.2 - golang: upgrade to v1.21.1 -**16.3.1** +## 16.3.1 - gitlab: upgrade CE to v16.3.1 - gitaly: upgrade to v16.3.1 - gitlab-pages: upgrade to v16.3.1 -**16.3.0** +## 16.3.0 - gitlab: upgrade CE to v16.3.0 - gitaly: upgrade to v16.3.0 - gitlab-pages: upgrade to v16.3.0 -**16.2.4** +## 16.2.4 - gitlab: upgrade CE to v16.2.4 - gitaly: upgrade to v16.2.4 - gitlab-pages: upgrade to v16.2.4 - golang: upgrade to v1.21.0 -**16.2.3** +## 16.2.3 - gitlab: upgrade CE to v16.2.3 - gitaly: upgrade to v16.2.3 - gitlab-pages: upgrade to v16.2.3 -**16.2.2** +## 16.2.2 - gitlab: upgrade CE to v16.2.2 - gitaly: upgrade to v16.2.2 @@ -489,131 +489,131 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - golang: upgrade to v1.20.7 - ubuntu: upgrade to focal-20230801 -**16.2.1** +## 16.2.1 - gitlab: upgrade CE to v16.2.1 - gitaly: upgrade to v16.2.1 - gitlab-pages: upgrade to v16.2.1 -**16.2.0** +## 16.2.0 - gitlab: upgrade CE to v16.2.0 - gitaly: upgrade to v16.2.0 - gitlab-pages: upgrade to v16.2.0 - golang: upgrade to v1.20.6 -**16.1.2** +## 16.1.2 - gitlab: upgrade CE to v16.1.2 - gitaly: upgrade to v16.1.2 - gitlab-pages: upgrade to v16.1.2 - ubuntu: upgrade to focal-20230624 -**16.1.1** +## 16.1.1 - gitlab: upgrade CE to v16.1.1 - gitaly: upgrade to v16.1.1 - gitlab-pages: upgrade to v16.1.1 -**16.1.0** +## 16.1.0 - gitlab: upgrade CE to v16.1.0 - gitaly: upgrade to v16.1.0 - gitlab-pages: upgrade to v16.1.0 - gitlab-shell: upgrade to v14.23.0 -**16.0.5** +## 16.0.5 - gitlab: upgrade CE to v16.0.5 - gitaly: upgrade to v16.0.5 - gitlab-pages: upgrade to v16.0.5 - ubuntu: upgrade to focal-20230605 -**16.0.4** +## 16.0.4 - gitlab: upgrade CE to v16.0.4 - gitaly: upgrade to v16.0.4 - gitlab-pages: upgrade to v16.0.4 -**16.0.3** +## 16.0.3 - gitlab: upgrade CE to v16.0.3 - gitaly: upgrade to v16.0.3 - gitlab-pages: upgrade to v16.0.3 -**16.0.2** +## 16.0.2 - gitlab: upgrade CE to v16.0.2 - gitaly: upgrade to v16.0.2 - gitlab-pages: upgrade to v16.0.2 - golang: upgrade to v1.20.5 -**16.0.1** +## 16.0.1 - gitlab: upgrade CE to v16.0.1 - gitaly: upgrade to v16.0.1 - gitlab-pages: upgrade to v16.0.1 -**16.0.0** +## 16.0.0 - gitlab: upgrade CE to v16.0.0 - gitaly: upgrade to v16.0.0 - gitlab-pages: upgrade to v16.0.0 - gitlab-shell: upgrade to v14.20.0 -**15.11.5** +## 15.11.5 - gitlab: upgrade CE to v15.11.5 - gitaly: upgrade to v15.11.5 - gitlab-pages: upgrade to v15.11.5 -**15.11.4** +## 15.11.4 - gitlab: upgrade CE to v15.11.4 - gitaly: upgrade to v15.11.4 - gitlab-pages: upgrade to v15.11.4 -**15.11.3** +## 15.11.3 - gitlab: upgrade CE to v15.11.3 - gitaly: upgrade to v15.11.3 - gitlab-pages: upgrade to v15.11.3 - ruby: upgrade to v3.0.6 -**15.11.2** +## 15.11.2 - gitlab: upgrade CE to v15.11.2 - gitaly: upgrade to v15.11.2 - gitlab-pages: upgrade to v15.11.2 -**15.11.1** +## 15.11.1 - gitlab: upgrade CE to v15.11.1 - gitaly: upgrade to v15.11.1 - gitlab-pages: upgrade to v15.11.1 - golang: upgrade to v1.20.4 -**15.11.0** +## 15.11.0 - gitlab: upgrade CE to v15.11.0 - gitaly: upgrade to v15.11.0 - gitlab-pages: upgrade to v15.11.0 - ubuntu: upgrade to focal-20230412 -**15.10.3** +## 15.10.3 - gitlab: upgrade CE to v15.10.3 - gitaly: upgrade to v15.10.3 - gitlab-pages: upgrade to v15.10.3 -**15.10.2** +## 15.10.2 - gitlab: upgrade CE to v15.10.2 - gitaly: upgrade to v15.10.2 - gitlab-pages: upgrade to v15.10.2 - golang: upgrade to v1.20.3 -**15.10.1** +## 15.10.1 - gitlab: upgrade CE to v15.10.1 - gitaly: upgrade to v15.10.1 @@ -621,7 +621,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - ruby: upgrade to v2.7.8 - ubuntu: upgrade to focal-20230308 -**15.10.0** +## 15.10.0 - gitlab: upgrade CE to v15.10.0 - gitaly: upgrade to v15.10.0 @@ -629,52 +629,52 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-shell: upgrade to v14.18.0 - ubuntu: upgrade to focal-20230308 -**15.9.3** +## 15.9.3 - gitlab: upgrade CE to v15.9.3 - gitaly: upgrade to v15.9.3 - gitlab-pages: upgrade to v15.9.3 - golang: upgrade to v1.20.2 -**15.9.2** +## 15.9.2 - gitlab: upgrade CE to v15.9.2 - gitaly: upgrade to v15.9.2 - gitlab-pages: upgrade to v15.9.2 - ubuntu: upgrade to focal-20230301 -**15.9.1** +## 15.9.1 - gitlab: upgrade CE to v15.9.1 - gitaly: upgrade to v15.9.1 - gitlab-pages: upgrade to v15.9.1 -**15.9.0** +## 15.9.0 - gitlab: upgrade CE to v15.9.0 - gitaly: upgrade to v15.9.0 - gitlab-pages: upgrade to v15.9.0 - gitlab-shell: upgrade to v14.17.0 -**15.8.2** +## 15.8.2 - gitlab: upgrade CE to v15.8.2 - gitaly: upgrade to v15.8.2 - gitlab-pages: upgrade to v15.8.2 - golang: upgrade to v1.19.6 -**15.8.1** +## 15.8.1 - gitlab: upgrade CE to v15.8.1 - gitaly: upgrade to v15.8.1 - gitlab-pages: upgrade to v15.8.1 - ubuntu: upgrade to focal-20230126 -**15.8.0-1** +## 15.8.0-1 - ruby: rollback to v2.7.7 -**15.8.0** +## 15.8.0 - gitlab: upgrade CE to v15.8.0 - gitaly: upgrade to v15.8.0 @@ -682,31 +682,31 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-shell: upgrade to v14.15.0 - golang: upgrade to v1.18.10 -**15.7.5** +## 15.7.5 - gitlab: upgrade CE to v15.7.5 - gitaly: upgrade to v15.7.5 - gitlab-pages: upgrade to v15.7.5 -**15.7.3** +## 15.7.3 - gitlab: upgrade CE to v15.7.3 - gitaly: upgrade to v15.7.3 - gitlab-pages: upgrade to v15.7.3 -**15.7.2** +## 15.7.2 - gitlab: upgrade CE to v15.7.2 - gitaly: upgrade to v15.7.2 - gitlab-pages: upgrade to v15.7.2 -**15.7.1** +## 15.7.1 - gitlab: upgrade CE to v15.7.1 - gitaly: upgrade to v15.7.1 - gitlab-pages: upgrade to v15.7.1 -**15.7.0** +## 15.7.0 - gitlab: upgrade CE to v15.7.0 - gitaly: upgrade to v15.7.0 @@ -714,7 +714,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-shell: upgrade to v14.14.0 - ruby: upgrade to v3.0.5 -**15.6.3** +## 15.6.3 - gitlab: upgrade CE to v15.6.3 - gitaly: upgrade to v15.6.3 @@ -723,17 +723,17 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - ruby: upgrade to v2.7.7 - ruby: upgrade to v3.0.4 -**15.6.2** +## 15.6.2 - gitlab: upgrade CE to v15.6.2 - gitaly: upgrade to v15.6.2 -**15.6.1** +## 15.6.1 - gitlab: upgrade CE to v15.6.1 - gitaly: upgrade to v15.6.1 -**15.6.0** +## 15.6.0 - gitlab: upgrade CE to v15.6.0 - gitaly: upgrade to v15.6.0 @@ -741,71 +741,71 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-pages: upgrade to v1.63.0 - golang: upgrade to v1.18.8 -**15.5.4** +## 15.5.4 - gitlab: upgrade CE to v15.5.4 - gitaly: upgrade to v15.5.4 -**15.5.3** +## 15.5.3 - gitlab: upgrade CE to v15.5.3 - gitaly: upgrade to v15.5.3 -**15.5.2** +## 15.5.2 - gitlab: upgrade CE to v15.5.2 - gitaly: upgrade to v15.5.2 - ubuntu: upgrade to focal-20221019 -**15.5.1** +## 15.5.1 - gitlab: upgrade CE to v15.5.1 - gitaly: upgrade to v15.5.1 -**15.5.0** +## 15.5.0 - gitlab: upgrade CE to v15.5.0 - gitaly: upgrade to v15.5.0 - gitlab-shell: upgrade to v14.12.0 -**15.4.3** +## 15.4.3 - gitlab: upgrade CE to v15.4.3 - gitaly: upgrade to v15.4.3 - ubuntu: upgrade to focal-20220922 -**15.4.2** +## 15.4.2 - gitlab: upgrade CE to v15.4.2 - gitaly: upgrade to v15.4.2 -**15.4.1** +## 15.4.1 - gitlab: upgrade CE to v15.4.1 - gitaly: upgrade to v15.4.1 -**15.4.0** +## 15.4.0 - gitlab: upgrade CE to v15.4.0 - gitaly: upgrade to v15.4.0 - ubuntu: upgrade tofocal-20220826 -**15.3.3** +## 15.3.3 - gitlab: upgrade CE to v15.3.3 - gitaly: upgrade to v15.3.3 -**15.3.2** +## 15.3.2 - gitlab: upgrade CE to v15.3.2 - gitaly: upgrade to v15.3.2 -**15.3.1** +## 15.3.1 - gitlab: upgrade CE to v15.3.1 - gitaly: upgrade to v15.3.1 -**15.3.0** +## 15.3.0 - gitlab: upgrade CE to v15.3.0 - gitaly: upgrade to v15.3.0 @@ -813,19 +813,19 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-pages: upgrade to v1.62.0 - ubuntu: upgrade to focal-20220801 -**15.2.2** +## 15.2.2 - gitlab: upgrade CE to v15.2.2 - gitaly: upgrade to v15.2.2 - golang: upgrade to v1.17.13 -**15.2.1** +## 15.2.1 - gitlab: upgrade CE to v15.2.1 - gitaly: upgrade to v15.2.1 - gitlab-pages: upgrade to v1.61.1 -**15.2.0** +## 15.2.0 - gitlab: upgrade CE to v15.2.0 - gitaly: upgrade to v15.2.0 @@ -833,46 +833,46 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-pages: upgrade to v1.61.0 - golang: upgrade to v1.17.12 -**15.1.3** +## 15.1.3 - gitlab: upgrade CE to v15.1.3 - gitaly: upgrade to v15.1.3 -**15.1.2** +## 15.1.2 - gitlab: upgrade CE to v15.1.2 - gitaly: upgrade to v15.1.2 -**15.1.1** +## 15.1.1 - gitlab: upgrade CE to v15.1.1 - gitaly: upgrade to v15.1.1 -**15.1.0** +## 15.1.0 - gitlab: upgrade CE to v15.1.0 - gitaly: upgrade to v15.1.0 - gitlab-shell: upgrade to v14.7.4 - gitlab-pages: upgrade to v1.59.0 -**15.0.3** +## 15.0.3 - gitlab: upgrade CE to v15.0.3 - gitaly: upgrade to v15.0.3 -**15.0.2** +## 15.0.2 - gitlab: upgrade CE to v15.0.2 - gitaly: upgrade to v15.0.2 - ubuntu: upgrade to focal-20220531 -**15.0.1** +## 15.0.1 - gitlab: upgrade CE to v15.0.1 - gitaly: upgrade to v15.0.1 - golang: upgrade to v1.17.11 -**15.0.0** +## 15.0.0 - gitlab: upgrade CE to v15.0.0 - gitaly: upgrade to v15.0.0 @@ -880,31 +880,31 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-shell: upgrade to v14.3.0 - gitlab-pages: upgrade to v1.58.0 -**14.10.3** +## 14.10.3 - gitlab: upgrade CE to v14.10.3 - gitaly: upgrade to v14.10.3 -**14.10.2** +## 14.10.2 - gitlab: upgrade CE to v14.10.2 - gitaly: upgrade to v14.10.2 - ubuntu: upgrade to focal-20220426 -**14.10.1** +## 14.10.1 - gitlab: upgrade CE to v14.10.1 - gitaly: upgrade to v14.10.1 - ubuntu: upgrade to focal-20220426 -**14.10.0** +## 14.10.0 - gitlab: upgrade CE to v14.10.0 - gitaly: upgrade to v14.10.0 - gitlab-shell: upgrade to v13.25.1 - ubuntu: upgrade to focal-20220415 -**14.9.3** +## 14.9.3 - gitlab: upgrade CE to v14.9.3 - gitaly: upgrade to v14.9.3 @@ -912,165 +912,165 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - ruby: upgrade to v2.7.6 - ubuntu: upgrade to focal-20220404 -**14.9.2** +## 14.9.2 - gitlab: upgrade CE to v14.9.2 - gitaly: upgrade to v14.9.2 - gitlab-pages: upgrade to v1.56.1 -**14.9.1** +## 14.9.1 - gitlab: upgrade CE to v14.9.1 - gitaly: upgrade to v14.9.1 -**14.9.0** +## 14.9.0 - gitlab: upgrade CE to v14.9.0 - gitaly: upgrade to v14.9.0 - gitlab-pages: upgrade to v1.56.0 - gitlab-shell: upgrade to v13.24.0 -**14.8.4** +## 14.8.4 - gitlab: upgrade CE to v14.8.4 - gitaly: upgrade to v14.8.4 -**14.8.3** +## 14.8.3 - gitlab: upgrade CE to v14.8.3 - gitaly: upgrade to v14.8.3 - golang: upgrade to v1.17.8 - ubuntu: upgrade to focal-20220316 -**14.8.2** +## 14.8.2 - gitlab: upgrade CE to v14.8.2 - gitaly: upgrade to v14.8.2 -**14.8.1** +## 14.8.1 - gitlab: upgrade CE to v14.8.1 - gitaly: upgrade to v14.8.1 -**14.8.0** +## 14.8.0 - gitlab: upgrade CE to v14.8.0 - gitaly: upgrade to v14.8.0 - gitlab-pages: upgrade to v1.54.0 - gitlab-shell: v13.23.2 -**14.7.3** +## 14.7.3 - gitlab: upgrade CE to v14.7.3 - gitaly: upgrade to v14.7.3 - golang: upgrade to v1.17.7 -**14.7.2** +## 14.7.2 - gitlab: upgrade CE to v14.7.2 - gitaly: upgrade to v14.7.2 - ubuntu: upgrade to focal-20220113 -**14.7.1** +## 14.7.1 - gitlab: upgrade CE to v14.7.1 - gitaly: upgrade to v14.7.1 -**14.7.0** +## 14.7.0 - gitlab: upgrade CE to v14.7.0 - gitaly: upgrade to v14.7.0 - gitlab-shell: v13.22.2 - gitlab-pages: upgrade to v1.51.0 -**14.6.3** +## 14.6.3 - gitlab: upgrade CE to v14.6.3 - gitaly: upgrade to v14.6.3 -**14.6.2** +## 14.6.2 - gitlab: upgrade CE to v14.6.2 - gitaly: upgrade to v14.6.2 - golang: upgrade to v1.17.6 - ubuntu: upgrade to focal-20220105 -**14.6.1** +## 14.6.1 - gitlab: upgrade CE to v14.6.1 - gitaly: upgrade to v14.6.1 -**14.6.0** +## 14.6.0 - gitlab: upgrade CE to v14.6.0 - gitaly: upgrade to v14.6.0 - gitlab-pages: upgrade to v1.49.0 -**14.5.2** +## 14.5.2 - gitlab: upgrade CE to v14.5.2 - gitaly: upgrade to v14.5.2 - golang: upgrade to v1.17.5 -**14.5.1** +## 14.5.1 - gitlab: upgrade CE to v14.5.1 - gitaly: upgrade to v14.5.1 - gitlab-shell: v13.22.1 -**14.5.0** +## 14.5.0 - gitlab: upgrade CE to v14.5.0 - gitaly: upgrade to v14.5.0 - gitlab-pages: upgrade to v1.48.0 - gitlab-shell: v13.22.0 -**14.4.4** +## 14.4.4 - gitlab: upgrade CE to v14.4.4 - gitaly: upgrade to v14.4.4 - ruby: upgrade to v2.7.5 -**14.4.3** +## 14.4.3 - gitlab: upgrade CE to v14.4.3 - gitaly: upgrade to v14.4.3 - golang: upgrade to v1.17.4 -**14.4.2** +## 14.4.2 - gitlab: upgrade CE to v14.4.2 - gitaly: upgrade to v14.4.2 - redis: upgrade to v6.2.6 -**14.4.1** +## 14.4.1 - gitlab: upgrade CE to v14.4.1 - gitaly: upgrade to v14.4.1 -**14.4.0** +## 14.4.0 - gitlab: upgrade CE to v14.4.0 - gitaly: upgrade to v14.4.0 - gitlab-pages: upgrade to v1.46.0 -**14.3.3** +## 14.3.3 - gitlab: upgrade CE to v14.3.3 - gitaly: upgrade to v14.3.3 -**14.3.2** +## 14.3.2 - gitlab: upgrade CE to v14.3.2 - gitaly: upgrade to v14.3.2 - gitlab-shell: v13.21.1 -**14.3.1** +## 14.3.1 - gitlab: upgrade CE to v14.3.1 - gitaly: upgrade to v14.3.1 -**14.3.0** +## 14.3.0 - gitlab: upgrade CE to v14.3.0 - gitaly: upgrade to v14.3.0 @@ -1079,218 +1079,218 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - ruby: compile ruby from source and use v2.7.4 - ubuntu: upgrade to focal-20211006 -**14.2.5** +## 14.2.5 - gitlab: upgrade CE to v14.2.5 - gitaly: upgrade to v14.2.5 -**14.2.4** +## 14.2.4 - gitlab: upgrade CE to v14.2.4 - gitaly: upgrade to v14.2.4 - golang: upgrade to v1.17.1 -**14.2.3** +## 14.2.3 - gitlab: upgrade CE to v14.2.3 - gitaly: upgrade to v14.2.3 -**14.2.2** +## 14.2.2 - gitlab: upgrade CE to v14.2.2 - gitaly: upgrade to v14.2.2 - ubuntu: upgrade to focal-20210827 -**14.2.1** +## 14.2.1 - gitlab: upgrade CE to v14.2.1 - gitaly: upgrade to v14.2.1 -**14.2.0** +## 14.2.0 - gitlab: upgrade CE to v14.2.0 - gitaly: upgrade to v14.2.0 - gitlab-pages: upgrade to v1.42.0 - golang: upgrade to v1.17 -**14.1.3** +## 14.1.3 - gitlab: upgrade CE to v14.1.3 - gitaly: upgrade to v14.1.3 - golang: upgrade to v1.16.7 -**14.1.2** +## 14.1.2 - gitlab: upgrade CE to v14.1.2 - gitaly: upgrade to v14.1.2 - gitlab-shell: upgrade to v13.19.1 -**14.1.1** +## 14.1.1 - gitlab: upgrade CE to v14.1.1 - gitaly: upgrade to v14.1.1 - ubuntu: upgrade to focal-20210723 -**14.1.0** +## 14.1.0 - gitlab: upgrade CE to v14.1.0 - gitaly: upgrade to v14.1.0 -**14.0.6** +## 14.0.6 - gitlab: upgrade CE to v14.0.6 - gitaly: upgrade to v14.0.6 - golang: upgrade to v1.16.6 -**14.0.5** +## 14.0.5 - gitlab: upgrade CE to v14.0.5 - gitaly: upgrade to v14.0.5 -**14.0.4** +## 14.0.4 - gitlab: upgrade CE to v14.0.4 - gitaly: upgrade to v14.0.4 -**14.0.3** +## 14.0.3 - gitlab: upgrade CE to v14.0.3 - gitaly: upgrade to v14.0.3 -**14.0.2** +## 14.0.2 - gitlab: upgrade CE to v14.0.2 - gitaly: upgrade to v14.0.2 -**14.0.1** +## 14.0.1 - gitlab: upgrade CE to v14.0.1 - gitaly: upgrade to v14.0.1 -**14.0.0** +## 14.0.0 - gitlab: upgrade CE to v14.0.0 - gitaly: upgrade to v14.0.0 - gitlab-shell: upgrade to v13.19.0 - gitlab-pages: upgrade to v1.40.0 -**13.12.5** +## 13.12.5 - gitlab: upgrade CE to v13.12.5 - gitaly: upgrade to v13.12.5 - ubuntu: upgrade to focal-20210609 -**13.12.4** +## 13.12.4 - gitlab: upgrade CE to v13.12.4 - gitaly: upgrade to v13.12.4 -**13.12.3** +## 13.12.3 - gitlab: upgrade CE to v13.12.3 - gitaly: upgrade to v13.12.3 - golang: upgrade to v1.16.5 -**13.12.2** +## 13.12.2 - gitlab: upgrade CE to v13.12.2 - gitaly: upgrade to v13.12.2 -**13.12.1** +## 13.12.1 - gitlab: upgrade CE to v13.12.1 - gitaly: upgrade to v13.12.1 -**13.12.0** +## 13.12.0 - gitlab: upgrade CE to v13.12.0 - gitlab-shell: upgrade to v13.18.0 - gitlab-pages: upgrade to v1.39.0 - gitaly: upgrade to v13.12.0 -**13.11.4** +## 13.11.4 - gitlab: upgrade CE to v13.11.4 - gitaly: upgrade to v13.11.4 - golang: upgrade to v1.16.4 - ubuntu: upgrade to focal-20210416 -**13.11.3** +## 13.11.3 - gitlab: upgrade CE to v13.11.3 - gitaly: upgrade to v13.11.3 -**13.11.2** +## 13.11.2 - gitlab: upgrade CE to v13.11.2 - gitaly: upgrade to v13.11.2 -**13.11.1** +## 13.11.1 - gitlab: upgrade CE to v13.11.1 - gitaly: upgrade to v13.11.1 -**13.11.0** +## 13.11.0 - gitlab: upgrade CE to v13.11.0 - gitaly: upgrade to v13.11.0 - gitlab-pages: upgrade to v1.38.0 - ubuntu: upgrade to focal-20210401 -**13.10.3** +## 13.10.3 - gitlab: upgrade CE to v13.10.3 - gitaly: upgrade to v13.10.3 -**13.10.2** +## 13.10.2 - gitlab: upgrade CE to v13.10.2 - gitaly: upgrade to v13.10.2 - golang: upgrade to v1.16.3 - ubuntu: upgrade to bionic-20210325 -**13.10.1** +## 13.10.1 - gitlab: upgrade CE to v13.10.1 - gitaly: upgrade to v13.10.1 - added libmagic1 to fit requirements of ruby-magic-static-0.3.4 (necessary for puma) -**13.10.0** +## 13.10.0 - gitlab: upgrade CE to v13.10.0 - gitaly: upgrade to v13.10.0 - gitlab-pages: upgrade to v1.36.0 -**13.9.5** +## 13.9.5 - gitlab: upgrade CE to v13.9.5 - gitaly: upgrade to v13.9.5 -**13.9.4** +## 13.9.4 - gitlab: upgrade CE to v13.9.4 - gitaly: upgrade to v13.9.4 - golang: upgrade to v1.16.2 - ubuntu: upgrade to bionic-20210222 -**13.9.3** +## 13.9.3 - gitlab: upgrade CE to v13.9.3 - gitaly: upgrade to v13.9.3 - gitlab-shell: upgrade to v13.17.0 -**13.9.2** +## 13.9.2 - gitlab: upgrade CE to v13.9.2 - gitaly: upgrade to v13.9.2 - gitlab-workhorse: upgrade to v8.63.2 -**13.9.1** +## 13.9.1 - gitlab: upgrade CE to v13.9.1 - gitaly: upgrade to v13.9.1 -**13.9.0** +## 13.9.0 - gitlab: upgrade CE to v13.9.0 - gitaly: upgrade to v13.9.0 @@ -1299,7 +1299,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-workhorse: upgrade to v8.63.0 - golang: upgrade to v1.16 -**13.8.4** +## 13.8.4 - added `SSL_PROTOCOLS` option to change protocols of the nginx - added `SSL_REGISTRY_CIPHERS` @@ -1310,23 +1310,23 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitaly: upgrade to v13.8.4 - gitlab-shell: upgrade to v13.15.1 -**13.8.3** +## 13.8.3 - gitlab: upgrade CE to v13.8.3 - gitaly: upgrade to v13.8.3 - golang: upgrade to v1.15.8 -**13.8.2** +## 13.8.2 - gitlab: upgrade CE to v13.8.2 - gitaly: upgrade to v13.8.2 -**13.8.1** +## 13.8.1 - gitlab: upgrade CE to v13.8.1 - gitaly: upgrade to v13.8.1 -**13.8.0** +## 13.8.0 - gitlab: upgrade CE to v13.8.0 - gitaly: upgrade to v13.8.0 @@ -1336,23 +1336,23 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - golang: upgrade to v1.15.7 - ubuntu: upgrade to bionic-20210118 -**13.7.4** +## 13.7.4 - gitlab: upgrade CE to v13.7.4 -**13.7.3** +## 13.7.3 - gitlab: upgrade CE to v13.7.3 - gitlab-pages: upgrade to v1.34.0 - gitlab-shell: upgrade to v13.7.3 - gitlab-workhorse: upgrade to v8.58.2 -**13.7.1** +## 13.7.1 - gitlab: upgrade CE to v13.7.1 - gitaly: upgrade v13.7.1 -**13.7.0** +## 13.7.0 - gitlab: upgrade CE to v13.7.0 - gitaly: upgrade v13.7.0 @@ -1362,22 +1362,22 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - ubuntu: upgrade to ubuntu bionic-20201119 - postgresql: upgrade to postgresql 12 -**13.6.3** +## 13.6.3 - gitlab: upgrade CE to v13.6.3 - gitaly: upgrade v13.6.3 -**13.6.2** +## 13.6.2 - gitlab: upgrade CE to v13.6.2 - gitaly: upgrade v13.6.2 -**13.6.1** +## 13.6.1 - gitlab: upgrade CE to v13.6.1 - gitaly: upgrade v13.6.1 -**13.6.0** +## 13.6.0 - gitlab: upgrade CE to v13.6.0 - gitaly: upgrade v13.6.0 @@ -1387,22 +1387,22 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - use bundler 2.1.4 - use ruby 2.7 -**13.5.4** +## 13.5.4 - gitlab: upgrade CE to v13.5.4 - gitaly: upgrade v13.5.4 -**13.5.3** +## 13.5.3 - gitlab: upgrade CE to v13.5.3 - gitaly: upgrade v13.5.3 -**13.5.2** +## 13.5.2 - gitlab: upgrade CE to v13.5.2 - gitaly: upgrade v13.5.2 -**13.5.1** +## 13.5.1 - gitlab: upgrade CE to v13.5.1 - gitaly: upgrade v13.5.1 @@ -1410,17 +1410,17 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-pages: upgrade to v1.28.0 - gitlab-workhorse: upgrade to v8.51.0 -**13.4.4** +## 13.4.4 - gitlab: upgrade CE to v13.4.4 - gitaly: upgrade to v13.4.4 -**13.4.3** +## 13.4.3 - gitlab: upgrade CE to v13.4.3 - gitaly: upgrade to v13.4.3 -**13.4.2** +## 13.4.2 - gitlab: upgrade CE to v13.4.2 - gitaly: upgrade to v13.4.2 @@ -1429,17 +1429,17 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-shell: uprade to 13.7.0 - ubuntu: upgrade to bionic-20200921 -**13.3.4** +## 13.3.4 - gitlab: upgrade CE to v13.3.4 - gitaly: upgrade to v13.3.4 -**13.3.1** +## 13.3.1 - gitlab: upgrade CE to v13.3.1 - gitaly: upgrade to v13.3.1 -**13.3.0** +## 13.3.0 - gitlab: upgrade CE to v13.3.0 - gitaly: upgrade to v13.3.0 @@ -1447,90 +1447,90 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab-shell: upgrade to v13.6.0 - gitlab-workhorse: upgrade to v8.39.0 -**13.2.6** +## 13.2.6 - gitlab: upgrade CE to v13.2.6 -**13.2.4** +## 13.2.4 - gitlab: upgrade CE to v13.2.4 - ubuntu: upgrade to bionic-20200713 -**13.2.3** +## 13.2.3 - gitlab: upgrade CE to v13.2.3 - golang: upgrade to 1.14.7 - gitaly: upgrade to 13.2.3 - postgresql: add btree_gist extension -**13.2.2** +## 13.2.2 - gitlab: upgrade CE to v13.2.2 -**13.2.1** +## 13.2.1 - gitlab: upgrade CE to v13.2.1 -**13.0.7** +## 13.0.7 - gitlab: upgrade CE to v13.0.7 -**13.0.6** +## 13.0.6 - gitlab: upgrade CE to v13.0.6 -**13.0.5** +## 13.0.5 - gitlab: upgrade CE to v13.0.5 -**13.0.3** +## 13.0.3 - gitlab: upgrade CE to v13.0.3 -**13.0.2** +## 13.0.2 - gitlab: upgrade CE to v13.0.2 -**13.0.1** +## 13.0.1 - gitlab: upgrade CE to v13.0.1 -**13.0.0** +## 13.0.0 - gitlab: upgrade CE to v13.0.0 -**12.10.6** +## 12.10.6 - gitlab: upgrade CE to v12.10.6 -**12.10.4** +## 12.10.4 - updated to ubuntu:bionic-20200403 - gitlab-workhorse: update to 8.30.1 - sync: upstream configs - gitlab: upgrade to 12.10.4 -**12.9.5** +## 12.9.5 - gitlab: updated to 12.9.5 - gitlab-shell: updated to 12.2.0 - gitaly: updated to 12.10.0 -**12.9.4** +## 12.9.4 - gitlab: upgrade CE to v12.9.4 - Update gitlab-workhorse to 8.25.2 - Update golang to 1.13.10 -**12.9.2** +## 12.9.2 - gitlab: upgrade CE to v12.9.2 -**12.9.1** +## 12.9.1 - gitlab: upgrade CE to v12.9.1 -**12.9.0** +## 12.9.0 - gitlab: upgrade CE to v12.9.0 - replaced unicorn with puma @@ -1541,65 +1541,61 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - Added `PUMA_WORKERS` - Added `PUMA_TIMEOUT` -**12.8.8** +## 12.8.8 - gitlab: upgrade CE to v12.8.8 -**12.8.7** +## 12.8.7 - gitlab: upgrade CE to v12.8.7 -**12.8.6** +## 12.8.6 - gitlab: upgrade CE to v12.8.6 -**12.8.5** +## 12.8.5 - gitlab: upgrade CE to v12.8.5 -**12.8.4** +## 12.8.4 - gitlab: upgrade CE to v12.8.4 -**12.8.3** +## 12.8.3 - gitlab: upgrade CE to v12.8.3 -**12.8.2** +## 12.8.2 - gitlab: upgrade CE to v12.8.2 -**12.8.1** +## 12.8.1 - gitlab: upgrade CE to v12.8.1 -**12.8.0** +## 12.8.0 - gitlab: upgrade CE to v12.8.0 - fix: ArgumentError: 'import/{{oauth2_generic_name}}' is not supported [#2101](https://github.com/sameersbn/docker-gitlab/issues/2101) -**12.7.8** +## 12.7.8 - Upgrade GitLab CE to 12.7.8 -**12.7.7** +## 12.7.7 - Upgrade GitLab CE to 12.7.7 - Add Generic OAuth Provider PR#2070 -**12.7.7** - -- Upgrade GitLab CE to 12.7.7 - -**12.7.6** +## 12.7.6 - gitlab: upgrade CE to v12.7.6 -**12.7.5** +## 12.7.5 - gitlab: upgrade CE to v12.7.5 -**12.7.4** +## 12.7.4 - Upgrade GitLab CE to 12.7.4 - Update golang to 1.13.7 @@ -1607,11 +1603,11 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - Update gitlab-workhorse to 8.20.0 - Update gitaly to 1.85.0 -**12.7.2** +## 12.7.2 - Upgrade GitLab CE to 12.7.2 -**12.7.0** +## 12.7.0 - Update gitlab-shell to 11.0.0 - Upgrade GitLab CE to 12.7.0 @@ -1620,162 +1616,162 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - Update gitlab-pages to 1.14.0 - Update gitlab-workhorse to 8.19.0 -**12.6.4** +## 12.6.4 - gitlab: upgrade CE to v12.6.4 -**12.6.3** +## 12.6.3 - gitlab: upgrade CE to v12.6.3 -**12.6.2** +## 12.6.2 - gitlab: upgrade CE to v12.6.2 -**12.6.1** +## 12.6.1 - gitlab: upgrade CE to v12.6.1 -**12.6.0** +## 12.6.0 - gitlab: upgrade CE to v12.6.0 -**12.5.7** +## 12.5.7 - gitlab: upgrade CE to v12.5.7 -**12.5.6** +## 12.5.6 - gitlab: upgrade CE to v12.5.6 -**12.5.5** +## 12.5.5 - gitlab: upgrade CE to v12.5.5 -**12.5.4** +## 12.5.4 - gitlab: upgrade CE to v12.5.4 - Update golang to 1.12.14 -**12.5.3** +## 12.5.3 - gitlab: upgrade CE to v12.5.3 -**12.5.2** +## 12.5.2 - gitlab: upgrade CE to v12.5.2 -**12.5.1** +## 12.5.1 - gitlab: upgrade CE to v12.5.1 -**12.5.0** +## 12.5.0 - gitlab: upgrade CE to v12.5.0 -**12.4.3** +## 12.4.3 - gitlab: upgrade CE to v12.4.3 -**12.4.2** +## 12.4.2 - gitlab: upgrade CE to v12.4.2 -**12.4.1** +## 12.4.1 - gitlab: upgrade CE to v12.4.1 -**12.4.0** +## 12.4.0 - gitlab: upgrade CE to v12.4.0 -**12.3.5** +## 12.3.5 - gitlab: upgrade CE to v12.3.5 -**12.3.4** +## 12.3.4 - gitlab: upgrade CE to v12.3.4 -**12.3.3** +## 12.3.3 - gitlab: upgrade CE to v12.3.3 -**12.3.2** +## 12.3.2 - gitlab: upgrade CE to v12.3.2 -**12.3.1** +## 12.3.1 - gitlab: upgrade CE to v12.3.1 -**12.3.0** +## 12.3.0 - gitlab: upgrade CE to v12.3.0 -**12.2.5** +## 12.2.5 - gitlab: upgrade CE to v12.2.5 -**12.2.4** +## 12.2.4 - gitlab: upgrade CE to v12.2.4 -**12.2.3** +## 12.2.3 - gitlab: upgrade CE to v12.2.3 -**12.2.1** +## 12.2.1 - gitlab: upgrade CE to v12.2.1 -**12.2.0** +## 12.2.0 - gitlab: upgrade CE to v12.2.0 - upgrade base image to ubuntu:bionic -**12.1.6** +## 12.1.6 - gitlab: upgrade CE to v12.1.6 -**12.1.4** +## 12.1.4 - gitlab: upgrade CE to v12.1.4 -**12.1.3** +## 12.1.3 - gitlab: upgrade CE to v12.1.3 -**12.1.2** +## 12.1.2 - gitlab: upgrade CE to v12.1.2 -**12.1.1** +## 12.1.1 - gitlab: upgrade CE to v12.1.1 -**12.1.0** +## 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** +## 12.0.4 - gitlab: upgrade CE to v12.0.4 -**12.0.3** +## 12.0.3 - gitlab: upgrade CE to v12.0.3 -**12.0.2** +## 12.0.2 - gitlab: upgrade CE to v12.0.2 -**12.0.1** +## 12.0.1 - gitlab: upgrade CE to v12.0.1 -**12.0.0** +## 12.0.0 - gitlab: upgrade CE to v12.0.0 - Update gitaly to 1.47.0 @@ -1784,134 +1780,134 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - ruby: update to 2.6 - python: update to 3 -**11.11.3** +## 11.11.3 - gitlab: upgrade CE to v11.11.3 - Update gitaly to 1.42.4 - Update golang to 1.12.6 -**11.11.2** +## 11.11.2 - gitlab: upgrade CE to v11.11.2 - Update gitaly to 1.42.3 -**11.11.1** +## 11.11.1 - gitlab: upgrade CE to v11.11.1 - Update gitaly to 1.42.2 -**11.11.0** +## 11.11.0 - 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** +## 11.10.4 - gitlab: upgrade CE to v11.10.4 -**11.10.3** +## 11.10.3 - gitlab: upgrade CE to v11.10.3 -**11.10.2** +## 11.10.2 - gitlab: upgrade CE to v11.10.2 -**11.10.1** +## 11.10.1 - gitlab: upgrade CE to v11.10.1 -**11.10.0** +## 11.10.0 - gitlab: upgrade CE to v11.10.0 -**11.9.8** +## 11.9.8 - gitlab: upgrade CE to v11.9.8 -**11.9.7** +## 11.9.7 - gitlab: upgrade CE to v11.9.7 -**11.9.6** +## 11.9.6 - gitlab: upgrade CE to v11.9.6 -**11.9.5** +## 11.9.5 - gitlab: upgrade CE to v11.9.5 -**11.9.4** +## 11.9.4 - gitlab: upgrade CE to v11.9.4 - Update gitlab-workhorse to 8.3.3 -**11.9.1** +## 11.9.1 - gitlab: upgrade CE to v11.9.1 - Update gitaly to 1.27.1 -**11.9.0** +## 11.9.0 - gitlab: upgrade CE to v11.9.0 -**11.8.3** +## 11.8.3 - gitlab: upgrade CE to v11.8.3 -**11.8.2** +## 11.8.2 - gitlab: upgrade CE to v11.8.2 -**11.8.1** +## 11.8.1 - gitlab: upgrade CE to v11.8.1 -**11.8.0** +## 11.8.0 - 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** +## 11.7.5 - gitlab: upgrade CE to v11.7.5 -**11.7.4** +## 11.7.4 - gitlab: upgrade CE to v11.7.4 -**11.7.3** +## 11.7.3 - 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** +## 11.7.0 - gitlab: upgrade CE to v11.7.0 -**11.6.5** +## 11.6.5 - gitlab: upgrade CE to v11.6.5 -**11.6.4** +## 11.6.4 - gitlab: upgrade CE to v11.6.4 -**11.6.3** +## 11.6.3 - gitlab: upgrade CE to v11.6.3 -**11.6.2** +## 11.6.2 - gitlab: upgrade CE to v11.6.2 -**11.6.1** +## 11.6.1 - gitlab: upgrade CE to v11.6.1 - Added `GITLAB_IMPERSONATION_ENABLED` @@ -1922,7 +1918,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - Added `GITLAB_PAGES_ACCESS_SECRET` - Added `GITLAB_PAGES_ACCESS_REDIRECT_URI` -**11.6.0** +## 11.6.0 - gitlab: upgrade CE to v11.6.0 - Update gitaly to 1.7.1 @@ -1938,203 +1934,203 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - Added `GITLAB_BACKUP_DIR_GROUP` - Added `GITLAB_PAGES_NGINX_PROXY` -**11.5.5** +## 11.5.5 - gitlab: upgrade CE to v11.5.5 -**11.5.4** +## 11.5.4 - gitlab: upgrade CE to v11.5.4 -**11.5.3** +## 11.5.3 - gitlab: upgrade CE to v11.5.3 -**11.5.2** +## 11.5.2 - gitlab: upgrade CE to v11.5.2 -**11.5.1-1** +## 11.5.1-1 - Fixed GitLab Dependencies -**11.5.1** +## 11.5.1 - gitlab: upgrade CE to v11.5.1 -**11.5.0** +## 11.5.0 - gitlab: upgrade CE to v11.5.0 -**11.4.7** +## 11.4.7 - gitlab: upgrade CE to v11.4.7 -**11.4.6** +## 11.4.6 - gitlab: upgrade CE to v11.4.6 -**11.4.5** +## 11.4.5 - gitlab: upgrade CE to v11.4.5 -**11.4.4** +## 11.4.4 - gitlab: upgrade CE to v11.4.4 - golang: update to 1.10.4 -**11.4.3** +## 11.4.3 - gitlab: upgrade CE to v11.4.3 -**11.4.2** +## 11.4.2 - gitlab: upgrade CE to v11.4.2 -**11.4.1** +## 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** +## 11.4.0 - gitlab: upgrade CE to v11.4.0 - baseimage: upgrade to xenial-20181005 -**11.3.6** +## 11.3.6 - gitlab: upgrade CE to v11.3.6 -**11.3.5** +## 11.3.5 - gitlab: upgrade CE to v11.3.5 -**11.3.4** +## 11.3.4 - gitlab: upgrade CE to v11.3.4 -**11.3.3** +## 11.3.3 - gitlab: upgrade CE to v11.3.3 -**11.3.2** +## 11.3.2 - gitlab: upgrade CE to v11.3.2 -**11.3.1** +## 11.3.1 - gitlab: upgrade CE to v11.3.1 -**11.3.0** +## 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** +## 11.2.3 - gitlab: upgrade CE to v11.2.3 -**11.2.2** +## 11.2.2 - gitlab: upgrade CE to v11.2.2 -**11.2.1** +## 11.2.1 - gitlab: upgrade CE to v11.2.1 -**11.2.0** +## 11.2.0 - gitlab: upgrade CE to v11.2.0 - ADD `GITLAB_DEFAULT_THEME` -**11.1.4** +## 11.1.4 - gitlab: upgrade CE to v11.1.4 -**11.1.3** +## 11.1.3 - gitlab: upgrade CE to v11.1.3 - Upgrade redis to 4.0.9-1 -**11.1.2** +## 11.1.2 - gitlab: upgrade CE to v11.1.2 -**11.1.1** +## 11.1.1 - gitlab: upgrade CE to v11.1.1 -**11.1.0** +## 11.1.0 - gitlab: upgrade CE to v11.1.0 -**11.0.4** +## 11.0.4 - gitlab: upgrade CE to v11.0.4 -**11.0.3** +## 11.0.3 - gitlab: upgrade CE to v11.0.3 - ruby: update to 2.4 -**11.0.2** +## 11.0.2 - gitlab: upgrade CE to v11.0.2 -**11.0.1** +## 11.0.1 - gitlab: upgrade CE to v11.0.1 -**11.0.0** +## 11.0.0 - gitlab: upgrade CE to v11.0.0 -**10.8.4** +## 10.8.4 - gitlab: upgrade CE to v10.8.4 -**10.8.3-1** +## 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** +## 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** +## 10.8.2 - gitlab: upgrade CE to v10.8.2 -**10.8.1** +## 10.8.1 - gitlab: upgrade CE to v10.8.1 -**10.8.0** +## 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** +## 10.7.4 - gitlab: upgrade CE to v10.7.4 - FIX `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` -**10.7.3** +## 10.7.3 - gitlab: upgrade CE to v10.7.3 -**10.7.2** +## 10.7.2 - gitlab: upgrade CE to v10.7.2 -**10.7.1** +## 10.7.1 - gitlab: upgrade CE to v10.7.1 -**10.7.0** +## 10.7.0 - gitlab: upgrade CE to v10.7.0 - ADD `GITLAB_SIDEKIQ_LOG_FORMAT` @@ -2176,98 +2172,98 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - ADD `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_ENDPOINT` - ADD `GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_AWS_PATH_STYLE` -**10.6.4** +## 10.6.4 - gitlab: upgrade CE to v10.6.4 -**10.6.3** +## 10.6.3 - gitlab: upgrade CE to v10.6.3 -**10.6.2** +## 10.6.2 - gitlab: upgrade CE to v10.6.2 - golang: update to 1.9.5 -**10.6.1** +## 10.6.1 - gitlab: upgrade CE to v10.6.1 -**10.6.0** +## 10.6.0 - gitlab: upgrade CE to v10.6.0 -**10.5.6** +## 10.5.6 - gitlab: security upgrade CE to v10.5.6 -**10.5.5** +## 10.5.5 - gitlab: upgrade CE to v10.5.5 -**10.5.4** +## 10.5.4 - gitlab: upgrade CE to v10.5.4 -**10.5.3** +## 10.5.3 - gitlab: upgrade CE to v10.5.3 -**10.5.2** +## 10.5.2 - gitlab: upgrade CE to v10.5.2 - Fix `GITLAB_UPLOADS_STORAGE_PATH` -**10.5.1** +## 10.5.1 - gitlab: upgrade CE to v10.5.1 -**10.5.0** +## 10.5.0 - gitlab: upgrade CE to v10.5.0 - Add `GITLAB_UPLOADS_STORAGE_PATH` - Add `GITLAB_UPLOADS_BASE_DIR` - Add `LDAP_LOWERCASE_USERNAMES` -**10.4.4** +## 10.4.4 - gitlab: upgrade CE to v10.4.4 -**10.4.3** +## 10.4.3 - gitlab: upgrade CE to v10.4.3 -**10.4.2-1** +## 10.4.2-1 - FIXED SSH Host Key generation through dropping the support for rsa1 -**10.4.2** +## 10.4.2 - gitlab: upgrade CE to v10.4.2 -**10.4.1** +## 10.4.1 - gitlab: upgrade CE to v10.4.1 -**10.4.0** +## 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** +## 10.3.6 - gitlab: upgrade CE to v10.3.6 -**10.3.5** +## 10.3.5 - gitlab: upgrade CE to v10.3.5 -**10.3.4** +## 10.3.4 - gitlab: upgrade CE to v10.3.4 -**10.3.3** +## 10.3.3 - gitlab: upgrade CE to v10.3.3 - ADDED `AWS_BACKUP_ENCRYPTION` [1449](https://github.com/sameersbn/docker-gitlab/pull/1449/) @@ -2275,15 +2271,15 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - FIXED `AWS_BACKUP_MULTIPART_CHUNK_SIZE` [1449](https://github.com/sameersbn/docker-gitlab/pull/1449/) - Apply PaX mark to ruby [1458](https://github.com/sameersbn/docker-gitlab/pull/1458) -**10.3.2** +## 10.3.2 - gitlab: upgrade CE to v10.3.2 -**10.3.1** +## 10.3.1 - gitlab: upgrade CE to v10.3.1 -**10.3.0** +## 10.3.0 - gitlab: upgrade CE to v10.3.0 - REMOVED `GITLAB_REPOSITORIES_STORAGES_DEFAULT_FAILURE_COUNT_THRESHOLD` @@ -2293,169 +2289,169 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - REMOVED `GITLAB_MAX_OBJECT_SIZE` - REMOVED `GITLAB_TIMEOUT` -**10.2.5** +## 10.2.5 - gitlab: upgrade CE to v10.2.5 -**10.2.4** +## 10.2.4 - gitlab: upgrade to CE v10.2.4 -**10.2.3** +## 10.2.3 - gitlab: upgrade to CE v10.2.3 -**10.2.2** +## 10.2.2 - gitlab: upgrade to CE v10.2.2 -**10.2.1** +## 10.2.1 - gitlab: upgrade to CE v10.2.1 -**10.2.0** +## 10.2.0 - gitlab: upgrade to CE v10.2.0 -**10.1.4** +## 10.1.4 - gitlab: upgrade to CE v10.1.4 -**10.1.3** +## 10.1.3 - gitlab: upgrade to CE v10.1.3 -**10.1.2** +## 10.1.2 - gitlab: upgrade to CE v10.1.2 -**10.1.1** +## 10.1.1 - gitlab: upgrade to CE v10.1.1 -**10.1.0** +## 10.1.0 - gitlab: upgrade to CE v10.1.0 - REMOVED `GITALY_ENABLED`` - ADDED `GITALY_ARTIFACTS_SERVER` - ADDED `GITALY_CLIENT_PATH` -**10.0.4** +## 10.0.4 - gitlab: upgrade to CE v10.0.4 -**10.0.3** +## 10.0.3 - gitlab: upgrade to CE v10.0.3 -**10.0.2** +## 10.0.2 - gitlab: upgrade to CE v10.0.2 -**10.0.1** +## 10.0.1 - gitlab: upgrade to CE v10.0.1 -**10.0.0** +## 10.0.0 - gitlab: upgrade to CE v10.0.0 -**9.5.5** +## 9.5.5 - gitlab: upgrade to CE v9.5.5 -**9.5.4** +## 9.5.4 - gitlab: upgrade to CE v9.5.4 -**9.5.3** +## 9.5.3 - gitlab: upgrade to CE v9.5.3 -**9.5.2** +## 9.5.2 - gitlab: upgrade to CE v9.5.2 -**9.5.1** +## 9.5.1 - gitlab: upgrade to CE v9.5.1 -**9.5.0** +## 9.5.0 - gitlab: upgrade to CE v9.5.0 -**9.4.5** +## 9.4.5 - gitlab: upgrade to CE v9.4.5 -**9.4.4** +## 9.4.4 - gitlab: upgrade to CE v9.4.4 -**9.4.3** +## 9.4.3 - gitlab: upgrade to CE v9.4.3 -**9.4.2** +## 9.4.2 - gitlab: upgrade to CE v9.4.2 -**9.4.1** +## 9.4.1 - gitlab: upgrade to CE v9.4.1 -**9.4.0-1** +## 9.4.0-1 - Fix asset compiling for missing translations -**9.4.0** +## 9.4.0 - gitlab: upgrade to CE v9.4.0 - Added support for nginx_real_ip module ([#1137](https://github.com/sameersbn/docker-gitlab/pull/1137)) - Added more security for regenerating certs ([#1288](https://github.com/sameersbn/docker-gitlab/pull/1288)) -**9.3.9** +## 9.3.9 - gitlab: upgrade to CE v9.3.9 -**9.3.8** +## 9.3.8 - gitlab: upgrade to CE v9.3.8 - Added RE2 library to build dependencies ([issue 35342](https://gitlab.com/gitlab-org/gitlab-foss/issues/35342)) -**9.3.7** +## 9.3.7 - gitlab: upgrade to CE v9.3.7 -**9.3.6** +## 9.3.6 - gitlab: upgrade to CE v9.3.6 -**9.3.5** +## 9.3.5 - gitlab: upgrade to CE v9.3.5 -**9.3.4** +## 9.3.4 - gitlab: upgrade to CE v9.3.4 -**9.3.3** +## 9.3.3 - gitlab: upgrade to CE v9.3.3 -**9.3.2** +## 9.3.2 - gitlab: upgrade to CE v9.3.2 -**9.3.1** +## 9.3.1 - gitlab: upgrade to CE v9.3.1 -**9.3.0-1** +## 9.3.0-1 - Add the missing Gitaly config to let git commands over http/https working -**9.3.0** +## 9.3.0 - gitlab: upgrade to CE v9.3.0 - update baseimage to `14.04.20170608` @@ -2465,108 +2461,108 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - Add `GITALY_SOCKET_PATH` - Add `GITALY_ADDRESS` -**9.2.7** +## 9.2.7 - gitlab: upgrade to CE v9.2.7 -**9.2.6** +## 9.2.6 - gitlab: upgrade to CE v9.2.6 -**9.2.5** +## 9.2.5 - gitlab: upgrade to CE v9.2.5 -**9.2.2** +## 9.2.2 - gitlab: upgrade to CE v9.2.2 -**9.2.1** +## 9.2.1 - gitlab: upgrade to CE v9.2.1 -**9.2.0** +## 9.2.0 - gitlab: upgrade to CE v9.2.0 - Add flexibility to use versions committed into gitlab-ce -**9.1.4** +## 9.1.4 - gitlab: upgrade to CE v9.1.4 -**9.1.3** +## 9.1.3 - gitlab: upgrade to CE v9.1.3 -**9.1.2** +## 9.1.2 - gitlab: upgrade to CE v9.1.2 - update baseimage to `14.04.20170503` -**9.1.1** +## 9.1.1 - gitlab: upgrade to CE v9.1.1 -**9.1.0-1** +## 9.1.0-1 - Fix gitlab-workhorse version display -**9.1.0** +## 9.1.0 - gitlab: upgrade to CE v9.1.0 - gitlab-shell: upgrade to 5.0.2 - gitlab-workhorse: upgrade to 1.4.3 -**9.0.6** +## 9.0.6 - gitlab: upgrade to CE v9.0.6 -**9.0.5** +## 9.0.5 - gitlab: upgrade to CE v9.0.5 -**9.0.4** +## 9.0.4 - gitlab: upgrade to CE v9.0.4 -**9.0.3** +## 9.0.3 - gitlab: upgrade to CE v9.0.3 -**9.0.2** +## 9.0.2 - gitlab: upgrade to CE v9.0.2 -**9.0.1** +## 9.0.1 - gitlab: upgrade to CE v9.0.1 - gitlab-workhorse 1.4.2 -**9.0.0** +## 9.0.0 - gitlab: upgrade to CE v9.0.0 - gitlab-shell 5.0.0 - gitlab-workhorse 1.4.1 - gitlab-pages 0.4.0 -**8.17.4** +## 8.17.4 - gitlab: upgrade to CE v8.17.4 -**8.17.3** +## 8.17.3 - gitlab: upgrade to CE v8.17.3 -**8.17.2** +## 8.17.2 - gitlab: upgrade to CE v8.17.2 -**8.17.1** +## 8.17.1 - gitlab: upgrade to CE v8.17.1 - fixes first problems with gitlab-pages -**8.17.0** +## 8.17.0 - gitlab: upgrade to CE v8.17.0 - added `GITLAB_PAGES_ENABLED` @@ -2581,52 +2577,52 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - added nodejs 7.x as core dependencies - added gitlab-pages daemon -**8.16.6** +## 8.16.6 - gitlab: upgrade to CE v8.16.6 - Fix logical bug of Remote Backup -**8.16.5** +## 8.16.5 - gitlab: upgrade to CE v8.16.5 -**8.16.4** +## 8.16.4 - gitlab: upgrade to CE v8.16.4 -**8.16.3** +## 8.16.3 - gitlab: upgrade to CE v8.16.3 -**8.16.2** +## 8.16.2 - gitlab: upgrade to CE v8.16.2 -**8.16.1** +## 8.16.1 - gitlab: upgrade to CE v8.16.1 -**8.16.0** +## 8.16.0 - gitlab: upgrade to CE v8.16.0 -**8.15.4** +## 8.15.4 - gitlab: upgrade to CE v8.15.4 -**8.15.3** +## 8.15.3 - gitlab: upgrade to CE v8.15.3 -**8.15.2** +## 8.15.2 - gitlab: upgrade to CE v8.15.2 -**8.15.1** +## 8.15.1 - gitlab: upgrade to CE v8.15.1 -**8.15.0** +## 8.15.0 - gitlab: upgrade to CE v8.15.0 - added `GITLAB_MATTERMOST_ENABLED` @@ -2636,245 +2632,244 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - added `OAUTH_AUTHENTIQ_SCOPE` - added `OAUTH_AUTHENTIQ_REDIRECT_URI` -**8.14.5** +## 8.14.5 - gitlab: upgrade to CE v8.14.5 -**8.14.4** +## 8.14.4 - gitlab: upgrade to CE v8.14.4 -**8.14.3** +## 8.14.3 - gitlab: upgrade to CE v8.14.3 -**8.14.2** +## 8.14.2 - gitlab: upgrade to CE v8.14.2 -**8.14.1** +## 8.14.1 - gitlab: upgrade to CE v8.14.1 -**8.14.0** +## 8.14.0 - gitlab: upgrade to CE v8.14.0 - added `IMAP_TIMEOUT` - update golang to 1.6.3 -**8.13.6** +## 8.13.6 - gitlab: upgrade to CE v8.13.6 -**8.13.5** +## 8.13.5 - gitlab: upgrade to CE v8.13.5 -**Important**: -We skipped `8.13.4` because it doesn't contain any changes. For more -information [8.13.4 release](https://about.gitlab.com/2016/11/09/gitlab-8-dot-13-dot-5-released/) +## 8.13.4 -**8.12.1** +**Important:** We skipped `8.13.4` because it doesn't contain any changes. For more information [8.13.4 release](https://about.gitlab.com/2016/11/09/gitlab-8-dot-13-dot-5-released/). -**8.13.3** +## 8.13.3 - gitlab: upgrade to CE v8.13.3 -**8.13.2** +## 8.13.2 - gitlab: upgrade to CE v8.13.2 -**8.13.1** +## 8.13.1 - gitlab: upgrade to CE v8.13.1 -**8.13.0** +## 8.13.0 - gitlab: upgrade to CE v8.13.0 - added `GITLAB_EMAIL_SUBJECT_SUFFIX` -**8.12.7** +## 8.12.7 - gitlab: upgrade to CE v8.12.7 -**8.12.6** +## 8.12.6 - gitlab: upgrade to CE v8.12.6 -**8.12.5** +## 8.12.5 - gitlab: upgrade to CE v8.12.5 -**8.12.4** +## 8.12.4 - gitlab: upgrade to CE v8.12.4 -**8.12.3** +## 8.12.3 - gitlab: upgrade to CE v8.12.3 -**Important**: -We skipped `8.12.2` because it doesn't contain any changes. For more -information [8.12.3 release](https://about.gitlab.com/2016/09/29/gitlab-8-12-3-released/) +## 8.12.2 -**8.12.1** +**Important:** We skipped `8.12.2` because it doesn't contain any changes. For more information [8.12.3 release](https://about.gitlab.com/2016/09/29/gitlab-8-12-3-released/). + +## 8.12.1 - gitlab: upgrade to CE v8.12.1 -**8.12.0** +## 8.12.0 - gitlab: upgrade to CE v8.12.0 -**8.11.7** +## 8.11.7 - gitlab: upgrade to CE v8.11.7 -**8.11.6** +## 8.11.6 - gitlab: upgrade to CE v8.11.6 -**8.11.5** +## 8.11.5 - gitlab: upgrade to CE v8.11.5 -**8.11.4** +## 8.11.4 - gitlab: upgrade to CE v8.11.4 -**8.11.3** +## 8.11.3 - gitlab: upgrade to CE v8.11.3 -**8.11.2** +## 8.11.2 - gitlab: upgrade to CE v8.11.2 -**8.11.0** +## 8.11.0 - gitlab: upgrade to CE v8.11.0 - added `GITLAB_SECRETS_SECRET_KEY_BASE` - added `GITLAB_SECRETS_OTP_KEY_BASE` -**Important** +## Important + When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/.secret` for `GITLAB_SECRETS_OTP_KEY_BASE` otherwise it will break your 2FA . -**8.10.7** +## 8.10.7 - gitlab: upgrade to CE v8.10.7 -**8.10.6** +## 8.10.6 - gitlab: upgrade to CE v8.10.6 -**8.10.5** +## 8.10.5 - gitlab: upgrade to CE v8.10.5 -**8.10.4** +## 8.10.4 - gitlab: upgrade to CE v8.10.4 -**8.10.3** +## 8.10.3 - gitlab: upgrade to CE v8.10.3 -**8.10.2-1** +## 8.10.2-1 - Fix `OAUTH_GOOGLE_RESTRICT_DOMAIN` -**8.10.2** +## 8.10.2 - gitlab: upgrade to CE v8.10.2 - Improve `OAUTH_GOOGLE_RESTRICT_DOMAIN` for multiple restricted domains -**8.10.1** +## 8.10.1 - gitlab: upgrade to CE v8.10.1 -**8.10.0** +## 8.10.0 - gitlab: upgrade to CE v8.10.0 -**8.9.6** +## 8.9.6 - gitlab: upgrade to CE v8.9.6 -**8.9.5** +## 8.9.5 - gitlab: upgrade to CE v8.9.5 -**8.9.4** +## 8.9.4 - gitlab: upgrade to CE v8.9.4 -**8.9.3** +## 8.9.3 - gitlab: upgrade to CE v8.9.3 -**8.9.2** +## 8.9.2 - gitlab: upgrade to CE v8.9.2 -**8.9.1** +## 8.9.1 - gitlab: upgrade to CE v8.9.1 -**8.9.0** +## 8.9.0 - gitlab: upgrade to CE v8.9.0 -**8.8.5-1** +## 8.8.5-1 - added GitLab Container Registry support - added `SSL_CIPHERS` option to change ciphers of the nginx -**8.8.5** +## 8.8.5 - gitlab: upgrade to CE v8.8.5 -**8.8.4** +## 8.8.4 - gitlab: upgrade to CE v8.8.4 - added `GITLAB_PROJECTS_LIMIT` configuration option -**8.8.3** +## 8.8.3 - gitlab: upgrade to CE v8.8.3 -**8.8.2** +## 8.8.2 - gitlab: upgrade to CE v8.8.2 -**8.8.1** +## 8.8.1 - gitlab: upgrade to CE v8.8.1 -**8.8.0** +## 8.8.0 - gitlab: upgrade to CE v8.8.0 - oauth: exposed `OAUTH_GITHUB_URL` and `OAUTH_GITHUB_VERIFY_SSL` options for users for GitHub Enterprise. -**8.7.6** +## 8.7.6 - gitlab: upgrade to CE v8.7.6 -**8.7.5** +## 8.7.5 - gitlab: upgrade to CE v8.7.5 -**8.7.3** +## 8.7.3 - gitlab: upgrade to CE v8.7.3 -**8.7.2** +## 8.7.2 - gitlab: upgrade to CE v8.7.2 -**8.7.1** +## 8.7.1 - gitlab: upgrade to CE v8.7.1 -**8.7.0** +## 8.7.0 - gitlab-shell: upgrade to v.2.7.2 - gitlab: upgrade to CE v8.7.0 @@ -2882,37 +2877,37 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - OAuth: Added `OAUTH_EXTERNAL_PROVIDERS` to specify external oauth providers. - Exposed `GITLAB_TRUSTED_PROXIES` configuration parameter -**8.6.7** +## 8.6.7 - added `GITLAB_SIGNUP_ENABLED` option to enable/disable signups - gitlab: upgrade to CE v8.6.7 -**8.6.6** +## 8.6.6 - gitlab: upgrade to CE v8.6.6 -**8.6.5** +## 8.6.5 - gitlab: upgrade to CE v8.6.5 -**8.6.4** +## 8.6.4 - gitlab: upgrade to CE v8.6.4 -**8.6.3** +## 8.6.3 - gitlab-shell: upgrade to v.2.6.12 - gitlab: upgrade to CE v8.6.3 -**8.6.2** +## 8.6.2 - gitlab: upgrade to CE v8.6.2 -**8.6.1** +## 8.6.1 - gitlab: upgrade to CE v8.6.1 -**8.6.0** +## 8.6.0 - gitlab-shell: upgrade to v.2.6.11 - gitlab-workhorse: upgrade to v0.7.1 @@ -2920,59 +2915,59 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - exposed configuration parameters for auth0 OAUTH support - fixed relative_url support -**8.5.8** +## 8.5.8 - gitlab: upgrade to CE v8.5.8 -**8.5.7** +## 8.5.7 - gitlab: upgrade to CE v8.5.7 -**8.5.5** +## 8.5.5 - gitlab: upgrade to CE v8.5.5 -**8.5.4** +## 8.5.4 - gitlab: upgrade to CE v8.5.4 -**8.5.3** +## 8.5.3 - gitlab: upgrade to CE v8.5.3 -**8.5.1** +## 8.5.1 - gitlab: upgrade to CE v8.5.1 -**8.5.0** +## 8.5.0 - gitlab-workhorse: upgrade to v0.6.4 - gitlab: upgrade to CE v8.5.0 - firstrun: expose `GITLAB_ROOT_EMAIL` configuration option - expose `OAUTH_AUTO_LINK_SAML_USER` configuration parameter -**8.4.4** +## 8.4.4 - gitlab: upgrade to CE v8.4.4 -**8.4.3** +## 8.4.3 - gitlab: upgrade to CE v8.4.3 -**8.4.2** +## 8.4.2 - gitlab-workhorse: upgrade to v0.6.2 - gitlab: upgrade to CE v8.4.2 -**8.4.1** +## 8.4.1 - gitlab: upgrade to CE v8.4.1 -**8.4.0-1** +## 8.4.0-1 - `assets:precompile` moved back to build time -**8.4.0** +## 8.4.0 - gitlab-shell: upgrade to v.2.6.10 - gitlab-workhorse: upgrade to v0.6.1 @@ -2981,25 +2976,25 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - oauth: expose azure oauth configuration options - `assets:precompile` executed at runtime -**8.3.4** +## 8.3.4 - gitlab-workhorse: upgrade to v0.5.4 - gitlab: upgrade to CE v8.3.4 - expose `LDAP_TIMEOUT` configuration parameter -**8.3.2** +## 8.3.2 - gitlab: upgrade to CE v8.3.2 -**8.3.1** +## 8.3.1 - gitlab: upgrade to CE v8.3.1 -**8.3.0-1** +## 8.3.0-1 - fixed static asset routing when `GITLAB_RELATIVE_URL_ROOT` is used. -**8.3.0** +## 8.3.0 - `envsubst` is now used for updating the configurations - renamed config `CA_CERTIFICATES_PATH` to `SSL_CA_CERTIFICATES_PATH` @@ -3012,24 +3007,24 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - removed `NGINX_MAX_UPLOAD_SIZE` configuration parameter - gitlab-shell: upgrade to v.2.6.9 -**8.2.3** +## 8.2.3 - fixed static asset routing when `GITLAB_RELATIVE_URL_ROOT` is used. - added `GITLAB_BACKUP_PG_SCHEMA` configuration parameter - gitlab: upgrade to CE v8.2.3 -**8.2.2** +## 8.2.2 - added `GITLAB_DOWNLOADS_DIR` configuration parameter - `DB_TYPE` parameter renamed to `DB_ADAPTER` with `mysql2` and `postgresql` as accepted values - exposed `DB_ENCODING` parameter - gitlab: upgrade to CE v8.2.2 -**8.2.1-1** +## 8.2.1-1 - fixed typo while setting the value of `GITLAB_ARTIFACTS_DIR` -**8.2.1** +## 8.2.1 - expose rack_attack configuration options - gitlab-shell: upgrade to v.2.6.8 @@ -3037,7 +3032,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - added `GITLAB_ARTIFACTS_ENABLED` configuration parameter - added `GITLAB_ARTIFACTS_DIR` configuration parameter -**8.2.0** +## 8.2.0 - gitlab-shell: upgrade to v.2.6.7 - gitlab-workhorse: upgrade to v.0.4.2 @@ -3047,67 +3042,67 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - added `GITLAB_PROJECTS_BUILDS` configuration parameter - added `GITLAB_LFS_ENABLED` configuration parameter -**8.1.4** +## 8.1.4 - gitlab: upgrade to CE v8.1.4 -**8.1.3** +## 8.1.3 - proper long-term fix for http/https cloning when `GITLAB_RELATIVE_URL_ROOT` is used - gitlab: upgrade to CE v8.1.3 - Expose Facebook OAUTH configuration parameters -**8.1.2** +## 8.1.2 - gitlab: upgrade to CE v8.1.2 - removed `GITLAB_SATELLITES_TIMEOUT` configuration parameter -**8.1.0-2** +## 8.1.0-2 - Recompile assets when `GITLAB_RELATIVE_URL_ROOT` is used Fixes #481 -**8.1.0-1** +## 8.1.0-1 - temporary fix for http/https cloning when `GITLAB_RELATIVE_URL_ROOT` is used -**8.1.0** +## 8.1.0 - gitlab: upgrade to CE v8.1.0 - gitlab-git-http-server: upgrade to v0.3.0 -**8.0.5-1** +## 8.0.5-1 - speed up container startup by compiling assets at image build time - test connection to redis-server -**8.0.5** +## 8.0.5 - gitlab: upgrade to CE v.8.0.5 -**8.0.4-2** +## 8.0.4-2 - fix http/https cloning when `GITLAB_RELATIVE_URL_ROOT` is used - allow user to override `OAUTH_ENABLED` setting -**8.0.4-1** +## 8.0.4-1 - update baseimage to `sameersbn/ubuntu:14.04.20151011` -**8.0.4** +## 8.0.4 - gitlab: upgrade to CE v.8.0.4 -**8.0.3** +## 8.0.3 - gitlab: upgrade to CE v.8.0.3 -**8.0.2** +## 8.0.2 - gitlab: upgrade to CE v.8.0.2 - added `IMAP_STARTTLS` parameter, defaults to `false` - expose oauth parameters for crowd server -**8.0.0** +## 8.0.0 - set default value of `DB_TYPE` to `postgres` - added sample Kubernetes rc and service description files @@ -3120,91 +3115,91 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - removed `GITLAB_ROBOTS_OVERRIDE` parameter. Override default `robots.txt` if `GITLAB_ROBOTS_PATH` exists. - added CI redirection using `GITLAB_CI_HOST` parameter -**7.14.3** +## 7.14.3 - gitlab: upgrade to CE v.7.14.3 -**7.14.2** +## 7.14.2 - Apply grsecurity policies to nodejs binary #394 - Fix broken emojis post migration #196 - gitlab-shell: upgrade to v.2.6.5 - gitlab: upgrade to CE v.7.14.2 -**7.14.1** +## 7.14.1 - gitlab: upgrade to CE v.7.14.1 -**7.14.0** +## 7.14.0 - gitlab-shell: upgrade to v.2.6.4 - gitlab: upgrade to CE v.7.14.0 -**7.13.5** +## 7.13.5 - gitlab: upgrade to CE v.7.13.5 -**7.13.4** +## 7.13.4 - gitlab: upgrade to CE v.7.13.4 -**7.13.3** +## 7.13.3 - gitlab: upgrade to CE v.7.13.3 -**7.13.2** +## 7.13.2 - gitlab: upgrade to CE v.7.13.2 -**7.13.1** +## 7.13.1 - gitlab: upgrade to CE v.7.13.1 -**7.13.0** +## 7.13.0 - expose SAML OAuth provider configuration - expose `OAUTH_AUTO_SIGN_IN_WITH_PROVIDER` configuration - gitlab: upgrade to CE v.7.13.0 -**7.12.2-2** +## 7.12.2-2 - enable persistence `.secret` file used in 2FA -**7.12.2-1** +## 7.12.2-1 - fixed gitlab:backup:restore raketask -**7.12.2** +## 7.12.2 - gitlab: upgrade to CE v.7.12.2 -**7.12.1** +## 7.12.1 - gitlab: upgrade to CE v.7.12.1 -**7.12.0** +## 7.12.0 - added `SMTP_TLS` configuration parameter - gitlab: upgrade to CE v.7.12.0 - added `OAUTH_AUTO_LINK_LDAP_USER` configuration parameter -**7.11.4-1** +## 7.11.4-1 - base image update to fix SSL vulnerability -**7.11.4** +## 7.11.4 - gitlab: upgrade to CE v.7.11.4 -**7.11.3** +## 7.11.3 - gitlab: upgrade to CE v.7.11.3 -**7.11.2** +## 7.11.2 - gitlab: upgrade to CE v.7.11.2 -**7.11.0** +## 7.11.0 - init: added `SIDEKIQ_MEMORY_KILLER_MAX_RSS` configuration option - init: added `SIDEKIQ_SHUTDOWN_TIMEOUT` configuration option @@ -3212,24 +3207,24 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - gitlab: upgrade to CE v.7.11.0 - init: removed `GITLAB_PROJECTS_VISIBILITY` ENV parameter -**7.10.4** +## 7.10.4 - gitlab: upgrade to CE v.7.10.4 -**7.10.3** +## 7.10.3 - gitlab: upgrade to CE v.7.10.3 -**7.10.2** +## 7.10.2 - init: added support for remote AWS backups - gitlab: upgrade to CE v.7.10.2 -**7.10.1** +## 7.10.1 - gitlab: upgrade to CE v.7.10.1 -**7.10.0** +## 7.10.0 - gitlab-shell: upgrade to v.2.6.2 - gitlab: upgrade to CE v.7.10.0 @@ -3237,11 +3232,11 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - init: added `GITLAB_EMAIL_REPLY_TO` configuration option - init: added `LDAP_BLOCK_AUTO_CREATED_USERS` configuration option -**7.9.4** +## 7.9.4 - gitlab: upgrade to CE v.7.9.4 -**7.9.3** +## 7.9.3 - added `NGINX_PROXY_BUFFERING` option - added `NGINX_ACCEL_BUFFERING` option @@ -3251,16 +3246,16 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - fixes: "transfer closed with xxx bytes remaining to read" error - gitlab: upgrade to CE v.7.9.3 -**7.9.2** +## 7.9.2 - gitlab: upgrade to CE v.7.9.2 -**7.9.1** +## 7.9.1 - init: set default value of `SMTP_OPENSSL_VERIFY_MODE` to `none` - gitlab: upgrade to CE v.7.9.1 -**7.9.0** +## 7.9.0 - gitlab-shell: upgrade to v.2.6.0 - gitlab: upgrade to CE v.7.9.0 @@ -3270,20 +3265,20 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - init: added BitBucket OAuth configuration support - init: added `GITLAB_EMAIL_DISPLAY_NAME` configuration option -**7.8.4** +## 7.8.4 - gitlab: upgrade to CE v.7.8.4 -**7.8.2** +## 7.8.2 - gitlab: upgrade to CE v.7.8.2 -**7.8.1** +## 7.8.1 - gitlab-shell: upgrade to v.2.5.4 - gitlab: upgrade to CE v.7.8.1 -**7.8.0** +## 7.8.0 - update postgresql client to the latest version, Closes #249 - removed `GITLAB_SIGNUP` configuration option, can be set from gitlab ui @@ -3296,16 +3291,16 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - init: set `LDAP_METHOD` default value to `plain` - init: added gitlab oauth configuration support -**7.7.2** +## 7.7.2 - gitlab-shell: upgrade to v.2.4.2 - gitlab: upgrade to CE v.7.7.2 -**7.7.1** +## 7.7.1 - gitlab: upgrade to CE v.7.7.1 -**7.7.0** +## 7.7.0 - init: added GOOGLE_ANALYTICS_ID configuration option - added support for mantis issue tracker @@ -3313,55 +3308,55 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - gitlab-shell: upgrade to v.2.4.1 - gitlab: upgrade to CE v.7.7.0 -**7.6.2** +## 7.6.2 - gitlab: upgrade to CE v.7.6.2 -**7.6.1** +## 7.6.1 - disable nginx ipv6 if host does not support it. - init: added GITLAB_BACKUP_TIME configuration option - gitlab: upgrade to CE v.7.6.1 -**7.6.0** +## 7.6.0 - add support for configuring piwik - gitlab-shell: upgrade to v.2.4.0 - gitlab: upgrade to CE v.7.6.0 -**7.5.3** +## 7.5.3 - accept `BACKUP` parameter while running the restore rake task, closes #220 - init: do not run `gitlab:satellites:create` rake task at startup - gitlab: upgrade to CE v.7.5.3 -**7.5.2** +## 7.5.2 - gitlab: upgrade to CE v.7.5.2 -**7.5.1** +## 7.5.1 - gitlab: upgrade to CE v.7.5.1 - gitlab-shell to v2.2.0 - added `GITLAB_TIMEZONE` configuration option - added `GITLAB_EMAIL_ENABLED` configuration option -**7.4.4** +## 7.4.4 - gitlab: upgrade to CE v.7.4.4 - added `SSL_VERIFY_CLIENT` configuration option - added `NGINX_WORKERS` configuration option - added `USERMAP_UID` and `USERMAP_GID` configuration option -**7.4.3** +## 7.4.3 - gitlab: upgrade to CE v.7.4.3 -**7.4.2** +## 7.4.2 - gitlab: upgrade to CE v.7.4.2 -**7.4.0** +## 7.4.0 - gitlab: upgrade to CE v.7.4.0 - config: added `LDAP_ACTIVE_DIRECTORY` configuration option @@ -3370,11 +3365,11 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - automatically compile assets if relative_url is changed - launch all daemons via supervisord -**7.3.2-1** +## 7.3.2-1 - fix mysql status check -**7.3.2** +## 7.3.2 - upgrade to gitlab-ce 7.3.2 - removed internal mysql server @@ -3384,24 +3379,24 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - added GITLAB_GRAVATAR_ENABLED configuration option - added fig.yml -**7.3.1-3** +## 7.3.1-3 - fix mysql command again! -**7.3.1-2** +## 7.3.1-2 - fix mysql server status check -**7.3.1-1** +## 7.3.1-1 - plug bash vulnerability by switching to dash shell - automatically run the `gitlab:setup` rake task for new installs -**7.3.1** +## 7.3.1 - upgrade to gitlab-ce 7.3.1 -**7.3.0** +## 7.3.0 - upgrade to gitlab-ce 7.3.0 - added GITLAB_WEBHOOK_TIMEOUT configuration option @@ -3409,7 +3404,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - removed internal redis server - shutdown the container gracefully -**7.2.2** +## 7.2.2 - upgrade to gitlab-ce 7.2.2 - added GITLAB_HTTPS_HSTS_ENABLED configuration option (advanced config) @@ -3420,25 +3415,25 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - added GITLAB_SSH_HOST configuration option - added GITLAB_USERNAME_CHANGE configuration option -**7.2.1-1** +## 7.2.1-1 - removed the GITLAB_HTTPS_ONLY configuration option - added NGINX_X_FORWARDED_PROTO configuration option - optimization: talk directly to the unicorn worker from gitlab-shell -**7.2.1** +## 7.2.1 - upgrade to gitlab-ce 7.2.1 - added new SMTP_ENABLED configuration option. -**7.2.0-1** +## 7.2.0-1 - fix nginx static route handling when GITLAB_RELATIVE_URL_ROOT is used. - fix relative root access without the trailing '/' character - added separate server block for http config in gitlab.https.permissive. Fixes #127 - added OAUTH_GOOGLE_RESTRICT_DOMAIN config option. -**7.2.0** +## 7.2.0 - upgrade to gitlab-ce 7.2.0 - update to the sameersbn/ubuntu:14.04.20140818 baseimage @@ -3454,13 +3449,13 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - update to gitlab-shell 1.9.7 - update to the sameersbn/ubuntu:14.04.20140812 baseimage -**7.1.1** +## 7.1.1 - removed "add_header X-Frame-Options DENY" setting from the nginx config. fixes #110 - upgrade to gitlab-ce 7.1.1 - run /etc/init.d/gitlab as git user, plays nicely with selinux -**7.1.0** +## 7.1.0 - removed GITLAB_SUPPORT configuration option - upgrade to gitlab-ce 7.1.0 @@ -3470,7 +3465,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - no more root access over ssh, use nsenter instead - upgrade to nginx-1.6.x series from the nginx/stable ppa -**7.0.0** +## 7.0.0 - upgrade to gitlab-7.0.0 - fix repository and gitlab-satellites directory permissions. @@ -3481,21 +3476,21 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - automatically migrate database when gitlab version is updated - upgrade to gitlab-shell 1.9.5 -**6.9.2** +## 6.9.2 - upgrade to gitlab-ce 6.9.2 -**6.9.1** +## 6.9.1 - upgrade to gitlab-ce 6.9.1 -**6.9.0** +## 6.9.0 - upgrade to gitlab-ce 6.9.0 - added GITLAB_RELATIVE_URL_ROOT configuration option - added NGINX_MAX_UPLOAD_SIZE configuration to specify the maximum acceptable size of attachments. -**6.8.2** +## 6.8.2 - upgrade to gitlab-ce 6.8.2 - renamed configuration option GITLAB_SHELL_SSH_PORT to GITLAB_SSH_PORT @@ -3517,11 +3512,11 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - cache compiled assets to boost application startup. - fix symlink to uploads directory -**6.8.1** +## 6.8.1 - upgrade to gitlab-ce 6.8.1 -**6.8.0** +## 6.8.0 - upgrade to gitlab-shell 1.9.3 - added GITLAB_SIGNIN setting to enable or disable standard login form @@ -3530,35 +3525,35 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - use sameersbn/ubuntu as the base docker image - install postgresql-client to fix restoring backups when used with a postgresql database backend. -**6.7.5** +## 6.7.5 - upgrade gitlab to 6.7.5 - support linking to mysql and postgresql containers - added DEFAULT_PROJECTS_LIMIT configuration option -**6.7.4** +## 6.7.4 - upgrade gitlab to 6.7.4 - added SMTP_AUTHENTICATION configuration option, defaults to :login. - added LDAP configuration options. -**6.7.3** +## 6.7.3 - upgrade gitlab to 6.7.3 - install ruby2.0 from ppa -**6.7.2** +## 6.7.2 - upgrade gitlab to 6.7.2 - upgrade gitlab-shell to 1.9.1 - reorganize repo - do not perform system upgrades () -**6.6.5** +## 6.6.5 - upgraded to gitlab-6.6.5 -**v6.6.4** +## v6.6.4 - upgraded to gitlab-6.6.4 - added changelog @@ -3569,7 +3564,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - added DB_PORT configuration option - changed backup time to 4am (UTC) -**v6.6.2** +## v6.6.2 - upgraded to gitlab-6.6.2 - added automated daily/monthly backups feature @@ -3579,7 +3574,7 @@ When you start to upgrade from `8.10-7` or below use the key of `/home/git/data/ - added app:rake command for executing gitlab rake tasks - documented hardware requirements -**v6.6.1** +## v6.6.1 - upgraded to gitlabhq-6.6.1 - reformatted README From d54b59a002609ada252c99364600d80a91be8908 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sat, 17 May 2025 23:37:23 +0200 Subject: [PATCH 478/522] Cleanup documentation --- docs/container_registry.md | 97 +++++++++++++++++------------------ docs/exposing-ssh-port.md | 3 +- docs/keycloak-idp.md | 4 +- docs/s3_compatible_storage.md | 34 ++++++------ 4 files changed, 67 insertions(+), 71 deletions(-) diff --git a/docs/container_registry.md b/docs/container_registry.md index b536dac6b..66c6f5877 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -1,24 +1,32 @@ -GitLab Container Registry -========================= +# GitLab Container Registry + Since `8.8.0` GitLab introduces a container registry. GitLab is helping to authenticate the user against the registry and proxy it via Nginx. By [Registry](https://docs.docker.com/registry) we mean the registry from docker whereas *Container Registry* is the feature in GitLab. -- [Prerequisites](#prerequisites) -- [Installation](#installation) -- [Configuration](#configuration) -- [Maintenance](#maintenance) +- [GitLab Container Registry](#gitlab-container-registry) + - [Prerequisites](#prerequisites) + - [Installation](#installation) + - [Setup with Nginx as Reverse Proxy](#setup-with-nginx-as-reverse-proxy) + - [Create auth tokens](#create-auth-tokens) + - [Update docker-compose.yml](#update-docker-composeyml) + - [Nginx Site Configuration](#nginx-site-configuration) + - [Configuration](#configuration) + - [Available Parameters](#available-parameters) + - [Container Registry storage driver](#container-registry-storage-driver) + - [Example for Amazon Simple Storage Service (s3)](#example-for-amazon-simple-storage-service-s3) + - [Storage limitations](#storage-limitations) + - [Maintenance](#maintenance) - [Creating Backups](#creating-backups) - [Restoring Backups](#restoring-backups) -- [Upgrading from an existing GitLab instance](#Upgrading-from-an-existing-GitLab-instance) - -# Prerequisites + - [Upgrading from an existing GitLab installation](#upgrading-from-an-existing-gitlab-installation) - - [Docker Distribution](https://github.com/docker/distribution) >= 2.4 - - [Docker GitLab](https://github.com/sameersbn/docker-gitlab) >= 8.8.5-1 +## Prerequisites +- [Docker Distribution](https://github.com/docker/distribution) >= 2.4 +- [Docker GitLab](https://github.com/sameersbn/docker-gitlab) >= 8.8.5-1 -# Installation +## Installation -## Setup with Nginx as Reverse Proxy +### Setup with Nginx as Reverse Proxy We assume that you already have Nginx installed on your host system and that you use a reverse proxy configuration to connect to your GitLab container. @@ -26,13 +34,13 @@ you use a reverse proxy configuration to connect to your GitLab container. In this example we use a dedicated domain for the registry. The URLs for the GitLab installation and the registry are: -* git.example.com -* registry.example.com +- git.example.com +- registry.example.com > Note: You could also run everything on the same domain and use different ports > instead. The required configuration changes below should be straightforward. -### Create auth tokens +#### Create auth tokens GitLab needs a certificate ("auth token") to talk to the registry API. The tokens must be provided in the `/certs` directory of your container. You could @@ -55,8 +63,7 @@ openssl x509 -in registry.csr -out registry.crt -req -signkey registry.key -days It doesn't matter which details (domain name, etc.) you enter during key creation. This information is not used at all. - -### Update docker-compose.yml +#### Update docker-compose.yml First add the configuration for the registry container to your `docker-compose.yml`. @@ -108,7 +115,7 @@ Then update the `volumes` and `environment` sections of your `gitlab` container: - ./certs:/certs ``` -### Nginx Site Configuration +#### Nginx Site Configuration ```nginx server { @@ -150,9 +157,9 @@ server { } ``` -# Configuration +## Configuration -## Available Parameters +### Available Parameters Here is an example of all configuration parameters that can be used in the GitLab container. @@ -174,15 +181,15 @@ where: | Parameter | Description | | --------- | ----------- | -| `GITLAB_REGISTRY_ENABLED ` | `true` or `false`. Enables the Registry in GitLab. By default this is `false`. | -| `GITLAB_REGISTRY_HOST ` | The host URL under which the Registry will run and the users will be able to use. | -| `GITLAB_REGISTRY_PORT ` | The port under which the external Registry domain will listen on. | -| `GITLAB_REGISTRY_API_URL ` | The internal API URL under which the Registry is exposed to. | -| `GITLAB_REGISTRY_KEY_PATH `| The private key location that is a pair of Registry's `rootcertbundle`. Read the [token auth configuration documentation][token-config]. | -| `GITLAB_REGISTRY_PATH ` | This should be the same directory like specified in Registry's `rootdirectory`. Read the [storage configuration documentation][storage-config]. This path needs to be readable by the GitLab user, the web-server user and the Registry user *if you use filesystem as storage configuration*. Read more in [#container-registry-storage-path](#container-registry-storage-path). | +| `GITLAB_REGISTRY_ENABLED` | `true` or `false`. Enables the Registry in GitLab. By default this is `false`. | +| `GITLAB_REGISTRY_HOST` | The host URL under which the Registry will run and the users will be able to use. | +| `GITLAB_REGISTRY_PORT` | The port under which the external Registry domain will listen on. | +| `GITLAB_REGISTRY_API_URL` | The internal API URL under which the Registry is exposed to. | +| `GITLAB_REGISTRY_KEY_PATH`| The private key location that is a pair of Registry's `rootcertbundle`. Read the [token auth configuration documentation][token-config]. | +| `GITLAB_REGISTRY_PATH` | This should be the same directory like specified in Registry's `rootdirectory`. Read the [storage configuration documentation][storage-config]. This path needs to be readable by the GitLab user, the web-server user and the Registry user *if you use filesystem as storage configuration*. Read more in [#container-registry-storage-path](#container-registry-storage-path). | | `GITLAB_REGISTRY_ISSUER` | This should be the same value as configured in Registry's `issuer`. Otherwise the authentication will not work. For more info read the [token auth configuration documentation][token-config]. | -| `SSL_REGISTRY_KEY_PATH ` | The private key of the `SSL_REGISTRY_CERT_PATH`. This will be later used in nginx to proxy your registry via https. | -| `SSL_REGISTRY_CERT_PATH ` | The certificate for the private key of `SSL_REGISTRY_KEY_PATH`. This will be later used in nginx to proxy your registry via https. | +| `SSL_REGISTRY_KEY_PATH` | The private key of the `SSL_REGISTRY_CERT_PATH`. This will be later used in nginx to proxy your registry via https. | +| `SSL_REGISTRY_CERT_PATH` | The certificate for the private key of `SSL_REGISTRY_KEY_PATH`. This will be later used in nginx to proxy your registry via https. | For more info look at [Available Configuration Parameters](https://github.com/sameersbn/docker-gitlab#available-configuration-parameters). @@ -200,12 +207,9 @@ gitlab: ... ``` -## Container Registry storage driver +### Container Registry storage driver -You can configure the Container Registry to use a different storage backend by -configuring a different storage driver. By default the GitLab Container Registry -is configured to use the filesystem driver, which makes use of [storage path](#container-registry-storage-path) -configuration. These configurations will all be done in the registry container. +You can configure the Container Registry to use a different storage backend by configuring a different storage driver. By default the GitLab Container Registry is configured to use the filesystem driver, which makes use of [storage path](#container-registry-storage-path) configuration. These configurations will all be done in the registry container. The different supported drivers are: @@ -227,7 +231,7 @@ Read more about the individual driver's config options in the > If you don't change `GITLAB_REGISTRY_DIR` you will find your registry data in the mounted volume from the GitLab Container under `./gitlab/shared/registry`. This don't need to be separated mounted because `./gitlab` is already mounted in the GitLab Container. If it will be mounted separated the whole restoring process of GitLab backup won't work because gitlab try to create an folder under `./gitlab/shared/registry` /`GITLAB_REGISTRY_DIR` and GitLab can't delete/remove the mount point inside the container so the restoring process of the backup will fail. > An example how it works is in the `docker-compose`. -### Example for Amazon Simple Storage Service (s3) +#### Example for Amazon Simple Storage Service (s3) If you want to configure your registry via `/etc/docker/registry/config.yml` your storage part should like this snippet below. @@ -243,8 +247,6 @@ storage: enabled: true ``` - - ```yaml ... registry: @@ -267,18 +269,17 @@ storage: Generally for more information about the configuration of the registry container you can find it under [registry configuration](https://docs.docker.com/registry/configuration). - -## Storage limitations +### Storage limitations Currently, there is no storage limitation, which means a user can upload an infinite amount of Docker images with arbitrary sizes. This setting will be configurable in future releases. +## Maintenance -# Maintenance If you use another storage configuration than filesystem it will have no impact on your Maintenance workflow. -## Creating Backups +### Creating Backups Creating Backups is the same like without a container registry. I would recommend to stop your registry container. @@ -287,11 +288,13 @@ 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:18.0.0 app:rake gitlab:backup:create ``` -## Restoring Backups + +### Restoring Backups GitLab also defines a rake task to restore a backup. @@ -317,8 +320,7 @@ docker run --name gitlab -it --rm [OPTIONS] \ sameersbn/gitlab:18.0.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` -# Upgrading from an existing GitLab installation - +## Upgrading from an existing GitLab installation If you want enable this feature for an existing instance of GitLab you need to do the following steps. @@ -365,6 +367,7 @@ docker run --name registry -d \ --env 'REGISTRY_STORAGE_DELETE_ENABLED=true' \ registry:2.4.1 ``` + - **Step 6**: Start the image ```bash @@ -381,11 +384,5 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \ sameersbn/gitlab:18.0.0 ``` - -[wildcard certificate]: https://en.wikipedia.org/wiki/Wildcard_certificate -[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-foss/blob/8-8-stable/doc/administration/container_registry.md diff --git a/docs/exposing-ssh-port.md b/docs/exposing-ssh-port.md index 9c37baee6..a2dbca10a 100644 --- a/docs/exposing-ssh-port.md +++ b/docs/exposing-ssh-port.md @@ -3,6 +3,5 @@ This is how to expose this internal ssh port without affecting the existing ssh port on the host server: * use this configuration script: [`../contrib/expose-gitlab-ssh-port.sh`](../contrib/expose-gitlab-ssh-port.sh) -* see implementation example in Vagrant: [harobed/docker-gitlab-vagrant-test -](https://github.com/harobed/docker-gitlab-vagrant-test) +* see implementation example in Vagrant: [harobed/docker-gitlab-vagrant-test](https://github.com/harobed/docker-gitlab-vagrant-test) * more information, see [« Exposing ssh port in dockerized gitlab-ce »](https://blog.xiaket.org/2017/exposing.ssh.port.in.dockerized.gitlab-ce.html) post diff --git a/docs/keycloak-idp.md b/docs/keycloak-idp.md index 61f76ce65..04bc3c734 100644 --- a/docs/keycloak-idp.md +++ b/docs/keycloak-idp.md @@ -37,7 +37,7 @@ Set the following in the docker-compose file: - OAUTH2_GENERIC_CLIENT_END_SESSION_ENDPOINT=http://:10081/auth/realms/master/protocol/openid-connect/logout ``` -`` is the IP address of your keycloak. For this example this would be your IP address, but if your Keycloak existed elsewhere for your deployment `` would be different as would the port and the realm. +`` is the IP address of your keycloak. For this example this would be your IP address, but if your Keycloak existed elsewhere for your deployment `` would be different as would the port and the realm. The following must also be configured: @@ -47,7 +47,7 @@ The following must also be configured: - OAUTH2_GENERIC_USER_EMAIL='email' ``` -The values will be different for your deployment. Navigate Keycloak's UI, select `Clients`, click `[your client]`, then open the `Client Scopes` tab, then open `Evaluate` sub-tab, enter a username you know in the `User` field, select the match, then `Generate Access Token` to see the values you need to configure. +The values will be different for your deployment. Navigate Keycloak's UI, select `Clients`, click `[your client]`, then open the `Client Scopes` tab, then open `Evaluate` sub-tab, enter a username you know in the `User` field, select the match, then `Generate Access Token` to see the values you need to configure. Also, make sure the following variables are filled in the docker-compose file: diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md index 35a15a0d5..4fb7d0fb3 100644 --- a/docs/s3_compatible_storage.md +++ b/docs/s3_compatible_storage.md @@ -1,23 +1,22 @@ -GitLab Backup to s3 compatible storage -================================================= +# GitLab Backup to s3 compatible storage -Enables automatic backups to self-hosted s3 compatible storage like minio (https://minio.io/) and others. +Enables automatic backups to self-hosted s3 compatible storage like minio () and others. This is an extend of AWS Remote Backups. As explained in [doc.gitlab.com](https://docs.gitlab.com/ce/raketasks/backup_restore.html#upload-backups-to-remote-cloud-storage), it uses [Fog library](http://fog.io) and the module fog-aws. More details on [s3 supported parameters](https://github.com/fog/fog-aws/blob/master/lib/fog/aws/storage.rb) - [GitLab Backup to s3 compatible storage](#gitlab-backup-to-s3-compatible-storage) -- [Available Parameters](#available-parameters) -- [Installation](#installation) - - [Docker Compose](#docker-compose) - - [Creating Backups](#creating-backups) - - [Restoring Backups](#restoring-backups) + - [Available Parameters](#available-parameters) + - [Installation](#installation) + - [Docker Compose](#docker-compose) + - [Creating Backups](#creating-backups) + - [Restoring Backups](#restoring-backups) -# Available Parameters +## Available Parameters Here is an example of all configuration parameters that can be used in the GitLab container. -``` +```yaml ... gitlab: ... @@ -28,7 +27,6 @@ gitlab: - AWS_BACKUP_SECRET_ACCESS_KEY=minio123 - AWS_BACKUP_BUCKET=docker - AWS_BACKUP_MULTIPART_CHUNK_SIZE=104857600 - ``` where: @@ -46,7 +44,7 @@ For more info look at [Available Configuration Parameters](https://github.com/sa A minimum set of these parameters are required to use the s3 compatible storage: -```yml +```yaml ... gitlab: environment: @@ -57,11 +55,12 @@ gitlab: - AWS_BACKUP_BUCKET=docker ... ``` -# Installation + +## Installation Starting a fresh installation with GitLab would be like the `docker-compose` file. -## Docker Compose +### Docker Compose This is an example with minio. @@ -214,15 +213,16 @@ services: command: server /export ``` - -## Creating Backups +### Creating Backups Execute the rake task with a removeable container. + ```bash docker run --name gitlab -it --rm [OPTIONS] \ sameersbn/gitlab:8.16.4 app:rake gitlab:backup:create ``` -## Restoring Backups + +### Restoring Backups Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`. From 4c2faca21314f92899585a7106f98a74d571c673 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 18 May 2025 08:53:04 +0200 Subject: [PATCH 479/522] Update README to add informations about GitLab CE and required PostgreSQL versions --- README.md | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 18a2e00a9..baa4a6d6d 100644 --- a/README.md +++ b/README.md @@ -254,10 +254,10 @@ This behavior can be checked using the command `docker logs` and an output like … Configuring gitlab::database - Installing postgresql client to avoid version mismatch on dumping --- Detected server version: 140007 +-- Detected server version: 160009 - Generating /home/git/.postgresqlrc -14 postgresql:5432 gitlabhq_production -- Uninstalling unused client(s): postgresql-client-12 postgresql-client-13 postgresql-client-15 +16 postgresql:5432 gitlabhq_production +- Uninstalling unused client(s): postgresql-client-13 postgresql-client-14 postgresql-client-15 postgresql-client-17 … ```` @@ -265,10 +265,16 @@ Please note furthermore, that only compatible versions of the `postgresql-client - `postgresql-client-13`, - `postgresql-client-14`, -- `postgresql-client-15`. -- and `postgresql-client-16`. +- `postgresql-client-15`, +- `postgresql-client-16`, +- and `postgresql-client-17`. -*NOTE:* Version 13.7.0 and later requires PostgreSQL version 12.x. Version 16.0.0 and later requires PostgreSQL version 13.x. Version 17.0.0 and later requires PostgreSQL version 14.x. +***Notes:*** + +- GitLab CE version 13.7.0 and later requires PostgreSQL version 12.x. +- GitLab CE version 16.0.0 and later requires PostgreSQL version 13.x. +- GitLab CE version 17.0.0 and later requires PostgreSQL version 14.x. +- GitLab CE version 18.0.0 and later requires PostgreSQL version 16.x. ##### External PostgreSQL Server @@ -341,10 +347,9 @@ docker run --name gitlab -d --link gitlab-postgresql:postgresql \ 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: -- [postgres](https://hub.docker.com/_/postgres/) -- [sameersbn/postgresql](https://quay.io/repository/sameersbn/postgresql/) -- [orchardup/postgresql](https://hub.docker.com/r/orchardup/postgresql/) -- [paintedfox/postgresql](https://hub.docker.com/r/paintedfox/postgresql/) +- [postgres](https://hub.docker.com/_/postgres/), +- [kkimurak/sameersbn-postgresql](https://hub.docker.com/r/kkimurak/sameersbn-postgresql), or +- [sameersbn/postgresql](https://quay.io/repository/sameersbn/postgresql/) . ##### Upgrading PostgreSQL @@ -2722,7 +2727,14 @@ Usage when using `docker-compose` can also be found there. > > If you're using `sameersbn/postgresql` then please upgrade to `kkimurak/sameersbn-postgresql:16` or later and add `DB_EXTENSION=pg_trgm,btree_gist` to the environment of the PostgreSQL container (see: ). > -> As of version 13.7.0, the required PostgreSQL is version 12.x. As of version 16.0.0, the required PostgreSQL is version 13.x. As of version 17.0.0, the required PostgreSQL is version 14.x. If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql). +> Please keep in mind that: +> +> - As of version 13.7.0, the required PostgreSQL version is 12.x. +> - As of version 16.0.0, the required PostgreSQL version is 13.x. +> - As of version 17.0.0, the required PostgreSQL version is 14.x. +> - As of version 18.0.0, the required PostgreSQL version is 16.x. +> +> If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql). GitLabHQ releases new versions on the 22nd of every month, bugfix releases immediately follow. I update this project almost immediately when a release is made (at least it has been the case so far). If you are using the image in production environments I recommend that you delay updates by a couple of days after the gitlab release, allowing some time for the dust to settle down. From c9ec90d853e25f66e583017504aad01955f6ba53 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 18 May 2025 14:06:02 +0200 Subject: [PATCH 480/522] Remove user 'ubuntu' and set uid and gid for user 'git' explicitly --- assets/build/install.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index 6163e6120..f3bfff6c5 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -74,7 +74,9 @@ gem update --no-document --system "${RUBYGEMS_VERSION}" rm -rf /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub # add ${GITLAB_USER} user -adduser --disabled-login --gecos 'GitLab' ${GITLAB_USER} +deluser --remove-home ubuntu +addgroup --gid 1000 git +adduser --uid 1000 --gid 1000 --disabled-login --gecos 'GitLab' ${GITLAB_USER} passwd -d ${GITLAB_USER} # set PATH (fixes cron job PATH issues) From e238e227ab678321a57c85803a3785cc74cffb4d Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Sun, 18 May 2025 17:48:33 +0200 Subject: [PATCH 481/522] Update NODE_OPTIONS in functions to match install script --- assets/runtime/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/functions b/assets/runtime/functions index b32048fb8..de90c30a2 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -2260,7 +2260,7 @@ migrate_database() { chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules exec_as_git yarn install --production --pure-lockfile echo "Recompiling assets (relative_url in use), this could take a while..." - exec_as_git bundle exec rake gitlab:assets:compile NODE_OPTIONS="--max-old-space-size=4096" >/dev/null 2>&1 + exec_as_git bundle exec rake gitlab:assets:compile NODE_OPTIONS="--max-old-space-size=8192" >/dev/null 2>&1 fi echo "Clearing cache..." From 576243c649b4cec8831daf3fd13ce26c3670eeaf Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Mon, 19 May 2025 07:17:57 +0200 Subject: [PATCH 482/522] Remove disable login option for adduser in order to allow user 'git' to login --- 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 f3bfff6c5..9cd6dd104 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -76,7 +76,7 @@ rm -rf /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub # add ${GITLAB_USER} user deluser --remove-home ubuntu addgroup --gid 1000 git -adduser --uid 1000 --gid 1000 --disabled-login --gecos 'GitLab' ${GITLAB_USER} +adduser --uid 1000 --gid 1000 --gecos 'GitLab' ${GITLAB_USER} passwd -d ${GITLAB_USER} # set PATH (fixes cron job PATH issues) From 8408f1e06451c6f933011bc1825f42e29c601431 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Mon, 19 May 2025 10:49:06 +0200 Subject: [PATCH 483/522] Add disabled password option for adduser as replacement for disabled login option --- 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 9cd6dd104..d9826c41d 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -76,7 +76,7 @@ rm -rf /etc/ssh/ssh_host_*_key /etc/ssh/ssh_host_*_key.pub # add ${GITLAB_USER} user deluser --remove-home ubuntu addgroup --gid 1000 git -adduser --uid 1000 --gid 1000 --gecos 'GitLab' ${GITLAB_USER} +adduser --uid 1000 --gid 1000 --disabled-password --gecos 'GitLab' ${GITLAB_USER} passwd -d ${GITLAB_USER} # set PATH (fixes cron job PATH issues) From 68ef26d601f245ca6551b7440c4d5ef66af6e537 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 22 May 2025 05:19:32 +0200 Subject: [PATCH 484/522] Upgrade GitLab CE to 18.0.1 --- Changelog.md | 7 +++ Dockerfile | 8 ++-- README.md | 58 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 45 deletions(-) diff --git a/Changelog.md b/Changelog.md index f6dc204e7..0179b9f04 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,13 @@ 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. +## 18.0.1 + +- gitlab: upgrade CE to v18.0.1 +- gitaly: upgrade to v18.0.1 +- gitlab-pages: upgrade to v18.0.1 +- gitlab-shell: upgrade to v14.42.0 + ## 18.0.0 - gitlab: upgrade CE to v18.0.0 diff --git a/Dockerfile b/Dockerfile index e8956ec88..65a81948c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ FROM ubuntu:noble-20250415.1 -ARG VERSION=18.0.0 +ARG VERSION=18.0.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.8 \ RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \ RUBYGEMS_VERSION=3.6.9 \ GOLANG_VERSION=1.24.3 \ - GITLAB_SHELL_VERSION=14.41.0 \ - GITLAB_PAGES_VERSION=18.0.0 \ - GITALY_SERVER_VERSION=18.0.0 \ + GITLAB_SHELL_VERSION=14.42.0 \ + GITLAB_PAGES_VERSION=18.0.1 \ + GITALY_SERVER_VERSION=18.0.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index baa4a6d6d..2b020de1f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:18.0.0 +# sameersbn/gitlab:18.0.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:18.0.0 +docker pull sameersbn/gitlab:18.0.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:18.0.0 + sameersbn/gitlab:18.0.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:18.0.0 + sameersbn/gitlab:18.0.1 ``` ### Database @@ -274,7 +274,7 @@ Please note furthermore, that only compatible versions of the `postgresql-client - GitLab CE version 13.7.0 and later requires PostgreSQL version 12.x. - GitLab CE version 16.0.0 and later requires PostgreSQL version 13.x. - GitLab CE version 17.0.0 and later requires PostgreSQL version 14.x. -- GitLab CE version 18.0.0 and later requires PostgreSQL version 16.x. +- GitLab CE version 18.0.1 and later requires PostgreSQL version 16.x. ##### External PostgreSQL Server @@ -298,7 +298,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:18.0.0 + sameersbn/gitlab:18.0.1 ``` ##### Linking to PostgreSQL Container @@ -342,7 +342,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:18.0.0 + sameersbn/gitlab:18.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: @@ -380,7 +380,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:18.0.0 + sameersbn/gitlab:18.0.1 ``` #### Linking to Redis Container @@ -407,7 +407,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:18.0.0 + sameersbn/gitlab:18.0.1 ``` #### Mail @@ -420,7 +420,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:18.0.0 + sameersbn/gitlab:18.0.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -440,7 +440,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:18.0.0 + sameersbn/gitlab:18.0.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -524,7 +524,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:18.0.0 + sameersbn/gitlab:18.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. @@ -540,7 +540,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:18.0.0 + sameersbn/gitlab:18.0.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -563,7 +563,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:18.0.0 + sameersbn/gitlab:18.0.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -611,7 +611,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:18.0.0 + sameersbn/gitlab:18.0.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -817,14 +817,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:18.0.0 + sameersbn/gitlab:18.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:18.0.0 app:sanitize + sameersbn/gitlab:18.0.1 app:sanitize ``` #### Piwik @@ -2567,7 +2567,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.0 app:rake gitlab:backup:create + sameersbn/gitlab:18.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. @@ -2602,14 +2602,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.0 app:rake db:setup + sameersbn/gitlab:18.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:18.0.0 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -2618,7 +2618,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:18.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2667,7 +2667,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:18.0.0 app:rake gitlab:env:info + sameersbn/gitlab:18.0.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2680,7 +2680,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.0 app:rake gitlab:import:repos + sameersbn/gitlab:18.0.1 app:rake gitlab:import:repos ``` Or @@ -2711,7 +2711,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.0 app:rake gitlab:import:repos + sameersbn/gitlab:18.0.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2732,7 +2732,7 @@ Usage when using `docker-compose` can also be found there. > - As of version 13.7.0, the required PostgreSQL version is 12.x. > - As of version 16.0.0, the required PostgreSQL version is 13.x. > - As of version 17.0.0, the required PostgreSQL version is 14.x. -> - As of version 18.0.0, the required PostgreSQL version is 16.x. +> - As of version 18.0.1, the required PostgreSQL version is 16.x. > > If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql). @@ -2742,12 +2742,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:18.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:18.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:18.0.0 +docker pull sameersbn/gitlab:18.0.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2773,7 +2773,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.0.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.0.1 ``` ### Shell Access @@ -2811,7 +2811,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:18.0.0 + image: sameersbn/gitlab:18.0.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 7eae4e2e9..9ce7d613e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.0.0 +18.0.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index ca6b49145..e74c084b4 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.0.0 + image: sameersbn/gitlab:18.0.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index d33d1dbfc..a343b3776 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:18.0.0 + image: sameersbn/gitlab:18.0.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 2ec91a1c0..e51ced9bb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.0.0 + image: sameersbn/gitlab:18.0.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 66c6f5877..3e9d05acf 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -291,7 +291,7 @@ Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.0 app:rake gitlab:backup:create + sameersbn/gitlab:18.0.1 app:rake gitlab:backup:create ``` ### Restoring Backups @@ -308,7 +308,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:18.0.0 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:18.0.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Upgrading from an existing GitLab installation @@ -327,7 +327,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:18.0.0 +docker pull sameersbn/gitlab:18.0.1 ``` - **Step 2**: Stop and remove the currently running image @@ -381,7 +381,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:18.0.0 +sameersbn/gitlab:18.0.1 ``` [storage-config]: https://docs.docker.com/registry/configuration/#storage diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index e7e45e867..629be2ebc 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.0.0 + image: sameersbn/gitlab:18.0.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 2dbd1a3ff..e276f1dd7 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.0.0 + image: sameersbn/gitlab:18.0.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 75988d916..cbff0fbb5 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:18.0.0 + image: sameersbn/gitlab:18.0.1 env: - name: TZ value: Asia/Kolkata From 37563a6a347e71e5cf32c767f6995e54bbc21a5a Mon Sep 17 00:00:00 2001 From: Amin Vakil Date: Fri, 30 May 2025 00:08:19 +0330 Subject: [PATCH 485/522] Remove version from docker-compose.yml the attribute `version` is obsolete, it will be ignored, please remove it to avoid potential confusion --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e51ced9bb..478c7cfbd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '2.3' services: redis: From ba1e228644c67a712f4f2b5eb9579a65700e836c Mon Sep 17 00:00:00 2001 From: Amin Vakil Date: Fri, 30 May 2025 00:09:21 +0330 Subject: [PATCH 486/522] yamllint --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 478c7cfbd..f2361b086 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ - +--- services: redis: restart: always From a10b1d51c897f73491971b87e0d7000903e1b8f0 Mon Sep 17 00:00:00 2001 From: Amin Vakil Date: Fri, 30 May 2025 13:53:53 +0330 Subject: [PATCH 487/522] Revert "yamllint" This reverts commit ba1e228644c67a712f4f2b5eb9579a65700e836c. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index f2361b086..478c7cfbd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ ---- + services: redis: restart: always From fc8cca599b590572f2d69f58a7cdd87bc814db17 Mon Sep 17 00:00:00 2001 From: Amin Vakil Date: Fri, 30 May 2025 13:55:40 +0330 Subject: [PATCH 488/522] Remove version from compose files --- README.md | 2 -- contrib/docker-swarm/docker-compose.yml | 2 -- docker-compose.swarm.yml | 1 - docs/docker-compose-keycloak.yml | 2 -- docs/docker-compose-registry.yml | 2 -- docs/s3_compatible_storage.md | 2 -- 6 files changed, 11 deletions(-) diff --git a/README.md b/README.md index 2b020de1f..f3546b6d5 100644 --- a/README.md +++ b/README.md @@ -2807,8 +2807,6 @@ To do that you will need to set the environment variable `GITLAB_MONITORING_IP_W You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com/compose/compose-file/compose-file-v2/#healthcheck) configuration to make periodic checks: ```yml -version: '2.3' - services: gitlab: image: sameersbn/gitlab:18.0.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index e74c084b4..0b5e97f2c 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.4' - services: redis: restart: always diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index a343b3776..c16e0d823 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -1,4 +1,3 @@ -version: '3.4' services: redis: image: redis:7 diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 629be2ebc..002bb4092 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -1,5 +1,3 @@ -version: '2' - services: redis: restart: always diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index e276f1dd7..0dd32b4a0 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -1,5 +1,3 @@ -version: '2' - services: redis: restart: always diff --git a/docs/s3_compatible_storage.md b/docs/s3_compatible_storage.md index 4fb7d0fb3..6e5ba10af 100644 --- a/docs/s3_compatible_storage.md +++ b/docs/s3_compatible_storage.md @@ -65,8 +65,6 @@ Starting a fresh installation with GitLab would be like the `docker-compose` fil This is an example with minio. ```yml -version: '2' - services: redis: restart: always From d8fb586b0c20436070c26660a2eb412a87fbd916 Mon Sep 17 00:00:00 2001 From: Henadii Sychevskyi Date: Tue, 3 Jun 2025 13:27:16 +0200 Subject: [PATCH 489/522] redirects fix --- assets/runtime/config/nginx/gitlab-registry | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/runtime/config/nginx/gitlab-registry b/assets/runtime/config/nginx/gitlab-registry index ce98d045f..f43be97e5 100644 --- a/assets/runtime/config/nginx/gitlab-registry +++ b/assets/runtime/config/nginx/gitlab-registry @@ -10,7 +10,7 @@ server { listen *:80; server_name {{GITLAB_REGISTRY_HOST}}; server_tokens off; ## Don't show the nginx version number, a security best practice - return 301 https://$http_host:$request_uri; + return 301 https://$http_host$request_uri; access_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_access.log; error_log {{GITLAB_LOG_DIR}}/nginx/gitlab_registry_error.log; } From 2e2f4f81767722e7e4bde4c1cb462bcf50f70247 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 12 Jun 2025 06:35:58 +0200 Subject: [PATCH 490/522] Upgrade GitLab CE to 18.0.2 --- Changelog.md | 8 ++++ Dockerfile | 10 ++--- README.md | 58 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 54 insertions(+), 46 deletions(-) diff --git a/Changelog.md b/Changelog.md index 0179b9f04..e4e54153b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,14 @@ 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. +## 18.0.2 + +- gitlab: upgrade CE to v18.0.2 +- gitaly: upgrade to v18.0.2 +- gitlab-pages: upgrade to v18.0.2 +- golang: upgrade to v1.24.4 +- ubuntu: upgrade to noble-20250529 + ## 18.0.1 - gitlab: upgrade CE to v18.0.1 diff --git a/Dockerfile b/Dockerfile index 65a81948c..ebf602577 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM ubuntu:noble-20250415.1 +FROM ubuntu:noble-20250529 -ARG VERSION=18.0.1 +ARG VERSION=18.0.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.8 \ RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \ RUBYGEMS_VERSION=3.6.9 \ - GOLANG_VERSION=1.24.3 \ + GOLANG_VERSION=1.24.4 \ GITLAB_SHELL_VERSION=14.42.0 \ - GITLAB_PAGES_VERSION=18.0.1 \ - GITALY_SERVER_VERSION=18.0.1 \ + GITLAB_PAGES_VERSION=18.0.2 \ + GITALY_SERVER_VERSION=18.0.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 2b020de1f..adccd7543 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:18.0.1 +# sameersbn/gitlab:18.0.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -127,7 +127,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:18.0.1 +docker pull sameersbn/gitlab:18.0.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -198,7 +198,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:18.0.1 + sameersbn/gitlab:18.0.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -233,7 +233,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:18.0.1 + sameersbn/gitlab:18.0.2 ``` ### Database @@ -274,7 +274,7 @@ Please note furthermore, that only compatible versions of the `postgresql-client - GitLab CE version 13.7.0 and later requires PostgreSQL version 12.x. - GitLab CE version 16.0.0 and later requires PostgreSQL version 13.x. - GitLab CE version 17.0.0 and later requires PostgreSQL version 14.x. -- GitLab CE version 18.0.1 and later requires PostgreSQL version 16.x. +- GitLab CE version 18.0.2 and later requires PostgreSQL version 16.x. ##### External PostgreSQL Server @@ -298,7 +298,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:18.0.1 + sameersbn/gitlab:18.0.2 ``` ##### Linking to PostgreSQL Container @@ -342,7 +342,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:18.0.1 + sameersbn/gitlab:18.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: @@ -380,7 +380,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:18.0.1 + sameersbn/gitlab:18.0.2 ``` #### Linking to Redis Container @@ -407,7 +407,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:18.0.1 + sameersbn/gitlab:18.0.2 ``` #### Mail @@ -420,7 +420,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:18.0.1 + sameersbn/gitlab:18.0.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -440,7 +440,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:18.0.1 + sameersbn/gitlab:18.0.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -524,7 +524,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:18.0.1 + sameersbn/gitlab:18.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. @@ -540,7 +540,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:18.0.1 + sameersbn/gitlab:18.0.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -563,7 +563,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:18.0.1 + sameersbn/gitlab:18.0.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -611,7 +611,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:18.0.1 + sameersbn/gitlab:18.0.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -817,14 +817,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:18.0.1 + sameersbn/gitlab:18.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:18.0.1 app:sanitize + sameersbn/gitlab:18.0.2 app:sanitize ``` #### Piwik @@ -2567,7 +2567,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.1 app:rake gitlab:backup:create + sameersbn/gitlab:18.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. @@ -2602,14 +2602,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.1 app:rake db:setup + sameersbn/gitlab:18.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:18.0.1 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -2618,7 +2618,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:18.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2667,7 +2667,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:18.0.1 app:rake gitlab:env:info + sameersbn/gitlab:18.0.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -2680,7 +2680,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.1 app:rake gitlab:import:repos + sameersbn/gitlab:18.0.2 app:rake gitlab:import:repos ``` Or @@ -2711,7 +2711,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.1 app:rake gitlab:import:repos + sameersbn/gitlab:18.0.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2732,7 +2732,7 @@ Usage when using `docker-compose` can also be found there. > - As of version 13.7.0, the required PostgreSQL version is 12.x. > - As of version 16.0.0, the required PostgreSQL version is 13.x. > - As of version 17.0.0, the required PostgreSQL version is 14.x. -> - As of version 18.0.1, the required PostgreSQL version is 16.x. +> - As of version 18.0.2, the required PostgreSQL version is 16.x. > > If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql). @@ -2742,12 +2742,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:18.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:18.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:18.0.1 +docker pull sameersbn/gitlab:18.0.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2773,7 +2773,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.0.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.0.2 ``` ### Shell Access @@ -2811,7 +2811,7 @@ version: '2.3' services: gitlab: - image: sameersbn/gitlab:18.0.1 + image: sameersbn/gitlab:18.0.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 9ce7d613e..3d5ab6e54 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.0.1 +18.0.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index e74c084b4..a15b519ea 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.0.1 + image: sameersbn/gitlab:18.0.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index a343b3776..da526b53f 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -63,7 +63,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:18.0.1 + image: sameersbn/gitlab:18.0.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index e51ced9bb..a5b0b545e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.0.1 + image: sameersbn/gitlab:18.0.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 3e9d05acf..4dc45ab24 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -291,7 +291,7 @@ Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.1 app:rake gitlab:backup:create + sameersbn/gitlab:18.0.2 app:rake gitlab:backup:create ``` ### Restoring Backups @@ -308,7 +308,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:18.0.1 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:18.0.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Upgrading from an existing GitLab installation @@ -327,7 +327,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:18.0.1 +docker pull sameersbn/gitlab:18.0.2 ``` - **Step 2**: Stop and remove the currently running image @@ -381,7 +381,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:18.0.1 +sameersbn/gitlab:18.0.2 ``` [storage-config]: https://docs.docker.com/registry/configuration/#storage diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 629be2ebc..12a39728a 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.0.1 + image: sameersbn/gitlab:18.0.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index e276f1dd7..0d033aa49 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -22,7 +22,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.0.1 + image: sameersbn/gitlab:18.0.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index cbff0fbb5..be10cd2c9 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:18.0.1 + image: sameersbn/gitlab:18.0.2 env: - name: TZ value: Asia/Kolkata From de75177e22a46231a0a59dce9955b715aa128858 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Mon, 27 Jan 2025 01:18:05 +0900 Subject: [PATCH 491/522] Remove patch to remove HSTS setting from app/controller/application_controller.rb Merged into upstream so no longer required - gitlab-foss: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9341 - commit df376bad3c8586eccc0ee2da1590d14a66bdff10 - merge commit (squashed) : 9ec03807fd1ad2e0f04721abb7e29a044d5d0e75 - gitlab: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1360 - commit 76e96878aad0a281f8c32ef98a276b499e2581ad First contained tag: - gitlab-foss: v9.0.0 - gitlab: v9.0.0-ee --- assets/build/install.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index d9826c41d..c6829e834 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -178,9 +178,6 @@ rm -rf ${GITLAB_GITALY_BUILD_DIR} go clean --modcache 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 - # revert `rake gitlab:setup` changes from gitlabhq/gitlabhq@a54af831bae023770bf9b2633cc45ec0d5f5a66a exec_as_git sed -i 's/db:reset/db:setup/' ${GITLAB_INSTALL_DIR}/lib/tasks/gitlab/setup.rake From 34786748002cc8a2830c12afe2090f73ca8c3c6a Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Mon, 2 Dec 2024 23:57:40 +0900 Subject: [PATCH 492/522] README.md: fix some typo - fix some typo in docs - #google-cloud-storage-gcs-remote-backup -> #google-cloud-storage-gcs-remote-backups (missing trailing "s") - opensource -> open source - #generation-of-self-signed-certificate -> #generation-of-a-self-signed-certificate (missing "-a") - postresql -> postgresql (missing "g") - STASRTSSL -> STARTTLS - clientside -> client side - raketasks -> rake tasks - healthcheck -> health check When referring to docker-compose's "healthcheck" setting, the notation without spaces is intentionally left. - fix unclosed parentheses --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 0480e3d75..0b46134a0 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ - [SAML](#saml) - [Crowd](#crowd) - [Microsoft Azure](#microsoft-azure) - - [Generic OAuth2](#Generic-OAuth2) + - [Generic OAuth2](#generic-oauth2) - [OpenID Connect](#openid-connect) - [Gitlab Pages](#gitlab-pages) - [External Issue Trackers](#external-issue-trackers) @@ -59,7 +59,7 @@ - [Restoring Backups](#restoring-backups) - [Automated Backups](#automated-backups) - [Amazon Web Services (AWS) Remote Backups](#amazon-web-services-aws-remote-backups) - - [Google Cloud Storage (GCS) Remote Backups](#google-cloud-storage-gcs-remote-backup) + - [Google Cloud Storage (GCS) Remote Backups](#google-cloud-storage-gcs-remote-backups) - [Rake Tasks](#rake-tasks) - [Import Repositories](#import-repositories) - [Upgrading](#upgrading) @@ -72,7 +72,7 @@ ## Introduction -Dockerfile to build a [GitLab](https://about.gitlab.com/) image for the [Docker](https://www.docker.com/products/docker-engine) opensource container platform. +Dockerfile to build a [GitLab](https://about.gitlab.com/) image for the [Docker](https://www.docker.com/products/docker-engine) open source container platform. 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 official GitLab documentation. @@ -599,11 +599,11 @@ The default path image is configured to look for the trusted SSL certificates is Copy the `ca.crt` file into the certs directory on the [datastore](#data-store). The `ca.crt` file should contain the root certificates of all the servers you want to trust. With respect to GitLab CI, this will be the contents of the gitlab_ci.crt file as described in the [README](https://github.com/sameersbn/docker-gitlab-ci/blob/master/README.md#ssl) of the [docker-gitlab-ci](https://github.com/sameersbn/docker-gitlab-ci) container. -By default, our own server certificate [gitlab.crt](#generation-of-self-signed-certificate) is added to the trusted certificates list. +By default, our own server certificate [gitlab.crt](#generation-of-a-self-signed-certificate) is added to the trusted certificates list. #### Deploy to a subdirectory (relative url root) -By default, GitLab expects that your application is running at the root e.g.. /). This section explains how to run your application inside a directory. +By default, GitLab expects that your application is running at the root (e.g.. /). This section explains how to run your application inside a directory. Let's assume we want to deploy our application to '/git'. GitLab needs to know this directory to generate the appropriate routes. This can be specified using the `GITLAB_RELATIVE_URL_ROOT` configuration option like so: @@ -1876,7 +1876,7 @@ The database type. Currently only postgresql is supported. Possible values: `pos ##### `DB_ENCODING` -The database encoding. For `DB_ADAPTER` values `postresql` this parameter defaults and `utf8` respectively. +The database encoding. For `DB_ADAPTER` values `postgresql` this parameter defaults and `utf8` respectively. ##### `DB_HOST` @@ -1984,7 +1984,7 @@ Enable SSL. Defaults to `true`. ##### `IMAP_STARTTLS` -Enable STARTSSL. Defaults to `false`. +Enable STARTTLS. Defaults to `false`. ##### `IMAP_MAILBOX` @@ -2528,7 +2528,7 @@ Sentry DSN. No defaults. ##### `SENTRY_CLIENTSIDE_DSN` -Sentry clientside DSN. No defaults. +Sentry client side DSN. No defaults. ##### `SENTRY_ENVIRONMENT` @@ -2670,7 +2670,7 @@ docker run --name gitlab -it --rm [OPTIONS] \ sameersbn/gitlab:18.0.2 app:rake gitlab:env:info ``` -You can also use `docker exec` to run raketasks on running gitlab instance. For example, +You can also use `docker exec` to run rake tasks on running gitlab instance. For example, ```bash docker exec --user git -it gitlab bundle exec rake gitlab:env:info RAILS_ENV=production @@ -2818,7 +2818,7 @@ services: start_period: 2m ``` -Then you will be able to consult the healthcheck log by executing: +Then you will be able to consult the health check log by executing: ```bash docker inspect --format "{{json .State.Health }}" $(docker-compose ps -q gitlab) | jq From 7684af95f901c214f4af03895af908be07370968 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Tue, 17 Jun 2025 18:51:38 +0900 Subject: [PATCH 493/522] Docs: fix RACK_ATTACK_WHITELIST section (quoting) --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0480e3d75..d0d2f5039 100644 --- a/README.md +++ b/README.md @@ -2490,14 +2490,14 @@ Enable/disable rack middleware for blocking & throttling abusive requests Defaul Always allow requests from whitelisted host. This should be a valid yaml sequence of host address. Each host address string must be a valid IP address that can be passed to `IPAddr.new` of ruby. See [ruby-lang reference](https://docs.ruby-lang.org/en/3.0/IPAddr.html#method-c-new) for detail. -If you need to set multiple hosts, set this parameter like `["1.1.1.1","192.168.0.0/24"]` for example. In docker-compose.yml, you have to quote whole value like below: +If you need to set multiple hosts, set this parameter like `["1.1.1.1","192.168.0.0/24"]` for example. ````yaml environment: -# pattern 1: surround with single quote, double quote each IP address -- RACK_ATTACK_WHITELIST='["1.1.1.1","192.168.0.0/24"]' -# pattern 2: surround with double quote, single quote each IP address -- RACK_ATTACK_WHITELIST="['1.1.1.1','192.168.0.0/24']" +# pattern 1: `- key=value` style : you can specify array of hosts as is +- RACK_ATTACK_WHITELIST=["1.1.1.1","192.168.0.0/24"] +# pattern 2: `key: value` style : you must surround with quote, as the value of environment variable must not be an array + RACK_ATTACK_WHITELIST: "['1.1.1.1','192.168.0.0/24']" ```` Defaults to `["127.0.0.1"]` From ac47124a0dd410036468fef94090548b61345625 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Fri, 30 May 2025 19:41:01 +0900 Subject: [PATCH 494/522] Allow setting ActiveRecord encryption secrets Add environment variable to set entry in secrets.yml related to active record encryption - active_record_encryption_primary_key (can be multiple) - active_record_encryption_deterministic_key (can be multiple) - active_record_encryption_key_derivation_salt Reference for '32 characters length' recommendation: https://gitlab.com/gitlab-org/gitlab/-/blob/v18.0.0-ee/config/initializers/2_secret_token.rb#L78-80 TODO: fix command line usage in documentation --- README.md | 28 ++++++++++++++++++++++ assets/runtime/config/gitlabhq/secrets.yml | 3 +++ assets/runtime/env-defaults | 5 ++++ assets/runtime/functions | 5 +++- contrib/docker-swarm/docker-compose.yml | 3 +++ docker-compose.swarm.yml | 3 +++ docker-compose.yml | 3 +++ kubernetes/gitlab-rc.yml | 6 +++++ 8 files changed, 55 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0480e3d75..97a2b91af 100644 --- a/README.md +++ b/README.md @@ -159,6 +159,8 @@ Generate random strings that are at least `64` characters long for each of `GITL > **Tip**: You can generate a random string using `pwgen -Bsv1 64` and assign it as the value of `GITLAB_SECRETS_DB_KEY_BASE`. +Also generate random strings that are typically `32` characters long for each of `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`, `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. These values are used for `ActiveRecord::Encryption` encrypted columns. + Start GitLab using: ```bash @@ -188,6 +190,8 @@ docker run --name gitlab-redis -d \ Step 3. Launch the gitlab container +TODO: fix and verify command line option to set newly created keys (especially primary_key and deterministic_key : they must be an array) + ```bash docker run --name gitlab -d \ --link gitlab-postgresql:postgresql --link gitlab-redis:redisio \ @@ -197,6 +201,9 @@ 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' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ + --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=long-and-random-alpha-numeric-string' \ + --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=long-and-random-alpha-numeric-string' \ + --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ sameersbn/gitlab:18.0.2 ``` @@ -923,6 +930,26 @@ Encryption key for session secrets. Ensure that your key is at least 64 characte Encryption key for encrypted settings related stuff with GitLab. Ensure that your key is at least 64 characters long and that you don't lose it. **If you lose or change this secret, encrypted settings will not work and might cause errors in merge requests and so on** You can generate one using `pwgen -Bsv1 64`. No defaults. +##### `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY` + +The base key to non-deterministically-encrypt data for `ActiveRecord::Encryption` encrypted columns. It can be used to set value for `active_record_encryption_primary_key` in config/secrets.yml. +Ensure that your key is alphanumeric string. Preferred to be 32 characters long. +If you need to set multiple keys, set this parameter like `["thisisfirstprimarykey","thisissecondprimarykey"]` for example. In docker-compose.yml, you have to quote whole value. +No defaults. + +##### `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` + +The base key to deterministically-encrypt data for `ActiveRecord::Encryption` encrypted columns. It can be used to set value for `active_record_encryption_deterministic_key` in config/secrets.yml. +Ensure that your key is alphanumeric string. Preferred to be 32 characters long. +If you need to set multiple keys, set this parameter like `["thisisfirstprimarykey","thisissecondprimarykey"]` for example. In docker-compose.yml, you have to quote whole value. +No defaults. + +##### `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT` + +The derivation salt to encrypt data for ActiveRecord::Encryption encrypted columns. It can be used to set value for `active_record_encryption_key_derivation_salt` in config/secrets.yml. +Ensure that your key is alphanumeric string. Preferred to be 32 characters long. +No defaults. + ##### `GITLAB_TIMEZONE` Configure the timezone for the gitlab application. This configuration does not effect cron jobs. Defaults to `UTC`. See the list of [acceptable values](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html). For settings the container timezone which will affect cron, see variable `TZ` @@ -2771,6 +2798,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.0.0` you need to provide the `GITLAB_SECRETS_DB_KEY_BASE` parameter while starting the image. > **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. > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. +> **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml` and result to unusable stage of some features such as dependency proxy. ```bash docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.0.2 diff --git a/assets/runtime/config/gitlabhq/secrets.yml b/assets/runtime/config/gitlabhq/secrets.yml index eae882dca..0bcdde2b9 100644 --- a/assets/runtime/config/gitlabhq/secrets.yml +++ b/assets/runtime/config/gitlabhq/secrets.yml @@ -7,6 +7,9 @@ production: secret_key_base: {{GITLAB_SECRETS_SECRET_KEY_BASE}} otp_key_base: {{GITLAB_SECRETS_OTP_KEY_BASE}} encrypted_settings_key_base: {{GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE}} + active_record_encryption_primary_key: {{GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY}} + active_record_encryption_deterministic_key: {{GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY}} + active_record_encryption_key_derivation_salt: {{GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT}} development: db_key_base: development diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 14e0ccc16..97d9c18fc 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -251,10 +251,15 @@ GITLAB_UPLOADS_OBJECT_STORE_CONNECTION_GOOGLE_JSON_KEY_LOCATION=${GITLAB_UPLOADS GITLAB_MATTERMOST_ENABLED=${GITLAB_MATTERMOST_ENABLED:-false} GITLAB_MATTERMOST_URL=${GITLAB_MATTERMOST_URL:-https://mattermost.example.com} +# secrets GITLAB_SECRETS_DB_KEY_BASE=${GITLAB_SECRETS_DB_KEY_BASE:-} GITLAB_SECRETS_SECRET_KEY_BASE=${GITLAB_SECRETS_SECRET_KEY_BASE:-} GITLAB_SECRETS_OTP_KEY_BASE=${GITLAB_SECRETS_OTP_KEY_BASE:-} GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=${GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE:-} +GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=${GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY:-} +GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=${GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY:-} +GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=${GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT:-} + GITLAB_NOTIFY_ON_BROKEN_BUILDS=${GITLAB_NOTIFY_ON_BROKEN_BUILDS:-true} GITLAB_NOTIFY_PUSHER=${GITLAB_NOTIFY_PUSHER:-false} diff --git a/assets/runtime/functions b/assets/runtime/functions index de90c30a2..20bb8ca7f 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -888,7 +888,10 @@ gitlab_configure_secrets() { GITLAB_SECRETS_DB_KEY_BASE \ GITLAB_SECRETS_SECRET_KEY_BASE \ GITLAB_SECRETS_OTP_KEY_BASE \ - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE + GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE \ + GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY \ + GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY \ + GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT local shell_secret="${GITLAB_INSTALL_DIR}/.gitlab_shell_secret" if [[ ! -f "${shell_secret}" ]]; then diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index f9bc27e0a..f1a618a83 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -60,6 +60,9 @@ services: - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string + - GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=["long-and-random-alphanumeric-string"] + - GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alphanumeric-string"] + - GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alphanumeric-string - GITLAB_ROOT_PASSWORD= - GITLAB_ROOT_EMAIL= diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 422bcfd76..b3089a40c 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -123,6 +123,9 @@ services: - GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alphanumeric-string - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string - GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alphanumeric-string + - GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=["long-and-random-alphanumeric-string"] + - GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alphanumeric-string"] + - GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alphanumeric-string - GITLAB_ROOT_PASSWORD= - GITLAB_ROOT_EMAIL= diff --git a/docker-compose.yml b/docker-compose.yml index 6383371ab..4fca22b9c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -62,6 +62,9 @@ services: - 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_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=["long-and-random-alphanumeric-string"] + - GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alphanumeric-string"] + - GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alphanumeric-string - GITLAB_ROOT_PASSWORD= - GITLAB_ROOT_EMAIL= diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index be10cd2c9..24b759e82 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -29,6 +29,12 @@ spec: value: long-and-random-alpha-numeric-string - name: GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE value: long-and-random-alpha-numeric-string + - name: GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY + value: '[long-and-random-alpha-numeric-string]' + - name: GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY + value: '[long-and-random-alpha-numeric-string]' + - name: GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT + value: long-and-random-alpha-numeric-string - name: GITLAB_ROOT_PASSWORD value: From 822a21e5e4a071a19d9bdfb27d749a956c0fe6fe Mon Sep 17 00:00:00 2001 From: Joerg Stoever Date: Thu, 12 Jun 2025 15:15:21 +0200 Subject: [PATCH 495/522] Some minor fixes to spelling and formatting --- README.md | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 97a2b91af..3b16951f8 100644 --- a/README.md +++ b/README.md @@ -159,7 +159,13 @@ Generate random strings that are at least `64` characters long for each of `GITL > **Tip**: You can generate a random string using `pwgen -Bsv1 64` and assign it as the value of `GITLAB_SECRETS_DB_KEY_BASE`. -Also generate random strings that are typically `32` characters long for each of `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`, `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. These values are used for `ActiveRecord::Encryption` encrypted columns. +Also generate random strings that are typically `32` characters long for each of: + +- `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY` +- `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` +- `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT` + +These values are used for `ActiveRecord::Encryption` encrypted columns. Details can be found under [Active Record Encryption](https://guides.rubyonrails.org/active_record_encryption.html). Start GitLab using: @@ -190,8 +196,6 @@ docker run --name gitlab-redis -d \ Step 3. Launch the gitlab container -TODO: fix and verify command line option to set newly created keys (especially primary_key and deterministic_key : they must be an array) - ```bash docker run --name gitlab -d \ --link gitlab-postgresql:postgresql --link gitlab-redis:redisio \ @@ -201,8 +205,8 @@ 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' \ --env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \ - --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=long-and-random-alpha-numeric-string' \ - --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=long-and-random-alpha-numeric-string' \ + --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=["long-and-random-alpha-numeric-string"]' \ + --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ sameersbn/gitlab:18.0.2 @@ -932,23 +936,15 @@ Encryption key for session secrets. Ensure that your key is at least 64 characte ##### `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY` -The base key to non-deterministically-encrypt data for `ActiveRecord::Encryption` encrypted columns. It can be used to set value for `active_record_encryption_primary_key` in config/secrets.yml. -Ensure that your key is alphanumeric string. Preferred to be 32 characters long. -If you need to set multiple keys, set this parameter like `["thisisfirstprimarykey","thisissecondprimarykey"]` for example. In docker-compose.yml, you have to quote whole value. -No defaults. +The base key used to encrypt data for non-deterministic `ActiveRecord::Encryption` encrypted columns. This value is used to set `active_record_encryption_primary_key` in `config/secrets.yml`. Ensure that your key is an alphanumeric string. Preferred to be 32 characters long. If you need to set multiple keys, set this parameter in the format `["first_primary_key","second_primary_key"]`. In `docker-compose.yml`, the value must NOT have additional quotes! **If you lose or change this secret, encrypted settings will not work and might cause errors in the API and the web interface.** No defaults. ##### `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` -The base key to deterministically-encrypt data for `ActiveRecord::Encryption` encrypted columns. It can be used to set value for `active_record_encryption_deterministic_key` in config/secrets.yml. -Ensure that your key is alphanumeric string. Preferred to be 32 characters long. -If you need to set multiple keys, set this parameter like `["thisisfirstprimarykey","thisissecondprimarykey"]` for example. In docker-compose.yml, you have to quote whole value. -No defaults. +The base key used to encrypt data for deterministic `ActiveRecord::Encryption` encrypted columns. This value is used to set `active_record_encryption_deterministic_key` in `config/secrets.yml`. Ensure that your key is an alphanumeric string. Preferred to be 32 characters long. If you need to set multiple keys, set this parameter in the format `["first_deterministic_key","second_deterministic_key"]`. In `docker-compose.yml`, the value must NOT have additional quotes! **If you lose or change this secret, encrypted settings will not work and might cause errors in the API and the web interface.** No defaults. ##### `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT` -The derivation salt to encrypt data for ActiveRecord::Encryption encrypted columns. It can be used to set value for `active_record_encryption_key_derivation_salt` in config/secrets.yml. -Ensure that your key is alphanumeric string. Preferred to be 32 characters long. -No defaults. +The salt used to encrypt data for `ActiveRecord::Encryption` encrypted columns. This value is used to set `active_record_encryption_key_derivation_salt` in `config/secrets.yml`. Ensure that your salt is an alphanumeric string. Preferred to be 32 characters long. **If you lose or change this secret, encrypted settings will not work and might cause errors in the API and the web interface.** No defaults. ##### `GITLAB_TIMEZONE` @@ -2796,9 +2792,12 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are - **Step 4**: Start the image > **Note**: Since GitLab `8.0.0` you need to provide the `GITLAB_SECRETS_DB_KEY_BASE` parameter while starting the image. + > **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. + > **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`. -> **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml` and result to unusable stage of some features such as dependency proxy. + +> **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.** ```bash docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.0.2 From e910e3024c376872ffdb8f115d970c78a642120d Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Thu, 16 Jan 2025 17:51:35 +0900 Subject: [PATCH 496/522] Stop recompiling assets to enable relative url As a result, an Internet connection is no longer required to use relative URLs. To enable relative url, we execute `gitlab:assets:compile`. This have been removed in official documentation in v10.0.0 (first committed to gitlab-foss, then ported to gitlab(-ee)) - EE: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1139/ - CE: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/8831 An internet connection was required when enabling relative urls to install the node modules required for compilation. I reviewed the rake task `gitlab:assets:compile` and investigated whether it was necessary to compile all assets just because the relative url changed, and found that this rake task is internally a separate rake task `gitlab:assets :fix_urls` which rewrite the reference URL in the css. I removed rake task `gitlab:assets:compile` at runtime and confirmed that the gitlab application worked normally as before. I have confirmed that at least the following functions work properly. - Administrator password reset at first login - Create empty project - Edit/add and commit files using web IDE - Create merge request/issue - Attach files to comments - Create empty group - Move existing project to group In addition, we no longer need to do following things - persist node_modules, recompiled assets and caches - apply patches to gitlab itself to avoid removing (symlink to) node_modules/ This change also reduces startup time in certain cases when the relative URL feature is enabled (when assets are compiled; for example, when performing a version upgrade or changing the relative URL) (on my environment, `gitlab:assets:fix_urls` took about 20 seconds) --- Dockerfile | 2 +- ...avoid-removing-node_modules_dir.patch.bak} | 0 ...-raketask-gitlab-assets-compile.patch.bak} | 0 assets/runtime/functions | 32 ------------------- 4 files changed, 1 insertion(+), 33 deletions(-) rename assets/build/patches/gitlabhq/{0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch => 0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch.bak} (100%) rename assets/build/patches/gitlabhq/{0004-fix-raketask-gitlab-assets-compile.patch => 0004-fix-raketask-gitlab-assets-compile.patch.bak} (100%) diff --git a/Dockerfile b/Dockerfile index ebf602577..db9a17ff9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -84,7 +84,7 @@ LABEL \ EXPOSE 22/tcp 80/tcp 443/tcp -VOLUME ["${GITLAB_DATA_DIR}", "${GITLAB_LOG_DIR}","${GITLAB_HOME}/gitlab/node_modules"] +VOLUME ["${GITLAB_DATA_DIR}", "${GITLAB_LOG_DIR}"] WORKDIR ${GITLAB_INSTALL_DIR} ENTRYPOINT ["/sbin/entrypoint.sh"] CMD ["app:start"] diff --git a/assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch b/assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch.bak similarity index 100% rename from assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch rename to assets/build/patches/gitlabhq/0003-fix_preinstall.mjs-to-avoid-removing-node_modules_dir.patch.bak diff --git a/assets/build/patches/gitlabhq/0004-fix-raketask-gitlab-assets-compile.patch b/assets/build/patches/gitlabhq/0004-fix-raketask-gitlab-assets-compile.patch.bak similarity index 100% rename from assets/build/patches/gitlabhq/0004-fix-raketask-gitlab-assets-compile.patch rename to assets/build/patches/gitlabhq/0004-fix-raketask-gitlab-assets-compile.patch.bak diff --git a/assets/runtime/functions b/assets/runtime/functions index de90c30a2..31da143cb 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -1756,25 +1756,6 @@ initialize_datadir() { chmod 700 ${GITLAB_DATA_DIR}/.ssh chmod 600 ${GITLAB_DATA_DIR}/.ssh/authorized_keys chown -R ${GITLAB_USER}: ${GITLAB_DATA_DIR}/.ssh - - # recompile and persist assets when relative_url is in use - if [[ -n ${GITLAB_RELATIVE_URL_ROOT} ]]; then - mkdir -p ${GITLAB_TEMP_DIR}/cache - chmod 755 ${GITLAB_TEMP_DIR}/cache - chown ${GITLAB_USER}: ${GITLAB_TEMP_DIR}/cache - - mkdir -p ${GITLAB_TEMP_DIR}/assets - chmod 755 ${GITLAB_TEMP_DIR}/assets - chown ${GITLAB_USER}: ${GITLAB_TEMP_DIR}/assets - - # symlink ${GITLAB_INSTALL_DIR}/tmp/cache -> ${GITLAB_TEMP_DIR}/cache - rm -rf ${GITLAB_INSTALL_DIR}/tmp/cache - exec_as_git ln -s ${GITLAB_TEMP_DIR}/cache ${GITLAB_INSTALL_DIR}/tmp/cache - - # symlink ${GITLAB_INSTALL_DIR}/public/assets -> ${GITLAB_TEMP_DIR}/assets - rm -rf ${GITLAB_INSTALL_DIR}/public/assets - exec_as_git ln -s ${GITLAB_TEMP_DIR}/assets ${GITLAB_INSTALL_DIR}/public/assets - fi } sanitize_datadir() { @@ -2250,19 +2231,6 @@ migrate_database() { # clear cache if relative_url has changed. [[ -f ${GITLAB_TEMP_DIR}/GITLAB_RELATIVE_URL_ROOT ]] && CACHE_GITLAB_RELATIVE_URL_ROOT=$(cat ${GITLAB_TEMP_DIR}/GITLAB_RELATIVE_URL_ROOT) if [[ ! -f ${GITLAB_TEMP_DIR}/GITLAB_RELATIVE_URL_ROOT || ${GITLAB_RELATIVE_URL_ROOT} != ${CACHE_GITLAB_RELATIVE_URL_ROOT} ]]; then - # assets need to be recompiled when GITLAB_RELATIVE_URL_ROOT is used - if [[ -n ${GITLAB_RELATIVE_URL_ROOT} ]]; then - if [[ ! -d ${GITLAB_HOME}/gitlab/node_modules ]]; then - mkdir -p ${GITLAB_HOME}/gitlab/node_modules - chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules - fi - echo "Prepare recompile assets... Installing missing node_modules for assets" - chown -R ${GITLAB_USER}: ${GITLAB_HOME}/gitlab/node_modules - exec_as_git yarn install --production --pure-lockfile - echo "Recompiling assets (relative_url in use), this could take a while..." - exec_as_git bundle exec rake gitlab:assets:compile NODE_OPTIONS="--max-old-space-size=8192" >/dev/null 2>&1 - fi - echo "Clearing cache..." exec_as_git bundle exec rake cache:clear >/dev/null 2>&1 echo "${GITLAB_RELATIVE_URL_ROOT}" > ${GITLAB_TEMP_DIR}/GITLAB_RELATIVE_URL_ROOT From c742614eef9aea35f84070a6fadd9a62661d0b0f Mon Sep 17 00:00:00 2001 From: ysicing Date: Wed, 18 Jun 2025 17:24:45 +0800 Subject: [PATCH 497/522] feat: Add support for Omniauth JWT login --- README.md | 22 ++++++++++++++++++++++ assets/runtime/config/gitlabhq/gitlab.yml | 13 +++++++++++-- assets/runtime/env-defaults | 11 +++++++++++ assets/runtime/functions | 23 ++++++++++++++++++++++- 4 files changed, 66 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0480e3d75..d025f7515 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,7 @@ - [Microsoft Azure](#microsoft-azure) - [Generic OAuth2](#Generic-OAuth2) - [OpenID Connect](#openid-connect) + - [JWT](#jwt) - [Gitlab Pages](#gitlab-pages) - [External Issue Trackers](#external-issue-trackers) - [Host UID / GID Mapping](#host-uid--gid-mapping) @@ -756,6 +757,27 @@ To use OIDC set at least `OAUTH_OIDC_ISSUER` and `OAUTH_OIDC_CLIENT_ID`. See [GitLab OIDC documentation](https://docs.gitlab.com/ee/administration/auth/oidc.html) and [OmniAuth OpenID Connect documentation](https://github.com/omniauth/omniauth_openid_connect/). +##### JWT + +To enable the JWT OmniAuth provider, you must register your application with JWT. JWT provides you with a secret key for you to use. + +To use JWT set at least `OAUTH_JWT_SECRET` and `OAUTH_JWT_AUTH_URL`. + +| GitLab setting | environment variable | default value | +| ------------------------------ | ----------------------------------- | -------------------------------| +| `label` | `OAUTH_JWT_LABEL` | `Jwt` | +| `secret` | `OAUTH_JWT_SECRET` | | +| `algorithm` | `OAUTH_JWT_ALGORITHM` | `HS256` | +| `uid_claim` | `OAUTH_JWT_UID_CLAIM` | `email` | +| `required_claims` | `OAUTH_JWT_REQUIRED_CLAIMS` | `["name", "email"]` | +| `info_map.name` | `OAUTH_JWT_INFO_MAP_NAME` | `name` | +| `info_map.email` | `OAUTH_JWT_INFO_MAP_EMAIL` | `email` | +| `auth_url` | `OAUTH_JWT_AUTH_URL` | | +| `valid_within` | `OAUTH_JWT_VALID_WITHIN` | `3600` | + + +See [OmniAuth JWT documentation](https://docs.gitlab.com/administration/auth/jwt/). + #### Gitlab Pages Gitlab Pages allows a user to host static websites from a project. Gitlab pages can be enabled with setting the environment variable `GITLAB_PAGES_ENABLED` to `true`. diff --git a/assets/runtime/config/gitlabhq/gitlab.yml b/assets/runtime/config/gitlabhq/gitlab.yml index f828dd6f5..9d562de66 100644 --- a/assets/runtime/config/gitlabhq/gitlab.yml +++ b/assets/runtime/config/gitlabhq/gitlab.yml @@ -937,7 +937,7 @@ production: &base login_url: '{{OAUTH_CAS3_LOGIN_URL}}', service_validate_url: '{{OAUTH_CAS3_VALIDATE_URL}}', logout_url: '{{OAUTH_CAS3_LOGOUT_URL}}'} } - - { name: 'authentiq', + - { name: 'authentiq', app_id: '{{OAUTH_AUTHENTIQ_CLIENT_ID}}', app_secret: 'OAUTH_AUTHENTIQ_CLIENT_SECRET', args: { scope: {{OAUTH_AUTHENTIQ_SCOPE}}, redirect_uri: '{{OAUTH_AUTHENTIQ_REDIRECT_URI}}' } } @@ -1048,7 +1048,16 @@ production: &base identifier: '{{OAUTH_OIDC_CLIENT_ID}}', secret: '{{OAUTH_OIDC_CLIENT_SECRET}}', redirect_uri: '{{OAUTH_OIDC_REDIRECT_URI}}' } } } - + - { name: 'jwt', + label: '{{OAUTH_JWT_LABEL}}', + args: { + secret: '{{OAUTH_JWT_SECRET}}', + algorithm: '{{OAUTH_JWT_ALGORITHM}}', + uid_claim: '{{OAUTH_JWT_UID_CLAIM}}', + required_claims: {{OAUTH_JWT_REQUIRED_CLAIMS}}, + info_map: { name: '{{OAUTH_JWT_INFO_MAP_NAME}}', email: '{{OAUTH_JWT_INFO_MAP_EMAIL}}' }, + auth_url: '{{OAUTH_JWT_AUTH_URL}}', + valid_within: {{OAUTH_JWT_VALID_WITHIN}} } } # SSO maximum session duration in seconds. Defaults to CAS default of 8 hours. # cas3: # session_duration: 28800 diff --git a/assets/runtime/env-defaults b/assets/runtime/env-defaults index 14e0ccc16..c2f62ba9c 100644 --- a/assets/runtime/env-defaults +++ b/assets/runtime/env-defaults @@ -559,6 +559,17 @@ case $GITLAB_HTTPS in ;; esac +### JWT +OAUTH_JWT_LABEL=${OAUTH_JWT_LABEL:-'Jwt'} +OAUTH_JWT_SECRET=${OAUTH_JWT_SECRET:-} +OAUTH_JWT_ALGORITHM=${OAUTH_JWT_ALGORITHM:-'HS256'} +OAUTH_JWT_UID_CLAIM=${OAUTH_JWT_UID_CLAIM:-'email'} +OAUTH_JWT_REQUIRED_CLAIMS=${OAUTH_JWT_REQUIRED_CLAIMS:-'["name", "email"]'} +OAUTH_JWT_INFO_MAP_NAME=${OAUTH_JWT_INFO_MAP_NAME:-'name'} +OAUTH_JWT_INFO_MAP_EMAIL=${OAUTH_JWT_INFO_MAP_EMAIL:-'email'} +OAUTH_JWT_AUTH_URL=${OAUTH_JWT_AUTH_URL:-} +OAUTH_JWT_VALID_WITHIN=${OAUTH_JWT_VALID_WITHIN:-3600} + ## ANALYTICS ### GOOGLE diff --git a/assets/runtime/functions b/assets/runtime/functions index de90c30a2..f65f7789d 100644 --- a/assets/runtime/functions +++ b/assets/runtime/functions @@ -821,6 +821,26 @@ gitlab_configure_oauth_oidc() { fi } +gitlab_configure_oauth_jwt() { + if [[ -n ${OAUTH_JWT_SECRET} && \ + -n ${OAUTH_JWT_AUTH_URL} ]]; then + echo "Configuring gitlab::oauth::jwt..." + OAUTH_ENABLED=${OAUTH_ENABLED:-true} + update_template ${GITLAB_CONFIG} \ + OAUTH_JWT_LABEL \ + OAUTH_JWT_SECRET \ + OAUTH_JWT_ALGORITHM \ + OAUTH_JWT_UID_CLAIM \ + OAUTH_JWT_REQUIRED_CLAIMS \ + OAUTH_JWT_INFO_MAP_NAME \ + OAUTH_JWT_INFO_MAP_EMAIL \ + OAUTH_JWT_AUTH_URL \ + OAUTH_JWT_VALID_WITHIN + else + exec_as_git sed -i "/name: 'jwt'/,/{{OAUTH_JWT_VALID_WITHIN}}/d" ${GITLAB_CONFIG} + fi +} + gitlab_configure_oauth() { echo "Configuring gitlab::oauth..." @@ -839,6 +859,7 @@ gitlab_configure_oauth() { gitlab_configure_oauth_azure gitlab_configure_oauth_azure_ad_v2 gitlab_configure_oauth_oidc + gitlab_configure_oauth_jwt OAUTH_ENABLED=${OAUTH_ENABLED:-false} update_template ${GITLAB_CONFIG} \ @@ -852,7 +873,7 @@ gitlab_configure_oauth() { OAUTH_ALLOW_BYPASS_TWO_FACTOR case ${OAUTH_AUTO_SIGN_IN_WITH_PROVIDER} in - cas3|google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd|azure_oauth2|azure_activedirectory_v2|oauth2_generic|$OAUTH2_GENERIC_NAME|oidc) + cas3|google_oauth2|facebook|twitter|github|gitlab|bitbucket|saml|crowd|azure_oauth2|azure_activedirectory_v2|oauth2_generic|$OAUTH2_GENERIC_NAME|oidc|jwt) update_template ${GITLAB_CONFIG} OAUTH_AUTO_SIGN_IN_WITH_PROVIDER ;; *) From e9575e47e8c4b696a945cfca6c4da53b53939e32 Mon Sep 17 00:00:00 2001 From: mixxtor <113852548+mixxtor@users.noreply.github.com> Date: Thu, 19 Jun 2025 12:14:55 +0700 Subject: [PATCH 498/522] docs: Fix required PostgreSQL version for GitLab 18.0.0 (was 18.0.2) Updated the documentation to correctly reflect that GitLab 18.0.0 requires PostgreSQL 16.x, not 18.0.2 as previously stated. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8fed21b82..47e8f90c8 100644 --- a/README.md +++ b/README.md @@ -2732,7 +2732,7 @@ Usage when using `docker-compose` can also be found there. > - As of version 13.7.0, the required PostgreSQL version is 12.x. > - As of version 16.0.0, the required PostgreSQL version is 13.x. > - As of version 17.0.0, the required PostgreSQL version is 14.x. -> - As of version 18.0.2, the required PostgreSQL version is 16.x. +> - As of version 18.0.0, the required PostgreSQL version is 16.x. > > If you're using PostgreSQL image other than the above, please review section [Upgrading PostgreSQL](#upgrading-postgresql). From 82ba5b8c35a8c11d214cb1b56bc4ffc1d6ed3475 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 19 Jun 2025 20:02:01 +0200 Subject: [PATCH 499/522] Upgrade GitLab CE to 18.1.0 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 56 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 49 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index e4e54153b..3cd55bf95 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ 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. +## 18.1.0 + +- gitlab: upgrade CE to v18.1.0 +- gitaly: upgrade to v18.1.0 +- gitlab-pages: upgrade to v18.1.0 + ## 18.0.2 - gitlab: upgrade CE to v18.0.2 diff --git a/Dockerfile b/Dockerfile index db9a17ff9..9dc487a5f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:noble-20250529 -ARG VERSION=18.0.2 +ARG VERSION=18.1.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.8 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.6.9 \ GOLANG_VERSION=1.24.4 \ GITLAB_SHELL_VERSION=14.42.0 \ - GITLAB_PAGES_VERSION=18.0.2 \ - GITALY_SERVER_VERSION=18.0.2 \ + GITLAB_PAGES_VERSION=18.1.0 \ + GITALY_SERVER_VERSION=18.1.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index b3c62e602..0e6311e04 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:18.0.2 +# sameersbn/gitlab:18.1.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:18.0.2 +docker pull sameersbn/gitlab:18.1.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -210,7 +210,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:18.0.2 + sameersbn/gitlab:18.1.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -245,7 +245,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:18.0.2 + sameersbn/gitlab:18.1.0 ``` ### Database @@ -286,7 +286,7 @@ Please note furthermore, that only compatible versions of the `postgresql-client - GitLab CE version 13.7.0 and later requires PostgreSQL version 12.x. - GitLab CE version 16.0.0 and later requires PostgreSQL version 13.x. - GitLab CE version 17.0.0 and later requires PostgreSQL version 14.x. -- GitLab CE version 18.0.2 and later requires PostgreSQL version 16.x. +- GitLab CE version 18.1.0 and later requires PostgreSQL version 16.x. ##### External PostgreSQL Server @@ -310,7 +310,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:18.0.2 + sameersbn/gitlab:18.1.0 ``` ##### Linking to PostgreSQL Container @@ -354,7 +354,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:18.0.2 + sameersbn/gitlab:18.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: @@ -392,7 +392,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:18.0.2 + sameersbn/gitlab:18.1.0 ``` #### Linking to Redis Container @@ -419,7 +419,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:18.0.2 + sameersbn/gitlab:18.1.0 ``` #### Mail @@ -432,7 +432,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:18.0.2 + sameersbn/gitlab:18.1.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -452,7 +452,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:18.0.2 + sameersbn/gitlab:18.1.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -536,7 +536,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:18.0.2 + sameersbn/gitlab:18.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. @@ -552,7 +552,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:18.0.2 + sameersbn/gitlab:18.1.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -575,7 +575,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:18.0.2 + sameersbn/gitlab:18.1.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -623,7 +623,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:18.0.2 + sameersbn/gitlab:18.1.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -850,14 +850,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:18.0.2 + sameersbn/gitlab:18.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:18.0.2 app:sanitize + sameersbn/gitlab:18.1.0 app:sanitize ``` #### Piwik @@ -2612,7 +2612,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.2 app:rake gitlab:backup:create + sameersbn/gitlab:18.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. @@ -2647,14 +2647,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.2 app:rake db:setup + sameersbn/gitlab:18.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:18.0.2 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:18.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2712,7 +2712,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:18.0.2 app:rake gitlab:env:info + sameersbn/gitlab:18.1.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run rake tasks on running gitlab instance. For example, @@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.2 app:rake gitlab:import:repos + sameersbn/gitlab:18.1.0 app:rake gitlab:import:repos ``` Or @@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.2 app:rake gitlab:import:repos + sameersbn/gitlab:18.1.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:18.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:18.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:18.0.2 +docker pull sameersbn/gitlab:18.1.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.** ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.0.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.1.0 ``` ### Shell Access @@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com ```yml services: gitlab: - image: sameersbn/gitlab:18.0.2 + image: sameersbn/gitlab:18.1.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 3d5ab6e54..d4df1049f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.0.2 +18.1.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index f1a618a83..d2cef8f79 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.0.2 + image: sameersbn/gitlab:18.1.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index b3089a40c..683de5888 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -62,7 +62,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:18.0.2 + image: sameersbn/gitlab:18.1.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 4fca22b9c..6aae35f20 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.0.2 + image: sameersbn/gitlab:18.1.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 4dc45ab24..e42f35c23 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -291,7 +291,7 @@ Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.2 app:rake gitlab:backup:create + sameersbn/gitlab:18.1.0 app:rake gitlab:backup:create ``` ### Restoring Backups @@ -308,7 +308,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:18.0.2 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.0.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:18.1.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Upgrading from an existing GitLab installation @@ -327,7 +327,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:18.0.2 +docker pull sameersbn/gitlab:18.1.0 ``` - **Step 2**: Stop and remove the currently running image @@ -381,7 +381,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:18.0.2 +sameersbn/gitlab:18.1.0 ``` [storage-config]: https://docs.docker.com/registry/configuration/#storage diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index d2cecf6b6..693d8cc56 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.0.2 + image: sameersbn/gitlab:18.1.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index d56c880c5..f0e174a58 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.0.2 + image: sameersbn/gitlab:18.1.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 24b759e82..73ac4b9ec 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:18.0.2 + image: sameersbn/gitlab:18.1.0 env: - name: TZ value: Asia/Kolkata From a92ff33d2ea52e8c41b004e62918a2c193db6157 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 19 Jun 2025 21:08:10 +0200 Subject: [PATCH 500/522] docs: Fix required version for GitLab 18 with respect to PostgreSQL --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0e6311e04..9eb955b00 100644 --- a/README.md +++ b/README.md @@ -286,7 +286,7 @@ Please note furthermore, that only compatible versions of the `postgresql-client - GitLab CE version 13.7.0 and later requires PostgreSQL version 12.x. - GitLab CE version 16.0.0 and later requires PostgreSQL version 13.x. - GitLab CE version 17.0.0 and later requires PostgreSQL version 14.x. -- GitLab CE version 18.1.0 and later requires PostgreSQL version 16.x. +- GitLab CE version 18.0.0 and later requires PostgreSQL version 16.x. ##### External PostgreSQL Server From 1d6fff4af668563aa921f043fd00498fc92b726b Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 25 Jun 2025 19:15:57 +0200 Subject: [PATCH 501/522] Upgrade GitLab CE to 18.1.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 3cd55bf95..d7612768e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ 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. +## 18.1.1 + +- gitlab: upgrade CE to v18.1.1 +- gitaly: upgrade to v18.1.1 +- gitlab-pages: upgrade to v18.1.1 + ## 18.1.0 - gitlab: upgrade CE to v18.1.0 diff --git a/Dockerfile b/Dockerfile index 9dc487a5f..567f19739 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:noble-20250529 -ARG VERSION=18.1.0 +ARG VERSION=18.1.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.8 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.6.9 \ GOLANG_VERSION=1.24.4 \ GITLAB_SHELL_VERSION=14.42.0 \ - GITLAB_PAGES_VERSION=18.1.0 \ - GITALY_SERVER_VERSION=18.1.0 \ + GITLAB_PAGES_VERSION=18.1.1 \ + GITALY_SERVER_VERSION=18.1.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 9eb955b00..fab0df345 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:18.1.0 +# sameersbn/gitlab:18.1.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:18.1.0 +docker pull sameersbn/gitlab:18.1.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -210,7 +210,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:18.1.0 + sameersbn/gitlab:18.1.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -245,7 +245,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:18.1.0 + sameersbn/gitlab:18.1.1 ``` ### Database @@ -310,7 +310,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:18.1.0 + sameersbn/gitlab:18.1.1 ``` ##### Linking to PostgreSQL Container @@ -354,7 +354,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:18.1.0 + sameersbn/gitlab:18.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: @@ -392,7 +392,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:18.1.0 + sameersbn/gitlab:18.1.1 ``` #### Linking to Redis Container @@ -419,7 +419,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:18.1.0 + sameersbn/gitlab:18.1.1 ``` #### Mail @@ -432,7 +432,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:18.1.0 + sameersbn/gitlab:18.1.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -452,7 +452,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:18.1.0 + sameersbn/gitlab:18.1.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -536,7 +536,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:18.1.0 + sameersbn/gitlab:18.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. @@ -552,7 +552,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:18.1.0 + sameersbn/gitlab:18.1.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -575,7 +575,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:18.1.0 + sameersbn/gitlab:18.1.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -623,7 +623,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:18.1.0 + sameersbn/gitlab:18.1.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -850,14 +850,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:18.1.0 + sameersbn/gitlab:18.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:18.1.0 app:sanitize + sameersbn/gitlab:18.1.1 app:sanitize ``` #### Piwik @@ -2612,7 +2612,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.0 app:rake gitlab:backup:create + sameersbn/gitlab:18.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. @@ -2647,14 +2647,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.0 app:rake db:setup + sameersbn/gitlab:18.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:18.1.0 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:18.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2712,7 +2712,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:18.1.0 app:rake gitlab:env:info + sameersbn/gitlab:18.1.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run rake tasks on running gitlab instance. For example, @@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.0 app:rake gitlab:import:repos + sameersbn/gitlab:18.1.1 app:rake gitlab:import:repos ``` Or @@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.0 app:rake gitlab:import:repos + sameersbn/gitlab:18.1.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:18.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:18.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:18.1.0 +docker pull sameersbn/gitlab:18.1.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.** ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.1.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.1.1 ``` ### Shell Access @@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com ```yml services: gitlab: - image: sameersbn/gitlab:18.1.0 + image: sameersbn/gitlab:18.1.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index d4df1049f..e8b385790 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.1.0 +18.1.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index d2cef8f79..6027ee004 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.1.0 + image: sameersbn/gitlab:18.1.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 683de5888..06b0872eb 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -62,7 +62,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:18.1.0 + image: sameersbn/gitlab:18.1.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 6aae35f20..e13084aab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.1.0 + image: sameersbn/gitlab:18.1.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index e42f35c23..1af95a932 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -291,7 +291,7 @@ Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.0 app:rake gitlab:backup:create + sameersbn/gitlab:18.1.1 app:rake gitlab:backup:create ``` ### Restoring Backups @@ -308,7 +308,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:18.1.0 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:18.1.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Upgrading from an existing GitLab installation @@ -327,7 +327,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:18.1.0 +docker pull sameersbn/gitlab:18.1.1 ``` - **Step 2**: Stop and remove the currently running image @@ -381,7 +381,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:18.1.0 +sameersbn/gitlab:18.1.1 ``` [storage-config]: https://docs.docker.com/registry/configuration/#storage diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 693d8cc56..82e294b40 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.1.0 + image: sameersbn/gitlab:18.1.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index f0e174a58..f9cd0de7f 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.1.0 + image: sameersbn/gitlab:18.1.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 73ac4b9ec..f7fe88894 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:18.1.0 + image: sameersbn/gitlab:18.1.1 env: - name: TZ value: Asia/Kolkata From 92b639b1fa243cf8ad0f4fa1c2371ff04ceccabd Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 9 Jul 2025 19:00:10 +0300 Subject: [PATCH 502/522] Upgrade GitLab CE to 18.1.2 --- Changelog.md | 8 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index d7612768e..6dceffbbd 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,14 @@ 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. +## 18.1.2 + +- gitlab: upgrade CE to v18.1.2 +- gitaly: upgrade to v18.1.2 +- gitlab-pages: upgrade to v18.1.2 +- golang: upgrade to v1.24.5 +- ubuntu: upgrade to noble-20250619 + ## 18.1.1 - gitlab: upgrade CE to v18.1.1 diff --git a/Dockerfile b/Dockerfile index 567f19739..789fb6171 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM ubuntu:noble-20250529 +FROM ubuntu:noble-20250619 -ARG VERSION=18.1.1 +ARG VERSION=18.1.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.8 \ RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \ RUBYGEMS_VERSION=3.6.9 \ - GOLANG_VERSION=1.24.4 \ + GOLANG_VERSION=1.24.5 \ GITLAB_SHELL_VERSION=14.42.0 \ - GITLAB_PAGES_VERSION=18.1.1 \ - GITALY_SERVER_VERSION=18.1.1 \ + GITLAB_PAGES_VERSION=18.1.2 \ + GITALY_SERVER_VERSION=18.1.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index fab0df345..0837ca8a1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:18.1.1 +# sameersbn/gitlab:18.1.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:18.1.1 +docker pull sameersbn/gitlab:18.1.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -210,7 +210,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:18.1.1 + sameersbn/gitlab:18.1.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -245,7 +245,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:18.1.1 + sameersbn/gitlab:18.1.2 ``` ### Database @@ -310,7 +310,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:18.1.1 + sameersbn/gitlab:18.1.2 ``` ##### Linking to PostgreSQL Container @@ -354,7 +354,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:18.1.1 + sameersbn/gitlab:18.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: @@ -392,7 +392,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:18.1.1 + sameersbn/gitlab:18.1.2 ``` #### Linking to Redis Container @@ -419,7 +419,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:18.1.1 + sameersbn/gitlab:18.1.2 ``` #### Mail @@ -432,7 +432,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:18.1.1 + sameersbn/gitlab:18.1.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -452,7 +452,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:18.1.1 + sameersbn/gitlab:18.1.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -536,7 +536,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:18.1.1 + sameersbn/gitlab:18.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. @@ -552,7 +552,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:18.1.1 + sameersbn/gitlab:18.1.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -575,7 +575,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:18.1.1 + sameersbn/gitlab:18.1.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -623,7 +623,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:18.1.1 + sameersbn/gitlab:18.1.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -850,14 +850,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:18.1.1 + sameersbn/gitlab:18.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:18.1.1 app:sanitize + sameersbn/gitlab:18.1.2 app:sanitize ``` #### Piwik @@ -2612,7 +2612,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.1 app:rake gitlab:backup:create + sameersbn/gitlab:18.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. @@ -2647,14 +2647,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.1 app:rake db:setup + sameersbn/gitlab:18.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:18.1.1 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:18.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2712,7 +2712,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:18.1.1 app:rake gitlab:env:info + sameersbn/gitlab:18.1.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run rake tasks on running gitlab instance. For example, @@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.1 app:rake gitlab:import:repos + sameersbn/gitlab:18.1.2 app:rake gitlab:import:repos ``` Or @@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.1 app:rake gitlab:import:repos + sameersbn/gitlab:18.1.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:18.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:18.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:18.1.1 +docker pull sameersbn/gitlab:18.1.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.** ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.1.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.1.2 ``` ### Shell Access @@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com ```yml services: gitlab: - image: sameersbn/gitlab:18.1.1 + image: sameersbn/gitlab:18.1.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index e8b385790..4fa4aa5e7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.1.1 +18.1.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 6027ee004..0e61a0078 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.1.1 + image: sameersbn/gitlab:18.1.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 06b0872eb..451f72730 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -62,7 +62,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:18.1.1 + image: sameersbn/gitlab:18.1.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index e13084aab..91c957374 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.1.1 + image: sameersbn/gitlab:18.1.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 1af95a932..a254b8d81 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -291,7 +291,7 @@ Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.1 app:rake gitlab:backup:create + sameersbn/gitlab:18.1.2 app:rake gitlab:backup:create ``` ### Restoring Backups @@ -308,7 +308,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:18.1.1 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:18.1.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Upgrading from an existing GitLab installation @@ -327,7 +327,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:18.1.1 +docker pull sameersbn/gitlab:18.1.2 ``` - **Step 2**: Stop and remove the currently running image @@ -381,7 +381,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:18.1.1 +sameersbn/gitlab:18.1.2 ``` [storage-config]: https://docs.docker.com/registry/configuration/#storage diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 82e294b40..f412fd49c 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.1.1 + image: sameersbn/gitlab:18.1.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index f9cd0de7f..71f930b64 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.1.1 + image: sameersbn/gitlab:18.1.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index f7fe88894..1255e6b28 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:18.1.1 + image: sameersbn/gitlab:18.1.2 env: - name: TZ value: Asia/Kolkata From 7cd573737f514b280c129a3b86dd660524947162 Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Mon, 2 Dec 2024 20:03:51 +0900 Subject: [PATCH 503/522] Remove `bundle install` for gitlab-shell --- assets/build/install.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index c6829e834..27c5dafb2 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -125,9 +125,6 @@ cd ${GITLAB_SHELL_INSTALL_DIR} exec_as_git cp -a config.yml.example config.yml echo "Compiling gitlab-shell golang executables..." -exec_as_git bundle config set --local deployment 'true' -exec_as_git bundle config set --local with 'development test' -exec_as_git bundle install -j"$(nproc)" exec_as_git "PATH=$PATH" make verify setup # remove unused repositories directory created by gitlab-shell install From d3141c3dc3780cdafcfec460fcb1d7d5cb97041b Mon Sep 17 00:00:00 2001 From: Amin Vakil Date: Thu, 3 Jul 2025 15:46:23 +0330 Subject: [PATCH 504/522] Use ed25519 in expose-gitlab-ssh-port.sh --- contrib/expose-gitlab-ssh-port.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/expose-gitlab-ssh-port.sh b/contrib/expose-gitlab-ssh-port.sh index 51f5339ec..0211d27ea 100644 --- a/contrib/expose-gitlab-ssh-port.sh +++ b/contrib/expose-gitlab-ssh-port.sh @@ -10,15 +10,15 @@ if ! id -u git >> /dev/null 2>&1; then 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" +su git -c "if [ ! -f /home/git/.ssh/id_ed25519 ]; then ssh-keygen -t ed25519 -N \"\" -f /home/git/.ssh/id_ed25519; fi" +su git -c "if [ -f /home/git/.ssh/id_ed25519.pub ]; then mv /home/git/.ssh/id_ed25519.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: Fri, 18 Jul 2025 14:43:03 +0200 Subject: [PATCH 505/522] Upgrade GitLab CE to 18.2.0 --- Changelog.md | 9 +++++ Dockerfile | 12 +++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 54 insertions(+), 45 deletions(-) diff --git a/Changelog.md b/Changelog.md index 6dceffbbd..ad4a048ab 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,15 @@ 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. +## 18.2.0 + +- gitlab: upgrade CE to v18.2.0 +- gitaly: upgrade to v18.2.0 +- gitlab-pages: upgrade to v18.2.0 +- gitlab-shell: upgrade to v14.43.0 +- rubygems: upgrade to v3.7.0 +- ubuntu: upgrade to noble-20250714 + ## 18.1.2 - gitlab: upgrade CE to v18.1.2 diff --git a/Dockerfile b/Dockerfile index 789fb6171..8cbab9ea3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM ubuntu:noble-20250619 +FROM ubuntu:noble-20250714 -ARG VERSION=18.1.2 +ARG VERSION=18.2.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.8 \ RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \ - RUBYGEMS_VERSION=3.6.9 \ + RUBYGEMS_VERSION=3.7.0 \ GOLANG_VERSION=1.24.5 \ - GITLAB_SHELL_VERSION=14.42.0 \ - GITLAB_PAGES_VERSION=18.1.2 \ - GITALY_SERVER_VERSION=18.1.2 \ + GITLAB_SHELL_VERSION=14.43.0 \ + GITLAB_PAGES_VERSION=18.2.0 \ + GITALY_SERVER_VERSION=18.2.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 0837ca8a1..da355c109 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:18.1.2 +# sameersbn/gitlab:18.2.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:18.1.2 +docker pull sameersbn/gitlab:18.2.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -210,7 +210,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:18.1.2 + sameersbn/gitlab:18.2.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -245,7 +245,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:18.1.2 + sameersbn/gitlab:18.2.0 ``` ### Database @@ -310,7 +310,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:18.1.2 + sameersbn/gitlab:18.2.0 ``` ##### Linking to PostgreSQL Container @@ -354,7 +354,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:18.1.2 + sameersbn/gitlab:18.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: @@ -392,7 +392,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:18.1.2 + sameersbn/gitlab:18.2.0 ``` #### Linking to Redis Container @@ -419,7 +419,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:18.1.2 + sameersbn/gitlab:18.2.0 ``` #### Mail @@ -432,7 +432,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:18.1.2 + sameersbn/gitlab:18.2.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -452,7 +452,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:18.1.2 + sameersbn/gitlab:18.2.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -536,7 +536,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:18.1.2 + sameersbn/gitlab:18.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. @@ -552,7 +552,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:18.1.2 + sameersbn/gitlab:18.2.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -575,7 +575,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:18.1.2 + sameersbn/gitlab:18.2.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -623,7 +623,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:18.1.2 + sameersbn/gitlab:18.2.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -850,14 +850,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:18.1.2 + sameersbn/gitlab:18.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:18.1.2 app:sanitize + sameersbn/gitlab:18.2.0 app:sanitize ``` #### Piwik @@ -2612,7 +2612,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.2 app:rake gitlab:backup:create + sameersbn/gitlab:18.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. @@ -2647,14 +2647,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.2 app:rake db:setup + sameersbn/gitlab:18.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:18.1.2 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:18.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2712,7 +2712,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:18.1.2 app:rake gitlab:env:info + sameersbn/gitlab:18.2.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run rake tasks on running gitlab instance. For example, @@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.2 app:rake gitlab:import:repos + sameersbn/gitlab:18.2.0 app:rake gitlab:import:repos ``` Or @@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.2 app:rake gitlab:import:repos + sameersbn/gitlab:18.2.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:18.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:18.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:18.1.2 +docker pull sameersbn/gitlab:18.2.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.** ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.1.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.2.0 ``` ### Shell Access @@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com ```yml services: gitlab: - image: sameersbn/gitlab:18.1.2 + image: sameersbn/gitlab:18.2.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 4fa4aa5e7..08e3ca9b8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.1.2 +18.2.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 0e61a0078..06a41a689 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.1.2 + image: sameersbn/gitlab:18.2.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 451f72730..e86e18b45 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -62,7 +62,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:18.1.2 + image: sameersbn/gitlab:18.2.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 91c957374..5dc089736 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.1.2 + image: sameersbn/gitlab:18.2.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index a254b8d81..1e8b9d225 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -291,7 +291,7 @@ Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.2 app:rake gitlab:backup:create + sameersbn/gitlab:18.2.0 app:rake gitlab:backup:create ``` ### Restoring Backups @@ -308,7 +308,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:18.1.2 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.1.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:18.2.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Upgrading from an existing GitLab installation @@ -327,7 +327,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:18.1.2 +docker pull sameersbn/gitlab:18.2.0 ``` - **Step 2**: Stop and remove the currently running image @@ -381,7 +381,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:18.1.2 +sameersbn/gitlab:18.2.0 ``` [storage-config]: https://docs.docker.com/registry/configuration/#storage diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index f412fd49c..995443b85 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.1.2 + image: sameersbn/gitlab:18.2.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 71f930b64..c1f1f83d7 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.1.2 + image: sameersbn/gitlab:18.2.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 1255e6b28..7ef09f7f0 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:18.1.2 + image: sameersbn/gitlab:18.2.0 env: - name: TZ value: Asia/Kolkata From a336dcd3c2ee420d8d2086a2f5d8039f1e6fbcbf Mon Sep 17 00:00:00 2001 From: KIMURA Kazunori Date: Sat, 19 Jul 2025 00:42:42 +0900 Subject: [PATCH 506/522] CI: update executor for job `release` to go 1.24 from go 1.22 "go installl meterup/github-release" fails as dependency (kevinburke/rest@v0.0.0) requires go >= 1.23.0) --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b23690010..10cf0a50a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -277,7 +277,7 @@ jobs: release: executor: name: go/default - tag: '1.22' + tag: '1.24' steps: - checkout - run: From 2b91edb1e3918f3f169f3e7edf51cbf305658e0e Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 24 Jul 2025 15:52:10 +0200 Subject: [PATCH 507/522] Upgrade GitLab CE to 18.2.1 --- Changelog.md | 8 ++++ Dockerfile | 12 +++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 53 insertions(+), 45 deletions(-) diff --git a/Changelog.md b/Changelog.md index ad4a048ab..bedbe4951 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,14 @@ 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. +## 18.2.1 + +- gitlab: upgrade CE to v18.2.1 +- gitaly: upgrade to v18.2.1 +- gitlab-pages: upgrade to v18.2.1 +- ruby: upgrade to v3.2.9 +- rubygems: upgrade to v3.7.1 + ## 18.2.0 - gitlab: upgrade CE to v18.2.0 diff --git a/Dockerfile b/Dockerfile index 8cbab9ea3..7dabe7e52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ FROM ubuntu:noble-20250714 -ARG VERSION=18.2.0 +ARG VERSION=18.2.1 ENV GITLAB_VERSION=${VERSION} \ - RUBY_VERSION=3.2.8 \ - RUBY_SOURCE_SHA256SUM="77acdd8cfbbe1f8e573b5e6536e03c5103df989dc05fa68c70f011833c356075" \ - RUBYGEMS_VERSION=3.7.0 \ + RUBY_VERSION=3.2.9 \ + RUBY_SOURCE_SHA256SUM="abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a" \ + RUBYGEMS_VERSION=3.7.1 \ GOLANG_VERSION=1.24.5 \ GITLAB_SHELL_VERSION=14.43.0 \ - GITLAB_PAGES_VERSION=18.2.0 \ - GITALY_SERVER_VERSION=18.2.0 \ + GITLAB_PAGES_VERSION=18.2.1 \ + GITALY_SERVER_VERSION=18.2.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index da355c109..d889d1554 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:18.2.0 +# sameersbn/gitlab:18.2.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:18.2.0 +docker pull sameersbn/gitlab:18.2.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -210,7 +210,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:18.2.0 + sameersbn/gitlab:18.2.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -245,7 +245,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:18.2.0 + sameersbn/gitlab:18.2.1 ``` ### Database @@ -310,7 +310,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:18.2.0 + sameersbn/gitlab:18.2.1 ``` ##### Linking to PostgreSQL Container @@ -354,7 +354,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:18.2.0 + sameersbn/gitlab:18.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: @@ -392,7 +392,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:18.2.0 + sameersbn/gitlab:18.2.1 ``` #### Linking to Redis Container @@ -419,7 +419,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:18.2.0 + sameersbn/gitlab:18.2.1 ``` #### Mail @@ -432,7 +432,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:18.2.0 + sameersbn/gitlab:18.2.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -452,7 +452,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:18.2.0 + sameersbn/gitlab:18.2.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -536,7 +536,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:18.2.0 + sameersbn/gitlab:18.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. @@ -552,7 +552,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:18.2.0 + sameersbn/gitlab:18.2.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -575,7 +575,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:18.2.0 + sameersbn/gitlab:18.2.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -623,7 +623,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:18.2.0 + sameersbn/gitlab:18.2.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -850,14 +850,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:18.2.0 + sameersbn/gitlab:18.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:18.2.0 app:sanitize + sameersbn/gitlab:18.2.1 app:sanitize ``` #### Piwik @@ -2612,7 +2612,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.0 app:rake gitlab:backup:create + sameersbn/gitlab:18.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. @@ -2647,14 +2647,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.0 app:rake db:setup + sameersbn/gitlab:18.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:18.2.0 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:18.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2712,7 +2712,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:18.2.0 app:rake gitlab:env:info + sameersbn/gitlab:18.2.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run rake tasks on running gitlab instance. For example, @@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.0 app:rake gitlab:import:repos + sameersbn/gitlab:18.2.1 app:rake gitlab:import:repos ``` Or @@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.0 app:rake gitlab:import:repos + sameersbn/gitlab:18.2.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:18.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:18.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:18.2.0 +docker pull sameersbn/gitlab:18.2.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.** ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.2.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.2.1 ``` ### Shell Access @@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com ```yml services: gitlab: - image: sameersbn/gitlab:18.2.0 + image: sameersbn/gitlab:18.2.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 08e3ca9b8..c0aa6d4ae 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.2.0 +18.2.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 06a41a689..bf4aa1fcf 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.2.0 + image: sameersbn/gitlab:18.2.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index e86e18b45..8ddb4059d 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -62,7 +62,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:18.2.0 + image: sameersbn/gitlab:18.2.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 5dc089736..4393e4f58 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.2.0 + image: sameersbn/gitlab:18.2.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 1e8b9d225..7165b8682 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -291,7 +291,7 @@ Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.0 app:rake gitlab:backup:create + sameersbn/gitlab:18.2.1 app:rake gitlab:backup:create ``` ### Restoring Backups @@ -308,7 +308,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:18.2.0 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:18.2.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Upgrading from an existing GitLab installation @@ -327,7 +327,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:18.2.0 +docker pull sameersbn/gitlab:18.2.1 ``` - **Step 2**: Stop and remove the currently running image @@ -381,7 +381,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:18.2.0 +sameersbn/gitlab:18.2.1 ``` [storage-config]: https://docs.docker.com/registry/configuration/#storage diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 995443b85..aa51a621a 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.2.0 + image: sameersbn/gitlab:18.2.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index c1f1f83d7..c9d2c4cdc 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.2.0 + image: sameersbn/gitlab:18.2.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 7ef09f7f0..38ce03ac9 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:18.2.0 + image: sameersbn/gitlab:18.2.1 env: - name: TZ value: Asia/Kolkata From 3c41556690dc81d89396fcdcdc33aefbb3c5dcbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Br=C3=BCggemann?= Date: Thu, 14 Aug 2025 12:01:38 +0200 Subject: [PATCH 508/522] Upgrade GitLab CE to 18.2.2 --- Changelog.md | 7 +++++ Dockerfile | 8 ++--- README.md | 54 ++++++++++++++++---------------- VERSION | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 +++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 10 files changed, 49 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index bedbe4951..a5573048c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,13 @@ 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. +## 18.2.2 + +- gitlab: upgrade CE to v18.2.2 +- gitaly: upgrade to v18.2.2 +- gitlab-pages: upgrade to v18.2.2 +- ubuntu: upgrade to noble-20250716 + ## 18.2.1 - gitlab: upgrade CE to v18.2.1 diff --git a/Dockerfile b/Dockerfile index 7dabe7e52..cbfcd2854 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:noble-20250714 +FROM ubuntu:noble-20250716 -ARG VERSION=18.2.1 +ARG VERSION=18.2.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.9 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.7.1 \ GOLANG_VERSION=1.24.5 \ GITLAB_SHELL_VERSION=14.43.0 \ - GITLAB_PAGES_VERSION=18.2.1 \ - GITALY_SERVER_VERSION=18.2.1 \ + GITLAB_PAGES_VERSION=18.2.2 \ + GITALY_SERVER_VERSION=18.2.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index d889d1554..c88cfb854 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:18.2.1 +# sameersbn/gitlab:18.2.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:18.2.1 +docker pull sameersbn/gitlab:18.2.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -210,7 +210,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:18.2.1 + sameersbn/gitlab:18.2.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -245,7 +245,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:18.2.1 + sameersbn/gitlab:18.2.2 ``` ### Database @@ -310,7 +310,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:18.2.1 + sameersbn/gitlab:18.2.2 ``` ##### Linking to PostgreSQL Container @@ -354,7 +354,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:18.2.1 + sameersbn/gitlab:18.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: @@ -392,7 +392,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:18.2.1 + sameersbn/gitlab:18.2.2 ``` #### Linking to Redis Container @@ -419,7 +419,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:18.2.1 + sameersbn/gitlab:18.2.2 ``` #### Mail @@ -432,7 +432,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:18.2.1 + sameersbn/gitlab:18.2.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -452,7 +452,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:18.2.1 + sameersbn/gitlab:18.2.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -536,7 +536,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:18.2.1 + sameersbn/gitlab:18.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. @@ -552,7 +552,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:18.2.1 + sameersbn/gitlab:18.2.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -575,7 +575,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:18.2.1 + sameersbn/gitlab:18.2.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -623,7 +623,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:18.2.1 + sameersbn/gitlab:18.2.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -850,14 +850,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:18.2.1 + sameersbn/gitlab:18.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:18.2.1 app:sanitize + sameersbn/gitlab:18.2.2 app:sanitize ``` #### Piwik @@ -2612,7 +2612,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.1 app:rake gitlab:backup:create + sameersbn/gitlab:18.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. @@ -2647,14 +2647,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.1 app:rake db:setup + sameersbn/gitlab:18.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:18.2.1 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:18.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2712,7 +2712,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:18.2.1 app:rake gitlab:env:info + sameersbn/gitlab:18.2.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run rake tasks on running gitlab instance. For example, @@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.1 app:rake gitlab:import:repos + sameersbn/gitlab:18.2.2 app:rake gitlab:import:repos ``` Or @@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.1 app:rake gitlab:import:repos + sameersbn/gitlab:18.2.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:18.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:18.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:18.2.1 +docker pull sameersbn/gitlab:18.2.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.** ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.2.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.2.2 ``` ### Shell Access @@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com ```yml services: gitlab: - image: sameersbn/gitlab:18.2.1 + image: sameersbn/gitlab:18.2.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index c0aa6d4ae..60ea50e40 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.2.1 +18.2.2 diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 8ddb4059d..634ae485f 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -62,7 +62,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:18.2.1 + image: sameersbn/gitlab:18.2.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 4393e4f58..27f87fcd0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.2.1 + image: sameersbn/gitlab:18.2.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 7165b8682..d669bbab5 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -291,7 +291,7 @@ Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.1 app:rake gitlab:backup:create + sameersbn/gitlab:18.2.2 app:rake gitlab:backup:create ``` ### Restoring Backups @@ -308,7 +308,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:18.2.1 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:18.2.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Upgrading from an existing GitLab installation @@ -327,7 +327,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:18.2.1 +docker pull sameersbn/gitlab:18.2.2 ``` - **Step 2**: Stop and remove the currently running image @@ -381,7 +381,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:18.2.1 +sameersbn/gitlab:18.2.2 ``` [storage-config]: https://docs.docker.com/registry/configuration/#storage diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index aa51a621a..198cf4b76 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.2.1 + image: sameersbn/gitlab:18.2.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index c9d2c4cdc..99302d577 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.2.1 + image: sameersbn/gitlab:18.2.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 38ce03ac9..743e24941 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:18.2.1 + image: sameersbn/gitlab:18.2.2 env: - name: TZ value: Asia/Kolkata From de19dee870551a5f7c819374e5917a0bc81f684b Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 14 Aug 2025 21:08:52 +0200 Subject: [PATCH 509/522] Upgrade golang to v1.24.6 --- Changelog.md | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index a5573048c..dbdf2bc54 100644 --- a/Changelog.md +++ b/Changelog.md @@ -8,6 +8,7 @@ gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of chan - gitlab: upgrade CE to v18.2.2 - gitaly: upgrade to v18.2.2 - gitlab-pages: upgrade to v18.2.2 +- golang: upgrade to v1.24.6 - ubuntu: upgrade to noble-20250716 ## 18.2.1 diff --git a/Dockerfile b/Dockerfile index cbfcd2854..bb3c1c948 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.9 \ RUBY_SOURCE_SHA256SUM="abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a" \ RUBYGEMS_VERSION=3.7.1 \ - GOLANG_VERSION=1.24.5 \ + GOLANG_VERSION=1.24.6 \ GITLAB_SHELL_VERSION=14.43.0 \ GITLAB_PAGES_VERSION=18.2.2 \ GITALY_SERVER_VERSION=18.2.2 \ From 272c868879cad1a487798369fbd4c91cd46c600b Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 14 Aug 2025 21:09:23 +0200 Subject: [PATCH 510/522] Upgrade used image version for docker compose microservice --- contrib/docker-swarm/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index bf4aa1fcf..9aa3e37ac 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.2.1 + image: sameersbn/gitlab:18.2.2 depends_on: - redis - postgresql From bcd81ae1fbcefd28438423872549fb681f337038 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 20 Aug 2025 04:51:10 +0200 Subject: [PATCH 511/522] Upgrade GitLab CE to 18.2.4 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index dbdf2bc54..38474fa4f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,13 @@ 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. +## 18.2.4 + +- gitlab: upgrade CE to v18.2.4 +- gitaly: upgrade to v18.2.4 +- gitlab-pages: upgrade to v18.2.4 +- gitlab-shell: upgrade to v14.44.0 + ## 18.2.2 - gitlab: upgrade CE to v18.2.2 diff --git a/Dockerfile b/Dockerfile index bb3c1c948..bd1b0a69f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ FROM ubuntu:noble-20250716 -ARG VERSION=18.2.2 +ARG VERSION=18.2.4 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.9 \ RUBY_SOURCE_SHA256SUM="abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a" \ RUBYGEMS_VERSION=3.7.1 \ GOLANG_VERSION=1.24.6 \ - GITLAB_SHELL_VERSION=14.43.0 \ - GITLAB_PAGES_VERSION=18.2.2 \ - GITALY_SERVER_VERSION=18.2.2 \ + GITLAB_SHELL_VERSION=14.44.0 \ + GITLAB_PAGES_VERSION=18.2.4 \ + GITALY_SERVER_VERSION=18.2.4 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index c88cfb854..b0ead1c3c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:18.2.2 +# sameersbn/gitlab:18.2.4 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:18.2.2 +docker pull sameersbn/gitlab:18.2.4 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -210,7 +210,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:18.2.2 + sameersbn/gitlab:18.2.4 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -245,7 +245,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:18.2.2 + sameersbn/gitlab:18.2.4 ``` ### Database @@ -310,7 +310,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:18.2.2 + sameersbn/gitlab:18.2.4 ``` ##### Linking to PostgreSQL Container @@ -354,7 +354,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:18.2.2 + sameersbn/gitlab:18.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: @@ -392,7 +392,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:18.2.2 + sameersbn/gitlab:18.2.4 ``` #### Linking to Redis Container @@ -419,7 +419,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:18.2.2 + sameersbn/gitlab:18.2.4 ``` #### Mail @@ -432,7 +432,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:18.2.2 + sameersbn/gitlab:18.2.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -452,7 +452,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:18.2.2 + sameersbn/gitlab:18.2.4 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -536,7 +536,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:18.2.2 + sameersbn/gitlab:18.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. @@ -552,7 +552,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:18.2.2 + sameersbn/gitlab:18.2.4 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -575,7 +575,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:18.2.2 + sameersbn/gitlab:18.2.4 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -623,7 +623,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:18.2.2 + sameersbn/gitlab:18.2.4 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -850,14 +850,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:18.2.2 + sameersbn/gitlab:18.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:18.2.2 app:sanitize + sameersbn/gitlab:18.2.4 app:sanitize ``` #### Piwik @@ -2612,7 +2612,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.2 app:rake gitlab:backup:create + sameersbn/gitlab:18.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. @@ -2647,14 +2647,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.2 app:rake db:setup + sameersbn/gitlab:18.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:18.2.2 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:18.2.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2712,7 +2712,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:18.2.2 app:rake gitlab:env:info + sameersbn/gitlab:18.2.4 app:rake gitlab:env:info ``` You can also use `docker exec` to run rake tasks on running gitlab instance. For example, @@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.2 app:rake gitlab:import:repos + sameersbn/gitlab:18.2.4 app:rake gitlab:import:repos ``` Or @@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.2 app:rake gitlab:import:repos + sameersbn/gitlab:18.2.4 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:18.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:18.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:18.2.2 +docker pull sameersbn/gitlab:18.2.4 ``` - **Step 2**: Stop and remove the currently running image @@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.** ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.2.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.2.4 ``` ### Shell Access @@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com ```yml services: gitlab: - image: sameersbn/gitlab:18.2.2 + image: sameersbn/gitlab:18.2.4 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 60ea50e40..93d4fc0a5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.2.2 +18.2.4 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 9aa3e37ac..aa0e6baea 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.2.2 + image: sameersbn/gitlab:18.2.4 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 634ae485f..4e930607f 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -62,7 +62,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:18.2.2 + image: sameersbn/gitlab:18.2.4 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 27f87fcd0..ea129ce85 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.2.2 + image: sameersbn/gitlab:18.2.4 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index d669bbab5..c73bd58e5 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -291,7 +291,7 @@ Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.2 app:rake gitlab:backup:create + sameersbn/gitlab:18.2.4 app:rake gitlab:backup:create ``` ### Restoring Backups @@ -308,7 +308,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:18.2.2 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:18.2.4 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Upgrading from an existing GitLab installation @@ -327,7 +327,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:18.2.2 +docker pull sameersbn/gitlab:18.2.4 ``` - **Step 2**: Stop and remove the currently running image @@ -381,7 +381,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:18.2.2 +sameersbn/gitlab:18.2.4 ``` [storage-config]: https://docs.docker.com/registry/configuration/#storage diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 198cf4b76..ee520f29b 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.2.2 + image: sameersbn/gitlab:18.2.4 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 99302d577..54c56f49e 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.2.2 + image: sameersbn/gitlab:18.2.4 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 743e24941..de4e40a28 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:18.2.2 + image: sameersbn/gitlab:18.2.4 env: - name: TZ value: Asia/Kolkata From 9ed7f75eaa49e34723c17c5e6c1335a8fba5f003 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 22 Aug 2025 00:36:07 +0200 Subject: [PATCH 512/522] Upgrade GitLab CE to 18.3.0 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 38474fa4f..8ba2422d5 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ 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. +## 18.3.0 + +- gitlab: upgrade CE to v18.3.0 +- gitaly: upgrade to v18.3.0 +- gitlab-pages: upgrade to v18.3.0 + ## 18.2.4 - gitlab: upgrade CE to v18.2.4 diff --git a/Dockerfile b/Dockerfile index bd1b0a69f..a9fe2c2c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:noble-20250716 -ARG VERSION=18.2.4 +ARG VERSION=18.3.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.9 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.7.1 \ GOLANG_VERSION=1.24.6 \ GITLAB_SHELL_VERSION=14.44.0 \ - GITLAB_PAGES_VERSION=18.2.4 \ - GITALY_SERVER_VERSION=18.2.4 \ + GITLAB_PAGES_VERSION=18.3.0 \ + GITALY_SERVER_VERSION=18.3.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index b0ead1c3c..d3bad305a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:18.2.4 +# sameersbn/gitlab:18.3.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:18.2.4 +docker pull sameersbn/gitlab:18.3.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -210,7 +210,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:18.2.4 + sameersbn/gitlab:18.3.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -245,7 +245,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:18.2.4 + sameersbn/gitlab:18.3.0 ``` ### Database @@ -310,7 +310,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:18.2.4 + sameersbn/gitlab:18.3.0 ``` ##### Linking to PostgreSQL Container @@ -354,7 +354,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:18.2.4 + sameersbn/gitlab:18.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: @@ -392,7 +392,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:18.2.4 + sameersbn/gitlab:18.3.0 ``` #### Linking to Redis Container @@ -419,7 +419,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:18.2.4 + sameersbn/gitlab:18.3.0 ``` #### Mail @@ -432,7 +432,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:18.2.4 + sameersbn/gitlab:18.3.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -452,7 +452,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:18.2.4 + sameersbn/gitlab:18.3.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -536,7 +536,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:18.2.4 + sameersbn/gitlab:18.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. @@ -552,7 +552,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:18.2.4 + sameersbn/gitlab:18.3.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -575,7 +575,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:18.2.4 + sameersbn/gitlab:18.3.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -623,7 +623,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:18.2.4 + sameersbn/gitlab:18.3.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -850,14 +850,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:18.2.4 + sameersbn/gitlab:18.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:18.2.4 app:sanitize + sameersbn/gitlab:18.3.0 app:sanitize ``` #### Piwik @@ -2612,7 +2612,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.4 app:rake gitlab:backup:create + sameersbn/gitlab:18.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. @@ -2647,14 +2647,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.4 app:rake db:setup + sameersbn/gitlab:18.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:18.2.4 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.4 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:18.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2712,7 +2712,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:18.2.4 app:rake gitlab:env:info + sameersbn/gitlab:18.3.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run rake tasks on running gitlab instance. For example, @@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.4 app:rake gitlab:import:repos + sameersbn/gitlab:18.3.0 app:rake gitlab:import:repos ``` Or @@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.4 app:rake gitlab:import:repos + sameersbn/gitlab:18.3.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:18.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:18.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:18.2.4 +docker pull sameersbn/gitlab:18.3.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.** ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.2.4 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.3.0 ``` ### Shell Access @@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com ```yml services: gitlab: - image: sameersbn/gitlab:18.2.4 + image: sameersbn/gitlab:18.3.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 93d4fc0a5..ef9129a61 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.2.4 +18.3.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index aa0e6baea..40df29f9a 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.2.4 + image: sameersbn/gitlab:18.3.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 4e930607f..9099e57b0 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -62,7 +62,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:18.2.4 + image: sameersbn/gitlab:18.3.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index ea129ce85..33089e7b0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.2.4 + image: sameersbn/gitlab:18.3.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index c73bd58e5..c8afc8a52 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -291,7 +291,7 @@ Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.4 app:rake gitlab:backup:create + sameersbn/gitlab:18.3.0 app:rake gitlab:backup:create ``` ### Restoring Backups @@ -308,7 +308,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:18.2.4 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.2.4 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:18.3.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Upgrading from an existing GitLab installation @@ -327,7 +327,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:18.2.4 +docker pull sameersbn/gitlab:18.3.0 ``` - **Step 2**: Stop and remove the currently running image @@ -381,7 +381,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:18.2.4 +sameersbn/gitlab:18.3.0 ``` [storage-config]: https://docs.docker.com/registry/configuration/#storage diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index ee520f29b..bf9257977 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.2.4 + image: sameersbn/gitlab:18.3.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 54c56f49e..64568249d 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.2.4 + image: sameersbn/gitlab:18.3.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index de4e40a28..040149cd6 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:18.2.4 + image: sameersbn/gitlab:18.3.0 env: - name: TZ value: Asia/Kolkata From bcc0a731eb673912f688cd79ac2b3216c16cc65b Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 28 Aug 2025 21:42:59 +0200 Subject: [PATCH 513/522] Upgrade GitLab CE to 18.3.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 8ba2422d5..a325375f6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ 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. +## 18.3.1 + +- gitlab: upgrade CE to v18.3.1 +- gitaly: upgrade to v18.3.1 +- gitlab-pages: upgrade to v18.3.1 + ## 18.3.0 - gitlab: upgrade CE to v18.3.0 diff --git a/Dockerfile b/Dockerfile index a9fe2c2c9..f809e177e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:noble-20250716 -ARG VERSION=18.3.0 +ARG VERSION=18.3.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.9 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.7.1 \ GOLANG_VERSION=1.24.6 \ GITLAB_SHELL_VERSION=14.44.0 \ - GITLAB_PAGES_VERSION=18.3.0 \ - GITALY_SERVER_VERSION=18.3.0 \ + GITLAB_PAGES_VERSION=18.3.1 \ + GITALY_SERVER_VERSION=18.3.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index d3bad305a..d79900a1a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:18.3.0 +# sameersbn/gitlab:18.3.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:18.3.0 +docker pull sameersbn/gitlab:18.3.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -210,7 +210,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:18.3.0 + sameersbn/gitlab:18.3.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -245,7 +245,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:18.3.0 + sameersbn/gitlab:18.3.1 ``` ### Database @@ -310,7 +310,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:18.3.0 + sameersbn/gitlab:18.3.1 ``` ##### Linking to PostgreSQL Container @@ -354,7 +354,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:18.3.0 + sameersbn/gitlab:18.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: @@ -392,7 +392,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:18.3.0 + sameersbn/gitlab:18.3.1 ``` #### Linking to Redis Container @@ -419,7 +419,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:18.3.0 + sameersbn/gitlab:18.3.1 ``` #### Mail @@ -432,7 +432,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:18.3.0 + sameersbn/gitlab:18.3.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -452,7 +452,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:18.3.0 + sameersbn/gitlab:18.3.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -536,7 +536,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:18.3.0 + sameersbn/gitlab:18.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. @@ -552,7 +552,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:18.3.0 + sameersbn/gitlab:18.3.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -575,7 +575,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:18.3.0 + sameersbn/gitlab:18.3.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -623,7 +623,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:18.3.0 + sameersbn/gitlab:18.3.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -850,14 +850,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:18.3.0 + sameersbn/gitlab:18.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:18.3.0 app:sanitize + sameersbn/gitlab:18.3.1 app:sanitize ``` #### Piwik @@ -2612,7 +2612,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.0 app:rake gitlab:backup:create + sameersbn/gitlab:18.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. @@ -2647,14 +2647,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.0 app:rake db:setup + sameersbn/gitlab:18.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:18.3.0 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:18.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2712,7 +2712,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:18.3.0 app:rake gitlab:env:info + sameersbn/gitlab:18.3.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run rake tasks on running gitlab instance. For example, @@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.0 app:rake gitlab:import:repos + sameersbn/gitlab:18.3.1 app:rake gitlab:import:repos ``` Or @@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.0 app:rake gitlab:import:repos + sameersbn/gitlab:18.3.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:18.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:18.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:18.3.0 +docker pull sameersbn/gitlab:18.3.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.** ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.3.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.3.1 ``` ### Shell Access @@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com ```yml services: gitlab: - image: sameersbn/gitlab:18.3.0 + image: sameersbn/gitlab:18.3.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index ef9129a61..217b5c6e8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.3.0 +18.3.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 40df29f9a..b4b2cafa8 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.3.0 + image: sameersbn/gitlab:18.3.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 9099e57b0..bb4b5653e 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -62,7 +62,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:18.3.0 + image: sameersbn/gitlab:18.3.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 33089e7b0..adee4e568 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.3.0 + image: sameersbn/gitlab:18.3.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index c8afc8a52..28175af3f 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -291,7 +291,7 @@ Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.0 app:rake gitlab:backup:create + sameersbn/gitlab:18.3.1 app:rake gitlab:backup:create ``` ### Restoring Backups @@ -308,7 +308,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:18.3.0 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:18.3.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Upgrading from an existing GitLab installation @@ -327,7 +327,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:18.3.0 +docker pull sameersbn/gitlab:18.3.1 ``` - **Step 2**: Stop and remove the currently running image @@ -381,7 +381,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:18.3.0 +sameersbn/gitlab:18.3.1 ``` [storage-config]: https://docs.docker.com/registry/configuration/#storage diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index bf9257977..70abc5c42 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.3.0 + image: sameersbn/gitlab:18.3.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 64568249d..c00caa6bf 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.3.0 + image: sameersbn/gitlab:18.3.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 040149cd6..c0f1b3c8a 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:18.3.0 + image: sameersbn/gitlab:18.3.1 env: - name: TZ value: Asia/Kolkata From 8076ab27ec26fcf9c4c4fdfd8fd8c08cd48d81aa Mon Sep 17 00:00:00 2001 From: Kazunori Kimura Date: Thu, 26 Jun 2025 01:34:45 +0900 Subject: [PATCH 514/522] disable compiling source map to reduce build time 30min -> 20min on my old PC, 20min -> 10min on my new PC --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f809e177e..6c643e471 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,8 @@ ENV GITLAB_VERSION=${VERSION} \ GITLAB_LOG_DIR="/var/log/gitlab" \ GITLAB_CACHE_DIR="/etc/docker-gitlab" \ RAILS_ENV=production \ - NODE_ENV=production + NODE_ENV=production \ + NO_SOURCEMAPS=true ENV GITLAB_INSTALL_DIR="${GITLAB_HOME}/gitlab" \ GITLAB_SHELL_INSTALL_DIR="${GITLAB_HOME}/gitlab-shell" \ From f83d352ee60092abc702d63b084566b7c0c938ec Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 10 Sep 2025 20:04:58 +0200 Subject: [PATCH 515/522] Upgrade GitLab CE to 18.3.2 --- Changelog.md | 10 +++++ Dockerfile | 14 +++---- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 56 insertions(+), 46 deletions(-) diff --git a/Changelog.md b/Changelog.md index a325375f6..a5e9266f0 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,16 @@ 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. +## 18.3.2 + +- gitlab: upgrade CE to v18.3.2 +- gitaly: upgrade to v18.3.2 +- gitlab-pages: upgrade to v18.3.2 +- gitlab-shell: upgrade to v14.45.2 +- golang: upgrade to v1.24.7 +- rubygems: upgrade to v3.7.2 +- ubuntu: upgrade to noble-20250805 + ## 18.3.1 - gitlab: upgrade CE to v18.3.1 diff --git a/Dockerfile b/Dockerfile index 6c643e471..c47b21d42 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM ubuntu:noble-20250716 +FROM ubuntu:noble-20250805 -ARG VERSION=18.3.1 +ARG VERSION=18.3.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.9 \ RUBY_SOURCE_SHA256SUM="abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a" \ - RUBYGEMS_VERSION=3.7.1 \ - GOLANG_VERSION=1.24.6 \ - GITLAB_SHELL_VERSION=14.44.0 \ - GITLAB_PAGES_VERSION=18.3.1 \ - GITALY_SERVER_VERSION=18.3.1 \ + RUBYGEMS_VERSION=3.7.2 \ + GOLANG_VERSION=1.24.7 \ + GITLAB_SHELL_VERSION=14.45.2 \ + GITLAB_PAGES_VERSION=18.3.2 \ + GITALY_SERVER_VERSION=18.3.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index d79900a1a..c91a15a73 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:18.3.1 +# sameersbn/gitlab:18.3.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:18.3.1 +docker pull sameersbn/gitlab:18.3.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -210,7 +210,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:18.3.1 + sameersbn/gitlab:18.3.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -245,7 +245,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:18.3.1 + sameersbn/gitlab:18.3.2 ``` ### Database @@ -310,7 +310,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:18.3.1 + sameersbn/gitlab:18.3.2 ``` ##### Linking to PostgreSQL Container @@ -354,7 +354,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:18.3.1 + sameersbn/gitlab:18.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: @@ -392,7 +392,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:18.3.1 + sameersbn/gitlab:18.3.2 ``` #### Linking to Redis Container @@ -419,7 +419,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:18.3.1 + sameersbn/gitlab:18.3.2 ``` #### Mail @@ -432,7 +432,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:18.3.1 + sameersbn/gitlab:18.3.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -452,7 +452,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:18.3.1 + sameersbn/gitlab:18.3.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -536,7 +536,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:18.3.1 + sameersbn/gitlab:18.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. @@ -552,7 +552,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:18.3.1 + sameersbn/gitlab:18.3.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -575,7 +575,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:18.3.1 + sameersbn/gitlab:18.3.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -623,7 +623,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:18.3.1 + sameersbn/gitlab:18.3.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -850,14 +850,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:18.3.1 + sameersbn/gitlab:18.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:18.3.1 app:sanitize + sameersbn/gitlab:18.3.2 app:sanitize ``` #### Piwik @@ -2612,7 +2612,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.1 app:rake gitlab:backup:create + sameersbn/gitlab:18.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. @@ -2647,14 +2647,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.1 app:rake db:setup + sameersbn/gitlab:18.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:18.3.1 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:18.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2712,7 +2712,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:18.3.1 app:rake gitlab:env:info + sameersbn/gitlab:18.3.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run rake tasks on running gitlab instance. For example, @@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.1 app:rake gitlab:import:repos + sameersbn/gitlab:18.3.2 app:rake gitlab:import:repos ``` Or @@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.1 app:rake gitlab:import:repos + sameersbn/gitlab:18.3.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:18.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:18.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:18.3.1 +docker pull sameersbn/gitlab:18.3.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.** ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.3.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.3.2 ``` ### Shell Access @@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com ```yml services: gitlab: - image: sameersbn/gitlab:18.3.1 + image: sameersbn/gitlab:18.3.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 217b5c6e8..a19b2d9a0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.3.1 +18.3.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index b4b2cafa8..e688dbe9b 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.3.1 + image: sameersbn/gitlab:18.3.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index bb4b5653e..b8c3fcdd7 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -62,7 +62,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:18.3.1 + image: sameersbn/gitlab:18.3.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index adee4e568..273c6d082 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.3.1 + image: sameersbn/gitlab:18.3.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 28175af3f..cfbcba16b 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -291,7 +291,7 @@ Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.1 app:rake gitlab:backup:create + sameersbn/gitlab:18.3.2 app:rake gitlab:backup:create ``` ### Restoring Backups @@ -308,7 +308,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:18.3.1 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:18.3.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Upgrading from an existing GitLab installation @@ -327,7 +327,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:18.3.1 +docker pull sameersbn/gitlab:18.3.2 ``` - **Step 2**: Stop and remove the currently running image @@ -381,7 +381,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:18.3.1 +sameersbn/gitlab:18.3.2 ``` [storage-config]: https://docs.docker.com/registry/configuration/#storage diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 70abc5c42..e96ba6622 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.3.1 + image: sameersbn/gitlab:18.3.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index c00caa6bf..aea22efba 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.3.1 + image: sameersbn/gitlab:18.3.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index c0f1b3c8a..df755fd5e 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:18.3.1 + image: sameersbn/gitlab:18.3.2 env: - name: TZ value: Asia/Kolkata From dee851eba25ef355fb90b68d3148e0918b26639a Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 18 Sep 2025 19:02:09 +0200 Subject: [PATCH 516/522] Upgrade GitLab CE to 18.4.0 --- Changelog.md | 7 ++++ Dockerfile | 8 ++-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 50 insertions(+), 43 deletions(-) diff --git a/Changelog.md b/Changelog.md index a5e9266f0..5acac20c4 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,13 @@ 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. +## 18.4.0 + +- gitlab: upgrade CE to v18.4.0 +- gitaly: upgrade to v18.4.0 +- gitlab-pages: upgrade to v18.4.0 +- ubuntu: upgrade to noble-20250910 + ## 18.3.2 - gitlab: upgrade CE to v18.3.2 diff --git a/Dockerfile b/Dockerfile index c47b21d42..7f34ec26e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:noble-20250805 +FROM ubuntu:noble-20250910 -ARG VERSION=18.3.2 +ARG VERSION=18.4.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.9 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.7.2 \ GOLANG_VERSION=1.24.7 \ GITLAB_SHELL_VERSION=14.45.2 \ - GITLAB_PAGES_VERSION=18.3.2 \ - GITALY_SERVER_VERSION=18.3.2 \ + GITLAB_PAGES_VERSION=18.4.0 \ + GITALY_SERVER_VERSION=18.4.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index c91a15a73..187cf811e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:18.3.2 +# sameersbn/gitlab:18.4.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:18.3.2 +docker pull sameersbn/gitlab:18.4.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -210,7 +210,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:18.3.2 + sameersbn/gitlab:18.4.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -245,7 +245,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:18.3.2 + sameersbn/gitlab:18.4.0 ``` ### Database @@ -310,7 +310,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:18.3.2 + sameersbn/gitlab:18.4.0 ``` ##### Linking to PostgreSQL Container @@ -354,7 +354,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:18.3.2 + sameersbn/gitlab:18.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: @@ -392,7 +392,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:18.3.2 + sameersbn/gitlab:18.4.0 ``` #### Linking to Redis Container @@ -419,7 +419,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:18.3.2 + sameersbn/gitlab:18.4.0 ``` #### Mail @@ -432,7 +432,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:18.3.2 + sameersbn/gitlab:18.4.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -452,7 +452,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:18.3.2 + sameersbn/gitlab:18.4.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -536,7 +536,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:18.3.2 + sameersbn/gitlab:18.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. @@ -552,7 +552,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:18.3.2 + sameersbn/gitlab:18.4.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -575,7 +575,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:18.3.2 + sameersbn/gitlab:18.4.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -623,7 +623,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:18.3.2 + sameersbn/gitlab:18.4.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -850,14 +850,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:18.3.2 + sameersbn/gitlab:18.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:18.3.2 app:sanitize + sameersbn/gitlab:18.4.0 app:sanitize ``` #### Piwik @@ -2612,7 +2612,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.2 app:rake gitlab:backup:create + sameersbn/gitlab:18.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. @@ -2647,14 +2647,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.2 app:rake db:setup + sameersbn/gitlab:18.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:18.3.2 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:18.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2712,7 +2712,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:18.3.2 app:rake gitlab:env:info + sameersbn/gitlab:18.4.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run rake tasks on running gitlab instance. For example, @@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.2 app:rake gitlab:import:repos + sameersbn/gitlab:18.4.0 app:rake gitlab:import:repos ``` Or @@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.2 app:rake gitlab:import:repos + sameersbn/gitlab:18.4.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:18.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:18.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:18.3.2 +docker pull sameersbn/gitlab:18.4.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.** ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.3.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.4.0 ``` ### Shell Access @@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com ```yml services: gitlab: - image: sameersbn/gitlab:18.3.2 + image: sameersbn/gitlab:18.4.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index a19b2d9a0..5b9720f0a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.3.2 +18.4.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index e688dbe9b..723774b9b 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.3.2 + image: sameersbn/gitlab:18.4.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index b8c3fcdd7..4ab0e3b39 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -62,7 +62,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:18.3.2 + image: sameersbn/gitlab:18.4.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 273c6d082..c19e074e3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.3.2 + image: sameersbn/gitlab:18.4.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index cfbcba16b..4bad14b88 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -291,7 +291,7 @@ Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.2 app:rake gitlab:backup:create + sameersbn/gitlab:18.4.0 app:rake gitlab:backup:create ``` ### Restoring Backups @@ -308,7 +308,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:18.3.2 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.3.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:18.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Upgrading from an existing GitLab installation @@ -327,7 +327,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:18.3.2 +docker pull sameersbn/gitlab:18.4.0 ``` - **Step 2**: Stop and remove the currently running image @@ -381,7 +381,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:18.3.2 +sameersbn/gitlab:18.4.0 ``` [storage-config]: https://docs.docker.com/registry/configuration/#storage diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index e96ba6622..cc8a58343 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.3.2 + image: sameersbn/gitlab:18.4.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index aea22efba..4b4dcc656 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.3.2 + image: sameersbn/gitlab:18.4.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index df755fd5e..c2bed5de1 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:18.3.2 + image: sameersbn/gitlab:18.4.0 env: - name: TZ value: Asia/Kolkata From 7048018305f508ca2716f888cd1814454984f4f2 Mon Sep 17 00:00:00 2001 From: KIMURA Kazunori Date: Tue, 8 Jul 2025 11:53:27 +0900 Subject: [PATCH 517/522] Remove postgresql-contrib --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7f34ec26e..c1259134f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ RUN set -ex && \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ sudo supervisor logrotate locales curl \ - nginx openssh-server postgresql-contrib redis-tools \ + nginx openssh-server redis-tools \ postgresql-client-13 postgresql-client-14 postgresql-client-15 postgresql-client-16 postgresql-client-17 \ python3 python3-docutils nodejs yarn gettext-base graphicsmagick \ libpq5 zlib1g libyaml-dev libssl-dev libgdbm-dev libre2-dev \ From a755d6d4562a6b99d6b7aed147abd4c3cb3149cb Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 26 Sep 2025 21:51:44 +0200 Subject: [PATCH 518/522] Upgrade GitLab CE to 18.4.1 --- Changelog.md | 7 ++++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 49 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 5acac20c4..400d5f002 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,13 @@ 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. +## 18.4.1 + +- gitlab: upgrade CE to v18.4.1 +- gitaly: upgrade to v18.4.1 +- gitlab-pages: upgrade to v18.4.1 +- ubuntu: upgrade to noble-20250910 + ## 18.4.0 - gitlab: upgrade CE to v18.4.0 diff --git a/Dockerfile b/Dockerfile index c1259134f..ecb6bfec5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:noble-20250910 -ARG VERSION=18.4.0 +ARG VERSION=18.4.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.9 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.7.2 \ GOLANG_VERSION=1.24.7 \ GITLAB_SHELL_VERSION=14.45.2 \ - GITLAB_PAGES_VERSION=18.4.0 \ - GITALY_SERVER_VERSION=18.4.0 \ + GITLAB_PAGES_VERSION=18.4.1 \ + GITALY_SERVER_VERSION=18.4.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 187cf811e..4ff1e3536 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:18.4.0 +# sameersbn/gitlab:18.4.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:18.4.0 +docker pull sameersbn/gitlab:18.4.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -210,7 +210,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:18.4.0 + sameersbn/gitlab:18.4.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -245,7 +245,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:18.4.0 + sameersbn/gitlab:18.4.1 ``` ### Database @@ -310,7 +310,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:18.4.0 + sameersbn/gitlab:18.4.1 ``` ##### Linking to PostgreSQL Container @@ -354,7 +354,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:18.4.0 + sameersbn/gitlab:18.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: @@ -392,7 +392,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:18.4.0 + sameersbn/gitlab:18.4.1 ``` #### Linking to Redis Container @@ -419,7 +419,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:18.4.0 + sameersbn/gitlab:18.4.1 ``` #### Mail @@ -432,7 +432,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:18.4.0 + sameersbn/gitlab:18.4.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -452,7 +452,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:18.4.0 + sameersbn/gitlab:18.4.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -536,7 +536,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:18.4.0 + sameersbn/gitlab:18.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. @@ -552,7 +552,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:18.4.0 + sameersbn/gitlab:18.4.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -575,7 +575,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:18.4.0 + sameersbn/gitlab:18.4.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -623,7 +623,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:18.4.0 + sameersbn/gitlab:18.4.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -850,14 +850,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:18.4.0 + sameersbn/gitlab:18.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:18.4.0 app:sanitize + sameersbn/gitlab:18.4.1 app:sanitize ``` #### Piwik @@ -2612,7 +2612,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.0 app:rake gitlab:backup:create + sameersbn/gitlab:18.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. @@ -2647,14 +2647,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.0 app:rake db:setup + sameersbn/gitlab:18.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:18.4.0 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:18.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2712,7 +2712,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:18.4.0 app:rake gitlab:env:info + sameersbn/gitlab:18.4.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run rake tasks on running gitlab instance. For example, @@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.0 app:rake gitlab:import:repos + sameersbn/gitlab:18.4.1 app:rake gitlab:import:repos ``` Or @@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.0 app:rake gitlab:import:repos + sameersbn/gitlab:18.4.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:18.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:18.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:18.4.0 +docker pull sameersbn/gitlab:18.4.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.** ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.4.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.4.1 ``` ### Shell Access @@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com ```yml services: gitlab: - image: sameersbn/gitlab:18.4.0 + image: sameersbn/gitlab:18.4.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 5b9720f0a..de473bd69 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.4.0 +18.4.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index 723774b9b..b90a45cb9 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.4.0 + image: sameersbn/gitlab:18.4.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 4ab0e3b39..a18491142 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -62,7 +62,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:18.4.0 + image: sameersbn/gitlab:18.4.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index c19e074e3..a351fa9d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.4.0 + image: sameersbn/gitlab:18.4.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 4bad14b88..a2257b3e9 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -291,7 +291,7 @@ Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.0 app:rake gitlab:backup:create + sameersbn/gitlab:18.4.1 app:rake gitlab:backup:create ``` ### Restoring Backups @@ -308,7 +308,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:18.4.0 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:18.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Upgrading from an existing GitLab installation @@ -327,7 +327,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:18.4.0 +docker pull sameersbn/gitlab:18.4.1 ``` - **Step 2**: Stop and remove the currently running image @@ -381,7 +381,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:18.4.0 +sameersbn/gitlab:18.4.1 ``` [storage-config]: https://docs.docker.com/registry/configuration/#storage diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index cc8a58343..42dfa5f72 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.4.0 + image: sameersbn/gitlab:18.4.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 4b4dcc656..475e8f54e 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.4.0 + image: sameersbn/gitlab:18.4.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index c2bed5de1..b3e181dbf 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:18.4.0 + image: sameersbn/gitlab:18.4.1 env: - name: TZ value: Asia/Kolkata From 71467c1662e87b13fb9d53d1b69618160318c1a8 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Thu, 9 Oct 2025 23:19:45 +0200 Subject: [PATCH 519/522] Upgrade GitLab CE to 18.4.2 --- Changelog.md | 8 ++++ Dockerfile | 10 ++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 52 insertions(+), 44 deletions(-) diff --git a/Changelog.md b/Changelog.md index 400d5f002..158a49343 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,14 @@ 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. +## 18.4.2 + +- gitlab: upgrade CE to v18.4.2 +- gitaly: upgrade to v18.4.2 +- gitlab-pages: upgrade to v18.4.2 +- golang: upgrade to v1.24.8 +- ubuntu: upgrade to noble-20250925 + ## 18.4.1 - gitlab: upgrade CE to v18.4.1 diff --git a/Dockerfile b/Dockerfile index ecb6bfec5..ba96695c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM ubuntu:noble-20250910 +FROM ubuntu:noble-20250925 -ARG VERSION=18.4.1 +ARG VERSION=18.4.2 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.9 \ RUBY_SOURCE_SHA256SUM="abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a" \ RUBYGEMS_VERSION=3.7.2 \ - GOLANG_VERSION=1.24.7 \ + GOLANG_VERSION=1.24.8 \ GITLAB_SHELL_VERSION=14.45.2 \ - GITLAB_PAGES_VERSION=18.4.1 \ - GITALY_SERVER_VERSION=18.4.1 \ + GITLAB_PAGES_VERSION=18.4.2 \ + GITALY_SERVER_VERSION=18.4.2 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 4ff1e3536..898f31f65 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:18.4.1 +# sameersbn/gitlab:18.4.2 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:18.4.1 +docker pull sameersbn/gitlab:18.4.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -210,7 +210,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:18.4.1 + sameersbn/gitlab:18.4.2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -245,7 +245,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:18.4.1 + sameersbn/gitlab:18.4.2 ``` ### Database @@ -310,7 +310,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:18.4.1 + sameersbn/gitlab:18.4.2 ``` ##### Linking to PostgreSQL Container @@ -354,7 +354,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:18.4.1 + sameersbn/gitlab:18.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: @@ -392,7 +392,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:18.4.1 + sameersbn/gitlab:18.4.2 ``` #### Linking to Redis Container @@ -419,7 +419,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:18.4.1 + sameersbn/gitlab:18.4.2 ``` #### Mail @@ -432,7 +432,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:18.4.1 + sameersbn/gitlab:18.4.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -452,7 +452,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:18.4.1 + sameersbn/gitlab:18.4.2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -536,7 +536,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:18.4.1 + sameersbn/gitlab:18.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. @@ -552,7 +552,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:18.4.1 + sameersbn/gitlab:18.4.2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -575,7 +575,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:18.4.1 + sameersbn/gitlab:18.4.2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -623,7 +623,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:18.4.1 + sameersbn/gitlab:18.4.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -850,14 +850,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:18.4.1 + sameersbn/gitlab:18.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:18.4.1 app:sanitize + sameersbn/gitlab:18.4.2 app:sanitize ``` #### Piwik @@ -2612,7 +2612,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.1 app:rake gitlab:backup:create + sameersbn/gitlab:18.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. @@ -2647,14 +2647,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.1 app:rake db:setup + sameersbn/gitlab:18.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:18.4.1 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:18.4.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2712,7 +2712,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:18.4.1 app:rake gitlab:env:info + sameersbn/gitlab:18.4.2 app:rake gitlab:env:info ``` You can also use `docker exec` to run rake tasks on running gitlab instance. For example, @@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.1 app:rake gitlab:import:repos + sameersbn/gitlab:18.4.2 app:rake gitlab:import:repos ``` Or @@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.1 app:rake gitlab:import:repos + sameersbn/gitlab:18.4.2 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:18.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:18.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:18.4.1 +docker pull sameersbn/gitlab:18.4.2 ``` - **Step 2**: Stop and remove the currently running image @@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.** ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.4.1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.4.2 ``` ### Shell Access @@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com ```yml services: gitlab: - image: sameersbn/gitlab:18.4.1 + image: sameersbn/gitlab:18.4.2 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index de473bd69..e5096b2fc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.4.1 +18.4.2 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index b90a45cb9..c29280827 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.4.1 + image: sameersbn/gitlab:18.4.2 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index a18491142..23d748942 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -62,7 +62,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:18.4.1 + image: sameersbn/gitlab:18.4.2 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index a351fa9d4..1462276a1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.4.1 + image: sameersbn/gitlab:18.4.2 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index a2257b3e9..81e03b696 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -291,7 +291,7 @@ Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.1 app:rake gitlab:backup:create + sameersbn/gitlab:18.4.2 app:rake gitlab:backup:create ``` ### Restoring Backups @@ -308,7 +308,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:18.4.1 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:18.4.2 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Upgrading from an existing GitLab installation @@ -327,7 +327,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:18.4.1 +docker pull sameersbn/gitlab:18.4.2 ``` - **Step 2**: Stop and remove the currently running image @@ -381,7 +381,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:18.4.1 +sameersbn/gitlab:18.4.2 ``` [storage-config]: https://docs.docker.com/registry/configuration/#storage diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 42dfa5f72..f51ef5326 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.4.1 + image: sameersbn/gitlab:18.4.2 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 475e8f54e..7e461336e 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.4.1 + image: sameersbn/gitlab:18.4.2 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index b3e181dbf..f22140208 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:18.4.1 + image: sameersbn/gitlab:18.4.2 env: - name: TZ value: Asia/Kolkata From 6909012b9a8e72ac2cc773c109c46e922a0ac66f Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 17 Oct 2025 05:46:10 +0200 Subject: [PATCH 520/522] Upgrade GitLab CE to 18.5.0 --- Changelog.md | 9 +++++ Dockerfile | 12 +++--- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 54 insertions(+), 45 deletions(-) diff --git a/Changelog.md b/Changelog.md index 158a49343..55965d954 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,15 @@ 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. +## 18.5.0 + +- gitlab: upgrade CE to v18.5.0 +- gitaly: upgrade to v18.5.0 +- gitlab-pages: upgrade to v18.5.0 +- gitlab-shell: upgrade to v14.45.3 +- golang: upgrade to v1.24.9 +- ubuntu: upgrade to noble-20251001 + ## 18.4.2 - gitlab: upgrade CE to v18.4.2 diff --git a/Dockerfile b/Dockerfile index ba96695c3..28c82f5c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM ubuntu:noble-20250925 +FROM ubuntu:noble-20251001 -ARG VERSION=18.4.2 +ARG VERSION=18.5.0 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.9 \ RUBY_SOURCE_SHA256SUM="abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a" \ RUBYGEMS_VERSION=3.7.2 \ - GOLANG_VERSION=1.24.8 \ - GITLAB_SHELL_VERSION=14.45.2 \ - GITLAB_PAGES_VERSION=18.4.2 \ - GITALY_SERVER_VERSION=18.4.2 \ + GOLANG_VERSION=1.24.9 \ + GITLAB_SHELL_VERSION=14.45.3 \ + GITLAB_PAGES_VERSION=18.5.0 \ + GITALY_SERVER_VERSION=18.5.0 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 898f31f65..57b6f892d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:18.4.2 +# sameersbn/gitlab:18.5.0 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:18.4.2 +docker pull sameersbn/gitlab:18.5.0 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -210,7 +210,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:18.4.2 + sameersbn/gitlab:18.5.0 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -245,7 +245,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:18.4.2 + sameersbn/gitlab:18.5.0 ``` ### Database @@ -310,7 +310,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:18.4.2 + sameersbn/gitlab:18.5.0 ``` ##### Linking to PostgreSQL Container @@ -354,7 +354,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:18.4.2 + sameersbn/gitlab:18.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: @@ -392,7 +392,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:18.4.2 + sameersbn/gitlab:18.5.0 ``` #### Linking to Redis Container @@ -419,7 +419,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:18.4.2 + sameersbn/gitlab:18.5.0 ``` #### Mail @@ -432,7 +432,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:18.4.2 + sameersbn/gitlab:18.5.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -452,7 +452,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:18.4.2 + sameersbn/gitlab:18.5.0 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -536,7 +536,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:18.4.2 + sameersbn/gitlab:18.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. @@ -552,7 +552,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:18.4.2 + sameersbn/gitlab:18.5.0 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -575,7 +575,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:18.4.2 + sameersbn/gitlab:18.5.0 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -623,7 +623,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:18.4.2 + sameersbn/gitlab:18.5.0 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -850,14 +850,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:18.4.2 + sameersbn/gitlab:18.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:18.4.2 app:sanitize + sameersbn/gitlab:18.5.0 app:sanitize ``` #### Piwik @@ -2612,7 +2612,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.2 app:rake gitlab:backup:create + sameersbn/gitlab:18.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. @@ -2647,14 +2647,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.2 app:rake db:setup + sameersbn/gitlab:18.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:18.4.2 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:18.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2712,7 +2712,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:18.4.2 app:rake gitlab:env:info + sameersbn/gitlab:18.5.0 app:rake gitlab:env:info ``` You can also use `docker exec` to run rake tasks on running gitlab instance. For example, @@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.2 app:rake gitlab:import:repos + sameersbn/gitlab:18.5.0 app:rake gitlab:import:repos ``` Or @@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.2 app:rake gitlab:import:repos + sameersbn/gitlab:18.5.0 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:18.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:18.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:18.4.2 +docker pull sameersbn/gitlab:18.5.0 ``` - **Step 2**: Stop and remove the currently running image @@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.** ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.4.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.5.0 ``` ### Shell Access @@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com ```yml services: gitlab: - image: sameersbn/gitlab:18.4.2 + image: sameersbn/gitlab:18.5.0 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index e5096b2fc..9020bd13e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.4.2 +18.5.0 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index c29280827..e342ed667 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.4.2 + image: sameersbn/gitlab:18.5.0 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 23d748942..9c2782af3 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -62,7 +62,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:18.4.2 + image: sameersbn/gitlab:18.5.0 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 1462276a1..2a52f0322 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.4.2 + image: sameersbn/gitlab:18.5.0 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 81e03b696..0c32030c8 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -291,7 +291,7 @@ Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.2 app:rake gitlab:backup:create + sameersbn/gitlab:18.5.0 app:rake gitlab:backup:create ``` ### Restoring Backups @@ -308,7 +308,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:18.4.2 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.4.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:18.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Upgrading from an existing GitLab installation @@ -327,7 +327,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:18.4.2 +docker pull sameersbn/gitlab:18.5.0 ``` - **Step 2**: Stop and remove the currently running image @@ -381,7 +381,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:18.4.2 +sameersbn/gitlab:18.5.0 ``` [storage-config]: https://docs.docker.com/registry/configuration/#storage diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index f51ef5326..231d13b05 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.4.2 + image: sameersbn/gitlab:18.5.0 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 7e461336e..799b1e4a7 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.4.2 + image: sameersbn/gitlab:18.5.0 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index f22140208..042152776 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:18.4.2 + image: sameersbn/gitlab:18.5.0 env: - name: TZ value: Asia/Kolkata From c0f13725ff5d0699d9330ac6ee97abdb6c073aa8 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Fri, 17 Oct 2025 19:58:10 +0200 Subject: [PATCH 521/522] Update download URL for golang source code --- 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 27c5dafb2..817fd61cf 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -110,7 +110,7 @@ gem install bundler:"${BUNDLER_VERSION}" # 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}/ +wget -cnv https://go.dev/dl/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/ # install gitlab-shell From e731a5899a54ef9faf0ff953369f5f5179f81f19 Mon Sep 17 00:00:00 2001 From: Steven Achilles Date: Wed, 22 Oct 2025 19:46:23 +0200 Subject: [PATCH 522/522] Upgrade GitLab CE to 18.5.1 --- Changelog.md | 6 +++ Dockerfile | 6 +-- README.md | 54 ++++++++++++------------- VERSION | 2 +- contrib/docker-swarm/docker-compose.yml | 2 +- docker-compose.swarm.yml | 2 +- docker-compose.yml | 2 +- docs/container_registry.md | 10 ++--- docs/docker-compose-keycloak.yml | 2 +- docs/docker-compose-registry.yml | 2 +- kubernetes/gitlab-rc.yml | 2 +- 11 files changed, 48 insertions(+), 42 deletions(-) diff --git a/Changelog.md b/Changelog.md index 55965d954..9d9654314 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,12 @@ 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. +## 18.5.1 + +- gitlab: upgrade CE to v18.5.1 +- gitaly: upgrade to v18.5.1 +- gitlab-pages: upgrade to v18.5.1 + ## 18.5.0 - gitlab: upgrade CE to v18.5.0 diff --git a/Dockerfile b/Dockerfile index 28c82f5c4..7712fb6be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:noble-20251001 -ARG VERSION=18.5.0 +ARG VERSION=18.5.1 ENV GITLAB_VERSION=${VERSION} \ RUBY_VERSION=3.2.9 \ @@ -8,8 +8,8 @@ ENV GITLAB_VERSION=${VERSION} \ RUBYGEMS_VERSION=3.7.2 \ GOLANG_VERSION=1.24.9 \ GITLAB_SHELL_VERSION=14.45.3 \ - GITLAB_PAGES_VERSION=18.5.0 \ - GITALY_SERVER_VERSION=18.5.0 \ + GITLAB_PAGES_VERSION=18.5.1 \ + GITALY_SERVER_VERSION=18.5.1 \ GITLAB_USER="git" \ GITLAB_HOME="/home/git" \ GITLAB_LOG_DIR="/var/log/gitlab" \ diff --git a/README.md b/README.md index 57b6f892d..5ecf8e454 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab:18.5.0 +# sameersbn/gitlab:18.5.1 [![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master) @@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull sameersbn/gitlab:18.5.0 +docker pull sameersbn/gitlab:18.5.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -210,7 +210,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \ --env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:18.5.0 + sameersbn/gitlab:18.5.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -245,7 +245,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:18.5.0 + sameersbn/gitlab:18.5.1 ``` ### Database @@ -310,7 +310,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:18.5.0 + sameersbn/gitlab:18.5.1 ``` ##### Linking to PostgreSQL Container @@ -354,7 +354,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:18.5.0 + sameersbn/gitlab:18.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: @@ -392,7 +392,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:18.5.0 + sameersbn/gitlab:18.5.1 ``` #### Linking to Redis Container @@ -419,7 +419,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:18.5.0 + sameersbn/gitlab:18.5.1 ``` #### Mail @@ -432,7 +432,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:18.5.0 + sameersbn/gitlab:18.5.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -452,7 +452,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:18.5.0 + sameersbn/gitlab:18.5.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -536,7 +536,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:18.5.0 + sameersbn/gitlab:18.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. @@ -552,7 +552,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:18.5.0 + sameersbn/gitlab:18.5.1 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -575,7 +575,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:18.5.0 + sameersbn/gitlab:18.5.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -623,7 +623,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:18.5.0 + sameersbn/gitlab:18.5.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -850,14 +850,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:18.5.0 + sameersbn/gitlab:18.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:18.5.0 app:sanitize + sameersbn/gitlab:18.5.1 app:sanitize ``` #### Piwik @@ -2612,7 +2612,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.5.0 app:rake gitlab:backup:create + sameersbn/gitlab:18.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. @@ -2647,14 +2647,14 @@ you need to prepare the database: ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.5.0 app:rake db:setup + sameersbn/gitlab:18.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:18.5.0 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -2663,7 +2663,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 + sameersbn/gitlab:18.5.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 ``` When using `docker-compose` you may use the following command to execute the restore. @@ -2712,7 +2712,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:18.5.0 app:rake gitlab:env:info + sameersbn/gitlab:18.5.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run rake tasks on running gitlab instance. For example, @@ -2725,7 +2725,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.5.0 app:rake gitlab:import:repos + sameersbn/gitlab:18.5.1 app:rake gitlab:import:repos ``` Or @@ -2756,7 +2756,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [ ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.5.0 app:rake gitlab:import:repos + sameersbn/gitlab:18.5.1 app:rake gitlab:import:repos ``` Watch the logs and your repositories should be available into your new gitlab container. @@ -2787,12 +2787,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:18.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:18.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:18.5.0 +docker pull sameersbn/gitlab:18.5.1 ``` - **Step 2**: Stop and remove the currently running image @@ -2822,7 +2822,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since Gitlab 17.8 you need to provide `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY`,`GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY` and `GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT`. If not provided, these keys will be generated by gitlab. The image can be started without setting these parameters, **but you will lose the settings when you shutting down the container without taking a backup of `secrets.yml` and settings stored securely (such as the Dependency Proxy) will be unusable and unrecoverable.** ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.5.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.5.1 ``` ### Shell Access @@ -2858,7 +2858,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com ```yml services: gitlab: - image: sameersbn/gitlab:18.5.0 + image: sameersbn/gitlab:18.5.1 healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] interval: 1m diff --git a/VERSION b/VERSION index 9020bd13e..82f73fb75 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.5.0 +18.5.1 diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml index e342ed667..97fe9d52e 100644 --- a/contrib/docker-swarm/docker-compose.yml +++ b/contrib/docker-swarm/docker-compose.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.5.0 + image: sameersbn/gitlab:18.5.1 depends_on: - redis - postgresql diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml index 9c2782af3..de799f1d0 100644 --- a/docker-compose.swarm.yml +++ b/docker-compose.swarm.yml @@ -62,7 +62,7 @@ services: - traefik-public gitlab: - image: sameersbn/gitlab:18.5.0 + image: sameersbn/gitlab:18.5.1 depends_on: - redis - postgresql diff --git a/docker-compose.yml b/docker-compose.yml index 2a52f0322..9e9752f2c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.5.0 + image: sameersbn/gitlab:18.5.1 depends_on: - redis - postgresql diff --git a/docs/container_registry.md b/docs/container_registry.md index 0c32030c8..d04f39a5b 100644 --- a/docs/container_registry.md +++ b/docs/container_registry.md @@ -291,7 +291,7 @@ Execute the rake task with a removeable container. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.5.0 app:rake gitlab:backup:create + sameersbn/gitlab:18.5.1 app:rake gitlab:backup:create ``` ### Restoring Backups @@ -308,7 +308,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:18.5.0 app:rake gitlab:backup:restore + sameersbn/gitlab:18.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. @@ -317,7 +317,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:18.5.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:18.5.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Upgrading from an existing GitLab installation @@ -327,7 +327,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:18.5.0 +docker pull sameersbn/gitlab:18.5.1 ``` - **Step 2**: Stop and remove the currently running image @@ -381,7 +381,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:18.5.0 +sameersbn/gitlab:18.5.1 ``` [storage-config]: https://docs.docker.com/registry/configuration/#storage diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml index 231d13b05..903ba799c 100644 --- a/docs/docker-compose-keycloak.yml +++ b/docs/docker-compose-keycloak.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.5.0 + image: sameersbn/gitlab:18.5.1 depends_on: - redis - postgresql diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml index 799b1e4a7..24b75c8db 100644 --- a/docs/docker-compose-registry.yml +++ b/docs/docker-compose-registry.yml @@ -20,7 +20,7 @@ services: gitlab: restart: always - image: sameersbn/gitlab:18.5.0 + image: sameersbn/gitlab:18.5.1 volumes: - gitlab-data:/home/git/data:Z - gitlab-logs:/var/log/gitlab diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml index 042152776..e069a6814 100644 --- a/kubernetes/gitlab-rc.yml +++ b/kubernetes/gitlab-rc.yml @@ -14,7 +14,7 @@ spec: spec: containers: - name: gitlab - image: sameersbn/gitlab:18.5.0 + image: sameersbn/gitlab:18.5.1 env: - name: TZ value: Asia/Kolkata