Skip to content

Commit d8ff73a

Browse files
committed
Upgrade GitLab CE to 17.1.2
1 parent 30af35c commit d8ff73a

File tree

11 files changed

+50
-43
lines changed

11 files changed

+50
-43
lines changed

Changelog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
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.
44

5+
**17.1.2**
6+
7+
- gitlab: upgrade CE to v17.1.2
8+
- gitaly: upgrade to v17.1.2
9+
- gitlab-pages: upgrade to v17.1.2
10+
- golang: upgrade to v1.22.5
11+
512
**17.1.1**
613

714
- gitlab: upgrade CE to v17.1.1

Dockerfile

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

3-
ARG VERSION=17.1.1
3+
ARG VERSION=17.1.2
44

55
ENV GITLAB_VERSION=${VERSION} \
66
RUBY_VERSION=3.2.4 \
77
RUBY_SOURCE_SHA256SUM="c72b3c5c30482dca18b0f868c9075f3f47d8168eaf626d4e682ce5b59c858692" \
88
RUBYGEMS_VERSION=3.5.14 \
9-
GOLANG_VERSION=1.22.4 \
9+
GOLANG_VERSION=1.22.5 \
1010
GITLAB_SHELL_VERSION=14.36.0 \
11-
GITLAB_PAGES_VERSION=17.1.1 \
12-
GITALY_SERVER_VERSION=17.1.1 \
11+
GITLAB_PAGES_VERSION=17.1.2 \
12+
GITALY_SERVER_VERSION=17.1.2 \
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:17.1.1
1+
# sameersbn/gitlab:17.1.2
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

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

128128
```bash
129-
docker pull sameersbn/gitlab:17.1.1
129+
docker pull sameersbn/gitlab:17.1.2
130130
```
131131

132132
You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -197,7 +197,7 @@ docker run --name gitlab -d \
197197
--env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
198198
--env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
199199
--volume /srv/docker/gitlab/gitlab:/home/git/data \
200-
sameersbn/gitlab:17.1.1
200+
sameersbn/gitlab:17.1.2
201201
```
202202

203203
*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
232232
```bash
233233
docker run --name gitlab -d \
234234
--volume /srv/docker/gitlab/gitlab:/home/git/data \
235-
sameersbn/gitlab:17.1.1
235+
sameersbn/gitlab:17.1.2
236236
```
237237

238238
### Database
@@ -290,7 +290,7 @@ docker run --name gitlab -d \
290290
--env 'DB_NAME=gitlabhq_production' \
291291
--env 'DB_USER=gitlab' --env 'DB_PASS=password' \
292292
--volume /srv/docker/gitlab/gitlab:/home/git/data \
293-
sameersbn/gitlab:17.1.1
293+
sameersbn/gitlab:17.1.2
294294
```
295295

296296
##### Linking to PostgreSQL Container
@@ -334,7 +334,7 @@ We are now ready to start the GitLab application.
334334
```bash
335335
docker run --name gitlab -d --link gitlab-postgresql:postgresql \
336336
--volume /srv/docker/gitlab/gitlab:/home/git/data \
337-
sameersbn/gitlab:17.1.1
337+
sameersbn/gitlab:17.1.2
338338
```
339339

340340
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
373373
```bash
374374
docker run --name gitlab -it --rm \
375375
--env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
376-
sameersbn/gitlab:17.1.1
376+
sameersbn/gitlab:17.1.2
377377
```
378378

379379
#### Linking to Redis Container
@@ -400,7 +400,7 @@ We are now ready to start the GitLab application.
400400

401401
```bash
402402
docker run --name gitlab -d --link gitlab-redis:redisio \
403-
sameersbn/gitlab:17.1.1
403+
sameersbn/gitlab:17.1.2
404404
```
405405

406406
#### Mail
@@ -413,7 +413,7 @@ If you are using Gmail then all you need to do is:
413413
docker run --name gitlab -d \
414414
--env '[email protected]' --env 'SMTP_PASS=PASSWORD' \
415415
--volume /srv/docker/gitlab/gitlab:/home/git/data \
416-
sameersbn/gitlab:17.1.1
416+
sameersbn/gitlab:17.1.2
417417
```
418418

419419
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 \
433433
--env '[email protected]' --env 'IMAP_PASS=PASSWORD' \
434434
--env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
435435
--volume /srv/docker/gitlab/gitlab:/home/git/data \
436-
sameersbn/gitlab:17.1.1
436+
sameersbn/gitlab:17.1.2
437437
```
438438

439439
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 \
517517
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
518518
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
519519
--volume /srv/docker/gitlab/gitlab:/home/git/data \
520-
sameersbn/gitlab:17.1.1
520+
sameersbn/gitlab:17.1.2
521521
```
522522

523523
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 \
533533
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
534534
--env 'NGINX_HSTS_MAXAGE=2592000' \
535535
--volume /srv/docker/gitlab/gitlab:/home/git/data \
536-
sameersbn/gitlab:17.1.1
536+
sameersbn/gitlab:17.1.2
537537
```
538538

539539
If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -556,7 +556,7 @@ docker run --name gitlab -d \
556556
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
557557
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
558558
--volume /srv/docker/gitlab/gitlab:/home/git/data \
559-
sameersbn/gitlab:17.1.1
559+
sameersbn/gitlab:17.1.2
560560
```
561561

562562
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
604604
docker run --name gitlab -it --rm \
605605
--env 'GITLAB_RELATIVE_URL_ROOT=/git' \
606606
--volume /srv/docker/gitlab/gitlab:/home/git/data \
607-
sameersbn/gitlab:17.1.1
607+
sameersbn/gitlab:17.1.2
608608
```
609609

610610
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`
786786
```bash
787787
docker run --name gitlab -it --rm [options] \
788788
--env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
789-
sameersbn/gitlab:17.1.1
789+
sameersbn/gitlab:17.1.2
790790
```
791791

792792
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:
793793

794794
```bash
795795
docker run --name gitlab -d [OPTIONS] \
796-
sameersbn/gitlab:17.1.1 app:sanitize
796+
sameersbn/gitlab:17.1.2 app:sanitize
797797
```
798798

799799
#### Piwik
@@ -2536,7 +2536,7 @@ Execute the rake task to create a backup.
25362536

25372537
```bash
25382538
docker run --name gitlab -it --rm [OPTIONS] \
2539-
sameersbn/gitlab:17.1.1 app:rake gitlab:backup:create
2539+
sameersbn/gitlab:17.1.2 app:rake gitlab:backup:create
25402540
```
25412541

25422542
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:
25712571

25722572
```bash
25732573
docker run --name gitlab -it --rm [OPTIONS] \
2574-
sameersbn/gitlab:17.1.1 app:rake db:setup
2574+
sameersbn/gitlab:17.1.2 app:rake db:setup
25752575
```
25762576

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

25792579
```bash
25802580
docker run --name gitlab -it --rm [OPTIONS] \
2581-
sameersbn/gitlab:17.1.1 app:rake gitlab:backup:restore
2581+
sameersbn/gitlab:17.1.2 app:rake gitlab:backup:restore
25822582
```
25832583

25842584
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
25872587

25882588
```bash
25892589
docker run --name gitlab -it --rm [OPTIONS] \
2590-
sameersbn/gitlab:17.1.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
2590+
sameersbn/gitlab:17.1.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
25912591
```
25922592

25932593
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
26362636

26372637
```bash
26382638
docker run --name gitlab -it --rm [OPTIONS] \
2639-
sameersbn/gitlab:17.1.1 app:rake gitlab:env:info
2639+
sameersbn/gitlab:17.1.2 app:rake gitlab:env:info
26402640
```
26412641

26422642
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
26492649

26502650
```bash
26512651
docker run --name gitlab -it --rm [OPTIONS] \
2652-
sameersbn/gitlab:17.1.1 app:rake gitlab:import:repos
2652+
sameersbn/gitlab:17.1.2 app:rake gitlab:import:repos
26532653
```
26542654

26552655
Or
@@ -2680,7 +2680,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
26802680

26812681
```bash
26822682
docker run --name gitlab -it --rm [OPTIONS] \
2683-
sameersbn/gitlab:17.1.1 app:rake gitlab:import:repos
2683+
sameersbn/gitlab:17.1.2 app:rake gitlab:import:repos
26842684
```
26852685

26862686
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
27042704

27052705
> **Note**
27062706
>
2707-
> 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.
2707+
> 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.
27082708

27092709
- **Step 1**: Update the docker image.
27102710

27112711
```bash
2712-
docker pull sameersbn/gitlab:17.1.1
2712+
docker pull sameersbn/gitlab:17.1.2
27132713
```
27142714

27152715
- **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
27352735
> **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`.
27362736

