Merge pull request #3207 from sachilles/upgrade-to-18.8.2

Upgrade GitLab CE to 18.8.2

Changelog.md

@@ -3,6 +3,82 @@
 This file only reflects the changes that are made in this image. Please 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.8.2
+
+- gitlab: upgrade CE to v18.8.2
+- gitaly: upgrade to v18.8.2
+- gitlab-pages: upgrade to v18.8.2
+
+## 18.8.1
+
+- gitlab: upgrade CE to v18.8.1
+- gitaly: upgrade to v18.8.1
+- gitlab-pages: upgrade to v18.8.1
+
+## 18.8.0
+
+- gitlab: upgrade CE to v18.8.0
+- gitaly: upgrade to v18.8.0
+- gitlab-pages: upgrade to v18.8.0
+- golang: upgrade to v1.24.12
+- ruby: upgrade to v3.2.10
+- ubuntu: upgrade to noble-20260113
+
+## 18.7.1
+
+- gitlab: upgrade CE to v18.7.1
+- gitaly: upgrade to v18.7.1
+- gitlab-pages: upgrade to v18.7.1
+
+## 18.7.0
+
+- gitlab: upgrade CE to v18.7.0
+- gitaly: upgrade to v18.7.0
+- gitlab-pages: upgrade to v18.7.0
+- gitlab-shell: upgrade to v14.45.5
+
+## 18.6.2
+
+- gitlab: upgrade CE to v18.6.2
+- gitaly: upgrade to v18.6.2
+- gitlab-pages: upgrade to v18.6.2
+- golang: upgrade to v1.24.11
+
+## 18.6.1
+
+- gitlab: upgrade CE to v18.6.1
+- gitaly: upgrade to v18.6.1
+- gitlab-pages: upgrade to v18.6.1
+
+## 18.6.0
+
+- gitlab: upgrade CE to v18.6.0
+- gitaly: upgrade to v18.6.0
+- gitlab-pages: upgrade to v18.6.0
+- ubuntu: upgrade to noble-20251013
+
+## 18.5.2
+
+- gitlab: upgrade CE to v18.5.2
+- gitaly: upgrade to v18.5.2
+- gitlab-pages: upgrade to v18.5.2
+- golang: upgrade to v1.24.10
+
+## 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
+- 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

Dockerfile

@@ -1,15 +1,15 @@
-FROM ubuntu:noble-20250925
+FROM ubuntu:noble-20260113
 
-ARG VERSION=18.4.2
+ARG VERSION=18.8.2
 
 ENV GITLAB_VERSION=${VERSION} \
-    RUBY_VERSION=3.2.9 \
+    RUBY_VERSION=3.2.10 \
-    RUBY_SOURCE_SHA256SUM="abbad98db9aeb152773b0d35868e50003b8c467f3d06152577c4dfed9d88ed2a" \
+    RUBY_SOURCE_SHA256SUM="880acb05e08da8c559c56a13e512bae1b472da67c72ebb750c765f9c2134e689" \
     RUBYGEMS_VERSION=3.7.2 \
-    GOLANG_VERSION=1.24.8 \
+    GOLANG_VERSION=1.24.12 \
-    GITLAB_SHELL_VERSION=14.45.2 \
+    GITLAB_SHELL_VERSION=14.45.5 \
-    GITLAB_PAGES_VERSION=18.4.2 \
+    GITLAB_PAGES_VERSION=18.8.2 \
-    GITALY_SERVER_VERSION=18.4.2 \
+    GITALY_SERVER_VERSION=18.8.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

README.md

@@ -1,4 +1,4 @@
-# sameersbn/gitlab:18.4.2
+# sameersbn/gitlab:18.8.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.2
+docker pull sameersbn/gitlab:18.8.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.2
+    sameersbn/gitlab:18.8.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.2
+    sameersbn/gitlab:18.8.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.2
+    sameersbn/gitlab:18.8.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.2
+    sameersbn/gitlab:18.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:
@@ -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.8.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.2
+    sameersbn/gitlab:18.8.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.2
+    sameersbn/gitlab:18.8.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.2
+    sameersbn/gitlab:18.8.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.2
+    sameersbn/gitlab:18.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.
@@ -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.8.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.2
+    sameersbn/gitlab:18.8.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.2
+    sameersbn/gitlab:18.8.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.2
+    sameersbn/gitlab:18.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:18.4.2 app:sanitize
+    sameersbn/gitlab:18.8.2 app:sanitize
 ```
 
 #### Piwik
@@ -1644,6 +1644,14 @@ Client Secret from earlier generated OAuth application
 
 Redirect URI, non existing pages domain to redirect to pages daemon, `https://projects.example.io/auth`
 
