Skip to content

Commit 3bdd6f8

Browse files
authored
Merge pull request sameersbn#3246 from avvertix/update-18-11-3
Update Gitlab CE to 18.11.3
2 parents 1e3b620 + 119bd8e commit 3bdd6f8

11 files changed

Lines changed: 50 additions & 43 deletions

Changelog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
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.3
7+
8+
- gitlab: upgrade CE to v18.11.3
9+
- gitaly: upgrade to v18.11.3
10+
- gitlab-pages: upgrade to v18.11.3
11+
- golang: upgrade to v1.26.3
12+
613
## 18.11.2
714

815
- gitlab: upgrade CE to v18.11.2

Dockerfile

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

3-
ARG VERSION=18.11.2
3+
ARG VERSION=18.11.3
44

55
ENV GITLAB_VERSION=${VERSION} \
66
RUBY_VERSION=3.3.11 \
77
RUBY_SOURCE_SHA256SUM="59f0fafb1a59a05dc3765117af3fa68e153eb48254708549f321c1e9e078d7a0" \
88
RUBYGEMS_VERSION=4.0.11 \
9-
GOLANG_VERSION=1.26.2 \
9+
GOLANG_VERSION=1.26.3 \
1010
GITLAB_SHELL_VERSION=14.49.0 \
11-
GITLAB_PAGES_VERSION=18.11.2 \
12-
GITALY_SERVER_VERSION=18.11.2 \
11+
GITLAB_PAGES_VERSION=18.11.3 \
12+
GITALY_SERVER_VERSION=18.11.3 \
1313
GITLAB_USER="git" \
1414
GITLAB_HOME="/home/git" \
1515
GITLAB_LOG_DIR="/var/log/gitlab" \

README.md

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# sameersbn/gitlab:18.11.2
1+
# sameersbn/gitlab:18.11.3
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

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

131131
```bash
132-
docker pull sameersbn/gitlab:18.11.2
132+
docker pull sameersbn/gitlab:18.11.3
133133
```
134134

135135
You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -211,7 +211,7 @@ docker run --name gitlab -d \
211211
--env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=["long-and-random-alpha-numeric-string"]' \
212212
--env 'GITLAB_SECRETS_ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=long-and-random-alpha-numeric-string' \
213213
--volume /srv/docker/gitlab/gitlab:/home/git/data \
214-
sameersbn/gitlab:18.11.2
214+
sameersbn/gitlab:18.11.3
215215
```
216216

217217
*Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -246,7 +246,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
246246
```bash
247247
docker run --name gitlab -d \
248248
--volume /srv/docker/gitlab/gitlab:/home/git/data \
249-
sameersbn/gitlab:18.11.2
249+
sameersbn/gitlab:18.11.3
250250
```
251251

252252
### Database
@@ -311,7 +311,7 @@ docker run --name gitlab -d \
311311
--env 'DB_NAME=gitlabhq_production' \
312312
--env 'DB_USER=gitlab' --env 'DB_PASS=password' \
313313
--volume /srv/docker/gitlab/gitlab:/home/git/data \
314-
sameersbn/gitlab:18.11.2
314+
sameersbn/gitlab:18.11.3
315315
```
316316

317317
##### Linking to PostgreSQL Container
@@ -355,7 +355,7 @@ We are now ready to start the GitLab application.
355355
```bash
356356
docker run --name gitlab -d --link gitlab-postgresql:postgresql \
357357
--volume /srv/docker/gitlab/gitlab:/home/git/data \
358-
sameersbn/gitlab:18.11.2
358+
sameersbn/gitlab:18.11.3
359359
```
360360

361361
Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images:
@@ -393,7 +393,7 @@ The image can be configured to use an external redis server. The configuration s
393393
```bash
394394
docker run --name gitlab -it --rm \
395395
--env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
396-
sameersbn/gitlab:18.11.2
396+
sameersbn/gitlab:18.11.3
397397
```
398398

399399
#### Linking to Redis Container
@@ -420,7 +420,7 @@ We are now ready to start the GitLab application.
420420

421421
```bash
422422
docker run --name gitlab -d --link gitlab-redis:redisio \
423-
sameersbn/gitlab:18.11.2
423+
sameersbn/gitlab:18.11.3
424424
```
425425

426426
#### Mail
@@ -433,7 +433,7 @@ If you are using Gmail then all you need to do is:
433433
docker run --name gitlab -d \
434434
--env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
435435
--volume /srv/docker/gitlab/gitlab:/home/git/data \
436-
sameersbn/gitlab:18.11.2
436+
sameersbn/gitlab:18.11.3
437437
```
438438

439439
Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -473,7 +473,7 @@ docker run --name gitlab -d \
473473
--env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \
474474
--env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
475475
--volume /srv/docker/gitlab/gitlab:/home/git/data \
476-
sameersbn/gitlab:18.11.2
476+
sameersbn/gitlab:18.11.3
477477
```
478478

479479
Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -557,7 +557,7 @@ docker run --name gitlab -d \
557557
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
558558
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
559559
--volume /srv/docker/gitlab/gitlab:/home/git/data \
560-
sameersbn/gitlab:18.11.2
560+
sameersbn/gitlab:18.11.3
561561
```
562562

563563
In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer.
@@ -573,7 +573,7 @@ docker run --name gitlab -d \
573573
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
574574
--env 'NGINX_HSTS_MAXAGE=2592000' \
575575
--volume /srv/docker/gitlab/gitlab:/home/git/data \
576-
sameersbn/gitlab:18.11.2
576+
sameersbn/gitlab:18.11.3
577577
```
578578

