Merge pull request #2768 from sachilles/upgrade-to-16.0.0

Upgrade GitLab CE to 16.0.0

Author: sachilles

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

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" \
@@ -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 \

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 '[email protected]' --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 '[email protected]' --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

VERSION

@@ -1 +1 @@
-15.11.5
+16.0.0

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,10 +117,28 @@ 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
 #    database: gitlabhq_geo_test
 #    username: postgres
 #    password:
 #    host: localhost
+#  embedding:
+#    adapter: postgresql
+#    encoding: unicode
+#    database: gitlabhq_embedding_test
+#    username: postgres
+#    password:
+#    host: localhost

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
+# <https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5512> and 
+# <https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5671> 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}

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}}"

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