From 9864ea420ac68081d90d3321c05d3a685c9aa33a Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Wed, 14 Nov 2018 15:28:07 +0000 Subject: [PATCH 1/3] Add chromedriver to www-gitlab-com --- Dockerfile.www-gitlab-com-2.4 | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.www-gitlab-com-2.4 b/Dockerfile.www-gitlab-com-2.4 index f85d945..ff74f41 100644 --- a/Dockerfile.www-gitlab-com-2.4 +++ b/Dockerfile.www-gitlab-com-2.4 @@ -2,6 +2,7 @@ FROM ruby:2.4-slim ADD /scripts/ /scripts/ RUN /scripts/install-www-gitlab-com +RUN /scripts/install-chrome # Set UTF-8 http://jaredmarkell.com/docker-and-locales/ # Must be set after install-essentials is run From f01ff2114b2a8a6c6dee8f1136253834665e3025 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Thu, 15 Nov 2018 07:00:22 +0000 Subject: [PATCH 2/3] Create custom image for www-gitlab-com rspec tests --- .gitlab-ci.yml | 6 ++++++ Dockerfile.www-gitlab-com-2.4 | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ce8662..1f25514 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,6 +65,9 @@ ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-grap ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom ruby-2.5.3-git-2.18-chrome-69.0-node-8.x-yarn-1.2-graphicsmagick-1.3.29-docker-18.06.1 test: *test_custom +# Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml +ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1 test: *test_custom + # Not used anymore (?) golang-1.9-git-2.9.0 test: *test_custom golang-1.9-git-2.14 test: *test_custom @@ -116,6 +119,9 @@ ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-8.x-yarn-1.2-postgresql-9.6-grap ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom ruby-2.5.3-git-2.18-chrome-69.0-node-8.x-yarn-1.2-graphicsmagick-1.3.29-docker-18.06.1: *build_and_deploy_custom +# Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml +ruby-2.4.5-git-2.18-chrome-69.0-docker-18.06.1: *build_and_deploy_custom + # Used by https://gitlab.com/gitlab-org/trello-power-up/blob/master/.gitlab-ci.yml (?) node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom diff --git a/Dockerfile.www-gitlab-com-2.4 b/Dockerfile.www-gitlab-com-2.4 index ff74f41..f85d945 100644 --- a/Dockerfile.www-gitlab-com-2.4 +++ b/Dockerfile.www-gitlab-com-2.4 @@ -2,7 +2,6 @@ FROM ruby:2.4-slim ADD /scripts/ /scripts/ RUN /scripts/install-www-gitlab-com -RUN /scripts/install-chrome # Set UTF-8 http://jaredmarkell.com/docker-and-locales/ # Must be set after install-essentials is run From 38a1021068d0e0ae7c326f02069f8295658e54bb Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Thu, 15 Nov 2018 07:52:03 +0000 Subject: [PATCH 3/3] Add apt-get update to install docker --- scripts/install-docker | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install-docker b/scripts/install-docker index ba83305..b2cade4 100755 --- a/scripts/install-docker +++ b/scripts/install-docker @@ -6,6 +6,7 @@ export DEBIAN_FRONTEND=noninteractive DOCKER_VERSION=${1} +apt-get update apt-get -y install \ apt-transport-https \ ca-certificates \