From 4332356fd4c41a0118a4183ba966fb1b7232addb Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Thu, 23 Mar 2017 21:05:02 +0800
Subject: [PATCH 1/2] Add an image for updated postgresql-client

---
 .gitlab-ci.yml                                       |  2 ++
 ...3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 | 12 ++++++++++++
 scripts/install-postgresql                           | 10 ++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 Dockerfile.ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6
 create mode 100755 scripts/install-postgresql

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a1485c5..a8b1586 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,6 +30,7 @@ before_script:
 ruby-2.1-git-2.7-phantomjs-2.1 test: *test_build
 ruby-2.3-git-2.7-phantomjs-2.1 test: *test_build
 ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1: *test_build
+ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *test_build
 ruby-2.3-static-analyses test: *test_build
 www-gitlab-com test: *test_build
 doc-gitlab-com test: *test_build
@@ -43,6 +44,7 @@ golang-1.8-git-2.8.4 test: *test_build
 ruby-2.1-git-2.7-phantomjs-2.1: *build_and_deploy
 ruby-2.3-git-2.7-phantomjs-2.1: *build_and_deploy
 ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1: *build_and_deploy
+ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and_deploy
 ruby-2.3-static-analyses: *build_and_deploy
 www-gitlab-com: *build_and_deploy
 doc-gitlab-com: *build_and_deploy
diff --git a/Dockerfile.ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 b/Dockerfile.ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6
new file mode 100644
index 0000000..2db22a9
--- /dev/null
+++ b/Dockerfile.ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6
@@ -0,0 +1,12 @@
+FROM ruby:2.3.3
+
+ADD / /
+RUN /scripts/install-essentials
+RUN /scripts/install-phantomjs 2.1.1
+RUN /scripts/install-node
+RUN /scripts/install-postgresql
+
+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/scripts/install-postgresql b/scripts/install-postgresql
new file mode 100755
index 0000000..faef1c0
--- /dev/null
+++ b/scripts/install-postgresql
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -xeo pipefail
+
+curl -sS -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+echo "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main" | tee /etc/apt/sources.list.d/postgresql.list
+
+apt-get update
+env DEBIAN_FRONTEND="noninteractive" apt-get install -y postgresql-client
+apt-get autoremove -yq

From 44879635e4a394fd5fc9e34cf4f6d38a61a1211f Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Thu, 23 Mar 2017 22:48:00 +0800
Subject: [PATCH 2/2] Append test to the test job name otherwise they're
 missing

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8b1586..a90b763 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,8 +29,8 @@ before_script:
 
 ruby-2.1-git-2.7-phantomjs-2.1 test: *test_build
 ruby-2.3-git-2.7-phantomjs-2.1 test: *test_build
-ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1: *test_build
-ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *test_build
+ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1 test: *test_build
+ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_build
 ruby-2.3-static-analyses test: *test_build
 www-gitlab-com test: *test_build
 doc-gitlab-com test: *test_build