Skip to content

Commit f68d93c

Browse files
authored
Merge pull request #3238 from sachilles/upgrade-to-18.11.0
Upgrade GitLab CE to 18.11.0
2 parents 616b420 + 21bc232 commit f68d93c

File tree

13 files changed

+56
-47
lines changed

13 files changed

+56
-47
lines changed

CI_MIGRATION.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,4 +122,3 @@ If you are using a reverse proxy, update the configuration such that `ci.example
122122
## Step 7 - Done!
123123

124124
You can now start the GitLab server normally. Make sure that `GITLAB_CI_HOST` and `GITLAB_SECRETS_DB_KEY_BASE` are defined in your containers environment.
125-

Changelog.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
33
This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://
44
gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
55

6+
## 18.11.0
7+
8+
- gitlab: upgrade CE to v18.11.0
9+
- gitaly: upgrade to v18.11.0
10+
- gitlab-pages: upgrade to v18.11.0
11+
- gitlab-shell: upgrade to v14.49.0
12+
- golang: upgrade to v1.26.2
13+
- ubuntu: upgrade to noble-20260410
14+
615
## 18.10.3
716

817
- gitlab: upgrade CE to v18.10.3

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
FROM ubuntu:noble-20260324
1+
FROM ubuntu:noble-20260410
22

3-
ARG VERSION=18.10.3
3+
ARG VERSION=18.11.0
44

55
ENV GITLAB_VERSION=${VERSION} \
66
RUBY_VERSION=3.3.11 \
77
RUBY_SOURCE_SHA256SUM="59f0fafb1a59a05dc3765117af3fa68e153eb48254708549f321c1e9e078d7a0" \
88
RUBYGEMS_VERSION=4.0.10 \
9-
GOLANG_VERSION=1.25.9 \
10-
GITLAB_SHELL_VERSION=14.47.0 \
11-
GITLAB_PAGES_VERSION=18.10.3 \
12-
GITALY_SERVER_VERSION=18.10.3 \
9+
GOLANG_VERSION=1.26.2 \
10+
GITLAB_SHELL_VERSION=14.49.0 \
11+
GITLAB_PAGES_VERSION=18.11.0 \
12+
GITALY_SERVER_VERSION=18.11.0 \
1313
GITLAB_USER="git" \
1414
GITLAB_HOME="/home/git" \
1515
GITLAB_LOG_DIR="/var/log/gitlab" \
@@ -38,7 +38,7 @@ RUN set -ex && \
3838
&& wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /etc/apt/keyrings/postgres.gpg \
3939
&& 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 \
4040
&& wget --quiet -O - https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
41-
&& 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 \
41+
&& echo 'deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main' > /etc/apt/sources.list.d/nodesource.list \
4242
&& wget --quiet -O - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor -o /etc/apt/keyrings/yarn.gpg \
4343
&& echo 'deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list \
4444
&& wget --quiet -O - https://nginx.org/keys/nginx_signing.key | gpg --dearmor -o /etc/apt/keyrings/nginx-archive-keyring.gpg \

README.md

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# sameersbn/gitlab:18.10.3
1+
# sameersbn/gitlab:18.11.0
22

33
[![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)
44

@@ -128,7 +128,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
128128
Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/sameersbn/gitlab) and is the recommended method of installation.
129129

130130
```bash
131-
docker pull sameersbn/gitlab:18.10.3
131+
docker pull sameersbn/gitlab:18.11.0
132132
```
133133

134134
You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -210,7 +210,7 @@ docker run --name gitlab -d \
210210
--env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
211211
--env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
212212
--volume /srv/docker/gitlab/gitlab:/home/git/data \
213-
sameersbn/gitlab:18.10.3
213+
sameersbn/gitlab:18.11.0
214214
```
215215

216216
*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
245245
```bash
246246
docker run --name gitlab -d \
247247
--volume /srv/docker/gitlab/gitlab:/home/git/data \
248-
sameersbn/gitlab:18.10.3
248+
sameersbn/gitlab:18.11.0
249249
```
250250

251251
### Database
@@ -310,7 +310,7 @@ docker run --name gitlab -d \
310310
--env 'DB_NAME=gitlabhq_production' \
311311
--env 'DB_USER=gitlab' --env 'DB_PASS=password' \
312312
--volume /srv/docker/gitlab/gitlab:/home/git/data \
313-
sameersbn/gitlab:18.10.3
313+
sameersbn/gitlab:18.11.0
314314
```
315315

316316
##### Linking to PostgreSQL Container
@@ -354,7 +354,7 @@ We are now ready to start the GitLab application.
354354
```bash
355355
docker run --name gitlab -d --link gitlab-postgresql:postgresql \
356356
--volume /srv/docker/gitlab/gitlab:/home/git/data \
357-
sameersbn/gitlab:18.10.3
357+
sameersbn/gitlab:18.11.0
358358
```
359359

360360
Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in 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
392392
```bash
393393
docker run --name gitlab -it --rm \
394394
--env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
395-
sameersbn/gitlab:18.10.3
395+
sameersbn/gitlab:18.11.0
396396
```
397397

398398
#### Linking to Redis Container
@@ -419,7 +419,7 @@ We are now ready to start the GitLab application.
419419

420420
```bash
421421
docker run --name gitlab -d --link gitlab-redis:redisio \
422-
sameersbn/gitlab:18.10.3
422+
sameersbn/gitlab:18.11.0
423423
```
424424

425425
#### Mail
@@ -432,7 +432,7 @@ If you are using Gmail then all you need to do is:
432432
docker run --name gitlab -d \
433433
--env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
434434
--volume /srv/docker/gitlab/gitlab:/home/git/data \
435-
sameersbn/gitlab:18.10.3
435+
sameersbn/gitlab:18.11.0
436436
```
437437

