Some minor docker fixes and improvements, cleanup image

Author: luc-tielen

.dockerignore

@@ -9,3 +9,11 @@ Dockerfile
 .envrc
 .ghci
 .gitignore
+./*.ll
+./*.o
+./*.a
+./*.wasm
+./*.eclair
+./*.dl
+./logo*
+hie.yaml

.github/workflows/build.yml

@@ -12,9 +12,7 @@ jobs:
         run: |
           set -eo pipefail
           docker build -f Dockerfile . -t eclair | tee eclair-lang-${{matrix.os}}.log
-          # We remove Eclair from /usr/bin. It is not needed for CI, and this
-          # caused some weird issues due to invoking cabal concurrently.
-          docker run --rm eclair bash -c "rm /usr/bin/eclair; make test" | tee -a eclair-lang-${{matrix.os}}.log
+          docker run --rm eclair bash -c "make test" | tee -a eclair-lang-${{matrix.os}}.log
       - name: Upload logs
         if: ${{ always() }}
         uses: actions/upload-artifact@v2

Dockerfile

@@ -45,16 +45,18 @@ WORKDIR /app/build
 ENV DATALOG_DIR=/app/build/cbits
 
 RUN echo -e '#!/bin/bash\nsource /root/.ghcup/env\nsource /root/.nvm/nvm.sh\nexec "$@"\n' > /app/build/entrypoint.sh \
-    && chmod u+x /app/build/entrypoint.sh \
-    && echo -e '#!/bin/bash\nsource /root/.ghcup/env\nECLAIR=`cabal list-bin eclair`\n$ECLAIR "$@"' > /usr/bin/eclair \
-    && chmod u+x /usr/bin/eclair
+    && chmod u+x /app/build/entrypoint.sh
 
 # The entrypoint script sources ghcup setup script so we can easily call cabal etc.
 ENTRYPOINT [ "/app/build/entrypoint.sh" ]
 
-# The default command to run, shows the help menu
-CMD [ "eclair", "--help" ]
-
 COPY . .
 
 RUN source /root/.ghcup/env && make build
+RUN echo -e '#!/bin/bash\nsource /root/.ghcup/env\n' > /usr/bin/eclair \
+    && source /root/.ghcup/env \
+    && echo -e "`cabal list-bin eclair` \"\$@\"" >> /usr/bin/eclair \
+    && chmod u+x /usr/bin/eclair
+
+# The default command to run, shows the help menu
+CMD [ "eclair", "--help" ]