wunker-bunker/wunker-os
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue with Container file ARGs

Browse Source
This commit is contained in:
Gerald Pinder
2023-09-10 20:38:42 -04:00
parent 6309cd6779
commit ad0e9ab402
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Containerfile.cp
View File

@@ -12,7 +12,7 @@ ARG BASE_IMAGE_URL=ghcr.io/ublue-os/cinnamon-main
FROM ${BASE_IMAGE_URL}:${FEDORA_MAJOR_VERSION} FROM ${BASE_IMAGE_URL}:${FEDORA_MAJOR_VERSION}
ARG USER_NAME=cp 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 # The default recipe set to the recipe's default filename
# so that `podman build` should just work for many people. # 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! # for manual overrides and editing by the machine's admin AFTER installation!
# See issue #28 (https://github.com/ublue-os/startingpoint/issues/28). # See issue #28 (https://github.com/ublue-os/startingpoint/issues/28).
COPY usr/ /usr COPY usr/ /usr
COPY ${USR_DIR}/ /usr COPY ${USER_DIR}/ /usr
# Copy the recipe that we're building. # Copy the recipe that we're building.
COPY ${RECIPE} /usr/share/ublue-os/recipe.yml COPY ${RECIPE} /usr/share/ublue-os/recipe.yml

3
Containerfile.jp
View File

@@ -26,7 +26,8 @@ ARG RECIPE=recipe-framework-13.yml
# for manual overrides and editing by the machine's admin AFTER installation! # for manual overrides and editing by the machine's admin AFTER installation!
# See issue #28 (https://github.com/ublue-os/startingpoint/issues/28). # See issue #28 (https://github.com/ublue-os/startingpoint/issues/28).
COPY usr/ /usr COPY usr/ /usr
COPY ${USR_DIR}/ /usr COPY ${USER_DIR}/ /usr
RUN ls /usr
# Copy the recipe that we're building. # Copy the recipe that we're building.
COPY ${RECIPE} /usr/share/ublue-os/recipe.yml COPY ${RECIPE} /usr/share/ublue-os/recipe.yml

2
recipe-desktop.yml
View File

@@ -36,7 +36,7 @@ rpm:
- plasma-browser-integration - plasma-browser-integration
- "gcc-c++" - "gcc-c++"
- id3v2 - id3v2
# - docker - docker
- xinput - xinput
- earthly - earthly
- kubectl - kubectl