From e128883c8a8de80730c7d2121f9c2435bcbadda6 Mon Sep 17 00:00:00 2001 From: Anuraag Agrawal Date: Wed, 21 Dec 2022 08:36:47 +0900 Subject: [PATCH] Cleanup --- docker/Dockerfile | 7 +++++-- docker/Dockerfile.dockerignore | 2 +- docker/{sdk.cmake => wasi-sdk.cmake} | 0 3 files changed, 6 insertions(+), 3 deletions(-) rename docker/{sdk.cmake => wasi-sdk.cmake} (100%) diff --git a/docker/Dockerfile b/docker/Dockerfile index 1868b5a..c0a1ff2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,10 @@ # the wasi-sdk sysroot. The SDK distribution must have first been built, # for example using docker_build.sh -# Extract built SDK archive to copy out the sysroot +# Extract built SDK archive to copy out the sysroot. We use an initial build +# stage to do this to make sure it is only the sysroot, not the entire SDK +# with binaries, that is included in the final image since we install those +# separately. FROM ubuntu:22.04 as dist ADD dist/wasi-sdk-*.*-linux.tar.gz / @@ -37,7 +40,7 @@ COPY --from=dist /wasi-sdk/share/wasi-sysroot/ /wasi-sysroot/ ADD dist/libclang_rt.builtins-wasm32-wasi-*.*.tar.gz /wasi-sysroot-clang_rt RUN ln -s /wasi-sysroot-clang_rt/lib/wasi/ $(echo /usr/lib/llvm-${LLVM_VERSION}/lib/clang/${LLVM_VERSION}.*)/lib/wasi -ADD docker/sdk.cmake /usr/share/cmake/wasi-sdk.cmake +ADD docker/wasi-sdk.cmake /usr/share/cmake/wasi-sdk.cmake ENV CMAKE_TOOLCHAIN_FILE /usr/share/cmake/wasi-sdk.cmake ADD cmake/Platform/WASI.cmake /usr/share/cmake/Modules/Platform/WASI.cmake diff --git a/docker/Dockerfile.dockerignore b/docker/Dockerfile.dockerignore index 86a88cf..bb1d072 100644 --- a/docker/Dockerfile.dockerignore +++ b/docker/Dockerfile.dockerignore @@ -1 +1 @@ -# Overrides top level .dockerignore to allow adding files to the image \ No newline at end of file +# Overrides top level .dockerignore to allow adding files to the image diff --git a/docker/sdk.cmake b/docker/wasi-sdk.cmake similarity index 100% rename from docker/sdk.cmake rename to docker/wasi-sdk.cmake