Skip to content

Commit

Permalink
Upgrade GitLab CE to 13.0.7 (#2185)
Browse files Browse the repository at this point in the history
  • Loading branch information
solidnerd committed Jun 29, 2020
1 parent 36e6bac commit 79fae20
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 38 deletions.
3 changes: 3 additions & 0 deletions Changelog.md
Expand Up @@ -3,6 +3,9 @@
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.

**13.0.7**
- gitlab: upgrade CE to v13.0.7

**13.0.6**
- gitlab: upgrade CE to v13.0.6

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
@@ -1,14 +1,14 @@
FROM ubuntu:bionic-20200403

ARG VERSION=13.0.6
ARG VERSION=13.0.7

ENV GITLAB_VERSION=${VERSION} \
RUBY_VERSION=2.6 \
GOLANG_VERSION=1.13.10 \
GITLAB_SHELL_VERSION=13.2.0 \
GITLAB_WORKHORSE_VERSION=8.31.2 \
GITLAB_PAGES_VERSION=1.18.0 \
GITALY_SERVER_VERSION=13.0.6 \
GITALY_SERVER_VERSION=13.0.7 \
GITLAB_USER="git" \
GITLAB_HOME="/home/git" \
GITLAB_LOG_DIR="/var/log/gitlab" \
Expand Down
56 changes: 28 additions & 28 deletions README.md
@@ -1,6 +1,6 @@
[![](https://images.microbadger.com/badges/image/sameersbn/gitlab.svg)](http://microbadger.com/images/sameersbn/gitlab "Get your own image badge on microbadger.com")

# sameersbn/gitlab:13.0.6
# sameersbn/gitlab:13.0.7

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

```bash
docker pull sameersbn/gitlab:13.0.6
docker pull sameersbn/gitlab:13.0.7
```

You can also pull the `latest` tag which is built from the repository *HEAD*
Expand Down Expand Up @@ -193,7 +193,7 @@ docker run --name gitlab -d \
--env 'GITLAB_SECRETS_SECRET_KEY_BASE=long-and-random-alpha-numeric-string' \
--env 'GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alpha-numeric-string' \
--volume /srv/docker/gitlab/gitlab:/home/git/data \
sameersbn/gitlab:13.0.6
sameersbn/gitlab:13.0.7
```

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

## Database
Expand Down Expand Up @@ -261,7 +261,7 @@ docker run --name gitlab -d \
--env 'DB_NAME=gitlabhq_production' \
--env 'DB_USER=gitlab' --env 'DB_PASS=password' \
--volume /srv/docker/gitlab/gitlab:/home/git/data \
sameersbn/gitlab:13.0.6
sameersbn/gitlab:13.0.7
```

#### Linking to PostgreSQL Container
Expand Down Expand Up @@ -305,7 +305,7 @@ We are now ready to start the GitLab application.
```bash
docker run --name gitlab -d --link gitlab-postgresql:postgresql \
--volume /srv/docker/gitlab/gitlab:/home/git/data \
sameersbn/gitlab:13.0.6
sameersbn/gitlab:13.0.7
```

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

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

```bash
docker run --name gitlab -d --link gitlab-redis:redisio \
sameersbn/gitlab:13.0.6
sameersbn/gitlab:13.0.7
```

### Mail
Expand All @@ -372,7 +372,7 @@ If you are using Gmail then all you need to do is:
docker run --name gitlab -d \
--env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
--volume /srv/docker/gitlab/gitlab:/home/git/data \
sameersbn/gitlab:13.0.6
sameersbn/gitlab:13.0.7
```

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

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

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.
Expand All @@ -485,7 +485,7 @@ docker run --name gitlab -d \
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
--env 'NGINX_HSTS_MAXAGE=2592000' \
--volume /srv/docker/gitlab/gitlab:/home/git/data \
sameersbn/gitlab:13.0.6
sameersbn/gitlab:13.0.7
```

If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
Expand All @@ -508,7 +508,7 @@ docker run --name gitlab -d \
--env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
--volume /srv/docker/gitlab/gitlab:/home/git/data \
sameersbn/gitlab:13.0.6
sameersbn/gitlab:13.0.7
```

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

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

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:

```bash
docker run --name gitlab -d [OPTIONS] \
sameersbn/gitlab:13.0.6 app:sanitize
sameersbn/gitlab:13.0.7 app:sanitize
```

### Piwik
Expand Down Expand Up @@ -1127,7 +1127,7 @@ Execute the rake task to create a backup.

```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:13.0.6 app:rake gitlab:backup:create
sameersbn/gitlab:13.0.7 app:rake gitlab:backup:create
```

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

```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:13.0.6 app:rake db:setup
sameersbn/gitlab:13.0.7 app:rake db:setup
```

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

```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:13.0.6 app:rake gitlab:backup:restore
sameersbn/gitlab:13.0.7 app:rake gitlab:backup:restore
```

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

```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:13.0.6 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
sameersbn/gitlab:13.0.7 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
```

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

```bash
docker-compose run --rm gitlab app:rake gitlab:backup:restore # List available backups
docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6 # Choose to restore from 1515629493
docker-compose run --rm gitlab app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.7 # Choose to restore from 1515629493
```


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

```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:13.0.6 app:rake gitlab:env:info
sameersbn/gitlab:13.0.7 app:rake gitlab:env:info
```

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

```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:13.0.6 app:rake gitlab:import:repos
sameersbn/gitlab:13.0.7 app:rake gitlab:import:repos
```

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

```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:13.0.6 app:rake gitlab:import:repos
sameersbn/gitlab:13.0.7 app:rake gitlab:import:repos
```

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

> **Note**
>
> 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.
> Upgrading to `sameersbn/gitlab:13.0.7` 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.
- **Step 1**: Update the docker image.

```bash
docker pull sameersbn/gitlab:13.0.6
docker pull sameersbn/gitlab:13.0.7
```

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

## Shell Access
Expand Down Expand Up @@ -1363,7 +1363,7 @@ version: '2.3'

services:
gitlab:
image: sameersbn/gitlab:13.0.6
image: sameersbn/gitlab:13.0.7
healthcheck:
test: ["CMD", "/usr/local/sbin/healthcheck"]
interval: 1m
Expand Down
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
13.0.6
13.0.7
2 changes: 1 addition & 1 deletion docker-compose.yml
Expand Up @@ -22,7 +22,7 @@ services:

gitlab:
restart: always
image: sameersbn/gitlab:13.0.6
image: sameersbn/gitlab:13.0.7
depends_on:
- redis
- postgresql
Expand Down
10 changes: 5 additions & 5 deletions docs/container_registry.md
Expand Up @@ -289,7 +289,7 @@ docker stop registry gitlab && docker rm registry gitlab
Execute the rake task with a removeable container.
```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:13.0.6 app:rake gitlab:backup:create
sameersbn/gitlab:13.0.7 app:rake gitlab:backup:create
```
## Restoring Backups

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

```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:13.0.6 app:rake gitlab:backup:restore
sameersbn/gitlab:13.0.7 app:rake gitlab:backup:restore
```

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

```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:13.0.6 app:rake gitlab:backup:restore BACKUP=1417624827
sameersbn/gitlab:13.0.7 app:rake gitlab:backup:restore BACKUP=1417624827
```

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

```bash
docker pull sameersbn/gitlab:13.0.6
docker pull sameersbn/gitlab:13.0.7
```

- **Step 2**: Stop and remove the currently running image
Expand Down Expand Up @@ -378,7 +378,7 @@ docker run --name gitlab -d [PREVIOUS_OPTIONS] \
--env 'GITLAB_REGISTRY_CERT_PATH=/certs/registry-auth.crt' \
--env 'GITLAB_REGISTRY_KEY_PATH=/certs/registry-auth.key' \
--link registry:registry
sameersbn/gitlab:13.0.6
sameersbn/gitlab:13.0.7
```


Expand Down
2 changes: 1 addition & 1 deletion kubernetes/gitlab-rc.yml
Expand Up @@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: gitlab
image: sameersbn/gitlab:13.0.6
image: sameersbn/gitlab:13.0.7
env:
- name: TZ
value: Asia/Kolkata
Expand Down

0 comments on commit 79fae20

Please sign in to comment.