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

Merge branch 'update-postgresql-2' into 'master'

Browse source 
Update PostgreSQL image to include golang 1.8

See merge request !32
This commit is contained in:
Kamil Trzciński 2017-04-12 10:38:26 +00:00
commit c4360546a1
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -30,8 +30,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: *test_build
ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_build
ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1 test: *test_build
ruby-2.3.3-golang-1.8-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
@ -45,8 +45,8 @@ 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.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1: *build_and_deploy
ruby-2.3.3-golang-1.8-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

3
Dockerfile.ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 → Dockerfile.ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6
View file

@ -4,8 +4,11 @@ ADD / /
RUN /scripts/install-essentials
RUN /scripts/install-phantomjs 2.1.1
RUN /scripts/install-node
RUN /scripts/install-golang
RUN /scripts/install-postgresql
ENV PATH /usr/local/go/bin:$PATH
RUN locale-gen en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en