From adc74554af48cdddbb899df0d2f0313f54e82956 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Sun, 22 Aug 2021 21:15:28 +0200
Subject: [PATCH 1/3] upgrade GitLab CE to 14.2.0

---
 Changelog.md                            |  6 +++
 Dockerfile                              |  8 ++--
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 0e33dd66e..947343dab 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,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.
 
+**14.2.0**
+- gitlab: upgrade CE to v14.2.0
+- gitaly: upgrade to v14.2.0
+- gitlab-pages: upgrade to v1.42.0
+- golang: upgrade to v1.17
+
 **14.1.3**
 - gitlab: upgrade CE to v14.1.3
 - gitaly: upgrade to v14.1.3
diff --git a/Dockerfile b/Dockerfile
index 6633c6d2c..4acc4f7d6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210723
 
-ARG VERSION=14.1.3
+ARG VERSION=14.2.0
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
-    GOLANG_VERSION=1.16.7 \
+    GOLANG_VERSION=1.17 \
     GITLAB_SHELL_VERSION=13.19.1 \
-    GITLAB_PAGES_VERSION=1.41.0 \
-    GITALY_SERVER_VERSION=14.1.3 \
+    GITLAB_PAGES_VERSION=1.42.0 \
+    GITALY_SERVER_VERSION=14.2.0 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index f602655ec..abcf7bc64 100644
--- a/README.md
+++ b/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:14.1.3
+# sameersbn/gitlab:14.2.0
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,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:14.1.3
+docker pull sameersbn/gitlab:14.2.0
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,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:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,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:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 ## Database
@@ -264,7 +264,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:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,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:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 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:
@@ -347,7 +347,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:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 ### Mail
@@ -387,7 +387,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:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,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:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,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:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 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.
@@ -507,7 +507,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:14.1.3
+ sameersbn/gitlab:14.2.0
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,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:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,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:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,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:14.1.3
+    sameersbn/gitlab:14.2.0
 ```
 
 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:14.1.3 app:sanitize
+    sameersbn/gitlab:14.2.0 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.2.0 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.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.3 app:rake db:setup
+    sameersbn/gitlab:14.2.0 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:14.1.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.2.0 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.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.3 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.2.0 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.
@@ -1305,7 +1305,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:14.1.3 app:rake gitlab:env:info
+    sameersbn/gitlab:14.2.0 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.2.0 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.1.3 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.2.0 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.1.3` 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:14.2.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.
 
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.1.3
+docker pull sameersbn/gitlab:14.2.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,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:14.1.3
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.0
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.1.3
+    image: sameersbn/gitlab:14.2.0
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index e84178ff7..07ea9fa43 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.1.3
+14.2.0
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index cacb7f5c2..a8706fa92 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.3
+    image: sameersbn/gitlab:14.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 9c1156bcd..45b41b549 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.1.3
+    image: sameersbn/gitlab:14.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index 5b5d5f72d..e7969e8d8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.3
+    image: sameersbn/gitlab:14.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index 5fa3b6f51..f043b1d0e 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -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:14.1.3 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.2.0 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -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:14.1.3 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.2.0 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.
@@ -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:14.1.3 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # 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
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.1.3
+docker pull sameersbn/gitlab:14.2.0
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -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:14.1.3
+sameersbn/gitlab:14.2.0
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index df526e76f..32a63bd69 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.3
+    image: sameersbn/gitlab:14.2.0
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index fcf78c54c..665573b2f 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.1.3
+    image: sameersbn/gitlab:14.2.0
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index 8d4ad70ff..dcfa0e36c 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.1.3
+        image: sameersbn/gitlab:14.2.0
         env:
         - name: TZ
           value: Asia/Kolkata

From 93a47b7d75d984c612475ffcdc636d84e632d468 Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Tue, 24 Aug 2021 20:55:08 +0200
Subject: [PATCH 2/3] Update patch
 '0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch'

---
 ...eature-checking-for-gitaly-on-a-fresh-install.patch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch b/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch
index 86c366105..2b80cde1d 100644
--- a/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch
+++ b/assets/build/patches/0001-fix-feature-checking-for-gitaly-on-a-fresh-install.patch
@@ -1,19 +1,19 @@
 diff --git a/lib/feature.rb b/lib/feature.rb
-index 7cf40b63fdf..f225a666cfc 100644
+index f8d34e9c386..549c7fc063e 100644
 --- a/lib/feature.rb
 +++ b/lib/feature.rb
-@@ -33,6 +33,7 @@ class Feature
+@@ -37,6 +37,7 @@ def get(key)
  
      def persisted_names
