scottk/secureblue
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/secureblue.git synced 2025-11-21 12:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: clean up bling a bit

Browse Source
This commit is contained in:
ER
2023-08-26 14:57:43 +03:00
parent 1d7a3a92b6
commit 81dca63764
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Containerfile
View File

@@ -1,5 +1,8 @@
# This is the Containerfile for your custom image. # This is the Containerfile for your custom image.
# Instead of adding RUN statements here, you should consider creating a script
# in `config/scripts/`. Read more in `modules/script/README.md`
# It takes in the recipe, version, and base image as arguments, # It takes in the recipe, version, and base image as arguments,
# all of which are provided by build.yml when doing builds # all of which are provided by build.yml when doing builds
# in the cloud. The ARGs have default values, but changing those # in the cloud. The ARGs have default values, but changing those
@@ -27,19 +30,16 @@ ARG IMAGE_REGISTRY=ghcr.io/ublue-os
# 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 public key
COPY cosign.pub /usr/share/ublue-os/cosign.pub COPY cosign.pub /usr/share/ublue-os/cosign.pub
# Copy the config folder
COPY config /usr/share/ublue-os/startingpoint COPY config /usr/share/ublue-os/startingpoint
# Copy nix install script and Universal Blue wallpapers RPM from Bling image # Copy the bling from ublue-os/bling into the image:
# * wallpapers
# * justfiles
# * nix installer
COPY --from=ghcr.io/ublue-os/bling:latest /rpms/ublue-os-wallpapers-0.1-1.fc38.noarch.rpm /tmp/ublue-os-wallpapers-0.1-1.fc38.noarch.rpm COPY --from=ghcr.io/ublue-os/bling:latest /rpms/ublue-os-wallpapers-0.1-1.fc38.noarch.rpm /tmp/ublue-os-wallpapers-0.1-1.fc38.noarch.rpm
# Integrate bling justfiles onto image
COPY --from=ghcr.io/ublue-os/bling:latest /files/usr/share/ublue-os/just /usr/share/ublue-os/just COPY --from=ghcr.io/ublue-os/bling:latest /files/usr/share/ublue-os/just /usr/share/ublue-os/just
# Copy dnkmmr's nix installer
COPY --from=ghcr.io/ublue-os/bling:latest /files/usr/bin/ublue-nix* /usr/bin COPY --from=ghcr.io/ublue-os/bling:latest /files/usr/bin/ublue-nix* /usr/bin
# "yq" used in build.sh and the "setup-flatpaks" just-action to read recipe.yml. # "yq" used in build.sh and the "setup-flatpaks" just-action to read recipe.yml.