diff --git a/Containerfile.cp b/Containerfile.cp index bbe0711..fb2a667 100644 --- a/Containerfile.cp +++ b/Containerfile.cp @@ -12,7 +12,7 @@ ARG BASE_IMAGE_URL=ghcr.io/ublue-os/cinnamon-main FROM ${BASE_IMAGE_URL}:${FEDORA_MAJOR_VERSION} ARG USER_NAME=cp -ARG USR_DIR=usr-${USER_NAME} +ARG USER_DIR=usr-${USER_NAME} # The default recipe set to the recipe's default filename # so that `podman build` should just work for many people. @@ -26,7 +26,7 @@ ARG RECIPE=recipe-c.yml # for manual overrides and editing by the machine's admin AFTER installation! # See issue #28 (https://github.com/ublue-os/startingpoint/issues/28). COPY usr/ /usr -COPY ${USR_DIR}/ /usr +COPY ${USER_DIR}/ /usr # Copy the recipe that we're building. COPY ${RECIPE} /usr/share/ublue-os/recipe.yml diff --git a/Containerfile.jp b/Containerfile.jp index 22c271f..ea7b0ce 100644 --- a/Containerfile.jp +++ b/Containerfile.jp @@ -26,7 +26,8 @@ ARG RECIPE=recipe-framework-13.yml # for manual overrides and editing by the machine's admin AFTER installation! # See issue #28 (https://github.com/ublue-os/startingpoint/issues/28). COPY usr/ /usr -COPY ${USR_DIR}/ /usr +COPY ${USER_DIR}/ /usr +RUN ls /usr # Copy the recipe that we're building. COPY ${RECIPE} /usr/share/ublue-os/recipe.yml diff --git a/recipe-desktop.yml b/recipe-desktop.yml index 7feddd9..d089320 100644 --- a/recipe-desktop.yml +++ b/recipe-desktop.yml @@ -36,7 +36,7 @@ rpm: - plasma-browser-integration - "gcc-c++" - id3v2 - # - docker + - docker - xinput - earthly - kubectl