Update after emscripten-core#530

Author: trzecieu

.circleci/config.yml

@@ -88,13 +88,9 @@ jobs:
             python scripts/test.py
 
   build-docker-image:
-    executor: bionic
+    machine: true # required for testing files permissions
     steps:
       - checkout
-      - run:
-          name: install docker
-          command: apt-get update -q && apt-get install -q -y docker.io
-      - setup_remote_docker
       # build and test the latest released version of EMSDK
       - run:
           name: build

docker/Makefile

@@ -1,7 +1,7 @@
 #!/usr/bin/env make
 
 # Emscripten version to build: Should match the version that has been already released.
-# i.e.:  1.38.45, 1.38.45-upstream
+# i.e.:  1.39.18
 version =
 alias =
 
@@ -11,21 +11,32 @@ ifndef version
 endif
 
 build: .TEST
-	docker build --network host --build-arg=EMSCRIPTEN_VERSION=${version}-upstream --tag emscripten/emsdk:${version} .
+	docker build --network host --build-arg=EMSCRIPTEN_VERSION=${version} --tag emscripten/emsdk:${version} .
 
 test: .TEST
-	# compilation without root
-	docker run --rm -u 1000:1000 -v `pwd`:/src -w /src emscripten/emsdk:${version} emcc -c main.c -o main
+	# compilation as non-root
+	docker run --rm -u `id -u`:`id -g` -v `pwd`:/src -w /src emscripten/emsdk:${version} \
+		bash -c "\
+			mkdir -p .test \
+			&& echo 'int main() { return 0; }' > .test/main.c \
+			&& emcc -c .test/main.c -o .test/main\
+		"
 	# artifact should be removable from host by non-root
-	rm -fr main
+	rm -fr .test
 
 	# running as non-root and forcing downloading ports
-	docker run --rm -u 1000:1000 --net=host emscripten/emsdk:${version} embuilder build zlib
+	docker run --rm -u `id -u`:`id -g` --net=host emscripten/emsdk:${version} embuilder build zlib
 
 	# compilation without entrypoint
-	docker run --rm -e /bin/bash -v `pwd`:/src -w /src emscripten/emsdk:${version} emcc -c main.c -o main
+	docker run --rm -e /bin/bash -v `pwd`:/src -w /src emscripten/emsdk:${version} \
+		bash -c "\
+			mkdir -p .test \
+			&& echo 'int main() { return 0; }' > .test/main.c \
+			&& emcc -c .test/main.c -o .test/main\
+		"
+
 	# artifact should be removable from host by non-root
-	rm -fr main
+	rm -fr .test
 
 push: .TEST
 	docker push emscripten/emsdk:${version}