Skip to content

Commit 1cc3513

Browse files
committed
Upgrade GitLab CE to 12.5.5
1 parent 1ef03e6 commit 1cc3513

File tree

7 files changed

+38
-35
lines changed

7 files changed

+38
-35
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+
**12.5.5**
7+
- gitlab: upgrade CE to v12.5.5
8+
69
**12.5.4**
710
- gitlab: upgrade CE to v12.5.4
811
- Update golang to 1.12.14

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM ubuntu:bionic-20191010
22

33
ARG BUILD_DATE
44
ARG VCS_REF
5-
ARG VERSION=12.5.4
5+
ARG VERSION=12.5.5
66

77
ENV GITLAB_VERSION=${VERSION} \
88
RUBY_VERSION=2.6 \

README.md

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
22
[![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")
33

4-
# sameersbn/gitlab:12.5.4
4+
# sameersbn/gitlab:12.5.5
55

66
- [Introduction](#introduction)
77
- [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
124124
> **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
125125
126126
```bash
127-
docker pull sameersbn/gitlab:12.5.4
127+
docker pull sameersbn/gitlab:12.5.5
128128
```
129129

130130
You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -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:12.5.4
196+
sameersbn/gitlab:12.5.5
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:12.5.4
231+
sameersbn/gitlab:12.5.5
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:12.5.4
264+
sameersbn/gitlab:12.5.5
265265
```
266266

267267
#### Linking to PostgreSQL Container
@@ -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:12.5.4
308+
sameersbn/gitlab:12.5.5
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:12.5.4
335+
sameersbn/gitlab:12.5.5
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:12.5.4
362+
sameersbn/gitlab:12.5.5
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:12.5.4
375+
sameersbn/gitlab:12.5.5
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:12.5.4
395+
sameersbn/gitlab:12.5.5
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:12.5.4
472+
sameersbn/gitlab:12.5.5
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:12.5.4
488+
sameersbn/gitlab:12.5.5
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:12.5.4
511+
sameersbn/gitlab:12.5.5
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:12.5.4
559+
sameersbn/gitlab:12.5.5
560560
```
561561

562562
GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -729,14 +729,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
729729
```bash
730730
docker run --name gitlab -it --rm [options] \
731731
--env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
732-
sameersbn/gitlab:12.5.4
732+
sameersbn/gitlab:12.5.5
733733
```
734734

735735
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:
736736

737737
```bash
738738
docker run --name gitlab -d [OPTIONS] \
739-
sameersbn/gitlab:12.5.4 app:sanitize
739+
sameersbn/gitlab:12.5.5 app:sanitize
740740
```
741741

742742
### Piwik
@@ -1101,7 +1101,7 @@ Execute the rake task to create a backup.
11011101

11021102
```bash
11031103
docker run --name gitlab -it --rm [OPTIONS] \
1104-
sameersbn/gitlab:12.5.4 app:rake gitlab:backup:create
1104+
sameersbn/gitlab:12.5.5 app:rake gitlab:backup:create
11051105
```
11061106

11071107
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.
@@ -1136,14 +1136,14 @@ you need to prepare the database:
11361136

11371137
```bash
11381138
docker run --name gitlab -it --rm [OPTIONS] \
1139-
sameersbn/gitlab:12.5.4 app:rake db:setup
1139+
sameersbn/gitlab:12.5.5 app:rake db:setup
11401140
```
11411141

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

11441144
```bash
11451145
docker run --name gitlab -it --rm [OPTIONS] \
1146-
sameersbn/gitlab:12.5.4 app:rake gitlab:backup:restore
1146+
sameersbn/gitlab:12.5.5 app:rake gitlab:backup:restore
11471147
```
11481148

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

11531153
```bash
11541154
docker run --name gitlab -it --rm [OPTIONS] \
1155-
sameersbn/gitlab:12.5.4 app:rake gitlab:backup:restore BACKUP=1417624827
1155+
sameersbn/gitlab:12.5.5 app:rake gitlab:backup:restore BACKUP=1417624827
11561156
```
11571157

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

12031203
```bash
12041204
docker run --name gitlab -it --rm [OPTIONS] \
1205-
sameersbn/gitlab:12.5.4 app:rake gitlab:env:info
1205+
sameersbn/gitlab:12.5.5 app:rake gitlab:env:info
12061206
```
12071207

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

12161216
```bash
12171217
docker run --name gitlab -it --rm [OPTIONS] \
1218-
sameersbn/gitlab:12.5.4 app:rake gitlab:import:repos
1218+
sameersbn/gitlab:12.5.5 app:rake gitlab:import:repos
12191219
```
12201220

12211221
Or
@@ -1246,7 +1246,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
12461246

12471247
```bash
12481248
docker run --name gitlab -it --rm [OPTIONS] \
1249-
sameersbn/gitlab:12.5.4 app:rake gitlab:import:repos
1249+
sameersbn/gitlab:12.5.5 app:rake gitlab:import:repos
12501250
```
12511251

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

12691269
> **Note**
12701270
>
1271-
> Upgrading to `sameersbn/gitlab:12.5.4` 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.
1271+
> Upgrading to `sameersbn/gitlab:12.5.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.
12721272
12731273
- **Step 1**: Update the docker image.
12741274

12751275
```bash
1276-
docker pull sameersbn/gitlab:12.5.4
1276+
docker pull sameersbn/gitlab:12.5.5
12771277
```
12781278

12791279
- **Step 2**: Stop and remove the currently running image
@@ -1299,7 +1299,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
12991299
> **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.
13001300
13011301
```bash
1302-
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.4
1302+
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.5.5
13031303
```
13041304

13051305
## Shell Access

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.5.4
1+
12.5.5

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:12.5.4
25+
image: sameersbn/gitlab:12.5.5
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
@@ -284,7 +284,7 @@ docker stop registry gitlab && docker rm registry gitlab
284284
Execute the rake task with a removeable container.
285285
```bash
286286
docker run --name gitlab -it --rm [OPTIONS] \
287-
sameersbn/gitlab:12.5.4 app:rake gitlab:backup:create
287+
sameersbn/gitlab:12.5.5 app:rake gitlab:backup:create
288288
```
289289
## Restoring Backups
290290

@@ -300,7 +300,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in
300300

301301
```bash
302302
docker run --name gitlab -it --rm [OPTIONS] \
303-
sameersbn/gitlab:12.5.4 app:rake gitlab:backup:restore
303+
sameersbn/gitlab:12.5.5 app:rake gitlab:backup:restore
304304
```
305305

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

310310
```bash
311311
docker run --name gitlab -it --rm [OPTIONS] \
312-
sameersbn/gitlab:12.5.4 app:rake gitlab:backup:restore BACKUP=1417624827
312+
sameersbn/gitlab:12.5.5 app:rake gitlab:backup:restore BACKUP=1417624827
313313
```
314314

315315
# Upgrading from an existing GitLab installation
@@ -320,7 +320,7 @@ If you want enable this feature for an existing instance of GitLab you need to d
320320
- **Step 1**: Update the docker image.
321321

322322
```bash
323-
docker pull sameersbn/gitlab:12.5.4
323+
docker pull sameersbn/gitlab:12.5.5
324324
```
325325

326326
- **Step 2**: Stop and remove the currently running image
@@ -373,7 +373,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
373373
--env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
374374
--env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
375375
--link registry:registry
376-
sameersbn/gitlab:12.5.4
376+
sameersbn/gitlab:12.5.5
377377
```
378378

379379

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

0 commit comments

Comments
 (0)