Skip to content

Commit 36e6bac

Browse files
author
f-io
authored
Upgrade GitLab CE to 13.0.6 (sameersbn#2175)
* Update docker-compose.yml Upgrade GitLab CE to 13.0.6 * Update GitLab CE to 13.0.6 * Upgrade GitLab CE to 13.0.6 * Upgrade GitLab CE to 13.0.6 * Upgrade GitLab CE to 13.0.6 changed postgres version. * Upgrade GitLab CE to 13.0.6 * Upgrade GitLab CE to 13.0.6 * Upgrade GitLab CE to 13.0.6 * Upgrade GitLab CE to 13.0.6 * Upgrade GitLab CE to 13.0.6 * Upgrade GitLab CE to 13.0.6 postgresql 11
1 parent 34c2d57 commit 36e6bac

File tree

7 files changed

+44
-41
lines changed

7 files changed

+44
-41
lines changed

Changelog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
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.0.6**
7+
- gitlab: upgrade CE to v13.0.6
8+
69
**13.0.5**
710
- gitlab: upgrade CE to v13.0.5
811

Dockerfile

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

3-
ARG VERSION=13.0.5
3+
ARG VERSION=13.0.6
44

55
ENV GITLAB_VERSION=${VERSION} \
66
RUBY_VERSION=2.6 \
77
GOLANG_VERSION=1.13.10 \
88
GITLAB_SHELL_VERSION=13.2.0 \
99
GITLAB_WORKHORSE_VERSION=8.31.2 \
1010
GITLAB_PAGES_VERSION=1.18.0 \
11-
GITALY_SERVER_VERSION=13.0.5 \
11+
GITALY_SERVER_VERSION=13.0.6 \
1212
GITLAB_USER="git" \
1313
GITLAB_HOME="/home/git" \
1414
GITLAB_LOG_DIR="/var/log/gitlab" \

README.md

Lines changed: 31 additions & 31 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.0.5
3+
# sameersbn/gitlab:13.0.6
44

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

126126
```bash
127-
docker pull sameersbn/gitlab:13.0.5
127+
docker pull sameersbn/gitlab:13.0.6
128128
```
129129

130130
You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -171,7 +171,7 @@ docker run --name gitlab-postgresql -d \
171171
--env 'DB_USER=gitlab' --env 'DB_PASS=password' \
172172
--env 'DB_EXTENSION=pg_trgm' \
173173
--volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \
174-
sameersbn/postgresql:10-2
174+
sameersbn/postgresql:11-20200524
175175
```
176176

177177
Step 2. Launch a redis container
@@ -193,7 +193,7 @@ docker run --name gitlab -d \
193193
--env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
194194
--env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
195195
--volume /srv/docker/gitlab/gitlab:/home/git/data \
196-
sameersbn/gitlab:13.0.5
196+
sameersbn/gitlab:13.0.6
197197
```
198198

199199
*Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -228,7 +228,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run
228228
```bash
229229
docker run --name gitlab -d \
230230
--volume /srv/docker/gitlab/gitlab:/home/git/data \
231-
sameersbn/gitlab:13.0.5
231+
sameersbn/gitlab:13.0.6
232232
```
233233

234234
## Database
@@ -261,7 +261,7 @@ docker run --name gitlab -d \
261261
--env 'DB_NAME=gitlabhq_production' \
262262
--env 'DB_USER=gitlab' --env 'DB_PASS=password' \
263263
--volume /srv/docker/gitlab/gitlab:/home/git/data \
264-
sameersbn/gitlab:13.0.5
264+
sameersbn/gitlab:13.0.6
265265
```
266266

267267
#### Linking to PostgreSQL Container
@@ -275,7 +275,7 @@ To illustrate linking with a postgresql container, we will use the [sameersbn/po
275275
First, lets pull the postgresql image from the docker index.
276276

277277
```bash
278-
docker pull sameersbn/postgresql:10-2
278+
docker pull sameersbn/postgresql:11-20200524
279279
```
280280

281281
For data persistence lets create a store for the postgresql and start the container.
@@ -295,7 +295,7 @@ docker run --name gitlab-postgresql -d \
295295
--env 'DB_USER=gitlab' --env 'DB_PASS=password' \
296296
--env 'DB_EXTENSION=pg_trgm' \
297297
--volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \
298-
sameersbn/postgresql:10-2
298+
sameersbn/postgresql:11-20200524
299299
```
300300

301301
The above command will create a database named `gitlabhq_production` and also create a user named `gitlab` with the password `password` with access to the `gitlabhq_production` database.
@@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
305305
```bash
306306
docker run --name gitlab -d --link gitlab-postgresql:postgresql \
307307
--volume /srv/docker/gitlab/gitlab:/home/git/data \
308-
sameersbn/gitlab:13.0.5
308+
sameersbn/gitlab:13.0.6
309309
```
310310

311311
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:
@@ -332,7 +332,7 @@ The image can be configured to use an external redis server. The configuration s
332332
```bash
333333
docker run --name gitlab -it --rm \
334334
--env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
335-
sameersbn/gitlab:13.0.5
335+
sameersbn/gitlab:13.0.6
336336
```
337337

338338
### Linking to Redis Container
@@ -359,7 +359,7 @@ We are now ready to start the GitLab application.
359359

360360
```bash
361361
docker run --name gitlab -d --link gitlab-redis:redisio \
362-
sameersbn/gitlab:13.0.5
362+
sameersbn/gitlab:13.0.6
363363
```
364364

365365
### Mail
@@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
372372
docker run --name gitlab -d \
373373
--env '[email protected]' --env 'SMTP_PASS=PASSWORD' \
374374
--volume /srv/docker/gitlab/gitlab:/home/git/data \
375-
sameersbn/gitlab:13.0.5
375+
sameersbn/gitlab:13.0.6
376376
```
377377

378378
Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -392,7 +392,7 @@ docker run --name gitlab -d \
392392
--env '[email protected]' --env 'IMAP_PASS=PASSWORD' \
393393
--env 'GITLAB_INCOMING_EMAIL_ADDRESS=USER+%{key}@gmail.com' \
394394
--volume /srv/docker/gitlab/gitlab:/home/git/data \
395-
sameersbn/gitlab:13.0.5
395+
sameersbn/gitlab:13.0.6
396396
```
397397

398398
Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -469,7 +469,7 @@ docker run --name gitlab -d \
469469
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \
470470
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
471471
--volume /srv/docker/gitlab/gitlab:/home/git/data \
472-
sameersbn/gitlab:13.0.5
472+
sameersbn/gitlab:13.0.6
473473
```
474474

475475
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.
@@ -485,7 +485,7 @@ docker run --name gitlab -d \
485485
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
486486
--env 'NGINX_HSTS_MAXAGE=2592000' \
487487
--volume /srv/docker/gitlab/gitlab:/home/git/data \
488-
sameersbn/gitlab:13.0.5
488+
sameersbn/gitlab:13.0.6
489489
```
490490

491491
If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -508,7 +508,7 @@ docker run --name gitlab -d \
508508
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
509509
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
510510
--volume /srv/docker/gitlab/gitlab:/home/git/data \
511-
sameersbn/gitlab:13.0.5
511+
sameersbn/gitlab:13.0.6
512512
```
513513

514514
Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -556,7 +556,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
556556
docker run --name gitlab -it --rm \
557557
--env 'GITLAB_RELATIVE_URL_ROOT=/git' \
558558
--volume /srv/docker/gitlab/gitlab:/home/git/data \
559-
sameersbn/gitlab:13.0.5
559+
sameersbn/gitlab:13.0.6
560560
```
561561

562562
GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -737,14 +737,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
737737
```bash
738738
docker run --name gitlab -it --rm [options] \
739739
--env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
740-
sameersbn/gitlab:13.0.5
740+
sameersbn/gitlab:13.0.6
741741
```
742742

743743
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:
744744

745745
```bash
746746
docker run --name gitlab -d [OPTIONS] \
747-
sameersbn/gitlab:13.0.5 app:sanitize
747+
sameersbn/gitlab:13.0.6 app:sanitize
748748
```
749749

750750
### Piwik
@@ -1127,7 +1127,7 @@ Execute the rake task to create a backup.
11271127

11281128
```bash
11291129
docker run --name gitlab -it --rm [OPTIONS] \
1130-
sameersbn/gitlab:13.0.5 app:rake gitlab:backup:create
1130+
sameersbn/gitlab:13.0.6 app:rake gitlab:backup:create
11311131
```
11321132

11331133
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.
@@ -1162,14 +1162,14 @@ you need to prepare the database:
11621162

11631163
```bash
11641164
docker run --name gitlab -it --rm [OPTIONS] \
1165-
sameersbn/gitlab:13.0.5 app:rake db:setup
1165+
sameersbn/gitlab:13.0.6 app:rake db:setup
11661166
```
11671167

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

11701170
```bash
11711171
docker run --name gitlab -it --rm [OPTIONS] \
1172-
sameersbn/gitlab:13.0.5 app:rake gitlab:backup:restore
1172+
sameersbn/gitlab:13.0.6 app:rake gitlab:backup:restore
11731173
```
11741174

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

11791179
```bash
11801180
docker run --name gitlab -it --rm [OPTIONS] \
1181-
sameersbn/gitlab:13.0.5 app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.6
1181+
sameersbn/gitlab:13.0.6 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
11821182
```
11831183

11841184
When using `docker-compose` you may use the following command to execute the restore.
11851185

11861186
```bash
11871187
docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
1188-
docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2018_01_11_10.3.6 # Choose to restore from 1515629493
1188+
docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 # Choose to restore from 1515629493
11891189
```
11901190

11911191

@@ -1228,7 +1228,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s
12281228

12291229
```bash
12301230
docker run --name gitlab -it --rm [OPTIONS] \
1231-
sameersbn/gitlab:13.0.5 app:rake gitlab:env:info
1231+
sameersbn/gitlab:13.0.6 app:rake gitlab:env:info
12321232
```
12331233

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

12421242
```bash
12431243
docker run --name gitlab -it --rm [OPTIONS] \
1244-
sameersbn/gitlab:13.0.5 app:rake gitlab:import:repos
1244+
sameersbn/gitlab:13.0.6 app:rake gitlab:import:repos
12451245
```
12461246

12471247
Or
@@ -1272,7 +1272,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
12721272

12731273
```bash
12741274
docker run --name gitlab -it --rm [OPTIONS] \
1275-
sameersbn/gitlab:13.0.5 app:rake gitlab:import:repos
1275+
sameersbn/gitlab:13.0.6 app:rake gitlab:import:repos
12761276
```
12771277

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

12951295
> **Note**
12961296
>
1297-
> Upgrading to `sameersbn/gitlab:13.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.
1297+
> Upgrading to `sameersbn/gitlab:13.0.6` 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.
12981298
12991299
- **Step 1**: Update the docker image.
13001300

13011301
```bash
1302-
docker pull sameersbn/gitlab:13.0.5
1302+
docker pull sameersbn/gitlab:13.0.6
13031303
```
13041304

13051305
- **Step 2**: Stop and remove the currently running image
@@ -1325,7 +1325,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
13251325
> **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.
13261326
13271327
```bash
1328-
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.0.5
1328+
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:13.0.6
13291329
```
13301330

13311331
## Shell Access
@@ -1363,7 +1363,7 @@ version: '2.3'
13631363

13641364
services:
13651365
gitlab:
1366-
image: sameersbn/gitlab:12.7.7
1366+
image: sameersbn/gitlab:13.0.6
13671367
healthcheck:
13681368
test: ["CMD", "/usr/local/sbin/healthcheck"]
13691369
interval: 1m

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
13.0.5
1+
13.0.6

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

384384

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.0.5
17+
image: sameersbn/gitlab:13.0.6
1818
env:
1919
- name: TZ
2020
value: Asia/Kolkata

0 commit comments

Comments
 (0)