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 'sh-bump-ruby-version' into 'master'

Browse source 
Bump Ruby to 2.3.7, Git to 2.16.3, and add Git 2.17.0

See merge request gitlab-org/gitlab-build-images!86
This commit is contained in:
Stan Hu 2018-04-08 05:05:58 +00:00
commit 435361b888
11 changed files with 34 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.gitlab-ci.yml
View file

@ -60,16 +60,19 @@ ruby-2.3-golang-1.9-git-2.9 test: *test_custom
ruby-2.3-golang-1.10-git-2.14 test: *test_custom
ruby-2.3-golang-1.10-git-2.9 test: *test_custom
ruby-2.3-golang-1.10-git-2.16 test: *test_custom
ruby-2.3.6-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
ruby-2.3.6-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
ruby-2.3.7-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
ruby-2.3.7-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
ruby-2.3.7-golang-1.9-git-2.17-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
golang-1.8.6-git-2.9.0 test: *test_custom
golang-1.8.6-git-2.14 test: *test_custom
golang-1.9-git-2.9.0 test: *test_custom
golang-1.9-git-2.14 test: *test_custom
golang-1.9-git-2.16 test: *test_custom
golang-1.9-git-2.17 test: *test_custom
golang-1.10-git-2.9.0 test: *test_custom
golang-1.10-git-2.14 test: *test_custom
golang-1.10-git-2.16 test: *test_custom
golang-1.10-git-2.17 test: *test_custom
node-8.9-chrome-63.0-yarn-1.2 test: *test_custom
www-gitlab-com test: *test_build
@ -95,16 +98,19 @@ ruby-2.3-golang-1.9-git-2.9: *build_and_deploy_custom
ruby-2.3-golang-1.10-git-2.16: *build_and_deploy_custom
ruby-2.3-golang-1.10-git-2.14: *build_and_deploy_custom
ruby-2.3-golang-1.10-git-2.9: *build_and_deploy_custom
ruby-2.3.6-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
ruby-2.3.6-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
ruby-2.3.7-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
ruby-2.3.7-golang-1.9-git-2.16-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
ruby-2.3.7-golang-1.9-git-2.17-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
golang-1.8.6-git-2.9.0: *build_and_deploy_custom
golang-1.8.6-git-2.14: *build_and_deploy_custom
golang-1.9-git-2.9.0: *build_and_deploy_custom
golang-1.9-git-2.14: *build_and_deploy_custom
golang-1.9-git-2.16: *build_and_deploy_custom
golang-1.9-git-2.17: *build_and_deploy_custom
golang-1.10-git-2.9.0: *build_and_deploy_custom
golang-1.10-git-2.14: *build_and_deploy_custom
golang-1.10-git-2.16: *build_and_deploy_custom
golang-1.10-git-2.17: *build_and_deploy_custom
node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom
www-gitlab-com: *build_and_deploy

4
Dockerfile.omnibus-gitlab-bionic
View file

@ -12,10 +12,10 @@ ENV LC_ALL en_US.UTF-8
ENV CC /usr/bin/gcc-6
ENV CXX /usr/bin/g++-6
ENV RUBY_VERSION 2.3.3
ENV RUBY_VERSION 2.3.7
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \
| tar -xzC /tmp \
&& cd /tmp/ruby-2.3.3 \
&& cd /tmp/ruby-2.3.7 \
&& ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
&& make \
&& make install

4
Dockerfile.omnibus-gitlab-centos6
View file

@ -9,10 +9,10 @@ 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.3.3
ENV RUBY_VERSION 2.3.7
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \
| tar -xzC /tmp \
&& cd /tmp/ruby-2.3.3 \
&& cd /tmp/ruby-2.3.7 \
&& ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
&& make \
&& make install

4
Dockerfile.omnibus-gitlab-centos7
View file

@ -9,10 +9,10 @@ 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.3.3
ENV RUBY_VERSION 2.3.7
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \
| tar -xzC /tmp \
&& cd /tmp/ruby-2.3.3 \
&& cd /tmp/ruby-2.3.7 \
&& ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
&& make \
&& make install

4
Dockerfile.omnibus-gitlab-jessie
View file

@ -10,10 +10,10 @@ ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV RUBY_VERSION 2.3.3
ENV RUBY_VERSION 2.3.7
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \
| tar -xzC /tmp \
&& cd /tmp/ruby-2.3.3 \
&& cd /tmp/ruby-2.3.7 \
&& ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
&& make \
&& make install

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

@ -10,10 +10,10 @@ 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.3.3
ENV RUBY_VERSION 2.3.7
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \
| tar -xzC /tmp \
&& cd /tmp/ruby-2.3.3 \
&& cd /tmp/ruby-2.3.7 \
&& ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
&& make \
&& make install

4
Dockerfile.omnibus-gitlab-stretch
View file

@ -11,10 +11,10 @@ ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV RUBY_VERSION 2.3.3
ENV RUBY_VERSION 2.3.7
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \
| tar -xzC /tmp \
&& cd /tmp/ruby-2.3.3 \
&& cd /tmp/ruby-2.3.7 \
&& ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
&& make \
&& make install

4
Dockerfile.omnibus-gitlab-trusty
View file

@ -4,10 +4,10 @@ RUN apt-get update -q \
&& apt-get install -y g++ gcc git make curl zlib1g-dev libssl-dev \
&& rm -rf /var/lib/apt/lists/*
ENV RUBY_VERSION 2.3.3
ENV RUBY_VERSION 2.3.7
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \
| tar -xzC /tmp \
&& cd /tmp/ruby-2.3.3 \
&& cd /tmp/ruby-2.3.7 \
&& ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
&& make \
&& make install

4
Dockerfile.omnibus-gitlab-wheezy
View file

@ -10,10 +10,10 @@ ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV RUBY_VERSION 2.3.3
ENV RUBY_VERSION 2.3.7
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \
| tar -xzC /tmp \
&& cd /tmp/ruby-2.3.3 \
&& cd /tmp/ruby-2.3.7 \
&& ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
&& make \
&& make install

4
Dockerfile.omnibus-gitlab-xenial
View file

@ -10,10 +10,10 @@ ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV RUBY_VERSION 2.3.3
ENV RUBY_VERSION 2.3.7
RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.3/ruby-${RUBY_VERSION}.tar.gz" \
| tar -xzC /tmp \
&& cd /tmp/ruby-2.3.3 \
&& cd /tmp/ruby-2.3.7 \
&& ./configure --disable-install-rdoc --disable-install-doc --disable-install-capi\
&& make \
&& make install

8
scripts/custom-docker-build
View file

@ -64,8 +64,12 @@ function print_git_args() {
GIT_DOWNLOAD_SHA256=023ffff6d3ba8a1bea779dfecc0ed0bb4ad68ab8601d14435dd8c08416f78d7f
;;
2.16)
GIT_VERSION=2.16.2
GIT_DOWNLOAD_SHA256=9acc4339b7a2ab484eea69d705923271682b7058015219cf5a7e6ed8dee5b5fb
GIT_VERSION=2.16.3
GIT_DOWNLOAD_SHA256=dda229e9c73f4fbb7d4324e0d993e11311673df03f73b194c554c2e9451e17cd
;;
2.17)
GIT_VERSION=2.17.0
GIT_DOWNLOAD_SHA256=7a0cff35dbb14b77dca6924c33ac9fe510b9de35d5267172490af548ec5ee1b8
;;
*) echo "Unknown git version $1"; exit 1;
esac