Skip to content

Commit c079996

Browse files
authored
Merge pull request #3069 from sachilles/upgrade-to-17.8.2
Upgrade GitLab CE to 17.8.2
2 parents 124cce4 + c938f39 commit c079996

11 files changed

+53
-45
lines changed

Changelog.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
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+
**17.8.2**
7+
8+
- gitlab: upgrade CE to v17.8.2
9+
- gitaly: upgrade to v17.8.2
10+
- gitlab-pages: upgrade to v17.8.2
11+
- golang: upgrade to v1.23.6
12+
- ruby: upgrade to v3.2.7
13+
614
**17.8.1**
715

816
- gitlab: upgrade CE to v17.8.1

Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
FROM ubuntu:jammy-20240911.1
22

3-
ARG VERSION=17.8.1
3+
ARG VERSION=17.8.2
44

55
ENV GITLAB_VERSION=${VERSION} \
6-
RUBY_VERSION=3.2.6 \
7-
RUBY_SOURCE_SHA256SUM="d9cb65ecdf3f18669639f2638b63379ed6fbb17d93ae4e726d4eb2bf68a48370" \
6+
RUBY_VERSION=3.2.7 \
7+
RUBY_SOURCE_SHA256SUM="8488fa620ff0333c16d437f2b890bba3b67f8745fdecb1472568a6114aad9741" \
88
RUBYGEMS_VERSION=3.5.14 \
9-
GOLANG_VERSION=1.23.5 \
9+
GOLANG_VERSION=1.23.6 \
1010
GITLAB_SHELL_VERSION=14.39.0 \
11-
GITLAB_PAGES_VERSION=17.8.1 \
12-
GITALY_SERVER_VERSION=17.8.1 \
11+
GITLAB_PAGES_VERSION=17.8.2 \
12+
GITALY_SERVER_VERSION=17.8.2 \
1313
GITLAB_USER="git" \
1414
GITLAB_HOME="/home/git" \
1515
GITLAB_LOG_DIR="/var/log/gitlab" \

README.md

+27-27
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# sameersbn/gitlab:17.8.1
1+
# sameersbn/gitlab:17.8.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

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

129129
```bash
130-
docker pull sameersbn/gitlab:17.8.1
130+
docker pull sameersbn/gitlab:17.8.2
131131
```
132132

133133
You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -198,7 +198,7 @@ docker run --name gitlab -d \
198198
--env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
199199
--env 'GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE=long-and-random-alpha-numeric-string' \
200200
--volume /srv/docker/gitlab/gitlab:/home/git/data \
201-
sameersbn/gitlab:17.8.1
201+
sameersbn/gitlab:17.8.2
202202
```
203203

204204
*Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -233,7 +233,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
233233
```bash
234234
docker run --name gitlab -d \
235235
--volume /srv/docker/gitlab/gitlab:/home/git/data \
236-
sameersbn/gitlab:17.8.1
236+
sameersbn/gitlab:17.8.2
237237
```
238238

239239
### Database
@@ -292,7 +292,7 @@ docker run --name gitlab -d \
292292
--env 'DB_NAME=gitlabhq_production' \
293293
--env 'DB_USER=gitlab' --env 'DB_PASS=password' \
294294
--volume /srv/docker/gitlab/gitlab:/home/git/data \
295-
sameersbn/gitlab:17.8.1
295+
sameersbn/gitlab:17.8.2
296296
```
297297

298298
##### Linking to PostgreSQL Container
@@ -336,7 +336,7 @@ We are now ready to start the GitLab application.
336336
```bash
337337
docker run --name gitlab -d --link gitlab-postgresql:postgresql \
338338
--volume /srv/docker/gitlab/gitlab:/home/git/data \
339-
sameersbn/gitlab:17.8.1
339+
sameersbn/gitlab:17.8.2
340340
```
341341

