diff --git a/Earthfile b/Earthfile index e91bb2c40..124f5cca4 100644 --- a/Earthfile +++ b/Earthfile @@ -323,17 +323,6 @@ framework: SAVE ARTIFACT --keep-own /framework/ framework -# This target must stay "dummy" because it has to be "FROM scratch" thus it cannot -# call "cat" or "echo". -framework-image: - FROM scratch - ARG FLAVOR - ARG VERSION - - COPY (+framework/framework --VERSION=$VERSION --FLAVOR=$FLAVOR) / - - SAVE IMAGE --push $IMAGE_REPOSITORY_ORG/framework:${VERSION}_${FLAVOR} - build-framework-image: FROM alpine ARG FLAVOR @@ -341,13 +330,17 @@ build-framework-image: COPY +version/VERSION ./ ARG VERSION=$(cat VERSION) - BUILD +framework-image --VERSION=$VERSION --FLAVOR=$FLAVOR - ARG _IMG="$IMAGE_REPOSITORY_ORG/framework:${VERSION}_${FLAVOR}" RUN echo $_IMG > FRAMEWORK_IMAGE SAVE ARTIFACT FRAMEWORK_IMAGE AS LOCAL build/FRAMEWORK_IMAGE + FROM scratch + + COPY (+framework/framework --VERSION=$VERSION --FLAVOR=$FLAVOR) / + + SAVE IMAGE --push $IMAGE_REPOSITORY_ORG/framework:${VERSION}_${FLAVOR} + base-image: ARG MODEL ARG FLAVOR