From 2ff5d28ac8bd21f30450f9e8b6dbd0929710c4bf Mon Sep 17 00:00:00 2001 From: Przemyslaw Ozgo Date: Sun, 21 Oct 2018 20:03:12 +0100 Subject: [PATCH 1/3] Updated to 11.4.0-ce.0 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e990d05..7f22ca3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ ENV BACKUP_TIME="0 12 * * *" \ TERM=xterm \ PACKAGECLOUD_REPO=gitlab-ce \ RELEASE_PACKAGE=gitlab-ce \ - RELEASE_VERSION=11.3.6-ce.0 \ - DOWNLOAD_URL=https://downloads-packages.s3.amazonaws.com/ubuntu-xenial/gitlab-ce_11.3.6-ce.0_amd64.deb + RELEASE_VERSION=11.4.0-ce.0 \ + DOWNLOAD_URL=https://downloads-packages.s3.amazonaws.com/ubuntu-xenial/gitlab-ce_11.4.0-ce.0_amd64.deb COPY container-files / From 1c536dfc1d5308cb3de006ff229893ac94be3806 Mon Sep 17 00:00:00 2001 From: Przemyslaw Ozgo Date: Sun, 21 Oct 2018 20:08:57 +0100 Subject: [PATCH 2/3] Fixed tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 080ac8f..999539a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ jobs: - docker login -u $DOCKER_USER -p $DOCKER_PASS - docker pull polinux/gitlab-ce:stage - docker tag polinux/gitlab-ce:stage polinux/gitlab-ce:latest - - export RELEASE=$(grep "HAPROXY_VERSION=" Dockerfile | sed 's|^.*=||g' |awk '{print $1}'); docker tag million12/haproxy:stage polinux/gitlab-ce:$RELEASE + - export RELEASE=$(grep "HAPROXY_VERSION=" Dockerfile | sed 's|^.*=||g' |awk '{print $1}'); docker tag polinux/gitlab-ce:stage polinux/gitlab-ce:$RELEASE - docker push polinux/gitlab-ce:latest - export RELEASE=$(grep "HAPROXY_VERSION=" Dockerfile | sed 's|^.*=||g' |awk '{print $1}'); docker push polinux/gitlab-ce:$RELEASE - docker push polinux/gitlab-ce:latest \ No newline at end of file From f16443173705b3c6067b73a78266fa154a6765fc Mon Sep 17 00:00:00 2001 From: Przemyslaw Ozgo Date: Sun, 21 Oct 2018 20:33:10 +0100 Subject: [PATCH 3/3] Fixed mismatch tag grep command. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9839851..fca3843 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ jobs: - docker login -u $DOCKER_USER -p $DOCKER_PASS - docker pull polinux/gitlab-ce:stage - docker tag polinux/gitlab-ce:stage polinux/gitlab-ce:latest - - export RELEASE=$(grep "HAPROXY_VERSION=" Dockerfile | sed 's|^.*=||g' |awk '{print $1}'); docker tag polinux/gitlab-ce:stage polinux/gitlab-ce:$RELEASE + - export RELEASE=$(grep "RELEASE_VERSION=" Dockerfile | sed 's|^.*=||g' |awk '{print $1}'); docker tag polinux/gitlab-ce:stage polinux/gitlab-ce:$RELEASE - docker push polinux/gitlab-ce:latest - export RELEASE=$(grep "RELEASE_VERSION=" Dockerfile | sed 's|^.*=||g' |awk '{print $1}'); docker push polinux/gitlab-ce:$RELEASE - docker push polinux/gitlab-ce:latest \ No newline at end of file