Skip to content

Commit ea35c5d

Browse files
committed
upgrade GitLab CE to 13.10.2
1 parent e786b09 commit ea35c5d

File tree

10 files changed

+48
-42
lines changed

10 files changed

+48
-42
lines changed

Changelog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
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+
**13.10.2**
7+
- gitlab: upgrade CE to v13.10.2
8+
- gitaly: upgrade to v13.10.2
9+
- golang: upgrade to v1.16.3
10+
- ubuntu: upgrade to bionic-20210325
11+
612
**13.10.1**
713
- gitlab: upgrade CE to v13.10.1
814
- gitaly: upgrade to v13.10.1

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM ubuntu:bionic-20210222
1+
FROM ubuntu:bionic-20210325
22

3-
ARG VERSION=13.10.1
3+
ARG VERSION=13.10.2
44

55
ENV GITLAB_VERSION=${VERSION} \
66
RUBY_VERSION=2.7 \
7-
GOLANG_VERSION=1.16.2 \
7+
GOLANG_VERSION=1.16.3 \
88
GITLAB_SHELL_VERSION=13.17.0 \
99
GITLAB_PAGES_VERSION=1.36.0 \
10-
GITALY_SERVER_VERSION=13.10.1 \
10+
GITALY_SERVER_VERSION=13.10.2 \
1111
GITLAB_USER="git" \
1212
GITLAB_HOME="/home/git" \
1313
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:13.10.1
3+
# sameersbn/gitlab:13.10.2
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:13.10.1
128+
docker pull sameersbn/gitlab:13.10.2
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:13.10.1
197+
sameersbn/gitlab:13.10.2
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:13.10.1
232+
sameersbn/gitlab:13.10.2
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:13.10.1
267+
sameersbn/gitlab:13.10.2
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:13.10.1
311+
sameersbn/gitlab:13.10.2
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:13.10.1
350+
sameersbn/gitlab:13.10.2
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:13.10.1
377+
sameersbn/gitlab:13.10.2
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:13.10.1
390+
sameersbn/gitlab:13.10.2
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:13.10.1
410+
sameersbn/gitlab:13.10.2
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:13.10.1
487+
sameersbn/gitlab:13.10.2
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:13.10.1
503+
sameersbn/gitlab:13.10.2
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:13.10.1
526+
sameersbn/gitlab:13.10.2
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:13.10.1
574+
sameersbn/gitlab:13.10.2
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:13.10.1
755+
sameersbn/gitlab:13.10.2
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:13.10.1 app:sanitize
762+
sameersbn/gitlab:13.10.2 app:sanitize
763763
```
764764

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

11511151
```bash
11521152
docker run --name gitlab -it --rm [OPTIONS] \
1153-
sameersbn/gitlab:13.10.1 app:rake gitlab:backup:create
1153+
sameersbn/gitlab:13.10.2 app:rake gitlab:backup:create
11541154
```
11551155

11561156
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.
@@ -1185,14 +1185,14 @@ you need to prepare the database:
11851185

11861186
```bash
11871187
docker run --name gitlab -it --rm [OPTIONS] \
1188-
sameersbn/gitlab:13.10.1 app:rake db:setup
1188+
sameersbn/gitlab:13.10.2 app:rake db:setup
11891189
```
11901190

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

11931193
```bash
11941194
docker run --name gitlab -it --rm [OPTIONS] \
1195-
sameersbn/gitlab:13.10.1 app:rake gitlab:backup:restore
1195+
sameersbn/gitlab:13.10.2 app:rake gitlab:backup:restore
11961196
```
11971197

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

12021202
```bash
12031203
docker run --name gitlab -it --rm [OPTIONS] \
1204-
sameersbn/gitlab:13.10.1 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
1204+
sameersbn/gitlab:13.10.2 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
12051205
```
12061206

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

12521252
```bash
12531253
docker run --name gitlab -it --rm [OPTIONS] \
1254-
sameersbn/gitlab:13.10.1 app:rake gitlab:env:info
1254+
sameersbn/gitlab:13.10.2 app:rake gitlab:env:info
12551255
```
12561256

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

12651265
```bash
12661266
docker run --name gitlab -it --rm [OPTIONS] \
1267-
sameersbn/gitlab:13.10.1 app:rake gitlab:import:repos
1267+
sameersbn/gitlab:13.10.2 app:rake gitlab:import:repos
12681268
```
12691269

12701270
Or
@@ -1295,7 +1295,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
12951295

12961296
```bash
12971297
docker run --name gitlab -it --rm [OPTIONS] \
1298-
sameersbn/gitlab:13.10.1 app:rake gitlab:import:repos
1298+
sameersbn/gitlab:13.10.2 app:rake gitlab:import:repos
12991299
```
13001300

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

13201320
> **Note**
13211321
>
1322-
> Upgrading to `sameersbn/gitlab:13.10.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.
1322+
> Upgrading to `sameersbn/gitlab:13.10.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.
13231323
13241324
- **Step 1**: Update the docker image.
13251325

13261326
```bash
1327-
docker pull sameersbn/gitlab:13.10.1
1327+
docker pull sameersbn/gitlab:13.10.2
13281328
```
13291329

13301330
- **Step 2**: Stop and remove the currently running image
@@ -1350,7 +1350,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
13501350
> **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.
13511351
13521352
```bash
1353-
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.10.1
1353+
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.10.2
13541354
```
13551355

13561356
## Shell Access
@@ -1388,7 +1388,7 @@ version: '2.3'
13881388

13891389
services:
13901390
gitlab:
1391-
image: sameersbn/gitlab:13.10.1
1391+
image: sameersbn/gitlab:13.10.2
13921392
healthcheck:
13931393
test: ["CMD", "/usr/local/sbin/healthcheck"]
13941394
interval: 1m

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

kubernetes/gitlab-rc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
spec:
1515
containers:
1616
- name: gitlab
17-
image: sameersbn/gitlab:13.10.1
17+
image: sameersbn/gitlab:13.10.2
1818
env:
1919
- name: TZ
2020
value: Asia/Kolkata

0 commit comments

Comments
 (0)