342342
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:
@@ -375,7 +375,7 @@ The image can be configured to use an external redis server. The configuration s
375375
```bash
376376
docker run --name gitlab -it --rm \
377377
--env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
378-
sameersbn/gitlab:17.8.1
378+
sameersbn/gitlab:17.8.2
379379
```
380380

381381
#### Linking to Redis Container
@@ -402,7 +402,7 @@ We are now ready to start the GitLab application.
402402

403403
```bash
404404
docker run --name gitlab -d --link gitlab-redis:redisio \
405-
sameersbn/gitlab:17.8.1
405+
sameersbn/gitlab:17.8.2
406406
```
407407

408408
#### Mail
@@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
415415
docker run --name gitlab -d \
416416
--env '[email protected]' --env 'SMTP_PASS=PASSWORD' \
417417
--volume /srv/docker/gitlab/gitlab:/home/git/data \
418-
sameersbn/gitlab:17.8.1
418+
sameersbn/gitlab:17.8.2
419419
```
420420

421421
Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -435,7 +435,7 @@ docker run --name gitlab -d \
435435
--env '[email protected]' --env 'IMAP_PASS=PASSWORD' \
436436
--env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
437437
--volume /srv/docker/gitlab/gitlab:/home/git/data \
438-
sameersbn/gitlab:17.8.1
438+
sameersbn/gitlab:17.8.2
439439
```
440440

441441
Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -519,7 +519,7 @@ docker run --name gitlab -d \
519519
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
520520
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
521521
--volume /srv/docker/gitlab/gitlab:/home/git/data \
522-
sameersbn/gitlab:17.8.1
522+
sameersbn/gitlab:17.8.2
523523
```
524524

525525
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.
@@ -535,7 +535,7 @@ docker run --name gitlab -d \
535535
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
536536
--env 'NGINX_HSTS_MAXAGE=2592000' \
537537
--volume /srv/docker/gitlab/gitlab:/home/git/data \
538-
sameersbn/gitlab:17.8.1
538+
sameersbn/gitlab:17.8.2
539539
```
540540

541541
If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -558,7 +558,7 @@ docker run --name gitlab -d \
558558
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
559559
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
560560
--volume /srv/docker/gitlab/gitlab:/home/git/data \
561-
sameersbn/gitlab:17.8.1
561+
sameersbn/gitlab:17.8.2
562562
```
563563

564564
Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -606,7 +606,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
606606
docker run --name gitlab -it --rm \
607607
--env 'GITLAB_RELATIVE_URL_ROOT=/git' \
608608
--volume /srv/docker/gitlab/gitlab:/home/git/data \
609-
sameersbn/gitlab:17.8.1
609+
sameersbn/gitlab:17.8.2
610610
```
611611

612612
GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -812,14 +812,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
812812
```bash
813813
docker run --name gitlab -it --rm [options] \
814814
--env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
815-
sameersbn/gitlab:17.8.1
815+
sameersbn/gitlab:17.8.2
816816
```
817817

818818
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:
819819

820820
```bash
821821
docker run --name gitlab -d [OPTIONS] \
822-
sameersbn/gitlab:17.8.1 app:sanitize
822+
sameersbn/gitlab:17.8.2 app:sanitize
823823
```
824824

825825
#### Piwik
@@ -2562,7 +2562,7 @@ Execute the rake task to create a backup.
25622562

25632563
```bash
25642564
docker run --name gitlab -it --rm [OPTIONS] \
2565-
sameersbn/gitlab:17.8.1 app:rake gitlab:backup:create
2565+
sameersbn/gitlab:17.8.2 app:rake gitlab:backup:create
25662566
```
25672567

25682568
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.
@@ -2597,14 +2597,14 @@ you need to prepare the database:
25972597

25982598
```bash
25992599
docker run --name gitlab -it --rm [OPTIONS] \
2600-
sameersbn/gitlab:17.8.1 app:rake db:setup
2600+
sameersbn/gitlab:17.8.2 app:rake db:setup
26012601
```
26022602

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

