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/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 \