diff options
| author | seth <[email protected]> | 2024-01-25 11:34:02 -0500 |
|---|---|---|
| committer | seth <[email protected]> | 2024-01-25 13:04:28 -0500 |
| commit | 4797a4ea58789a201cbdc2923c4867903e8c2ac5 (patch) | |
| tree | 5a0d72ac319fd13df61ed285d7d92e854291a972 | |
| parent | 88707eb2d7ab99d86047da0958cdd15104d1deaf (diff) | |
base: fix config layer
| -rw-r--r-- | base/Containerfile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/base/Containerfile b/base/Containerfile index 1a3d88d..66d58ba 100644 --- a/base/Containerfile +++ b/base/Containerfile @@ -2,9 +2,9 @@ ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-silverblue}" ARG BASE_IMAGE="quay.io/fedora-ostree-desktops/${IMAGE_FLAVOR}" ARG FEDORA_VERSION="${FEDORA_VERSION:-39}" +FROM ghcr.io/getchoo/config:${FEDORA_VERSION} as config FROM ${BASE_IMAGE}:${FEDORA_VERSION} -ARG FEDORA_VERSION="${FEDORA_VERSION:-39}" - +ARG FEDORA_VERSION COPY initial_setup.sh /usr/bin/ COPY packages.yaml /tmp/ @@ -41,7 +41,7 @@ RUN rpm-ostree override remove \ # install third party packages & repos RUN cd /etc/yum.repos.d/ && \ - curl -LO https://pkgs.tailscale.com/stable/fedora/tailscale.repo \ + curl -LO https://pkgs.tailscale.com/stable/fedora/tailscale.repo && \ echo -e \ "[code]\n" \ "name=Visual Studio Code\n" \ @@ -61,8 +61,8 @@ RUN readarray -td '' pkgs < <(/tmp/yq '.install[]' /tmp/packages.yaml) && \ # enable automatic updates RUN sed -i 's/#AutomaticUpdatePolicy.*/AutomaticUpdatePolicy=stage/' /etc/rpm-ostreed.conf -# bring in config layer -COPY --from=ghcr.io/getchoo/config:${FEDORA_VERSION} /rpms /tmp/config +# install container policy +COPY --from=config /rpms /tmp/config RUN rpm-ostree install /tmp/config/container-policy/getchoo-container-policy*.rpm |