keep invoking ARG

runtimeverification · Aug 1, 2023 · 147cbe6 · 147cbe6
1 parent ed71981
commit 147cbe6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/actions/with-docker/action.yml b/.github/actions/with-docker/action.yml
@@ -66,7 +66,6 @@ runs:
         --build-arg GROUP_ID=${GROUP_ID}                 \
         --build-arg USER=${USER}                         \
         --build-arg GROUP=${GROUP}                       \
-        --build-arg BASE_OS=${BASE_OS}                   \
         --build-arg BASE_DISTRO=${BASE_DISTRO}           \
         --build-arg K_COMMIT=${K_COMMIT}                 \
         --build-arg K_VERSION=${K_VERSION}               \

diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile
@@ -1,14 +1,17 @@
 ARG K_COMMIT
+ARG K_VERSION
 ARG Z3_VERSION
+ARG BASE_DISTRO
 FROM ghcr.io/foundry-rs/foundry:nightly-aeba75e4799f1e11e3daba98d967b83e286b0c4a as FOUNDRY
 
 ARG K_COMMIT
+ARG K_VERSION
 ARG Z3_VERSION
+ARG BASE_DISTRO
 FROM z3:${Z3_VERSION} as Z3
 
-ARG BASE_OS
-ARG BASE_DISTRO
 ARG K_VERSION
+ARG BASE_DISTRO
 FROM stack:${BASE_DISTRO}-${K_VERSION} as STACK
 
 ARG K_COMMIT
@@ -20,6 +23,8 @@ COPY --from=FOUNDRY /usr/local/bin/cast /usr/local/bin/cast
 
 COPY --from=Z3 /usr/bin/z3 /usr/bin/z3
 
+COPY --from=STACK /usr/local/bin/stack /usr/local/bin/stack
+
 ARG LLVM_VERSION
 
 RUN    apt-get update                  \