diff --git a/.circleci/config.yml b/.circleci/config.yml index 6033ad3..281f32f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -181,13 +181,13 @@ jobs: name: install docker command: apt-get update -q && apt-get install -q -y docker.io - setup_remote_docker - # Build and test the tip-of-tree build of EMSDK + # Build the `latest` version of EMSDK as docker image - run: name: build - command: make -C ./docker version=tot build + command: make -C ./docker version=latest build - run: name: test - command: make -C ./docker version=tot test + command: make -C ./docker version=latest test publish-docker-image-x64: executor: bionic diff --git a/docker/Makefile b/docker/Makefile index 22bea0e..749ecfe 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -14,7 +14,7 @@ ifndef version endif build: Dockerfile .TEST - cd .. && docker build --network host --build-arg=EMSCRIPTEN_VERSION=${version} -t ${image_name}:${version} -f docker/$< . + cd .. && docker build --progress=plain --network host --build-arg=EMSCRIPTEN_VERSION=${version} -t ${image_name}:${version} -f docker/$< . test: test_dockerimage.sh .TEST # test as non-root