-       return [] unless Gitlab::Database.exists?
+       return [] unless Gitlab::Database.main.exists?
 +      return [] unless Feature::FlipperFeature.table_exists?
  
        # This loads names of all stored feature flags
        # and returns a stable Set in the following order:
-@@ -67,6 +68,7 @@ class Feature
+@@ -74,6 +75,7 @@ def enabled?(key, thing = nil, type: :development, default_enabled: false)
        # During setup the database does not exist yet. So we haven't stored a value
        # for the feature yet and return the default.
-       return default_enabled unless Gitlab::Database.exists?
+       return default_enabled unless Gitlab::Database.main.exists?
 +      return default_enabled unless Feature::FlipperFeature.table_exists?
  
        feature = get(key)

From 6cfafa60bc6bf47860d8e217bbd55e934afdeafe Mon Sep 17 00:00:00 2001
From: Steven Achilles <steven.achilles@googlemail.com>
Date: Wed, 25 Aug 2021 06:09:32 +0200
Subject: [PATCH 3/3] upgrade GitLab CE to 14.2.1

---
 Changelog.md                            |  4 ++
 Dockerfile                              |  4 +-
 README.md                               | 54 ++++++++++++-------------
 VERSION                                 |  2 +-
 contrib/docker-swarm/docker-compose.yml |  2 +-
 docker-compose.swarm.yml                |  2 +-
 docker-compose.yml                      |  2 +-
 docs/container_registry.md              | 10 ++---
 docs/docker-compose-keycloak.yml        |  2 +-
 docs/docker-compose-registry.yml        |  2 +-
 kubernetes/gitlab-rc.yml                |  2 +-
 11 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 947343dab..415e9d181 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,10 @@
 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.
 
+**14.2.0**
+- gitlab: upgrade CE to v14.2.1
+- gitaly: upgrade to v14.2.1
+
 **14.2.0**
 - gitlab: upgrade CE to v14.2.0
 - gitaly: upgrade to v14.2.0
diff --git a/Dockerfile b/Dockerfile
index 4acc4f7d6..7524ddc32 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
 FROM ubuntu:focal-20210723
 
-ARG VERSION=14.2.0
+ARG VERSION=14.2.1
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.7 \
     GOLANG_VERSION=1.17 \
     GITLAB_SHELL_VERSION=13.19.1 \
     GITLAB_PAGES_VERSION=1.42.0 \
