Merge pull request #12 from sameersbn/master

release 12.9.2
taomaree · Apr 18, 2020 · f8c2087 · f8c2087
2 parents b75d2ff + c530f56
commit f8c2087
Show file tree

Hide file tree

Showing 26 changed files with 601 additions and 226 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -34,23 +34,6 @@ jobs:
             docker version
             docker info
 
-      - restore_cache:
-          keys:
-            - cache-v2-{{ .Branch }}
-          paths:
-            - /tmp/cache/layers.tar
-
-      - run:
-          name: Loading docker cache
-          command: |
-            if [[ -f /tmp/cache/layers.tar ]]; then
-              echo "Loading cache ..."
-              docker load -i /tmp/cache/layers.tar
-              docker image ls
-            else
-              echo "Couldn't find any caches"
-            fi
-
       - run:
           name: Build docker image
           command: |
@@ -74,16 +57,6 @@ jobs:
             docker run --network container:$(docker-compose ps -q gitlab) \
               appropriate/curl --ipv4 --retry 15 --retry-delay 5 --retry-connrefused http://localhost/explore
 
-      - run:
-          name: Generate docker build image cache
-          command: |
-            mkdir -p /tmp/cache/
-            docker save -o /tmp/cache/layers.tar ${IMAGE_NAME}
-
-      - save_cache:
-          key: cache-v2-{{ .Branch }}
-          paths:
-            - /tmp/cache/layers.tar
 
 workflows:
   version: 2

diff --git a/Changelog.md b/Changelog.md
@@ -3,6 +3,57 @@
 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.9.2**
+- gitlab: upgrade CE to v12.9.2
+
+**12.9.1**
+- gitlab: upgrade CE to v12.9.1
+
+**12.9.0**
+- gitlab: upgrade CE to v12.9.0
+- replaced unicorn with puma
+- Removed `UNICORN_WORKERS`
+- Removed `UNICORN_TIMEOUT`
+- Added `PUMA_THREADS_MIN`
+- Added `PUMA_THREADS_MAX`
+- Added `PUMA_WORKERS`
+- Added `PUMA_TIMEOUT`
+
+**12.8.8**
+- gitlab: upgrade CE to v12.8.8
+
+**12.8.7**
+- gitlab: upgrade CE to v12.8.7
+
+**12.8.6**
+- gitlab: upgrade CE to v12.8.6
+
+**12.8.5**
+- gitlab: upgrade CE to v12.8.5
+
+**12.8.4**
+- gitlab: upgrade CE to v12.8.4
+
+**12.8.3**
+- gitlab: upgrade CE to v12.8.3
+
+**12.8.2**
+- gitlab: upgrade CE to v12.8.2
+
+**12.8.1**
+- gitlab: upgrade CE to v12.8.1
+
+**12.8.0**
+- gitlab: upgrade CE to v12.8.0
+- fix: ArgumentError: 'import/{{oauth2_generic_name}}' is not supported [#2101](https://github.com/sameersbn/docker-gitlab/issues/2101)
+
+**12.7.8**
+- Upgrade GitLab CE to 12.7.8
+
+**12.7.7**
+- Upgrade GitLab CE to 12.7.7
+- Add Generic OAuth Provider PR#2070
+
 **12.7.7**
 - Upgrade GitLab CE to 12.7.7
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,16 +1,16 @@
-FROM ubuntu:bionic-20191202
+FROM ubuntu:bionic-20200219
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG VERSION=12.7.7
+ARG VERSION=12.9.2
 
 ENV GITLAB_VERSION=${VERSION} \
     RUBY_VERSION=2.6 \
     GOLANG_VERSION=1.13.7 \
-    GITLAB_SHELL_VERSION=11.0.0 \
-    GITLAB_WORKHORSE_VERSION=8.20.0 \
-    GITLAB_PAGES_VERSION=1.12.0 \
-    GITALY_SERVER_VERSION=1.83.0 \
+    GITLAB_SHELL_VERSION=12.0.0 \
+    GITLAB_WORKHORSE_VERSION=8.25.1 \
+    GITLAB_PAGES_VERSION=1.17.0 \
+    GITALY_SERVER_VERSION=12.9.2 \
     GITLAB_USER="git" \
     GITLAB_HOME="/home/git" \
     GITLAB_LOG_DIR="/var/log/gitlab" \