438438
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 \
452452
--env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
453453
--env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
454454
--volume /srv/docker/gitlab/gitlab:/home/git/data \
455-
sameersbn/gitlab:18.10.3
455+
sameersbn/gitlab:18.11.0
456456
```
457457

458458
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 \
536536
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
537537
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
538538
--volume /srv/docker/gitlab/gitlab:/home/git/data \
539-
sameersbn/gitlab:18.10.3
539+
sameersbn/gitlab:18.11.0
540540
```
541541

542542
In this configuration, any requests made 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 \
552552
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
553553
--env 'NGINX_HSTS_MAXAGE=2592000' \
554554
--volume /srv/docker/gitlab/gitlab:/home/git/data \
555-
sameersbn/gitlab:18.10.3
555+
sameersbn/gitlab:18.11.0
556556
```
557557

558558
If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -575,7 +575,7 @@ docker run --name gitlab -d \
575575
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
576576
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
577577
--volume /srv/docker/gitlab/gitlab:/home/git/data \
578-
sameersbn/gitlab:18.10.3
578+
sameersbn/gitlab:18.11.0
579579
```
580580

581581
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
623623
docker run --name gitlab -it --rm \
624624
--env 'GITLAB_RELATIVE_URL_ROOT=/git' \
625625
--volume /srv/docker/gitlab/gitlab:/home/git/data \
626-
sameersbn/gitlab:18.10.3
626+
sameersbn/gitlab:18.11.0
627627
```
628628

629629
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`
850850
```bash
851851
docker run --name gitlab -it --rm [options] \
852852
--env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
853-
sameersbn/gitlab:18.10.3
853+
sameersbn/gitlab:18.11.0
854854
```
855855

856856
When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command:
857857

858858
```bash
859859
docker run --name gitlab -d [OPTIONS] \
860-
sameersbn/gitlab:18.10.3 app:sanitize
860+
sameersbn/gitlab:18.11.0 app:sanitize
861861
```
862862

863863
#### Piwik
@@ -2628,7 +2628,7 @@ Execute the rake task to create a backup.
26282628

26292629
```bash
26302630
docker run --name gitlab -it --rm [OPTIONS] \
2631-
sameersbn/gitlab:18.10.3 app:rake gitlab:backup:create
2631+
sameersbn/gitlab:18.11.0 app:rake gitlab:backup:create
26322632
```
26332633

26342634
A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter.
@@ -2663,14 +2663,14 @@ you need to prepare the database:
26632663

26642664
```bash
26652665
docker run --name gitlab -it --rm [OPTIONS] \
2666-
sameersbn/gitlab:18.10.3 app:rake db:setup
2666+
sameersbn/gitlab:18.11.0 app:rake db:setup
26672667
```
26682668

26692669
Execute the rake task to restore a backup. Make sure you run the container in interactive mode `-it`.
26702670

26712671
```bash
26722672
docker run --name gitlab -it --rm [OPTIONS] \
2673-
sameersbn/gitlab:18.10.3 app:rake gitlab:backup:restore
2673+
sameersbn/gitlab:18.11.0 app:rake gitlab:backup:restore
26742674
```
26752675

26762676
The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -2679,7 +2679,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
26792679

26802680
```bash
26812681
docker run --name gitlab -it --rm [OPTIONS] \
2682-
sameersbn/gitlab:18.10.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
2682+
sameersbn/gitlab:18.11.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
26832683
```
26842684

26852685
When using `docker-compose` you may use the following command to execute the restore.
@@ -2728,7 +2728,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
27282728

27292729
```bash
27302730
docker run --name gitlab -it --rm [OPTIONS] \
2731-
sameersbn/gitlab:18.10.3 app:rake gitlab:env:info
2731+
sameersbn/gitlab:18.11.0 app:rake gitlab:env:info
27322732
```
27332733

27342734
You can also use `docker exec` to run rake tasks on running gitlab instance. For example,
@@ -2741,7 +2741,7 @@ Similarly, to import bare repositories into GitLab project instance
27412741

