Skip to content

Commit

Permalink
Merge pull request #3028 from sachilles/upgrade-to-17.5.1
Browse files Browse the repository at this point in the history
Upgrade GitLab CE to 17.5.1
  • Loading branch information
sachilles authored Oct 26, 2024
2 parents 8ce157e + 3b310bc commit a79f284
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 42 deletions.
6 changes: 6 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

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.

**17.5.1**

- gitlab: upgrade CE to v17.5.1
- gitaly: upgrade to v17.5.1
- gitlab-pages: upgrade to v17.5.1

**17.5.0**

- gitlab: upgrade CE to v17.5.0
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
FROM ubuntu:focal-20241011

ARG VERSION=17.5.0
ARG VERSION=17.5.1

ENV GITLAB_VERSION=${VERSION} \
RUBY_VERSION=3.2.5 \
RUBY_SOURCE_SHA256SUM="ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16" \
RUBYGEMS_VERSION=3.5.14 \
GOLANG_VERSION=1.23.2 \
GITLAB_SHELL_VERSION=14.39.0 \
GITLAB_PAGES_VERSION=17.5.0 \
GITALY_SERVER_VERSION=17.5.0 \
GITLAB_PAGES_VERSION=17.5.1 \
GITALY_SERVER_VERSION=17.5.1 \
GITLAB_USER="git" \
GITLAB_HOME="/home/git" \
GITLAB_LOG_DIR="/var/log/gitlab" \
Expand Down
54 changes: 27 additions & 27 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# sameersbn/gitlab:17.5.0
# sameersbn/gitlab:17.5.1

[![CircleCI](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master.svg?style=svg)](https://circleci.com/gh/sameersbn/docker-gitlab/tree/master)

Expand Down Expand Up @@ -127,7 +127,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:17.5.0
docker pull sameersbn/gitlab:17.5.1
```

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

*Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
Expand Down Expand Up @@ -233,7 +233,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:17.5.0
sameersbn/gitlab:17.5.1
```

### Database
Expand Down Expand Up @@ -292,7 +292,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:17.5.0
sameersbn/gitlab:17.5.1
```

##### Linking to PostgreSQL Container
Expand Down Expand Up @@ -336,7 +336,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:17.5.0
sameersbn/gitlab:17.5.1
```

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 Down Expand Up @@ -375,7 +375,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:17.5.0
sameersbn/gitlab:17.5.1
```

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

```bash
docker run --name gitlab -d --link gitlab-redis:redisio \
sameersbn/gitlab:17.5.0
sameersbn/gitlab:17.5.1
```

#### Mail
Expand All @@ -415,7 +415,7 @@ If you are using Gmail then all you need to do is:
docker run --name gitlab -d \
--env '[email protected]' --env 'SMTP_PASS=PASSWORD' \
--volume /srv/docker/gitlab/gitlab:/home/git/data \
sameersbn/gitlab:17.5.0
sameersbn/gitlab:17.5.1
```

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

Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
Expand Down Expand Up @@ -519,7 +519,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:17.5.0
sameersbn/gitlab:17.5.1
```

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 @@ -535,7 +535,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:17.5.0
sameersbn/gitlab:17.5.1
```

If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
Expand All @@ -558,7 +558,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:17.5.0
sameersbn/gitlab:17.5.1
```

Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
Expand Down Expand Up @@ -606,7 +606,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:17.5.0
sameersbn/gitlab:17.5.1
```

GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
Expand Down Expand Up @@ -812,14 +812,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:17.5.0
sameersbn/gitlab:17.5.1
```

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:17.5.0 app:sanitize
sameersbn/gitlab:17.5.1 app:sanitize
```

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

```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:17.5.0 app:rake gitlab:backup:create
sameersbn/gitlab:17.5.1 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 @@ -2597,14 +2597,14 @@ you need to prepare the database:

```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:17.5.0 app:rake db:setup
sameersbn/gitlab:17.5.1 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:17.5.0 app:rake gitlab:backup:restore
sameersbn/gitlab:17.5.1 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 @@ -2613,7 +2613,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date

```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:17.5.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
sameersbn/gitlab:17.5.1 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.
Expand Down Expand Up @@ -2662,7 +2662,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:17.5.0 app:rake gitlab:env:info
sameersbn/gitlab:17.5.1 app:rake gitlab:env:info
```

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

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

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

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

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

> **Note**
>
> Upgrading to `sameersbn/gitlab:17.5.0` 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:17.5.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.

- **Step 1**: Update the docker image.

```bash
docker pull sameersbn/gitlab:17.5.0
docker pull sameersbn/gitlab:17.5.1
```

- **Step 2**: Stop and remove the currently running image
Expand All @@ -2761,7 +2761,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
> **Note**: Since Gitlab 13.7 you need to provide the `GITLAB_SECRETS_ENCRYPTED_SETTINGS_KEY_BASE` parameter while starting the image. If not provided, the key will be generated by gitlab. So you can start the image without setting this parameter. But you will lose the key when you shutting down the container without taking a backup of `secrets.yml`.

```bash
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.5.0
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:17.5.1
```

### Shell Access
Expand Down Expand Up @@ -2799,7 +2799,7 @@ version: '2.3'
services:
gitlab:
image: sameersbn/gitlab:17.5.0
image: sameersbn/gitlab:17.5.1
healthcheck:
test: ["CMD", "/usr/local/sbin/healthcheck"]
interval: 1m
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
17.5.0
17.5.1
2 changes: 1 addition & 1 deletion contrib/docker-swarm/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:

gitlab:
restart: always
image: sameersbn/gitlab:17.5.0
image: sameersbn/gitlab:17.5.1
depends_on:
- redis
- postgresql
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.swarm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ services:
- traefik-public

gitlab:
image: sameersbn/gitlab:17.5.0
image: sameersbn/gitlab:17.5.1
depends_on:
- redis
- postgresql
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:

gitlab:
restart: always
image: sameersbn/gitlab:17.5.0
image: sameersbn/gitlab:17.5.1
depends_on:
- redis
- postgresql
Expand Down
10 changes: 5 additions & 5 deletions docs/container_registry.md
Original file line number Diff line number Diff line change
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:17.5.0 app:rake gitlab:backup:create
sameersbn/gitlab:17.5.1 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:17.5.0 app:rake gitlab:backup:restore
sameersbn/gitlab:17.5.1 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:17.5.0 app:rake gitlab:backup:restore BACKUP=1417624827
sameersbn/gitlab:17.5.1 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:17.5.0
docker pull sameersbn/gitlab:17.5.1
```

- **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:17.5.0
sameersbn/gitlab:17.5.1
```


Expand Down
2 changes: 1 addition & 1 deletion docs/docker-compose-keycloak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:

gitlab:
restart: always
image: sameersbn/gitlab:17.5.0
image: sameersbn/gitlab:17.5.1
depends_on:
- redis
- postgresql
Expand Down
2 changes: 1 addition & 1 deletion docs/docker-compose-registry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:

gitlab:
restart: always
image: sameersbn/gitlab:17.5.0
image: sameersbn/gitlab:17.5.1
volumes:
- gitlab-data:/home/git/data:Z
- gitlab-logs:/var/log/gitlab
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/gitlab-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
spec:
containers:
- name: gitlab
image: sameersbn/gitlab:17.5.0
image: sameersbn/gitlab:17.5.1
env:
- name: TZ
value: Asia/Kolkata
Expand Down

0 comments on commit a79f284

Please sign in to comment.