27372737
```bash
2738-
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.1.1
2738+
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.1.2
27392739
```
27402740

27412741
### Shell Access
@@ -2773,7 +2773,7 @@ version: '2.3'
27732773
27742774
services:
27752775
gitlab:
2776-
image: sameersbn/gitlab:17.1.1
2776+
image: sameersbn/gitlab:17.1.2
27772777
healthcheck:
27782778
test: ["CMD", "/usr/local/sbin/healthcheck"]
27792779
interval: 1m

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
17.1.1
1+
17.1.2

contrib/docker-swarm/docker-compose.yml

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

2323
gitlab:
2424
restart: always
25-
image: sameersbn/gitlab:17.1.1
25+
image: sameersbn/gitlab:17.1.2
2626
depends_on:
2727
- redis
2828
- postgresql

docker-compose.swarm.yml

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

6565
gitlab:
66-
image: sameersbn/gitlab:17.1.1
66+
image: sameersbn/gitlab:17.1.2
6767
depends_on:
6868
- redis
6969
- postgresql

docker-compose.yml

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

2323
gitlab:
2424
restart: always
25-
image: sameersbn/gitlab:17.1.1
25+
image: sameersbn/gitlab:17.1.2
2626
depends_on:
2727
- redis
2828
- postgresql

docs/container_registry.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
289289
Execute the rake task with a removeable container.
290290
```bash
291291
docker run --name gitlab -it --rm [OPTIONS] \
292-
sameersbn/gitlab:17.1.1 app:rake gitlab:backup:create
292+
sameersbn/gitlab:17.1.2 app:rake gitlab:backup:create
293293
```
294294
## Restoring Backups
295295

@@ -305,7 +305,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
305305

306306
```bash
307307
docker run --name gitlab -it --rm [OPTIONS] \
308-
sameersbn/gitlab:17.1.1 app:rake gitlab:backup:restore
308+
sameersbn/gitlab:17.1.2 app:rake gitlab:backup:restore
309309
```
310310

311311
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
314314

315315
```bash
316316
docker run --name gitlab -it --rm [OPTIONS] \
317-
sameersbn/gitlab:17.1.1 app:rake gitlab:backup:restore BACKUP=1417624827
317+
sameersbn/gitlab:17.1.2 app:rake gitlab:backup:restore BACKUP=1417624827
318318
```
319319

320320
# 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
325325
- **Step 1**: Update the docker image.
326326

327327
```bash
328-
docker pull sameersbn/gitlab:17.1.1
328+
docker pull sameersbn/gitlab:17.1.2
329329
```
330330

331331
- **Step 2**: Stop and remove the currently running image
@@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
378378
--env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
379379
--env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
380380
--link registry:registry
381-
sameersbn/gitlab:17.1.1
381+
sameersbn/gitlab:17.1.2
382382
```
383383

384384

docs/docker-compose-keycloak.yml

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

2323
gitlab:
2424
restart: always
25-
image: sameersbn/gitlab:17.1.1
25+
image: sameersbn/gitlab:17.1.2
2626
depends_on:
2727
- redis
2828
- postgresql

docs/docker-compose-registry.yml

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

2323
gitlab:
2424
restart: always
25-
image: sameersbn/gitlab:17.1.1
25+
image: sameersbn/gitlab:17.1.2
2626
volumes:
2727
- gitlab-data:/home/git/data:Z
2828
- gitlab-logs:/var/log/gitlab

0 commit comments

Comments
 (0)