Skip to content

Commit f9b62de

Browse files
authored
Merge pull request #2531 from sachilles/upgrade-to-14.9.1
Upgrade GitLab CE to 14.9.1
2 parents a74563c + cdf54d4 commit f9b62de

File tree

11 files changed

+45
-41
lines changed

11 files changed

+45
-41
lines changed

Changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
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+
**14.9.1**
6+
- gitlab: upgrade CE to v14.9.1
7+
- gitaly: upgrade to v14.9.1
8+
59
**14.9.0**
610
- gitlab: upgrade CE to v14.9.0
711
- gitaly: upgrade to v14.9.0

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
FROM ubuntu:focal-20220316
22

3-
ARG VERSION=14.9.0
3+
ARG VERSION=14.9.1
44

55
ENV GITLAB_VERSION=${VERSION} \
66
RUBY_VERSION=2.7.5 \
77
RUBY_SOURCE_SHA256SUM="2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1" \
88
GOLANG_VERSION=1.17.8 \
99
GITLAB_SHELL_VERSION=13.24.0 \
1010
GITLAB_PAGES_VERSION=1.56.0 \
11-
GITALY_SERVER_VERSION=14.9.0 \
11+
GITALY_SERVER_VERSION=14.9.1 \
1212
GITLAB_USER="git" \
1313
GITLAB_HOME="/home/git" \
1414
GITLAB_LOG_DIR="/var/log/gitlab" \

README.md

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
22

3-
# sameersbn/gitlab:14.9.0
3+
# sameersbn/gitlab:14.9.1
44

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

127127
```bash
128-
docker pull sameersbn/gitlab:14.9.0
128+
docker pull sameersbn/gitlab:14.9.1
129129
```
130130

131131
You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,7 @@ docker run --name gitlab -d \
194194
--env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
195195
--env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
196196
--volume /srv/docker/gitlab/gitlab:/home/git/data \
197-
sameersbn/gitlab:14.9.0
197+
sameersbn/gitlab:14.9.1
198198
```
199199

200200
*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
229229
```bash
230230
docker run --name gitlab -d \
231231
--volume /srv/docker/gitlab/gitlab:/home/git/data \
232-
sameersbn/gitlab:14.9.0
232+
sameersbn/gitlab:14.9.1
233233
```
234234

235235
## Database
@@ -264,7 +264,7 @@ docker run --name gitlab -d \
264264
--env 'DB_NAME=gitlabhq_production' \
265265
--env 'DB_USER=gitlab' --env 'DB_PASS=password' \
266266
--volume /srv/docker/gitlab/gitlab:/home/git/data \
267-
sameersbn/gitlab:14.9.0
267+
sameersbn/gitlab:14.9.1
268268
```
269269

270270
#### Linking to PostgreSQL Container
@@ -308,7 +308,7 @@ We are now ready to start the GitLab application.
308308
```bash
309309
docker run --name gitlab -d --link gitlab-postgresql:postgresql \
310310
--volume /srv/docker/gitlab/gitlab:/home/git/data \
311-
sameersbn/gitlab:14.9.0
311+
sameersbn/gitlab:14.9.1
312312
```
313313

314314
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:
@@ -347,7 +347,7 @@ The image can be configured to use an external redis server. The configuration s
347347
```bash
348348
docker run --name gitlab -it --rm \
349349
--env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
350-
sameersbn/gitlab:14.9.0
350+
sameersbn/gitlab:14.9.1
351351
```
352352

353353
### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
374374

375375
```bash
376376
docker run --name gitlab -d --link gitlab-redis:redisio \
377-
sameersbn/gitlab:14.9.0
377+
sameersbn/gitlab:14.9.1
378378
```
379379

380380
### Mail
@@ -387,7 +387,7 @@ If you are using Gmail then all you need to do is:
387387
docker run --name gitlab -d \
388388
--env '[email protected]' --env 'SMTP_PASS=PASSWORD' \
389389
--volume /srv/docker/gitlab/gitlab:/home/git/data \
390-
sameersbn/gitlab:14.9.0
390+
sameersbn/gitlab:14.9.1
391391
```
392392

393393
Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,7 @@ docker run --name gitlab -d \
407407
--env '[email protected]' --env 'IMAP_PASS=PASSWORD' \
408408
--env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
409409
--volume /srv/docker/gitlab/gitlab:/home/git/data \
410-
sameersbn/gitlab:14.9.0
410+
sameersbn/gitlab:14.9.1
411411
```
412412

413413
Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,7 @@ docker run --name gitlab -d \
491491
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
492492
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
493493
--volume /srv/docker/gitlab/gitlab:/home/git/data \
494-
sameersbn/gitlab:14.9.0
494+
sameersbn/gitlab:14.9.1
495495
```
496496

497497
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.
@@ -507,7 +507,7 @@ docker run --name gitlab -d \
507507
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
508508
--env 'NGINX_HSTS_MAXAGE=2592000' \
509509
--volume /srv/docker/gitlab/gitlab:/home/git/data \
510-
sameersbn/gitlab:14.9.0
510+
sameersbn/gitlab:14.9.1
511511
```
512512

