Merge branch 'update-postgresql' into 'master'

Add an image for updated postgresql-client

See merge request !29
This commit is contained in:
Kamil Trzciński 2017-03-27 12:13:33 +00:00
commit 1cb3b6104c
3 changed files with 25 additions and 1 deletions

View file

@ -29,7 +29,8 @@ before_script:
ruby-2.1-git-2.7-phantomjs-2.1 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 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 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 ruby-2.3-static-analyses test: *test_build
www-gitlab-com test: *test_build www-gitlab-com test: *test_build
doc-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.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-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: *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 ruby-2.3-static-analyses: *build_and_deploy
www-gitlab-com: *build_and_deploy www-gitlab-com: *build_and_deploy
doc-gitlab-com: *build_and_deploy doc-gitlab-com: *build_and_deploy

View file

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

10
scripts/install-postgresql Executable file
View file

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