From 30688f1b8e51299ea7f01657e8e1953596638e95 Mon Sep 17 00:00:00 2001 From: "Z.J. van de Weg" Date: Tue, 29 Nov 2016 13:52:05 +0100 Subject: [PATCH 1/2] Add image for ruby 2.3.3 --- .gitlab-ci.yml | 2 ++ Dockerfile.ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1 | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 Dockerfile.ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 761f9e2..0501170 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,12 +29,14 @@ 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 test: *test_build ruby-2.3-static-analyses test: *test_build www-gitlab-com test: *test_build doc-gitlab-com 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: *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 b/Dockerfile.ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1 new file mode 100644 index 0000000..0c846ab --- /dev/null +++ b/Dockerfile.ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1 @@ -0,0 +1,11 @@ +FROM ruby:2.3.3 + +ADD / / +RUN /scripts/install-essentials +RUN /scripts/install-phantomjs 2.1.1 +RUN /scripts/install-node + +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 From 11e82419645a84a6434a6e4a4918287ac035cb2c Mon Sep 17 00:00:00 2001 From: "Z.J. van de Weg" Date: Tue, 29 Nov 2016 14:13:23 +0100 Subject: [PATCH 2/2] Build image on CI This also removes an image which wasn't build yet, as thats absorbed into the one I was working on. --- .gitlab-ci.yml | 3 ++- Dockerfile.ruby-2.3-git-2.7-phantomjs-2.1-node-7.1 | 11 ----------- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 Dockerfile.ruby-2.3-git-2.7-phantomjs-2.1-node-7.1 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0501170..e850617 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,13 +29,14 @@ 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 test: *test_build +ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1: *test_build ruby-2.3-static-analyses test: *test_build www-gitlab-com test: *test_build doc-gitlab-com 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: *build_and_deploy ruby-2.3-static-analyses: *build_and_deploy www-gitlab-com: *build_and_deploy diff --git a/Dockerfile.ruby-2.3-git-2.7-phantomjs-2.1-node-7.1 b/Dockerfile.ruby-2.3-git-2.7-phantomjs-2.1-node-7.1 deleted file mode 100644 index 184e690..0000000 --- a/Dockerfile.ruby-2.3-git-2.7-phantomjs-2.1-node-7.1 +++ /dev/null @@ -1,11 +0,0 @@ -FROM ruby:2.3 - -ADD / / -RUN /scripts/install-essentials -RUN /scripts/install-phantomjs 2.1.1 -RUN /scripts/install-node - -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 \ No newline at end of file