513513
If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,7 @@ docker run --name gitlab -d \
530530
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
531531
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
532532
--volume /srv/docker/gitlab/gitlab:/home/git/data \
533-
sameersbn/gitlab:14.9.0
533+
sameersbn/gitlab:14.9.1
534534
```
535535

536536
Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
578578
docker run --name gitlab -it --rm \
579579
--env 'GITLAB_RELATIVE_URL_ROOT=/git' \
580580
--volume /srv/docker/gitlab/gitlab:/home/git/data \
581-
sameersbn/gitlab:14.9.0
581+
sameersbn/gitlab:14.9.1
582582
```
583583

584584
GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
759759
```bash
760760
docker run --name gitlab -it --rm [options] \
761761
--env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
762-
sameersbn/gitlab:14.9.0
762+
sameersbn/gitlab:14.9.1
763763
```
764764

765765
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:
766766

767767
```bash
768768
docker run --name gitlab -d [OPTIONS] \
769-
sameersbn/gitlab:14.9.0 app:sanitize
769+
sameersbn/gitlab:14.9.1 app:sanitize
770770
```
771771

772772
### Piwik
@@ -2354,7 +2354,7 @@ Execute the rake task to create a backup.
23542354

23552355
```bash
23562356
docker run --name gitlab -it --rm [OPTIONS] \
2357-
sameersbn/gitlab:14.9.0 app:rake gitlab:backup:create
2357+
sameersbn/gitlab:14.9.1 app:rake gitlab:backup:create
23582358
```
23592359

23602360
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.
@@ -2389,14 +2389,14 @@ you need to prepare the database:
23892389

23902390
```bash
23912391
docker run --name gitlab -it --rm [OPTIONS] \
2392-
sameersbn/gitlab:14.9.0 app:rake db:setup
2392+
sameersbn/gitlab:14.9.1 app:rake db:setup
23932393
```
23942394

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

23972397
```bash
23982398
docker run --name gitlab -it --rm [OPTIONS] \
2399-
sameersbn/gitlab:14.9.0 app:rake gitlab:backup:restore
2399+
sameersbn/gitlab:14.9.1 app:rake gitlab:backup:restore
24002400
```
24012401

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

24062406
```bash
24072407
docker run --name gitlab -it --rm [OPTIONS] \
2408-
sameersbn/gitlab:14.9.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
2408+
sameersbn/gitlab:14.9.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
24092409
```
24102410

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

24562456
```bash
24572457
docker run --name gitlab -it --rm [OPTIONS] \
2458-
sameersbn/gitlab:14.9.0 app:rake gitlab:env:info
2458+
sameersbn/gitlab:14.9.1 app:rake gitlab:env:info
24592459
```
24602460

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

24692469
```bash
24702470
docker run --name gitlab -it --rm [OPTIONS] \
2471-
sameersbn/gitlab:14.9.0 app:rake gitlab:import:repos
2471+
sameersbn/gitlab:14.9.1 app:rake gitlab:import:repos
24722472
```
24732473

24742474
Or
@@ -2499,7 +2499,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
24992499

25002500
```bash
25012501
docker run --name gitlab -it --rm [OPTIONS] \
2502-
sameersbn/gitlab:14.9.0 app:rake gitlab:import:repos
2502+
sameersbn/gitlab:14.9.1 app:rake gitlab:import:repos
25032503
```
25042504

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

25242524
> **Note**
25252525
>
2526-
> Upgrading to `sameersbn/gitlab:14.9.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.
2526+
> Upgrading to `sameersbn/gitlab:14.9.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.
25272527
25282528
- **Step 1**: Update the docker image.
25292529

25302530
```bash
2531-
docker pull sameersbn/gitlab:14.9.0
2531+
docker pull sameersbn/gitlab:14.9.1
25322532
```
25332533

25342534
- **Step 2**: Stop and remove the currently running image
@@ -2554,7 +2554,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
25542554
> **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.
25552555
25562556
```bash
2557-
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.9.0
2557+
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.9.1
25582558
```
25592559

25602560
## Shell Access
@@ -2592,7 +2592,7 @@ version: '2.3'
25922592

25932593
services:
25942594
gitlab:
2595-
image: sameersbn/gitlab:14.9.0
2595+
image: sameersbn/gitlab:14.9.1
25962596
healthcheck:
25972597
test: ["CMD", "/usr/local/sbin/healthcheck"]
25982598
interval: 1m

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.9.0
1+
14.9.1

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:14.9.0
25+
image: sameersbn/gitlab:14.9.1
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:14.9.0
66+
image: sameersbn/gitlab:14.9.1
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:14.9.0
25+
image: sameersbn/gitlab:14.9.1
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:14.9.0 app:rake gitlab:backup:create
292+
sameersbn/gitlab:14.9.1 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:14.9.0 app:rake gitlab:backup:restore
308+
sameersbn/gitlab:14.9.1 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:14.9.0 app:rake gitlab:backup:restore BACKUP=1417624827
317+
sameersbn/gitlab:14.9.1 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:14.9.0
328+
docker pull sameersbn/gitlab:14.9.1
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:14.9.0
381+
sameersbn/gitlab:14.9.1
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:14.9.0
25+
image: sameersbn/gitlab:14.9.1
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:14.9.0
25+
image: sameersbn/gitlab:14.9.1
2626
volumes:
2727
- gitlab-data:/home/git/data:Z
2828
- gitlab-logs:/var/log/gitlab

0 commit comments

Comments
 (0)