From 4309303255fc6bf8c52a95b792191aa0b35b4284 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 20 Nov 2024 23:39:44 -0800 Subject: [PATCH] fixup-dockerfile --- .github/Dockerfile | 5 ----- .github/workflows/snek.yml | 11 ++++++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/Dockerfile b/.github/Dockerfile index 23213f3..a1c65ad 100644 --- 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 index 7abfe8e..69ba0d4 100644 --- a/.github/workflows/snek.yml +++ b/.github/workflows/snek.yml @@ -70,15 +70,16 @@ 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 \ make DESTDIR=/artifacts PREFIX=/opt/snek SNEK_OTHEROS=1 SNEK_RISCV_TEST=1 black check install install-otheros - name: 'Upload results'