diff options
| author | seth <[email protected]> | 2024-01-25 12:37:45 -0500 |
|---|---|---|
| committer | seth <[email protected]> | 2024-01-25 13:04:28 -0500 |
| commit | a53272abb7337c38415c290265cdb09a4995bedd (patch) | |
| tree | dc8ececbccd7f343fbd293b3ac393f8f526e35d6 /base | |
| parent | 96990f3cee98fdff2984bd40457afeef4f87f42a (diff) | |
tree-wide: use `FROM .. AS` over `COPY --from`
Diffstat (limited to 'base')
| -rw-r--r-- | base/Containerfile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/base/Containerfile b/base/Containerfile index 5d8088f..5d49bd7 100644 --- a/base/Containerfile +++ b/base/Containerfile @@ -2,13 +2,15 @@ ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-silverblue}" ARG BASE_IMAGE="quay.io/fedora-ostree-desktops/${IMAGE_FLAVOR}" ARG FEDORA_VERSION="${FEDORA_VERSION:-39}" +FROM docker.io/mikefarah/yq as yq FROM ghcr.io/getchoo/config:${FEDORA_VERSION} as config -FROM ${BASE_IMAGE}:${FEDORA_VERSION} + +FROM ${BASE_IMAGE}:${FEDORA_VERSION} as builder ARG FEDORA_VERSION COPY initial_setup.sh /usr/bin/ COPY packages.yaml /tmp/ -COPY --from=docker.io/mikefarah/yq /usr/bin/yq /tmp/ +COPY --from=yq /usr/bin/yq /tmp/ # remove non-flatpak firefox RUN rpm-ostree override remove firefox firefox-langpacks |