fixup-dockerfile

keith-packard · Nov 21, 2024 · 8b6515d · 8b6515d
1 parent 19dba99
commit 8b6515d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/.github/Dockerfile b/.github/Dockerfile
@@ -35,8 +35,3 @@ RUN apt-get update && \
     icnsutils \
     black && \
     pip3 install --break-system-packages pynsist
-
-RUN mkdir snek
-COPY ./ snek/
-
-WORKDIR ./snek
diff --git a/.github/workflows/snek.yml b/.github/workflows/snek.yml
@@ -70,15 +70,17 @@ jobs:
           docker load -i $IMAGE_FILE
           docker images -a $IMAGE
 
-      - name: 'Create install destinationn'
+      - name: 'Create install destination'
         run: |
-          mkdir `pwd`/artifacts
+          mkdir -p artifacts
 
       - name: 'Build snek'
         run: |
-          docker run --rm \
-            --mount type=bind,source=`pwd`/artifacts,destination=/artifacts \
-            snek \
+          docker run \
+             -v $(readlink -f snek):/snek \
+             -v $(readlink -f artifacts):/artifacts \
+             -w /snek \
+             $IMAGE \
             make DESTDIR=/artifacts PREFIX=/opt/snek SNEK_OTHEROS=1 SNEK_RISCV_TEST=1 black check install install-otheros
 
       - name: 'Upload results'