From dc88c78a26087c2c62958d96a5ee0bc1936bfa79 Mon Sep 17 00:00:00 2001
From: Anuraag Agrawal <anuraaga@gmail.com>
Date: Tue, 20 Dec 2022 10:53:43 +0900
Subject: [PATCH] Cleanup

---
 .github/workflows/main.yml           | 2 +-
 .gitignore                           | 2 --
 sdk.Dockerfile => docker/Dockerfile  | 6 +-----
 docker/Dockerfile.dockerignore       | 1 +
 sdk.docker.cmake => docker/sdk.cmake | 0
 sdk.Dockerfile.dockerignore          | 1 -
 6 files changed, 3 insertions(+), 9 deletions(-)
 rename sdk.Dockerfile => docker/Dockerfile (83%)
 create mode 100644 docker/Dockerfile.dockerignore
 rename sdk.docker.cmake => docker/sdk.cmake (100%)
 delete mode 100644 sdk.Dockerfile.dockerignore

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f8c30a9..e1fe6be 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -128,7 +128,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          file: sdk.Dockerfile
+          file: docker/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
diff --git a/.gitignore b/.gitignore
index e144103..9d0b71a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
 build
 dist
-.idea
-.vscode
\ No newline at end of file
diff --git a/sdk.Dockerfile b/docker/Dockerfile
similarity index 83%
rename from sdk.Dockerfile
rename to docker/Dockerfile
index d2e9899..1868b5a 100644
--- a/sdk.Dockerfile
+++ b/docker/Dockerfile
@@ -24,10 +24,6 @@ RUN apt-get update && \
     curl -sS https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/llvm.gpg && \
     echo "deb [signed-by=/etc/apt/trusted.gpg.d/llvm.gpg] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${LLVM_VERSION} main" >> /etc/apt/sources.list.d/llvm.list && \
     echo "deb-src [signed-by=/etc/apt/trusted.gpg.d/llvm.gpg] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-${LLVM_VERSION} main" >> /etc/apt/sources.list.d/llvm.list && \
-\
-    curl -sS https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/kitware.gpg && \
-    echo "deb [signed-by=/etc/apt/trusted.gpg.d/kitware.gpg] https://apt.kitware.com/ubuntu/ jammy main" >> /etc/apt/sources.list.d/kitware.list && \
-    echo "deb-src [signed-by=/etc/apt/trusted.gpg.d/kitware.gpg] https://apt.kitware.com/ubuntu/ jammy main" >> /etc/apt/sources.list.d/kitware.list && \
 \
     apt-get update && \
     apt-get install -y clang-${LLVM_VERSION} lld-${LLVM_VERSION} cmake ninja-build make autoconf autogen automake libtool && \
@@ -41,7 +37,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 sdk.docker.cmake /usr/share/cmake/wasi-sdk.cmake
+ADD docker/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
new file mode 100644
index 0000000..86a88cf
--- /dev/null
+++ b/docker/Dockerfile.dockerignore
@@ -0,0 +1 @@
+# Overrides top level .dockerignore to allow adding files to the image
\ No newline at end of file
diff --git a/sdk.docker.cmake b/docker/sdk.cmake
similarity index 100%
rename from sdk.docker.cmake
rename to docker/sdk.cmake
diff --git a/sdk.Dockerfile.dockerignore b/sdk.Dockerfile.dockerignore
deleted file mode 100644
index 586e3d7..0000000
--- a/sdk.Dockerfile.dockerignore
+++ /dev/null
@@ -1 +0,0 @@
-!dist
\ No newline at end of file