26052605
```bash
26062606
docker run --name gitlab -it --rm [OPTIONS] \
2607-
sameersbn/gitlab:17.8.1 app:rake gitlab:backup:restore
2607+
sameersbn/gitlab:17.8.2 app:rake gitlab:backup:restore
26082608
```
26092609

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

26142614
```bash
26152615
docker run --name gitlab -it --rm [OPTIONS] \
2616-
sameersbn/gitlab:17.8.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
2616+
sameersbn/gitlab:17.8.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
26172617
```
26182618

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

26632663
```bash
26642664
docker run --name gitlab -it --rm [OPTIONS] \
2665-
sameersbn/gitlab:17.8.1 app:rake gitlab:env:info
2665+
sameersbn/gitlab:17.8.2 app:rake gitlab:env:info
26662666
```
26672667

26682668
You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -2675,7 +2675,7 @@ Similarly, to import bare repositories into GitLab project instance
26752675

26762676
```bash
26772677
docker run --name gitlab -it --rm [OPTIONS] \
2678-
sameersbn/gitlab:17.8.1 app:rake gitlab:import:repos
2678+
sameersbn/gitlab:17.8.2 app:rake gitlab:import:repos
26792679
```
26802680

26812681
Or
@@ -2706,7 +2706,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
27062706

27072707
```bash
27082708
docker run --name gitlab -it --rm [OPTIONS] \
2709-
sameersbn/gitlab:17.8.1 app:rake gitlab:import:repos
2709+
sameersbn/gitlab:17.8.2 app:rake gitlab:import:repos
27102710
```
27112711

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

27312731
> **Note**
27322732
>
2733-
> Upgrading to `sameersbn/gitlab:17.8.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.
2733+
> Upgrading to `sameersbn/gitlab:17.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.
27342734

27352735
- **Step 1**: Update the docker image.
27362736

27372737
```bash
2738-
docker pull sameersbn/gitlab:17.8.1
2738+
docker pull sameersbn/gitlab:17.8.2
27392739
```
27402740

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

27632763
```bash
2764-
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.8.1
2764+
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.8.2
27652765
```
27662766

27672767
### Shell Access
@@ -2799,7 +2799,7 @@ version: '2.3'
27992799
28002800
services:
28012801
gitlab:
2802-
image: sameersbn/gitlab:17.8.1
2802+
image: sameersbn/gitlab:17.8.2
28032803
healthcheck:
28042804
test: ["CMD", "/usr/local/sbin/healthcheck"]
28052805
interval: 1m

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
17.8.1
1+
17.8.2

contrib/docker-swarm/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222

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

docker-compose.swarm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ services:
6363
- traefik-public
6464

6565
gitlab:
66-
image: sameersbn/gitlab:17.8.1
66+
image: sameersbn/gitlab:17.8.2
6767
depends_on:
6868
- redis
6969
- postgresql

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222

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

docs/container_registry.md

+5-5
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.8.1 app:rake gitlab:backup:create
292+
sameersbn/gitlab:17.8.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.8.1 app:rake gitlab:backup:restore
308+
sameersbn/gitlab:17.8.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.8.1 app:rake gitlab:backup:restore BACKUP=1417624827
317+
sameersbn/gitlab:17.8.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.8.1
328+
docker pull sameersbn/gitlab:17.8.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.8.1
381+
sameersbn/gitlab:17.8.2
382382
```
383383

384384

docs/docker-compose-keycloak.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222

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

docs/docker-compose-registry.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222

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

kubernetes/gitlab-rc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
spec:
1515
containers:
1616
- name: gitlab
17-
image: sameersbn/gitlab:17.8.1
17+
image: sameersbn/gitlab:17.8.2
1818
env:
1919
- name: TZ
2020
value: Asia/Kolkata

0 commit comments

Comments
 (0)