+##### `GITLAB_PAGES_NAMESPACE_IN_PATH`
+
+Enable namespace-in-path option for gitlab pages, defaults to `false`.
+
+##### `GITLAB_PAGES_LOG_VERBOSE`
+
+Enable verbose logging for gitlab pages, defaults to `false`.
+
 ##### `GITLAB_HTTPS`
 
 Set to `true` to enable https support, disabled by default.
@@ -2612,7 +2620,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.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.
@@ -2647,14 +2655,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.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:18.4.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.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.
@@ -2663,7 +2671,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.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.
@@ -2712,7 +2720,7 @@ The `app:rake` 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.8.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2725,7 +2733,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.8.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -2756,7 +2764,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.8.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -2787,12 +2795,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.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:18.4.2
+docker pull sameersbn/gitlab:18.8.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -2822,7 +2830,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.8.2
 ```
 
 ### Shell Access
@@ -2858,7 +2866,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.8.2
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m

VERSION

@@ -1 +1 @@
-18.4.2
+18.8.2

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

assets/runtime/config/gitaly/config.toml

@@ -94,5 +94,5 @@ dir = "{{GITLAB_SHELL_INSTALL_DIR}}"
 
 [gitlab]
 secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret"
-url = "http://localhost:8181{{GITLAB_RELATIVE_URL_ROOT}}"
+url = "http://127.0.0.1:8181{{GITLAB_RELATIVE_URL_ROOT}}"
 

assets/runtime/config/gitlab-pages/config

@@ -4,5 +4,7 @@ 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
+internal-gitlab-server=http://127.0.0.1:8080{{GITLAB_RELATIVE_URL_ROOT}}
 api-secret-key={{GITLAB_INSTALL_DIR}}/.gitlab_pages_secret
+log-verbose={{GITLAB_PAGES_LOG_VERBOSE}}
+namespace-in-path={{GITLAB_PAGES_NAMESPACE_IN_PATH}}

assets/runtime/config/gitlabhq/cable.yml

@@ -2,11 +2,11 @@
 # https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/cable.yml.example
 development:
   adapter: redis
-  url: redis://localhost:6379
+  url: redis://127.0.0.1:6379
   channel_prefix: gitlab_development
 test:
   adapter: redis
-  url: redis://localhost:6379
+  url: redis://127.0.0.1:6379
   channel_prefix: gitlab_test
 production:
   adapter: redis

assets/runtime/config/gitlabhq/gitlab.yml

@@ -410,6 +410,7 @@ production: &base
     artifacts_server: {{GITLAB_PAGES_ARTIFACTS_SERVER}} # Set to false if you want to disable online view of HTML artifacts
     external_http: {{GITLAB_PAGES_EXTERNAL_HTTP}} # If defined, enables custom domain support in GitLab Pages
     external_https: {{GITLAB_PAGES_EXTERNAL_HTTPS}} # If defined, enables custom domain and certificate support in GitLab Pages
+    namespace_in_path: {{GITLAB_PAGES_NAMESPACE_IN_PATH}}
 
     # File that contains the shared secret key for verifying access for gitlab-pages.
     # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app).

assets/runtime/config/gitlabhq/puma.rb

@@ -40,30 +40,47 @@ workers {{PUMA_WORKERS}}
 
 require_relative "{{GITLAB_INSTALL_DIR}}/lib/gitlab/cluster/lifecycle_events"
 
-on_restart do
+if Gem::Version.new(Puma::Const::PUMA_VERSION) < Gem::Version.new('7.0')
-  # Signal application hooks that we're about to restart
+  Gitlab::Cluster::LifecycleEvents.set_puma_options @config.options
-  Gitlab::Cluster::LifecycleEvents.do_before_master_restart
+
+  on_restart do
+    # Signal application hooks that we're about to restart
+    Gitlab::Cluster::LifecycleEvents.do_before_master_restart
+  end
+
+  on_worker_boot do
+    # Signal application hooks of worker start
+    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
+else
+  Gitlab::Cluster::LifecycleEvents.set_puma_worker_count(3)
+
+  before_restart do
+    # Signal application hooks that we're about to restart
+    Gitlab::Cluster::LifecycleEvents.do_before_master_restart
+  end
+
+  before_worker_boot do
+    # Signal application hooks of worker start
+    Gitlab::Cluster::LifecycleEvents.do_worker_start
+  end
+
+  before_worker_shutdown do
+    # Signal application hooks that a worker is shutting down
+    Gitlab::Cluster::LifecycleEvents.do_worker_stop
+  end
 end
 
 before_fork do
-  # Signal to the puma killer
-  Gitlab::Cluster::PumaWorkerKillerInitializer.start(@config.options, puma_per_worker_max_memory_mb: {{PUMA_PER_WORKER_MAX_MEMORY_MB}}, puma_master_max_memory_mb: {{PUMA_MASTER_MAX_MEMORY_MB}}) unless ENV['DISABLE_PUMA_WORKER_KILLER']
-
   # Signal application hooks that we're about to fork
   Gitlab::Cluster::LifecycleEvents.do_before_fork
 end
 
-Gitlab::Cluster::LifecycleEvents.set_puma_options @config.options
-on_worker_boot do
-  # Signal application hooks of worker start
-  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!
@@ -87,11 +104,10 @@ log_formatter do |str|
   json_formatter.call(str)
 end
 
-lowlevel_error_handler do |ex, env|
+require_relative "{{GITLAB_INSTALL_DIR}}/lib/gitlab/puma/error_handler"
-  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
+error_handler = Gitlab::Puma::ErrorHandler.new(ENV['RAILS_ENV'] == 'production')
-  [500, {}, ["An error has occurred and reported in the system's low-level error handler."]]
+
+lowlevel_error_handler do |ex, env, status_code|
+  error_handler.execute(ex, env, status_code)
 end

assets/runtime/config/gitlabhq/resque.yml

@@ -2,7 +2,7 @@
 # a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
 #
 development:
-  url: redis://localhost:6379
+  url: redis://127.0.0.1:6379
   # sentinels:
   #   -
   #     host: localhost
@@ -11,7 +11,7 @@ development:
   #     host: slave2
   #     port: 26381 # point to sentinel, not to redis port
 test:
-  url: redis://localhost:6379
+  url: redis://127.0.0.1:6379
 production:
   # Redis (single instance)
   url: redis://{{REDIS_HOST}}:{{REDIS_PORT}}/{{REDIS_DB_NUMBER}}

assets/runtime/config/nginx/gitlab

@@ -17,7 +17,7 @@
 ## See installation.md#using-https for additional HTTPS configuration details.
 
 upstream gitlab-workhorse {
-  server localhost:8181 fail_timeout=0;
+  server 127.0.0.1:8181 fail_timeout=0;
 }
 
 map $http_upgrade $connection_upgrade_gitlab {

assets/runtime/config/nginx/gitlab-pages

@@ -15,7 +15,7 @@ server {
     proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
     proxy_set_header    X-Forwarded-Proto   $scheme;
     # The same address as passed to GitLab Pages: `-listen-proxy`
-    proxy_pass          http://localhost:8090/;
+    proxy_pass          http://127.0.0.1:8090/;
   }
   # Define custom error pages
   error_page 403 /403.html;

assets/runtime/config/nginx/gitlab-ssl

@@ -21,7 +21,7 @@
 ## See installation.md#using-https for additional HTTPS configuration details.
 
 upstream gitlab-workhorse {
-  server localhost:8181 fail_timeout=0;
+  server 127.0.0.1:8181 fail_timeout=0;
 }
 
 map $http_upgrade $connection_upgrade_gitlab_ssl {

assets/runtime/env-defaults

@@ -15,7 +15,7 @@ GITLAB_DOWNLOADS_DIR="${GITLAB_DOWNLOADS_DIR:-$GITLAB_TEMP_DIR/downloads}"
 GITLAB_SHARED_DIR="${GITLAB_SHARED_DIR:-$GITLAB_DATA_DIR/shared}"
 GITLAB_DEFAULT_THEME=${GITLAB_DEFAULT_THEME:-2}
 GITLAB_HTTPS=${GITLAB_HTTPS:-false}
-GITLAB_HOST=${GITLAB_HOST:-localhost}
+GITLAB_HOST=${GITLAB_HOST:-127.0.0.1}
 GITLAB_CI_HOST=${GITLAB_CI_HOST:-}
 GITLAB_PORT=${GITLAB_PORT:-}
 GITLAB_IMPERSONATION_ENABLED=${GITLAB_IMPERSONATION_ENABLED:-true}
@@ -270,7 +270,7 @@ GITLAB_REGISTRY_ENABLED=${GITLAB_REGISTRY_ENABLED:-false}
 GITLAB_REGISTRY_DIR="${GITLAB_REGISTRY_DIR:-$GITLAB_SHARED_DIR/registry}"
 GITLAB_REGISTRY_HOST=${GITLAB_REGISTRY_HOST:-registry.example.com}
 GITLAB_REGISTRY_PORT=${GITLAB_REGISTRY_PORT:-443}
-GITLAB_REGISTRY_API_URL=${GITLAB_REGISTRY_API_URL:-http://localhost:5000/}
+GITLAB_REGISTRY_API_URL=${GITLAB_REGISTRY_API_URL:-http://127.0.0.1:5000/}
 GITLAB_REGISTRY_KEY_PATH=${GITLAB_REGISTRY_KEY_PATH:-config/registry.key}
 GITLAB_REGISTRY_ISSUER=${GITLAB_REGISTRY_ISSUER:-gitlab-issuer}
 GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES=${GITLAB_REGISTRY_GENERATE_INTERNAL_CERTIFICATES:-false}
@@ -633,6 +633,8 @@ GITLAB_PAGES_ACCESS_CLIENT_ID=${GITLAB_PAGES_ACCESS_CLIENT_ID:-}
 GITLAB_PAGES_ACCESS_CLIENT_SECRET=${GITLAB_PAGES_ACCESS_CLIENT_SECRET:-}
 GITLAB_PAGES_ACCESS_REDIRECT_URI=${GITLAB_PAGES_ACCESS_REDIRECT_URI:-}
 GITLAB_PAGES_NGINX_PROXY=${GITLAB_PAGES_NGINX_PROXY:-true}
+GITLAB_PAGES_NAMESPACE_IN_PATH=${GITLAB_PAGES_NAMESPACE_IN_PATH:-false}
+GITLAB_PAGES_LOG_VERBOSE=${GITLAB_PAGES_LOG_VERBOSE:-false}
 
 ## Gitaly
 GITALY_CLIENT_PATH=${GITALY_CLIENT_PATH:-$GITLAB_GITALY_INSTALL_DIR}

assets/runtime/functions

@@ -1436,7 +1436,8 @@ gitlab_configure_pages(){
     GITLAB_PAGES_PORT \
     GITLAB_PAGES_HTTPS \
     GITLAB_PAGES_ARTIFACTS_SERVER \
-    GITLAB_PAGES_ACCESS_CONTROL
+    GITLAB_PAGES_ACCESS_CONTROL \
+    GITLAB_PAGES_NAMESPACE_IN_PATH
 
   if [[ -n ${GITLAB_PAGES_EXTERNAL_HTTP} ]]; then
     update_template ${GITLAB_CONFIG} \
@@ -2158,6 +2159,8 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then
       GITLAB_PAGES_ACCESS_REDIRECT_URI \
       GITLAB_PAGES_ACCESS_SECRET \
       GITLAB_PAGES_ACCESS_CONTROL_SERVER \
+      GITLAB_PAGES_NAMESPACE_IN_PATH \
+      GITLAB_PAGES_LOG_VERBOSE \
       GITLAB_INSTALL_DIR
 
   if [[ -n ${GITLAB_PAGES_ARTIFACTS_SERVER_URL} ]]; then
@@ -2167,6 +2170,9 @@ if [[ ${GITLAB_PAGES_ACCESS_CONTROL} == true ]]; then
   fi
 else
   update_template ${GITLAB_PAGES_CONFIG} \
+      GITLAB_RELATIVE_URL_ROOT \
+      GITLAB_PAGES_NAMESPACE_IN_PATH \
+      GITLAB_PAGES_LOG_VERBOSE \
       GITLAB_INSTALL_DIR
 
   exec_as_git sed -i "/{{GITLAB_PAGES_ACCESS_CLIENT_ID}}/d" ${GITLAB_PAGES_CONFIG}

contrib/docker-swarm/docker-compose.yml

@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.4.2
+    image: sameersbn/gitlab:18.8.2
     depends_on:
       - redis
       - postgresql

docker-compose.swarm.yml

@@ -62,7 +62,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:18.4.2
+    image: sameersbn/gitlab:18.8.2
     depends_on:
       - redis
       - postgresql

docker-compose.yml

@@ -21,7 +21,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.4.2
+    image: sameersbn/gitlab:18.8.2
     depends_on:
       - redis
       - postgresql

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.8.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.2 app:rake gitlab:backup:restore
+    sameersbn/gitlab:18.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.
@@ -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.8.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.2
+docker pull sameersbn/gitlab:18.8.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.2
+sameersbn/gitlab:18.8.2
 ```
 
 [storage-config]: https://docs.docker.com/registry/configuration/#storage

docs/docker-compose-keycloak.yml

@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.4.2
+    image: sameersbn/gitlab:18.8.2
     depends_on:
       - redis
       - postgresql

docs/docker-compose-registry.yml

@@ -20,7 +20,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:18.4.2
+    image: sameersbn/gitlab:18.8.2
     volumes:
       - gitlab-data:/home/git/data:Z
       - gitlab-logs:/var/log/gitlab

kubernetes/gitlab-rc.yml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:18.4.2
+        image: sameersbn/gitlab:18.8.2
         env:
         - name: TZ
           value: Asia/Kolkata