-    GITALY_SERVER_VERSION=14.2.0 \
+    GITALY_SERVER_VERSION=14.2.1 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \
diff --git a/README.md b/README.md
index abcf7bc64..8704540fa 100644
--- a/README.md
+++ b/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:14.2.0
+# sameersbn/gitlab:14.2.1
 
 - [Introduction](#introduction)
     - [Changelog](Changelog.md)
@@ -125,7 +125,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:14.2.0
+docker pull sameersbn/gitlab:14.2.1
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
@@ -194,7 +194,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:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
@@ -229,7 +229,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:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 ## Database
@@ -264,7 +264,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:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 #### Linking to PostgreSQL Container
@@ -308,7 +308,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:14.2.0
+    sameersbn/gitlab:14.2.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:
@@ -347,7 +347,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:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 ### Linking to Redis Container
@@ -374,7 +374,7 @@ We are now ready to start the GitLab application.
 
 ```bash
 docker run --name gitlab -d --link gitlab-redis:redisio \
-    sameersbn/gitlab:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 ### Mail
@@ -387,7 +387,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:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified.
@@ -407,7 +407,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:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
@@ -491,7 +491,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:14.2.0
+    sameersbn/gitlab:14.2.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.
@@ -507,7 +507,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:14.2.0
+ sameersbn/gitlab:14.2.1
 ```
 
 If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
@@ -530,7 +530,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:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
@@ -578,7 +578,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:14.2.0
+    sameersbn/gitlab:14.2.1
 ```
 
 GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
@@ -759,14 +759,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:14.2.0
+    sameersbn/gitlab:14.2.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:14.2.0 app:sanitize
+    sameersbn/gitlab:14.2.1 app:sanitize
 ```
 
 ### Piwik
@@ -1204,7 +1204,7 @@ Execute the rake task to create a backup.
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.2.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.
@@ -1239,14 +1239,14 @@ you need to prepare the database:
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.0 app:rake db:setup
+    sameersbn/gitlab:14.2.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:14.2.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.2.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.
@@ -1255,7 +1255,7 @@ To avoid user interaction in the restore operation, specify the timestamp, date
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.0 app:rake gitlab:backup:restore BACKUP=1515629493_2020_12_06_13.0.6
+    sameersbn/gitlab:14.2.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.
@@ -1305,7 +1305,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:14.2.0 app:rake gitlab:env:info
+    sameersbn/gitlab:14.2.1 app:rake gitlab:env:info
 ```
 
 You can also use `docker exec` to run raketasks on running gitlab instance. For example,
@@ -1318,7 +1318,7 @@ Similarly, to import bare repositories into GitLab project instance
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.2.1 app:rake gitlab:import:repos
 ```
 
 Or
@@ -1349,7 +1349,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [
 
 ```bash
 docker run --name gitlab -it --rm [OPTIONS] \
-    sameersbn/gitlab:14.2.0 app:rake gitlab:import:repos
+    sameersbn/gitlab:14.2.1 app:rake gitlab:import:repos
 ```
 
 Watch the logs and your repositories should be available into your new gitlab container.
@@ -1373,12 +1373,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
 
 > **Note**
 >
-> Upgrading to `sameersbn/gitlab:14.2.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:14.2.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:14.2.0
+docker pull sameersbn/gitlab:14.2.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -1404,7 +1404,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:14.2.0
+docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:14.2.1
 ```
 
 ## Shell Access
@@ -1442,7 +1442,7 @@ version: '2.3'
 
 services:
   gitlab:
-    image: sameersbn/gitlab:14.2.0
+    image: sameersbn/gitlab:14.2.1
     healthcheck:
       test: ["CMD", "/usr/local/sbin/healthcheck"]
       interval: 1m
diff --git a/VERSION b/VERSION
index 07ea9fa43..dab6a80f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.2.0
+14.2.1
diff --git a/contrib/docker-swarm/docker-compose.yml b/contrib/docker-swarm/docker-compose.yml
index a8706fa92..abf12237b 100644
--- a/contrib/docker-swarm/docker-compose.yml
+++ b/contrib/docker-swarm/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.0
+    image: sameersbn/gitlab:14.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.swarm.yml b/docker-compose.swarm.yml
index 45b41b549..2f41597a9 100644
--- a/docker-compose.swarm.yml
+++ b/docker-compose.swarm.yml
@@ -63,7 +63,7 @@ services:
       - traefik-public
 
   gitlab:
-    image: sameersbn/gitlab:14.2.0
+    image: sameersbn/gitlab:14.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docker-compose.yml b/docker-compose.yml
index e7969e8d8..7f7daa7bb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.0
+    image: sameersbn/gitlab:14.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/container_registry.md b/docs/container_registry.md
index f043b1d0e..96a30891b 100644
--- a/docs/container_registry.md
+++ b/docs/container_registry.md
@@ -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:14.2.0 app:rake gitlab:backup:create
+    sameersbn/gitlab:14.2.1 app:rake gitlab:backup:create
 ```
 ## Restoring Backups
 
@@ -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:14.2.0 app:rake gitlab:backup:restore
+    sameersbn/gitlab:14.2.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.
@@ -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:14.2.0 app:rake gitlab:backup:restore BACKUP=1417624827
+    sameersbn/gitlab:14.2.1 app:rake gitlab:backup:restore BACKUP=1417624827
 ```
 
 # 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
 - **Step 1**: Update the docker image.
 
 ```bash
-docker pull sameersbn/gitlab:14.2.0
+docker pull sameersbn/gitlab:14.2.1
 ```
 
 - **Step 2**: Stop and remove the currently running image
@@ -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:14.2.0
+sameersbn/gitlab:14.2.1
 ```
 
 
diff --git a/docs/docker-compose-keycloak.yml b/docs/docker-compose-keycloak.yml
index 32a63bd69..4c90d2c80 100644
--- a/docs/docker-compose-keycloak.yml
+++ b/docs/docker-compose-keycloak.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.0
+    image: sameersbn/gitlab:14.2.1
     depends_on:
     - redis
     - postgresql
diff --git a/docs/docker-compose-registry.yml b/docs/docker-compose-registry.yml
index 665573b2f..06ed540cb 100644
--- a/docs/docker-compose-registry.yml
+++ b/docs/docker-compose-registry.yml
@@ -22,7 +22,7 @@ services:
 
   gitlab:
     restart: always
-    image: sameersbn/gitlab:14.2.0
+    image: sameersbn/gitlab:14.2.1
     volumes:
     - gitlab-data:/home/git/data:Z
     - gitlab-logs:/var/log/gitlab
diff --git a/kubernetes/gitlab-rc.yml b/kubernetes/gitlab-rc.yml
index dcfa0e36c..2dc6632d6 100644
--- a/kubernetes/gitlab-rc.yml
+++ b/kubernetes/gitlab-rc.yml
@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: sameersbn/gitlab:14.2.0
+        image: sameersbn/gitlab:14.2.1
         env:
         - name: TZ
           value: Asia/Kolkata