Merge pull request #10 from sameersbn/master

release 12.4.2

.gitlab-ci.yml

@@ -7,7 +7,7 @@ before_script:
   - export VERSION=$(cat VERSION)
   - export CI_REGISTRY=${CI_REGISTRY:-hub.docker.com}
   - export CI_REGISTRY_USER=${CI_REGISTRY_USER:-gitlab-ci-token}
-  - export CI_REGISTRY_PASSWORD=${CI_REGISTRY_PASS:-${CI_REGISTRY_PASSWORD:-${CI_JOB_TOKEN}}}
+  - export CI_REGISTRY_PASSWORD=${CI_REGISTRY_PASSWORD:-${CI_JOB_TOKEN}}
   - export DOCKER_IMAGE=${DOCKER_IMAGE:-${CI_REGISTRY}/${CI_PROJECT_PATH}}
   - |
     if [ "${DOCKER_IMAGE}" = "/" ]; then
@@ -35,7 +35,7 @@ docker:build:branches:
   except:
     - master
   script:
-    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY}
+    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
     - docker build
       --pull
       --cache-from=${DOCKER_IMAGE}:${CI_COMMIT_REF_SLUG}
@@ -49,7 +49,7 @@ docker:build:release:
   only:
     - tags
   script:
-    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASS} ${CI_REGISTRY}
+    - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
     - docker build
       --pull
       --cache-from=${DOCKER_IMAGE}:${VERSION}

CONTRIBUTING.md

@@ -9,5 +9,4 @@ Overrides for these values can be set within the project, under `Settings` -> `C
 | `CI_REGISTRY`          | `hub.docker.com`   | If available this will be automatically overriden by registry address which is configured within the GitLab instance                                                                                                     |
 | `CI_REGISTRY_USER`     | `gitlab-ci-token`  | Username for the registry                                                                                                                                                                                                |
 | `CI_REGISTRY_PASSWORD` | `${CI_JOB_TOKEN}`  | Password for the registry                                                                                                                                                                                                |
-| `CI_REGISTRY_PASS`     | `${CI_JOB_TOKEN}`  | DEPRECATED: Use `CI_REGISTRY_PASSWORD`                                                                                                                                                                                   |
 | `DOCKER_IMAGE`         | `sameersbn/gitlab` | Docker image name, will be automatically be overriden by the running GitLab instance with the `${CI_PROJECT_PATH}` variable. This will case the image to be uploaded to the local registry of the project within GitLab. |

Changelog.md

@@ -3,6 +3,18 @@
 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.
 
+**12.4.2**
+- gitlab: upgrade CE to v12.4.2
+
+**12.4.1**
+- gitlab: upgrade CE to v12.4.1
+
+**12.4.0**
+- gitlab: upgrade CE to v12.4.0
+
+**12.3.5**
+- gitlab: upgrade CE to v12.3.5
+
 **12.3.4**
 - gitlab: upgrade CE to v12.3.4
 

Dockerfile

@@ -1,16 +1,16 @@
-FROM ubuntu:bionic-20190807
+FROM ubuntu:bionic-20191010
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.3.4
+ARG VERSION=12.4.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
-    GOLANG_VERSION=1.12.9 \
-    GITLAB_SHELL_VERSION=10.0.0 \
-    GITLAB_WORKHORSE_VERSION=8.10.0 \
-    GITLAB_PAGES_VERSION=1.9.0 \
-    GITALY_SERVER_VERSION=1.65.1 \
+    GOLANG_VERSION=1.12.12 \
+    GITLAB_SHELL_VERSION=10.2.0 \
+    GITLAB_WORKHORSE_VERSION=8.14.0 \
+    GITLAB_PAGES_VERSION=1.11.0 \
+    GITALY_SERVER_VERSION=1.67.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \

README.md

@@ -1,7 +1,7 @@
 [![Docker Repository on Quay.io](https://quay.io/repository/sameersbn/gitlab/status "Docker Repository on Quay.io")](https://quay.io/repository/sameersbn/gitlab)
 [![](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:12.3.4
+# sameersbn/gitlab:12.4.2
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -124,7 +124,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
 > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
 
 ```bash
-docker pull sameersbn/gitlab:12.3.4
+docker pull sameersbn/gitlab:12.4.2
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -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:12.3.4
+    sameersbn/gitlab:12.4.2
 ```
 
 *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
 ```bash
 docker run --name gitlab -d \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.4
+    sameersbn/gitlab:12.4.2
 ```
 
 ## Database
@@ -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:12.3.4
+    sameersbn/gitlab:12.4.2
 ```
 
 #### Linking to PostgreSQL Container
@@ -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:12.3.4
+    sameersbn/gitlab:12.4.2
 ```
 
 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
 ```bash
 docker run --name gitlab -it --rm \
     --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \
-    sameersbn/gitlab:12.3.4
+    sameersbn/gitlab:12.4.2
 ```
 
 ### Linking to Redis Container
@@ -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:12.3.4
+    sameersbn/gitlab:12.4.2
 ```
 
 ### Mail
@@ -372,7 +372,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:12.3.4
+    sameersbn/gitlab:12.4.2
 ```
 
 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 \
     --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:12.3.4
+    sameersbn/gitlab:12.4.2
 ```
 
 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 \
     --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:12.3.4
