upstream/bin is not added to PATH by emsdk_env.sh

Author: kleisauke

docker/Dockerfile

@@ -63,7 +63,7 @@ COPY --from=stage_build /emsdk /emsdk
 # using `--entrypoint /bin/bash` in CLI).
 # This corresponds to the env variables set during: `source ./emsdk_env.sh`
 ENV EMSDK=/emsdk \
-    PATH="/emsdk:/emsdk/upstream/emscripten:/emsdk/upstream/bin:/emsdk/node/15.14.0_64bit/bin:${PATH}"
+    PATH="/emsdk:/emsdk/upstream/emscripten:/emsdk/node/15.14.0_64bit/bin:${PATH}"
 
 # ------------------------------------------------------------------------------
 # Create a 'standard` 1000:1000 user

docker/test_dockerimage.sh

@@ -5,7 +5,6 @@ if [ $EUID -eq 0 ]; then
   sudo -u nobody `which emcc` --version
 fi
 
-which llvm-ar
 which emsdk
 node --version
 npm --version