From 5523a823e06b60fba90d06a7ba167edaf73dbaad Mon Sep 17 00:00:00 2001 From: shibedrill Date: Thu, 10 Apr 2025 22:33:21 -0400 Subject: [PATCH] Slight restructure --- .gitignore | 2 +- build/build-image.sh | 12 ++++++++++-- build/packages.txt | 1 + compose.yml | 5 ++--- packages.txt | 0 5 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 build/packages.txt delete mode 100644 packages.txt diff --git a/.gitignore b/.gitignore index f93606f..c288aea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -artifacts/ +build/artifacts/ secrets/ \ No newline at end of file diff --git a/build/build-image.sh b/build/build-image.sh index ba4250c..2e44612 100755 --- a/build/build-image.sh +++ b/build/build-image.sh @@ -3,6 +3,14 @@ set -euxo pipefail mkdir -p /artifacts/dist -export EPREFIX="/artifacts/dist" +export EPREFIX="/build/artifacts/dist" -emerge --sync --quiet \ No newline at end of file +rm -f /var/db/repos/gentoo/metadata/timestamp.chk +emerge --sync --quiet +eselect profile list | grep hardened +eselect profile set default/linux/amd64/23.0/musl/hardened/selinux + +mkdir -p /etc/portage/sets +cp /build/packages.txt /etc/portage/sets/halogenos + +emerge @halogenos \ No newline at end of file diff --git a/build/packages.txt b/build/packages.txt new file mode 100644 index 0000000..b0e62ae --- /dev/null +++ b/build/packages.txt @@ -0,0 +1 @@ +app-shells/bash \ No newline at end of file diff --git a/compose.yml b/compose.yml index c941e15..2efc042 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,6 @@ services: image: docker.io/gentoo/stage3 command: /build/build-image.sh volumes: - - ./artifacts:/artifacts - ./build:/build sign: image: docker.io/vladgh/gpg @@ -13,11 +12,11 @@ services: - signing_key_private - signing_key_public volumes: - - ./artifacts:/artifacts + - ./build/artifacts:/artifacts serve: image: docker.io/halverneus/static-file-server volumes: - - ./artifacts:/artifacts + - ./build/artifacts:/artifacts secrets: signing_key_password: diff --git a/packages.txt b/packages.txt deleted file mode 100644 index e69de29..0000000