From d5cecaa7dccca3bb3f81725e932b6b00cd6d21f6 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <zegerjan@gitlab.com>
Date: Thu, 22 Sep 2016 16:56:56 +0300
Subject: [PATCH] Start versioning images based on dependency versions

Also this removes the Ruby 2.2 images we don't use anyway.
---
 .gitlab-ci.yml                                     | 13 ++++---------
 ....1 => Dockerfile.ruby-2.1-git-2.7-phantomjs-2.1 |  6 ++++++
 Dockerfile.ruby-2.1-gitlab-8.11                    | 14 --------------
 Dockerfile.ruby-2.2                                |  8 --------
 Dockerfile.ruby-2.2-gitlab-8.11                    | 14 --------------
 ....3 => Dockerfile.ruby-2.3-git-2.7-phantomjs-2.1 |  6 ++++++
 Dockerfile.ruby-2.3-gitlab-8.11                    | 14 --------------
 7 files changed, 16 insertions(+), 59 deletions(-)
 rename Dockerfile.ruby-2.1 => Dockerfile.ruby-2.1-git-2.7-phantomjs-2.1 (52%)
 delete mode 100644 Dockerfile.ruby-2.1-gitlab-8.11
 delete mode 100644 Dockerfile.ruby-2.2
 delete mode 100644 Dockerfile.ruby-2.2-gitlab-8.11
 rename Dockerfile.ruby-2.3 => Dockerfile.ruby-2.3-git-2.7-phantomjs-2.1 (53%)
 delete mode 100644 Dockerfile.ruby-2.3-gitlab-8.11

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d31de45..7814290 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/Dockerfile.ruby-2.1 b/Dockerfile.ruby-2.1-git-2.7-phantomjs-2.1
similarity index 52%
rename from Dockerfile.ruby-2.1
rename to Dockerfile.ruby-2.1-git-2.7-phantomjs-2.1
index 9868f32..5cb6855 100644
--- a/Dockerfile.ruby-2.1
+++ b/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
diff --git a/Dockerfile.ruby-2.1-gitlab-8.11 b/Dockerfile.ruby-2.1-gitlab-8.11
deleted file mode 100644
index 35cd5f1..0000000
--- a/Dockerfile.ruby-2.1-gitlab-8.11
+++ /dev/null
@@ -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
diff --git a/Dockerfile.ruby-2.2 b/Dockerfile.ruby-2.2
deleted file mode 100644
index 46fcdd2..0000000
--- a/Dockerfile.ruby-2.2
+++ /dev/null
@@ -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
diff --git a/Dockerfile.ruby-2.2-gitlab-8.11 b/Dockerfile.ruby-2.2-gitlab-8.11
deleted file mode 100644
index d0e1760..0000000
--- a/Dockerfile.ruby-2.2-gitlab-8.11
+++ /dev/null
@@ -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
diff --git a/Dockerfile.ruby-2.3 b/Dockerfile.ruby-2.3-git-2.7-phantomjs-2.1
similarity index 53%
rename from Dockerfile.ruby-2.3
rename to Dockerfile.ruby-2.3-git-2.7-phantomjs-2.1
index 02be75b..a51c43b 100644
--- a/Dockerfile.ruby-2.3
+++ b/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
diff --git a/Dockerfile.ruby-2.3-gitlab-8.11 b/Dockerfile.ruby-2.3-gitlab-8.11
deleted file mode 100644
index 6f649c8..0000000
--- a/Dockerfile.ruby-2.3-gitlab-8.11
+++ /dev/null
@@ -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