27422742
```bash
27432743
docker run --name gitlab -it --rm [OPTIONS] \
2744-
sameersbn/gitlab:18.10.3 app:rake gitlab:import:repos
2744+
sameersbn/gitlab:18.11.0 app:rake gitlab:import:repos
27452745
```
27462746

27472747
Or
@@ -2772,7 +2772,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
27722772

27732773
```bash
27742774
docker run --name gitlab -it --rm [OPTIONS] \
2775-
sameersbn/gitlab:18.10.3 app:rake gitlab:import:repos
2775+
sameersbn/gitlab:18.11.0 app:rake gitlab:import:repos
27762776
```
27772777

27782778
Watch the logs and your repositories should be available into your new gitlab container.
@@ -2803,12 +2803,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
28032803

28042804
> **Note**
28052805
>
2806-
> Upgrading to `sameersbn/gitlab:18.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.
2806+
> Upgrading to `sameersbn/gitlab:18.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.
28072807

28082808
- **Step 1**: Update the docker image.
28092809

28102810
```bash
2811-
docker pull sameersbn/gitlab:18.10.3
2811+
docker pull sameersbn/gitlab:18.11.0
28122812
```
28132813

28142814
- **Step 2**: Stop and remove the currently running image
@@ -2838,7 +2838,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
28382838
> **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.**
28392839

28402840
```bash
2841-
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.10.3
2841+
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.11.0
28422842
```
28432843

28442844
### Shell Access
@@ -2874,7 +2874,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
28742874
```yml
28752875
services:
28762876
gitlab:
2877-
image: sameersbn/gitlab:18.10.3
2877+
image: sameersbn/gitlab:18.11.0
28782878
healthcheck:
28792879
test: ["CMD", "/usr/local/sbin/healthcheck"]
28802880
interval: 1m

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.10.3
1+
18.11.0

assets/build/install.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ chown ${GITLAB_USER}: ${GITLAB_INSTALL_DIR}/config/database.yml
211211
exec_as_git yarn install --production --pure-lockfile
212212

213213
echo "Compiling assets. Please be patient, this could take a while..."
214+
node scripts/frontend/infection_scanner/infection_scanner.mjs
214215
exec_as_git bundle exec rake gitlab:assets:compile USE_DB=false SKIP_STORAGE_VALIDATION=true NODE_OPTIONS="--max-old-space-size=8192"
215216

216217
# remove auto generated ${GITLAB_DATA_DIR}/config/secrets.yml

contrib/docker-swarm/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020

2121
gitlab:
2222
restart: always
23-
image: sameersbn/gitlab:18.10.3
23+
image: sameersbn/gitlab:18.11.0
2424
depends_on:
2525
- redis
2626
- postgresql

docker-compose.swarm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ services:
6262
- traefik-public
6363

6464
gitlab:
65-
image: sameersbn/gitlab:18.10.3
65+
image: sameersbn/gitlab:18.11.0
6666
depends_on:
6767
- redis
6868
- postgresql

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ services:
2121

2222
gitlab:
2323
restart: always
24-
image: sameersbn/gitlab:18.10.3
24+
image: sameersbn/gitlab:18.11.0
2525
depends_on:
2626
- redis
2727
- postgresql

docs/container_registry.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ Execute the rake task with a removeable container.
298298

299299
```bash
300300
docker run --name gitlab -it --rm [OPTIONS] \
301-
sameersbn/gitlab:18.10.3 app:rake gitlab:backup:create
301+
sameersbn/gitlab:18.11.0 app:rake gitlab:backup:create
302302
```
303303

304304
### Restoring Backups
@@ -315,7 +315,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
315315

316316
```bash
317317
docker run --name gitlab -it --rm [OPTIONS] \
318-
sameersbn/gitlab:18.10.3 app:rake gitlab:backup:restore
318+
sameersbn/gitlab:18.11.0 app:rake gitlab:backup:restore
319319
```
320320

321321
The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue.
@@ -324,7 +324,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
324324

325325
```bash
326326
docker run --name gitlab -it --rm [OPTIONS] \
327-
sameersbn/gitlab:18.10.3 app:rake gitlab:backup:restore BACKUP=1417624827
327+
sameersbn/gitlab:18.11.0 app:rake gitlab:backup:restore BACKUP=1417624827
328328
```
329329

330330
## Upgrading from an existing GitLab installation
@@ -334,7 +334,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
334334
- **Step 1**: Update the docker image.
335335

336336
```bash
337-
docker pull sameersbn/gitlab:18.10.3
337+
docker pull sameersbn/gitlab:18.11.0
338338
```
339339

340340
- **Step 2**: Stop and remove the currently running image
@@ -388,7 +388,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
388388
--env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
389389
--env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
390390
--link registry:registry
391-
sameersbn/gitlab:18.10.3
391+
sameersbn/gitlab:18.11.0
392392
```
393393

394394
[storage-config]: https://docs.docker.com/registry/configuration/#storage

0 commit comments

Comments
 (0)