Start versioning images based on dependency versions

Also this removes the Ruby 2.2 images we don't use anyway.

.gitlab-ci.yml

@@ -27,15 +27,10 @@ before_script:
   only:
     - master
 
-ruby-2.1 test: *test_build
+ruby-2.1-git-2.7-phantomjs-2.1 test: *test_build
-ruby-2.2 test: *test_build
+ruby-2.3-git-2.7-phantomjs-2.1 test: *test_build
-ruby-2.3 test: *test_build
 www-gitlab-com test: *test_build
 
-ruby-2.1: *build_and_deploy
+ruby-2.1-git-2.7-phantomjs-2.1: *build_and_deploy
-ruby-2.1-phantomjs2: *build_and_deploy
+ruby-2.3-git-2.7-phantomjs-2.1: *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
 www-gitlab-com: *build_and_deploy

Dockerfile.ruby-2.1-git-2.7-phantomjs-2.1

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

Dockerfile.ruby-2.1-gitlab-8.11

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

Dockerfile.ruby-2.2

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

Dockerfile.ruby-2.2-gitlab-8.11

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

Dockerfile.ruby-2.3-git-2.7-phantomjs-2.1

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

Dockerfile.ruby-2.3-gitlab-8.11

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