diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e30b12..e08cbf2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,13 +78,13 @@ ruby-2.4-golang-1.11-git-2.17 test: *test_custom ruby-2.4-golang-1.11-git-2.18 test: *test_custom # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml -ruby-2.4.4-golang-1.9-git-2.18-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom -ruby-2.4.4-golang-1.9-git-2.18-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom -ruby-2.4.4-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom -ruby-2.4.4-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom -ruby-2.4.4-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom -ruby-2.4.4-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom -ruby-2.4.4-git-2.18-chrome-69.0-node-8.x-yarn-1.2-graphicsmagick-1.3.29-docker-18.06.1 test: *test_custom +ruby-2.4.5-golang-1.9-git-2.18-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom +ruby-2.4.5-golang-1.9-git-2.18-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom +ruby-2.4.5-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom +ruby-2.4.5-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom +ruby-2.4.5-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom +ruby-2.4.5-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom +ruby-2.4.5-git-2.18-chrome-69.0-node-8.x-yarn-1.2-graphicsmagick-1.3.29-docker-18.06.1 test: *test_custom # Not used anymore (?) golang-1.9-git-2.9.0 test: *test_custom @@ -151,13 +151,13 @@ ruby-2.4-golang-1.11-git-2.18: *build_and_deploy_custom # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml -ruby-2.4.4-golang-1.9-git-2.18-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom -ruby-2.4.4-golang-1.9-git-2.18-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom -ruby-2.4.4-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom -ruby-2.4.4-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom -ruby-2.4.4-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom -ruby-2.4.4-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom -ruby-2.4.4-git-2.18-chrome-69.0-node-8.x-yarn-1.2-graphicsmagick-1.3.29-docker-18.06.1: *build_and_deploy_custom +ruby-2.4.5-golang-1.9-git-2.18-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom +ruby-2.4.5-golang-1.9-git-2.18-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom +ruby-2.4.5-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom +ruby-2.4.5-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom +ruby-2.4.5-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom +ruby-2.4.5-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom +ruby-2.4.5-git-2.18-chrome-69.0-node-8.x-yarn-1.2-graphicsmagick-1.3.29-docker-18.06.1: *build_and_deploy_custom # Used by https://gitlab.com/gitlab-org/trello-power-up/blob/master/.gitlab-ci.yml (?) node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom diff --git a/Dockerfile.danger b/Dockerfile.danger index cd89826..91ffddc 100644 --- a/Dockerfile.danger +++ b/Dockerfile.danger @@ -1,4 +1,4 @@ -FROM ruby:2.4.4-stretch +FROM ruby:2.4.5-stretch MAINTAINER GitLab Quality Team ADD /scripts/ /scripts/ diff --git a/Dockerfile.gitlab-charts-build-base b/Dockerfile.gitlab-charts-build-base index ed2ad36..e42b485 100644 --- a/Dockerfile.gitlab-charts-build-base +++ b/Dockerfile.gitlab-charts-build-base @@ -1,4 +1,4 @@ -FROM ruby:2.4.4-alpine +FROM ruby:2.4.5-alpine MAINTAINER GitLab Distribution Team ENV HELM_VERSION=2.11.0 diff --git a/Dockerfile.omnibus-gitlab-bionic b/Dockerfile.omnibus-gitlab-bionic index 9e796fc..a111ebe 100644 --- a/Dockerfile.omnibus-gitlab-bionic +++ b/Dockerfile.omnibus-gitlab-bionic @@ -12,7 +12,7 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 -ENV RUBY_VERSION 2.4.4 +ENV RUBY_VERSION 2.4.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ && cd "/tmp/ruby-${RUBY_VERSION}" \ diff --git a/Dockerfile.omnibus-gitlab-centos6 b/Dockerfile.omnibus-gitlab-centos6 index ca70bed..e5a039c 100644 --- a/Dockerfile.omnibus-gitlab-centos6 +++ b/Dockerfile.omnibus-gitlab-centos6 @@ -10,7 +10,7 @@ ENV LANG en_US.UTF-8 ENV LC_ALL en_US.UTF-8 RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8 -ENV RUBY_VERSION 2.4.4 +ENV RUBY_VERSION 2.4.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ && cd "/tmp/ruby-${RUBY_VERSION}" \ diff --git a/Dockerfile.omnibus-gitlab-centos7 b/Dockerfile.omnibus-gitlab-centos7 index 794155a..116d176 100644 --- a/Dockerfile.omnibus-gitlab-centos7 +++ b/Dockerfile.omnibus-gitlab-centos7 @@ -10,7 +10,7 @@ ENV LANG en_US.UTF-8 ENV LC_ALL en_US.UTF-8 RUN localedef -c -f UTF-8 -i en_US en_US.UTF-8 -ENV RUBY_VERSION 2.4.4 +ENV RUBY_VERSION 2.4.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ && cd "/tmp/ruby-${RUBY_VERSION}" \ diff --git a/Dockerfile.omnibus-gitlab-jessie b/Dockerfile.omnibus-gitlab-jessie index 3f540f7..65d2cce 100644 --- a/Dockerfile.omnibus-gitlab-jessie +++ b/Dockerfile.omnibus-gitlab-jessie @@ -12,7 +12,7 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 -ENV RUBY_VERSION 2.4.4 +ENV RUBY_VERSION 2.4.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ && cd "/tmp/ruby-${RUBY_VERSION}" \ diff --git a/Dockerfile.omnibus-gitlab-opensuse42.3 b/Dockerfile.omnibus-gitlab-opensuse42.3 index 81ea03b..abfcfec 100644 --- a/Dockerfile.omnibus-gitlab-opensuse42.3 +++ b/Dockerfile.omnibus-gitlab-opensuse42.3 @@ -11,7 +11,7 @@ ENV LC_ALL en_US.UTF-8 ENV LANGUAGE en_US:en RUN localedef -i en_US -f UTF-8 en_US.UTF-8 -ENV RUBY_VERSION 2.4.4 +ENV RUBY_VERSION 2.4.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ && cd "/tmp/ruby-${RUBY_VERSION}" \ diff --git a/Dockerfile.omnibus-gitlab-stretch b/Dockerfile.omnibus-gitlab-stretch index 875ab12..44cd329 100644 --- a/Dockerfile.omnibus-gitlab-stretch +++ b/Dockerfile.omnibus-gitlab-stretch @@ -13,7 +13,7 @@ ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 -ENV RUBY_VERSION 2.4.4 +ENV RUBY_VERSION 2.4.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ && cd "/tmp/ruby-${RUBY_VERSION}" \ diff --git a/Dockerfile.omnibus-gitlab-trusty b/Dockerfile.omnibus-gitlab-trusty index 82201d7..214543f 100644 --- a/Dockerfile.omnibus-gitlab-trusty +++ b/Dockerfile.omnibus-gitlab-trusty @@ -6,7 +6,7 @@ RUN apt-get update -q \ && apt-get clean -yqq \ && rm -rf /var/lib/apt/lists/* -ENV RUBY_VERSION 2.4.4 +ENV RUBY_VERSION 2.4.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ && cd "/tmp/ruby-${RUBY_VERSION}" \ diff --git a/Dockerfile.omnibus-gitlab-wheezy b/Dockerfile.omnibus-gitlab-wheezy index f5c102b..6db7ccf 100644 --- a/Dockerfile.omnibus-gitlab-wheezy +++ b/Dockerfile.omnibus-gitlab-wheezy @@ -12,7 +12,7 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 -ENV RUBY_VERSION 2.4.4 +ENV RUBY_VERSION 2.4.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ && cd "/tmp/ruby-${RUBY_VERSION}" \ diff --git a/Dockerfile.omnibus-gitlab-xenial b/Dockerfile.omnibus-gitlab-xenial index 8594bb3..fb8a043 100644 --- a/Dockerfile.omnibus-gitlab-xenial +++ b/Dockerfile.omnibus-gitlab-xenial @@ -12,7 +12,7 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 -ENV RUBY_VERSION 2.4.4 +ENV RUBY_VERSION 2.4.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ && cd "/tmp/ruby-${RUBY_VERSION}" \