579579
If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -596,7 +596,7 @@ docker run --name gitlab -d \
596596
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
597597
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
598598
--volume /srv/docker/gitlab/gitlab:/home/git/data \
599-
sameersbn/gitlab:18.11.2
599+
sameersbn/gitlab:18.11.3
600600
```
601601

602602
Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -644,7 +644,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
644644
docker run --name gitlab -it --rm \
645645
--env 'GITLAB_RELATIVE_URL_ROOT=/git' \
646646
--volume /srv/docker/gitlab/gitlab:/home/git/data \
647-
sameersbn/gitlab:18.11.2
647+
sameersbn/gitlab:18.11.3
648648
```
649649

650650
GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -871,14 +871,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
871871
```bash
872872
docker run --name gitlab -it --rm [options] \
873873
--env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
874-
sameersbn/gitlab:18.11.2
874+
sameersbn/gitlab:18.11.3
875875
```
876876

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

879879
```bash
880880
docker run --name gitlab -d [OPTIONS] \
881-
sameersbn/gitlab:18.11.2 app:sanitize
881+
sameersbn/gitlab:18.11.3 app:sanitize
882882
```
883883

884884
#### Piwik
@@ -2677,7 +2677,7 @@ Execute the rake task to create a backup.
26772677

26782678
```bash
26792679
docker run --name gitlab -it --rm [OPTIONS] \
2680-
sameersbn/gitlab:18.11.2 app:rake gitlab:backup:create
2680+
sameersbn/gitlab:18.11.3 app:rake gitlab:backup:create
26812681
```
26822682

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

27132713
```bash
27142714
docker run --name gitlab -it --rm [OPTIONS] \
2715-
sameersbn/gitlab:18.11.2 app:rake db:setup
2715+
sameersbn/gitlab:18.11.3 app:rake db:setup
27162716
```
27172717

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

27202720
```bash
27212721
docker run --name gitlab -it --rm [OPTIONS] \
2722-
sameersbn/gitlab:18.11.2 app:rake gitlab:backup:restore
2722+
sameersbn/gitlab:18.11.3 app:rake gitlab:backup:restore
27232723
```
27242724

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

27292729
```bash
27302730
docker run --name gitlab -it --rm [OPTIONS] \
2731-
sameersbn/gitlab:18.11.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
2731+
sameersbn/gitlab:18.11.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
27322732
```
27332733

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

27782778
```bash
27792779
docker run --name gitlab -it --rm [OPTIONS] \
2780-
sameersbn/gitlab:18.11.2 app:rake gitlab:env:info
2780+
sameersbn/gitlab:18.11.3 app:rake gitlab:env:info
27812781
```
27822782

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

27912791
```bash
27922792
docker run --name gitlab -it --rm [OPTIONS] \
2793-
sameersbn/gitlab:18.11.2 app:rake gitlab:import:repos
2793+
sameersbn/gitlab:18.11.3 app:rake gitlab:import:repos
27942794
```
27952795

27962796
Or
@@ -2821,7 +2821,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
28212821

28222822
```bash
28232823
docker run --name gitlab -it --rm [OPTIONS] \
2824-
sameersbn/gitlab:18.11.2 app:rake gitlab:import:repos
2824+
sameersbn/gitlab:18.11.3 app:rake gitlab:import:repos
28252825
```
28262826

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

28532853
> **Note**
28542854
>
2855-
> Upgrading to `sameersbn/gitlab:18.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.
2855+
> Upgrading to `sameersbn/gitlab:18.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.
28562856

28572857
- **Step 1**: Update the docker image.
28582858

28592859
```bash
2860-
docker pull sameersbn/gitlab:18.11.2
2860+
docker pull sameersbn/gitlab:18.11.3
28612861
```
28622862

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

28892889
```bash
2890-
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.11.2
2890+
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:18.11.3
28912891
```
28922892

28932893
### Shell Access
@@ -2923,7 +2923,7 @@ You can also set your `docker-compose.yml` [healthcheck](https://docs.docker.com
29232923
```yml
29242924
services:
29252925
gitlab:
2926-
image: sameersbn/gitlab:18.11.2
2926+
image: sameersbn/gitlab:18.11.3
29272927
healthcheck:
29282928
test: ["CMD", "/usr/local/sbin/healthcheck"]
29292929
interval: 1m

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.11.2
1+
18.11.3

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.11.2
23+
image: sameersbn/gitlab:18.11.3
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.11.2
65+
image: sameersbn/gitlab:18.11.3
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.11.2
24+
image: sameersbn/gitlab:18.11.3
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.11.2 app:rake gitlab:backup:create
301+
sameersbn/gitlab:18.11.3 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.11.2 app:rake gitlab:backup:restore
318+
sameersbn/gitlab:18.11.3 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.11.2 app:rake gitlab:backup:restore BACKUP=1417624827
327+
sameersbn/gitlab:18.11.3 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.11.2
337+
docker pull sameersbn/gitlab:18.11.3
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.11.2
391+
sameersbn/gitlab:18.11.3
392392
```
393393

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

docs/docker-compose-keycloak.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.11.2
23+
image: sameersbn/gitlab:18.11.3
2424
depends_on:
2525
- redis
2626
- postgresql

docs/docker-compose-registry.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.11.2
23+
image: sameersbn/gitlab:18.11.3
2424
volumes:
2525
- gitlab-data:/home/git/data:Z
2626
- gitlab-logs:/var/log/gitlab

0 commit comments

Comments
 (0)