#2: make it explicit in Docker configuration that only Linux is suppo…

…rted
gift-surg · Sep 24, 2019 · df4fc7b · df4fc7b
1 parent 0b5e30e
commit df4fc7b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -8,14 +8,14 @@ setup:docker:linux:
   variables:
     DOCKER_HOST: tcp://docker:2375/
     DOCKER_DRIVER: overlay2
-    DOCKER_IMAGE_NAME_CI: ${CI_REGISTRY_IMAGE}/puma-ci:${CI_COMMIT_REF_SLUG}
+    DOCKER_IMAGE_NAME_CI: ${CI_REGISTRY_IMAGE}/puma-ci-linux:${CI_COMMIT_REF_SLUG}
   services:
     - docker:dind
   script:
     # Login to our registry
     - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin ${CI_REGISTRY}
     - cd ./ci/docker
-    - docker build --target PUMA_CI -t ${DOCKER_IMAGE_NAME_CI} .
+    - docker build --target PUMA_CI_LINUX -t ${DOCKER_IMAGE_NAME_CI} .
     - docker push ${DOCKER_IMAGE_NAME_CI}
   tags:
     - docker

diff --git a/ci/docker/linux/Dockerfile b/ci/docker/linux/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04 AS PUMA_CI
+FROM ubuntu:18.04 AS PUMA_CI_LINUX
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
         tzdata \