+    sameersbn/gitlab:12.4.2
 ```
 
 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 \
  --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
  --env 'NGINX_HSTS_MAXAGE=2592000' \
  --volume /srv/docker/gitlab/gitlab:/home/git/data \
- sameersbn/gitlab:12.3.4
+ sameersbn/gitlab:12.4.2
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -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:12.3.4
+    sameersbn/gitlab:12.4.2
 ```
 
 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
 docker run --name gitlab -it --rm \
     --env 'GITLAB_RELATIVE_URL_ROOT=/git' \
     --volume /srv/docker/gitlab/gitlab:/home/git/data \
-    sameersbn/gitlab:12.3.4
+    sameersbn/gitlab:12.4.2
 ```
 
 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`
 ```bash
 docker run --name gitlab -it --rm [options] \
     --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \
-    sameersbn/gitlab:12.3.4
+    sameersbn/gitlab:12.4.2
 ```
 
 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:12.3.4 app:sanitize
+    sameersbn/gitlab:12.4.2 app:sanitize
 ```
 
 ### Piwik
@@ -930,7 +930,7 @@ Below is the complete list of available options that can be used to customize yo
 | `DB_ADAPTER` | The database type. Currently only postgresql is supported. Over 12.1 postgres force. Possible values: `postgresql`. Defaults to `postgresql`. |
 | `DB_ENCODING` | The database encoding. For `DB_ADAPTER` values `postresql` this parameter defaults and `utf8` respectively. |
 | `DB_HOST` | The database server hostname. Defaults to `localhost`. |
-| `DB_PORT` | The database server port. Defaults to `3306` for mysql and `5432` for postgresql. |
+| `DB_PORT` | The database server port. Defaults to `5432` for postgresql. |
 | `DB_NAME` | The database database name. Defaults to `gitlabhq_production` |
 | `DB_USER` | The database database user. Defaults to `root` |
 | `DB_PASS` | The database database password. Defaults to no password |
@@ -1102,7 +1102,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.4 app:rake gitlab:backup:create
+    sameersbn/gitlab:12.4.2 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.
@@ -1137,14 +1137,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.4 app:rake db:setup
+    sameersbn/gitlab:12.4.2 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:12.3.4 app:rake gitlab:backup:restore
+    sameersbn/gitlab:12.4.2 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.
@@ -1153,7 +1153,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.4 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:12.4.2 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 When using `docker-compose` you may use the following command to execute the restore.
@@ -1203,7 +1203,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:12.3.4 app:rake gitlab:env:info
+    sameersbn/gitlab:12.4.2 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1216,7 +1216,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.4.2 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1247,7 +1247,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:12.3.4 app:rake gitlab:import:repos
+    sameersbn/gitlab:12.4.2 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1269,12 +1269,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:12.3.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.
+> Upgrading to `sameersbn/gitlab:12.4.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.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:12.3.4
+docker pull sameersbn/gitlab:12.4.2
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1300,7 +1300,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:12.3.4
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:12.4.2
 ```
 
 ## Shell Access

VERSION

@@ -1 +1 @@
-12.3.4
+12.4.2

assets/runtime/config/nginx/gitlab-pages-ssl

@@ -31,7 +31,6 @@ server {
 
   ## Strong SSL Security
   ## https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html & https://cipherli.st/
-  ssl on;
   ssl_certificate {{SSL_PAGES_CERT_PATH}};
   ssl_certificate_key {{SSL_PAGES_KEY_PATH}};
 

assets/runtime/config/nginx/gitlab-registry

@@ -27,7 +27,6 @@ server {
 
   ## Strong SSL Security
   ## https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html & https://cipherli.st/
-  ssl on;
   ssl_certificate {{SSL_REGISTRY_CERT_PATH}};
   ssl_certificate_key {{SSL_REGISTRY_KEY_PATH}};
 

assets/runtime/config/nginx/gitlab-ssl

@@ -53,7 +53,6 @@ server {
 
   ## Strong SSL Security
   ## https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html & https://cipherli.st/
-  ssl on;
   ssl_certificate {{SSL_CERTIFICATE_PATH}};
   ssl_certificate_key {{SSL_KEY_PATH}};
   ssl_verify_client {{SSL_VERIFY_CLIENT}};

assets/runtime/env-defaults

@@ -37,7 +37,6 @@ NGINX_HSTS_MAXAGE=${NGINX_HSTS_MAXAGE:-31536000}
 ## DATABASE
 DB_ADAPTER=${DB_ADAPTER:-postgresql}
 DB_ENCODING=${DB_ENCODING:-}
-DB_COLLATION=${DB_COLLATION:-}
 DB_HOST=${DB_HOST:-}
 DB_PORT=${DB_PORT:-}
 DB_NAME=${DB_NAME:-}

assets/runtime/functions

@@ -99,9 +99,8 @@ update_template() {
 }
 
 gitlab_finalize_database_parameters() {
-  # is a mysql or postgresql database linked?
-  # requires that the mysql or postgresql containers have exposed
-  # port 3306 and 5432 respectively.
+  # is a postgresql database linked?
+  # requires that the postgresql containers have exposed port 5432.
   DB_HOST=${DB_HOST:-${POSTGRESQL_PORT_5432_TCP_ADDR}}
   DB_PORT=${DB_PORT:-${POSTGRESQL_PORT_5432_TCP_PORT}}
 
@@ -138,11 +137,9 @@ gitlab_finalize_database_parameters() {
   fi
 
   # set default port number if not specified
-
-  DB_ENCODING=${DB_ENCODING:-unicode}
-  # DB_COLLATION: Not supported for postgresql and will be removed below.
   DB_PORT=${DB_PORT:-5432}
 
+  DB_ENCODING=${DB_ENCODING:-unicode}
 
   # set default user and database
   DB_USER=${DB_USER:-root}