mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-11 02:52:56 +01:00
Merge branch 'sh-bump-ruby-2-4-5' into 'master'
Bump Ruby interpreter to 2.4.5 See merge request gitlab-org/gitlab-build-images!125
This commit is contained in:
commit
8b2e2b03e7
12 changed files with 25 additions and 25 deletions
|
|
@ -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
|
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
|
# 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.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.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.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.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.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.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.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.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.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.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.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.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-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 (?)
|
# Not used anymore (?)
|
||||||
golang-1.9-git-2.9.0 test: *test_custom
|
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
|
||||||
|
|
||||||
# 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.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.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.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.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.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.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.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.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.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.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.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.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-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 (?)
|
# 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
|
node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ruby:2.4.4-stretch
|
FROM ruby:2.4.5-stretch
|
||||||
MAINTAINER GitLab Quality Team
|
MAINTAINER GitLab Quality Team
|
||||||
|
|
||||||
ADD /scripts/ /scripts/
|
ADD /scripts/ /scripts/
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
FROM ruby:2.4.4-alpine
|
FROM ruby:2.4.5-alpine
|
||||||
MAINTAINER GitLab Distribution Team
|
MAINTAINER GitLab Distribution Team
|
||||||
|
|
||||||
ENV HELM_VERSION=2.11.0
|
ENV HELM_VERSION=2.11.0
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ ENV LANG en_US.UTF-8
|
||||||
ENV LANGUAGE en_US:en
|
ENV LANGUAGE en_US:en
|
||||||
ENV LC_ALL en_US.UTF-8
|
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" \
|
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz" \
|
||||||
| tar -xzC /tmp \
|
| tar -xzC /tmp \
|
||||||
&& cd "/tmp/ruby-${RUBY_VERSION}" \
|
&& cd "/tmp/ruby-${RUBY_VERSION}" \
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ ENV LANG en_US.UTF-8
|
||||||
ENV LC_ALL en_US.UTF-8
|
ENV LC_ALL en_US.UTF-8
|
||||||
RUN localedef -c -f UTF-8 -i en_US 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" \
|
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz" \
|
||||||
| tar -xzC /tmp \
|
| tar -xzC /tmp \
|
||||||
&& cd "/tmp/ruby-${RUBY_VERSION}" \
|
&& cd "/tmp/ruby-${RUBY_VERSION}" \
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ ENV LANG en_US.UTF-8
|
||||||
ENV LC_ALL en_US.UTF-8
|
ENV LC_ALL en_US.UTF-8
|
||||||
RUN localedef -c -f UTF-8 -i en_US 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" \
|
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz" \
|
||||||
| tar -xzC /tmp \
|
| tar -xzC /tmp \
|
||||||
&& cd "/tmp/ruby-${RUBY_VERSION}" \
|
&& cd "/tmp/ruby-${RUBY_VERSION}" \
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ ENV LANG en_US.UTF-8
|
||||||
ENV LANGUAGE en_US:en
|
ENV LANGUAGE en_US:en
|
||||||
ENV LC_ALL en_US.UTF-8
|
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" \
|
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz" \
|
||||||
| tar -xzC /tmp \
|
| tar -xzC /tmp \
|
||||||
&& cd "/tmp/ruby-${RUBY_VERSION}" \
|
&& cd "/tmp/ruby-${RUBY_VERSION}" \
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ ENV LC_ALL en_US.UTF-8
|
||||||
ENV LANGUAGE en_US:en
|
ENV LANGUAGE en_US:en
|
||||||
RUN localedef -i en_US -f UTF-8 en_US.UTF-8
|
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" \
|
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz" \
|
||||||
| tar -xzC /tmp \
|
| tar -xzC /tmp \
|
||||||
&& cd "/tmp/ruby-${RUBY_VERSION}" \
|
&& cd "/tmp/ruby-${RUBY_VERSION}" \
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ ENV LANGUAGE en_US:en
|
||||||
ENV LC_ALL en_US.UTF-8
|
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" \
|
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz" \
|
||||||
| tar -xzC /tmp \
|
| tar -xzC /tmp \
|
||||||
&& cd "/tmp/ruby-${RUBY_VERSION}" \
|
&& cd "/tmp/ruby-${RUBY_VERSION}" \
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ RUN apt-get update -q \
|
||||||
&& apt-get clean -yqq \
|
&& apt-get clean -yqq \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& 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" \
|
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz" \
|
||||||
| tar -xzC /tmp \
|
| tar -xzC /tmp \
|
||||||
&& cd "/tmp/ruby-${RUBY_VERSION}" \
|
&& cd "/tmp/ruby-${RUBY_VERSION}" \
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ ENV LANG en_US.UTF-8
|
||||||
ENV LANGUAGE en_US:en
|
ENV LANGUAGE en_US:en
|
||||||
ENV LC_ALL en_US.UTF-8
|
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" \
|
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz" \
|
||||||
| tar -xzC /tmp \
|
| tar -xzC /tmp \
|
||||||
&& cd "/tmp/ruby-${RUBY_VERSION}" \
|
&& cd "/tmp/ruby-${RUBY_VERSION}" \
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ ENV LANG en_US.UTF-8
|
||||||
ENV LANGUAGE en_US:en
|
ENV LANGUAGE en_US:en
|
||||||
ENV LC_ALL en_US.UTF-8
|
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" \
|
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.tar.gz" \
|
||||||
| tar -xzC /tmp \
|
| tar -xzC /tmp \
|
||||||
&& cd "/tmp/ruby-${RUBY_VERSION}" \
|
&& cd "/tmp/ruby-${RUBY_VERSION}" \
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue