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

Start versioning images based on dependency versions

Browse source 
Also this removes the Ruby 2.2 images we don't use anyway.
This commit is contained in:
Z.J. van de Weg 2016-09-22 16:56:56 +03:00
parent e1f3488d98
commit d5cecaa7dc
7 changed files with 16 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

13
.gitlab-ci.yml
View file

@ -27,15 +27,10 @@ before_script:
only:
- master
ruby-2.1 test: *test_build
ruby-2.2 test: *test_build
ruby-2.3 test: *test_build
ruby-2.1-git-2.7-phantomjs-2.1 test: *test_build
ruby-2.3-git-2.7-phantomjs-2.1 test: *test_build
www-gitlab-com test: *test_build
ruby-2.1: *build_and_deploy
ruby-2.1-phantomjs2: *build_and_deploy
ruby-2.2: *build_and_deploy
ruby-2.2-phantomjs2: *build_and_deploy
ruby-2.3: *build_and_deploy
ruby-2.3-phantomjs2: *build_and_deploy
ruby-2.1-git-2.7-phantomjs-2.1: *build_and_deploy
ruby-2.3-git-2.7-phantomjs-2.1: *build_and_deploy
www-gitlab-com: *build_and_deploy

6
Dockerfile.ruby-2.1 → Dockerfile.ruby-2.1-git-2.7-phantomjs-2.1
View file

@ -6,3 +6,9 @@ ENV PACKAGES="git-core" \
ADD / /
RUN /scripts/install-essentials
RUN /scripts/install-phantomjs 2.1.1
RUN /scripts/install-git
RUN locale-gen en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8

14
Dockerfile.ruby-2.1-gitlab-8.11
View file

@ -1,14 +0,0 @@
FROM ruby:2.1
ENV PACKAGES="git-core"
ADD / /
RUN /scripts/install-essentials
# Set UTF-8 http://jaredmarkell.com/docker-and-locales/
# Must be set after install-essentials is run
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
RUN /scripts/install-phantomjs

8
Dockerfile.ruby-2.2
View file

@ -1,8 +0,0 @@
FROM ruby:2.2
ENV PACKAGES="git-core" \
LC_ALL=en_US.UTF-8
ADD / /
RUN /scripts/install-essentials
RUN /scripts/install-phantomjs 2.1.1

14
Dockerfile.ruby-2.2-gitlab-8.11
View file

@ -1,14 +0,0 @@
FROM ruby:2.2
ENV PACKAGES="git-core"
ADD / /
RUN /scripts/install-essentials
# Set UTF-8 http://jaredmarkell.com/docker-and-locales/
# Must be set after install-essentials is run
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
RUN /scripts/install-phantomjs

6
Dockerfile.ruby-2.3 → Dockerfile.ruby-2.3-git-2.7-phantomjs-2.1
View file

@ -6,3 +6,9 @@ ENV PACKAGES="git-core" \
ADD / /
RUN /scripts/install-essentials
RUN /scripts/install-phantomjs 2.1.1
RUN /scripts/install-git
RUN locale-gen en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8

14
Dockerfile.ruby-2.3-gitlab-8.11
View file

@ -1,14 +0,0 @@
FROM ruby:2.3.1
ENV PACKAGES="git-core"
ADD / /
RUN /scripts/install-essentials
# Set UTF-8 http://jaredmarkell.com/docker-and-locales/
# Must be set after install-essentials is run
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
RUN /scripts/install-phantomjs