chore: Ensure cargo installs use version for build scripts image

This commit is contained in:
Gerald Pinder 2024-05-07 20:16:22 -04:00
parent 55c1b087f7
commit 2923c417ab
4 changed files with 17 additions and 27 deletions

View file

@ -58,16 +58,7 @@ build-scripts:
chmod +x "scripts/${script}"
END
DO --pass-args +LABELS
ARG EARTHLY_GIT_HASH
SAVE IMAGE --push "$IMAGE:$EARTHLY_GIT_HASH-build-scripts"
ARG TAGGED="false"
ARG LATEST="false"
IF [ "$TAGGED" = "true" ] && [ "$LATEST" ]
SAVE IMAGE --push "$IMAGE:latest-build-scripts"
END
DO --pass-args +SAVE_IMAGE --SUFFIX="-build-scripts"
blue-build-cli:
ARG BASE_IMAGE="registry.fedoraproject.org/fedora-toolbox"
@ -151,7 +142,7 @@ version:
COPY --keep-ts --dir src/ template/ recipe/ utils/ /app
COPY --keep-ts Cargo.* /app
RUN echo "$(cargo metadata --format-version 1 | jq -r '.packages[] | select(.name == "blue-build") .version')" > /version
RUN echo "$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[] | select(.name == "blue-build") .version')" > /version
SAVE ARTIFACT /version
@ -181,6 +172,8 @@ SAVE_IMAGE:
ARG EARTHLY_GIT_BRANCH
SAVE IMAGE --push "${IMAGE}:${EARTHLY_GIT_BRANCH}${SUFFIX}"
END
ARG EARTHLY_GIT_HASH
SAVE IMAGE --push "${IMAGE}:${EARTHLY_GIT_HASH}${SUFFIX}"
LABELS:
FUNCTION