commit 72410825954463fe2a7e1a78513010c41faac35b
author Sam Clegg <sbc@chromium.org> Mon Jun 22 16:09:09 2020 -0700
committer GitHub <noreply@github.com> Mon Jun 22 16:09:09 2020 -0700
tree ebd90d8db16a8fdc5b70a2e83b052b7880e12579
parent 27b23d467d5b8beb73d4d325b9a32c8eb77e8f95

Build docker image as part of CI (#527)

We only publish on tag, but we want to build and test the image
on all PRs.

.circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 11f40b0..67ef717 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -91,15 +91,37 @@
             python scripts/test.py
 
   build-docker-image:
-    machine: true
+    executor: bionic
     steps:
       - checkout
-      - run: docker build --network host --build-arg=EMSCRIPTEN_VERSION=${CIRCLE_TAG}-upstream --tag emscripten/emsdk:${CIRCLE_TAG} ./docker
-      - run: docker tag emscripten/emsdk:${CIRCLE_TAG} emscripten/emsdk:latest
-      - run: |
-          docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
-          docker push emscripten/emsdk:${CIRCLE_TAG}
-          docker push emscripten/emsdk:latest
+      - run:
+          name: install docker
+          command: apt-get update -q && apt-get install -q -y docker.io
+      - setup_remote_docker
+      - run:
+          name: build
+          command: docker build --network host ./docker
+
+  publish-docker-image:
+    executor: bionic
+    steps:
+      - checkout
+      - run:
+          name: install docker
+          command: apt-get update -q && apt-get install -q -y docker.io
+      - setup_remote_docker
+      - run:
+          name: build
+          command: docker build --network host --build-arg=EMSCRIPTEN_VERSION=${CIRCLE_TAG}-upstream --tag emscripten/emsdk:${CIRCLE_TAG} ./docker
+      - run:
+          name: tag image
+          command: docker tag emscripten/emsdk:${CIRCLE_TAG} emscripten/emsdk:latest
+      - run:
+          name: push image
+          command: |
+            docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
+            docker push emscripten/emsdk:${CIRCLE_TAG}
+            docker push emscripten/emsdk:latest
 
 workflows:
   flake8:
@@ -116,7 +138,8 @@
       - test-windows
   build-docker-image:
     jobs:
-      - build-docker-image:
+      - build-docker-image
+      - publish-docker-image:
           filters:
             branches:
               ignore: /.*/