From 147cbe64e2691483b068a4d6bd408ecfce959934 Mon Sep 17 00:00:00 2001 From: franfran Date: Tue, 1 Aug 2023 23:32:30 +0300 Subject: [PATCH] keep invoking ARG --- .github/actions/with-docker/action.yml | 1 - .github/workflows/Dockerfile | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/actions/with-docker/action.yml b/.github/actions/with-docker/action.yml index d8ad330501..b95b86e7ff 100644 --- 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 index 4be79a36c5..6f0b96a6a6 100644 --- 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 \