From 44bf7cfbe6d1300f498942a1eac574e31f0e0e42 Mon Sep 17 00:00:00 2001
From: Sam Clegg <sbc@chromium.org>
Date: Thu, 14 Mar 2024 09:45:41 -0700
Subject: [PATCH] CI: Build `latest` docker image rather than `tot` (#1359)

This means that CI run that update `latest` actually test the thing
we are about to ship.

We recently had a case where `latest` was broken but `tot` was fixes
and we accidentally shipped a broken SDK version (#1353).
---
 .circleci/config.yml | 6 +++---
 docker/Makefile      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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