NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 10:02:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'bump-ruby-2.6.5-omnibus' into 'master'

Browse source 
Bump Ruby to 2.6.5 in omnibus-gitlab tester images

See merge request gitlab-org/gitlab-build-images!262
This commit is contained in:
Stan Hu 2020-01-03 14:41:09 +00:00
commit 1d4063cd45
14 changed files with 10 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -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

2
Dockerfile.omnibus-gitlab-bionic
View file

@ -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}" \

2
Dockerfile.omnibus-gitlab-buster
View file

@ -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}" \

2
Dockerfile.omnibus-gitlab-centos6
View file

@ -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}" \

2
Dockerfile.omnibus-gitlab-centos7
View file

@ -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}" \

2
Dockerfile.omnibus-gitlab-centos8
View file

@ -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}" \

2
Dockerfile.omnibus-gitlab-jessie
View file

@ -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}" \

23
Dockerfile.omnibus-gitlab-opensuse15.0
View file

@ -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.3
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

2
Dockerfile.omnibus-gitlab-opensuse15.1
View file

@ -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}" \

23
Dockerfile.omnibus-gitlab-opensuse42.3
View file

@ -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.3
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

2
Dockerfile.omnibus-gitlab-stretch
View file

@ -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}" \

18
Dockerfile.omnibus-gitlab-trusty
View file

@ -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.3
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

2
Dockerfile.omnibus-gitlab-wheezy
View file

@ -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}" \

2
Dockerfile.omnibus-gitlab-xenial
View file

@ -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}" \