From 6b2a062bce674dea6029c05c87f969f3bd56ecab Mon Sep 17 00:00:00 2001 From: "Balasankar \"Balu\" C" Date: Thu, 2 Jan 2020 10:44:46 +0530 Subject: [PATCH 1/2] Bump Ruby version to 2.6.5 in omnibus-gitlab images Signed-off-by: Balasankar "Balu" C --- Dockerfile.omnibus-gitlab-bionic | 2 +- Dockerfile.omnibus-gitlab-buster | 2 +- Dockerfile.omnibus-gitlab-centos6 | 2 +- Dockerfile.omnibus-gitlab-centos7 | 2 +- Dockerfile.omnibus-gitlab-centos8 | 2 +- Dockerfile.omnibus-gitlab-jessie | 2 +- Dockerfile.omnibus-gitlab-opensuse15.0 | 2 +- Dockerfile.omnibus-gitlab-opensuse15.1 | 2 +- Dockerfile.omnibus-gitlab-opensuse42.3 | 2 +- Dockerfile.omnibus-gitlab-stretch | 2 +- Dockerfile.omnibus-gitlab-trusty | 2 +- Dockerfile.omnibus-gitlab-wheezy | 2 +- Dockerfile.omnibus-gitlab-xenial | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile.omnibus-gitlab-bionic b/Dockerfile.omnibus-gitlab-bionic index 6180a54..e60b751 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.6.3 +ENV RUBY_VERSION 2.6.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ && cd "/tmp/ruby-${RUBY_VERSION}" \ diff --git a/Dockerfile.omnibus-gitlab-buster b/Dockerfile.omnibus-gitlab-buster index 418e7be..8d22944 100644 --- a/Dockerfile.omnibus-gitlab-buster +++ b/Dockerfile.omnibus-gitlab-buster @@ -13,7 +13,7 @@ ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 -ENV RUBY_VERSION 2.6.3 +ENV RUBY_VERSION 2.6.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/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 5ed1961..ef1265a 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.6.3 +ENV RUBY_VERSION 2.6.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/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 e8386e3..c575a7d 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.6.3 +ENV RUBY_VERSION 2.6.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ && cd "/tmp/ruby-${RUBY_VERSION}" \ diff --git a/Dockerfile.omnibus-gitlab-centos8 b/Dockerfile.omnibus-gitlab-centos8 index 50ca43f..4279faa 100644 --- a/Dockerfile.omnibus-gitlab-centos8 +++ b/Dockerfile.omnibus-gitlab-centos8 @@ -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.6.3 +ENV RUBY_VERSION 2.6.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/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 55d8920..30b2c42 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.6.3 +ENV RUBY_VERSION 2.6.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ && cd "/tmp/ruby-${RUBY_VERSION}" \ diff --git a/Dockerfile.omnibus-gitlab-opensuse15.0 b/Dockerfile.omnibus-gitlab-opensuse15.0 index e8e3f7f..aee1165 100644 --- a/Dockerfile.omnibus-gitlab-opensuse15.0 +++ b/Dockerfile.omnibus-gitlab-opensuse15.0 @@ -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.6.3 +ENV RUBY_VERSION 2.6.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ && cd "/tmp/ruby-${RUBY_VERSION}" \ diff --git a/Dockerfile.omnibus-gitlab-opensuse15.1 b/Dockerfile.omnibus-gitlab-opensuse15.1 index 398b17a..aea166b 100644 --- a/Dockerfile.omnibus-gitlab-opensuse15.1 +++ b/Dockerfile.omnibus-gitlab-opensuse15.1 @@ -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.6.3 +ENV RUBY_VERSION 2.6.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/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 961c4b8..f50cada 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.6.3 +ENV RUBY_VERSION 2.6.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/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 373e447..588c869 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.6.3 +ENV RUBY_VERSION 2.6.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/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 ee1cf51..0ece714 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.6.3 +ENV RUBY_VERSION 2.6.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/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 90b9d8c..a592ba5 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.6.3 +ENV RUBY_VERSION 2.6.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/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 10261e1..6189339 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.6.3 +ENV RUBY_VERSION 2.6.5 RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ | tar -xzC /tmp \ && cd "/tmp/ruby-${RUBY_VERSION}" \ From 35ff50ea0efb7a7badccfe85fbd7b5bcda5d5f86 Mon Sep 17 00:00:00 2001 From: "Balasankar \"Balu\" C" Date: Thu, 2 Jan 2020 10:46:57 +0530 Subject: [PATCH 2/2] Remove outdated omnibus-gitlab images Signed-off-by: Balasankar "Balu" C --- .gitlab-ci.yml | 4 ---- Dockerfile.omnibus-gitlab-opensuse15.0 | 23 ----------------------- Dockerfile.omnibus-gitlab-opensuse42.3 | 23 ----------------------- Dockerfile.omnibus-gitlab-trusty | 18 ------------------ 4 files changed, 68 deletions(-) delete mode 100644 Dockerfile.omnibus-gitlab-opensuse15.0 delete mode 100644 Dockerfile.omnibus-gitlab-opensuse42.3 delete mode 100644 Dockerfile.omnibus-gitlab-trusty diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3009428..bc2b2de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,8 +96,6 @@ omnibus-gitlab-centos6 test: *test_build omnibus-gitlab-centos7 test: *test_build omnibus-gitlab-centos8 test: *test_build omnibus-gitlab-jessie test: *test_build -omnibus-gitlab-opensuse42.3 test: *test_build -omnibus-gitlab-opensuse15.0 test: *test_build omnibus-gitlab-opensuse15.1 test: *test_build omnibus-gitlab-stretch test: *test_build omnibus-gitlab-buster test: *test_build @@ -159,8 +157,6 @@ omnibus-gitlab-centos6: *build_and_deploy omnibus-gitlab-centos7: *build_and_deploy omnibus-gitlab-centos8: *build_and_deploy omnibus-gitlab-jessie: *build_and_deploy -omnibus-gitlab-opensuse42.3: *build_and_deploy -omnibus-gitlab-opensuse15.0: *build_and_deploy omnibus-gitlab-opensuse15.1: *build_and_deploy omnibus-gitlab-stretch: *build_and_deploy omnibus-gitlab-buster: *build_and_deploy diff --git a/Dockerfile.omnibus-gitlab-opensuse15.0 b/Dockerfile.omnibus-gitlab-opensuse15.0 deleted file mode 100644 index aee1165..0000000 --- a/Dockerfile.omnibus-gitlab-opensuse15.0 +++ /dev/null @@ -1,23 +0,0 @@ -FROM opensuse/leap:15.0 - -RUN zypper -q -n --gpg-auto-import-keys update \ - && zypper -q -n in -t pattern devel_perl devel_basis \ - && zypper -q -n install \ - gcc gcc-c++ git make curl zlib-devel libopenssl-devel glibc-i18ndata glibc-locale hostname \ - && zypper clean -a - -ENV LANG en_US.UTF-8 -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.6.5 -RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ - | tar -xzC /tmp \ - && cd "/tmp/ruby-${RUBY_VERSION}" \ - && ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\ - && make \ - && make install \ - && cd / \ - && rm -rf "/tmp/ruby-${RUBY_VERSION}" \ - && gem install bundler --no-document diff --git a/Dockerfile.omnibus-gitlab-opensuse42.3 b/Dockerfile.omnibus-gitlab-opensuse42.3 deleted file mode 100644 index f50cada..0000000 --- a/Dockerfile.omnibus-gitlab-opensuse42.3 +++ /dev/null @@ -1,23 +0,0 @@ -FROM opensuse/archive:42.3 - -RUN zypper -q -n --gpg-auto-import-keys update \ - && zypper -q -n in -t pattern devel_perl devel_basis \ - && zypper -q -n install \ - gcc gcc-c++ git make curl zlib-devel libopenssl-devel glibc-i18ndata glibc-locale hostname \ - && zypper clean -a - -ENV LANG en_US.UTF-8 -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.6.5 -RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ - | tar -xzC /tmp \ - && cd "/tmp/ruby-${RUBY_VERSION}" \ - && ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\ - && make \ - && make install \ - && cd / \ - && rm -rf "/tmp/ruby-${RUBY_VERSION}" \ - && gem install bundler --no-document diff --git a/Dockerfile.omnibus-gitlab-trusty b/Dockerfile.omnibus-gitlab-trusty deleted file mode 100644 index 0ece714..0000000 --- a/Dockerfile.omnibus-gitlab-trusty +++ /dev/null @@ -1,18 +0,0 @@ -FROM ubuntu:14.04 - -RUN apt-get update -q \ - && apt-get install -y g++ gcc git make curl zlib1g-dev libssl-dev \ - && apt-get autoremove -yq \ - && apt-get clean -yqq \ - && rm -rf /var/lib/apt/lists/* - -ENV RUBY_VERSION 2.6.5 -RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.6/ruby-${RUBY_VERSION}.tar.gz" \ - | tar -xzC /tmp \ - && cd "/tmp/ruby-${RUBY_VERSION}" \ - && ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\ - && make \ - && make install \ - && cd / \ - && rm -rf "/tmp/ruby-${RUBY_VERSION}" \ - && gem install bundler --no-document