Skip to content

Commit f2a36d2

Browse files
authored
Merge pull request sameersbn#2384 from sachilles/upgrade-to-14.0.5
upgrade GitLab CE to 14.0.5
2 parents 3d84c35 + 5c85269 commit f2a36d2

11 files changed

+49
-41
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](
44
https://gitlab.com/gitlab-org/gitlab-foss/blob/master/CHANGELOG.md) for the list of changes in GitLab.
55

6+
**14.0.5**
7+
- gitlab: upgrade CE to v14.0.5
8+
- gitaly: upgrade to v14.0.5
9+
10+
**14.0.4**
11+
- gitlab: upgrade CE to v14.0.4
12+
- gitaly: upgrade to v14.0.4
13+
614
**14.0.3**
715
- gitlab: upgrade CE to v14.0.3
816
- gitaly: upgrade to v14.0.3

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
FROM ubuntu:focal-20210609
22

3-
ARG VERSION=14.0.3
3+
ARG VERSION=14.0.5
44

55
ENV GITLAB_VERSION=${VERSION} \
66
RUBY_VERSION=2.7 \
77
GOLANG_VERSION=1.16.5 \
88
GITLAB_SHELL_VERSION=13.19.0 \
99
GITLAB_PAGES_VERSION=1.40.0 \
10-
GITALY_SERVER_VERSION=14.0.3 \
10+
GITALY_SERVER_VERSION=14.0.5 \
1111
GITLAB_USER="git" \
1212
GITLAB_HOME="/home/git" \
1313
GITLAB_LOG_DIR="/var/log/gitlab" \

README.md

+27-27
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.0.3
3+
# sameersbn/gitlab:14.0.5
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.0.3
128+
docker pull sameersbn/gitlab:14.0.5
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.0.3
197+
sameersbn/gitlab:14.0.5
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.0.3
232+
sameersbn/gitlab:14.0.5
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.0.3
267+
sameersbn/gitlab:14.0.5
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.0.3
311+
sameersbn/gitlab:14.0.5
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.0.3
350+
sameersbn/gitlab:14.0.5
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.0.3
377+
sameersbn/gitlab:14.0.5
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.0.3
390+
sameersbn/gitlab:14.0.5
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.0.3
410+
sameersbn/gitlab:14.0.5
411411
```
412412

413413
Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -484,7 +484,7 @@ docker run --name gitlab -d \
484484
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
485485
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
486486
--volume /srv/docker/gitlab/gitlab:/home/git/data \
487-
sameersbn/gitlab:14.0.3
487+
sameersbn/gitlab:14.0.5
488488
```
489489

490490
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.
@@ -500,7 +500,7 @@ docker run --name gitlab -d \
500500
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
501501
--env 'NGINX_HSTS_MAXAGE=2592000' \
502502
--volume /srv/docker/gitlab/gitlab:/home/git/data \
503-
sameersbn/gitlab:14.0.3
503+
sameersbn/gitlab:14.0.5
504504
```
505505

506506
If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -523,7 +523,7 @@ docker run --name gitlab -d \
523523
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
524524
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
525525
--volume /srv/docker/gitlab/gitlab:/home/git/data \
526-
sameersbn/gitlab:14.0.3
526+
sameersbn/gitlab:14.0.5
527527
```
528528

529529
Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -571,7 +571,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
571571
docker run --name gitlab -it --rm \
572572
--env 'GITLAB_RELATIVE_URL_ROOT=/git' \
573573
--volume /srv/docker/gitlab/gitlab:/home/git/data \
574-
sameersbn/gitlab:14.0.3
574+
sameersbn/gitlab:14.0.5
575575
```
576576

577577
GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -752,14 +752,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
752752
```bash
753753
docker run --name gitlab -it --rm [options] \
754754
--env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
755-
sameersbn/gitlab:14.0.3
755+
sameersbn/gitlab:14.0.5
756756
```
757757

758758
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:
759759

760760
```bash
761761
docker run --name gitlab -d [OPTIONS] \
762-
sameersbn/gitlab:14.0.3 app:sanitize
762+
sameersbn/gitlab:14.0.5 app:sanitize
763763
```
764764

765765
### Piwik
@@ -1172,7 +1172,7 @@ Execute the rake task to create a backup.
11721172

11731173
```bash
11741174
docker run --name gitlab -it --rm [OPTIONS] \
1175-
sameersbn/gitlab:14.0.3 app:rake gitlab:backup:create
1175+
sameersbn/gitlab:14.0.5 app:rake gitlab:backup:create
11761176
```
11771177

11781178
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.
@@ -1207,14 +1207,14 @@ you need to prepare the database:
12071207

12081208
```bash
12091209
docker run --name gitlab -it --rm [OPTIONS] \
1210-
sameersbn/gitlab:14.0.3 app:rake db:setup
1210+
sameersbn/gitlab:14.0.5 app:rake db:setup
12111211
```
12121212

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

12151215
```bash
12161216
docker run --name gitlab -it --rm [OPTIONS] \
1217-
sameersbn/gitlab:14.0.3 app:rake gitlab:backup:restore
1217+
sameersbn/gitlab:14.0.5 app:rake gitlab:backup:restore
12181218
```
12191219

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

12241224
```bash
12251225
docker run --name gitlab -it --rm [OPTIONS] \
1226-
sameersbn/gitlab:14.0.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
1226+
sameersbn/gitlab:14.0.5 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
12271227
```
12281228

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

12741274
```bash
12751275
docker run --name gitlab -it --rm [OPTIONS] \
1276-
sameersbn/gitlab:14.0.3 app:rake gitlab:env:info
1276+
sameersbn/gitlab:14.0.5 app:rake gitlab:env:info
12771277
```
12781278

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

12871287
```bash
12881288
docker run --name gitlab -it --rm [OPTIONS] \
1289-
sameersbn/gitlab:14.0.3 app:rake gitlab:import:repos
1289+
sameersbn/gitlab:14.0.5 app:rake gitlab:import:repos
12901290
```
12911291

12921292
Or
@@ -1317,7 +1317,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
13171317

13181318
```bash
13191319
docker run --name gitlab -it --rm [OPTIONS] \
1320-
sameersbn/gitlab:14.0.3 app:rake gitlab:import:repos
1320+
sameersbn/gitlab:14.0.5 app:rake gitlab:import:repos
13211321
```
13221322

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

13421342
> **Note**
13431343
>
1344-
> Upgrading to `sameersbn/gitlab:14.0.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.
1344+
> Upgrading to `sameersbn/gitlab:14.0.5` 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.
13451345
13461346
- **Step 1**: Update the docker image.
13471347

13481348
```bash
1349-
docker pull sameersbn/gitlab:14.0.3
1349+
docker pull sameersbn/gitlab:14.0.5
13501350
```
13511351

13521352
- **Step 2**: Stop and remove the currently running image
@@ -1372,7 +1372,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
13721372
> **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.
13731373
13741374
```bash
1375-
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.3
1375+
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.0.5
13761376
```
13771377

13781378
## Shell Access
@@ -1410,7 +1410,7 @@ version: '2.3'
14101410

14111411
services:
14121412
gitlab:
1413-
image: sameersbn/gitlab:14.0.3
1413+
image: sameersbn/gitlab:14.0.5
14141414
healthcheck:
14151415
test: ["CMD", "/usr/local/sbin/healthcheck"]
14161416
interval: 1m

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.0.3
1+
14.0.5

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:14.0.3
25+
image: sameersbn/gitlab:14.0.5
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:14.0.3
66+
image: sameersbn/gitlab:14.0.5
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:14.0.3
25+
image: sameersbn/gitlab:14.0.5
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:14.0.3 app:rake gitlab:backup:create
292+
sameersbn/gitlab:14.0.5 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.0.3 app:rake gitlab:backup:restore
308+
sameersbn/gitlab:14.0.5 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.0.3 app:rake gitlab:backup:restore BACKUP=1417624827
317+
sameersbn/gitlab:14.0.5 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.0.3
328+
docker pull sameersbn/gitlab:14.0.5
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.0.3
381+
sameersbn/gitlab:14.0.5
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:14.0.3
25+
image: sameersbn/gitlab:14.0.5
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:14.0.3
25+
image: sameersbn/gitlab:14.0.5
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:14.0.3
17+
image: sameersbn/gitlab:14.0.5
1818
env:
1919
- name: TZ
2020
value: Asia/Kolkata

0 commit comments

Comments
 (0)