chore: fix docker image uploads, don't allow confusion over Dockerfil…

…es (#1077)
GaloisInc · Feb 16, 2021 · 31d691b · 31d691b
1 parent dbcccd3
commit 31d691b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 84 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -21,6 +21,7 @@ jobs:
           password: ${{ secrets.GITHUBSAW }}
           repository: galoisinc/saw
           tags: "latest,${{ steps.outputs.outputs.saw-version }}"
+          dockerfile: saw/Dockerfile
           add_git_labels: true
           push: true
   saw-remote-api:
@@ -39,6 +40,6 @@ jobs:
           password: ${{ secrets.GITHUBSAW }}
           repository: galoisinc/saw-remote-api
           tags: "latest,${{ steps.outputs.outputs.saw-version }}"
-          file: Dockerfile-remote-api
+          dockerfile: saw-remote-api/Dockerfile
           add_git_labels: true
           push: true
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -38,6 +38,7 @@ jobs:
           password: ${{ secrets.GITHUBSAW }}
           repository: galoisinc/saw
           tags: "nightly"
+          dockerfile: saw/Dockerfile
           add_git_labels: true
           push: ${{ github.event_name == 'schedule' }}
 
@@ -57,7 +58,7 @@ jobs:
           password: ${{ secrets.GITHUBSAW }}
           repository: galoisinc/saw-remote-api
           tags: "nightly"
-          file: Dockerfile-remote-api
+          dockerfile: saw-remote-api/Dockerfile
           add_git_labels: true
           push: ${{ github.event_name == 'schedule' }}
 

diff --git a/Dockerfile-remote-api b/Dockerfile-remote-api
diff --git a/saw-remote-api/Dockerfile b/saw-remote-api/Dockerfile
@@ -47,26 +47,23 @@ RUN useradd -m saw
 COPY --chown=saw:saw . /home/saw
 USER saw
 WORKDIR /home/saw
-ARG CRYPTOLPATH="/cryptol/.cryptol"
 ENV LANG=C.UTF-8 \
     LC_ALL=C.UTF-8
 COPY cabal.GHC-8.8.4.config cabal.project.freeze
-RUN mkdir -p rootfs/usr/local/bin
-RUN cabal v2-update && \
-    cabal v2-build -j saw-remote-api:exe:saw-remote-api && \
-    cp $(cabal v2-exec which saw-remote-api) rootfs/usr/local/bin
-RUN mkdir -p rootfs/"${CRYPTOLPATH}" \
-    && cp -r deps/cryptol/lib/* rootfs/"${CRYPTOLPATH}"
+RUN cabal v2-update && cabal v2-build -j exe:saw-remote-api
+RUN mkdir -p /home/saw/rootfs/usr/local/bin
+RUN cp $(cabal v2-exec which saw-remote-api) /home/saw/rootfs/usr/local/bin/saw-remote-api
+WORKDIR /home/saw
 USER root
 RUN chown -R root:root /home/saw/rootfs
 
 FROM debian:buster-slim
 RUN apt-get update \
-    && apt-get install -y libgmp10 libgomp1 libffi6 wget libncurses5 unzip \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
-RUN useradd -m saw && chown -R saw:saw /home/saw
+    && apt-get install -y libgmp10 libgomp1 libffi6 wget libncurses5 unzip
 COPY --from=build /home/saw/rootfs /
 COPY --from=solvers /solvers/rootfs /
+RUN useradd -m saw && chown -R saw:saw /home/saw
+USER saw
 ENV LANG=C.UTF-8 \
     LC_ALL=C.UTF-8
 ENTRYPOINT ["/usr/local/bin/saw-remote-api"]

diff --git a/Dockerfile → saw/Dockerfile b/Dockerfile → saw/Dockerfile