- fixes

Author: fgsoftware1

.gitignore

@@ -1,2 +1,17 @@
+# ISO STUFF
+work/
 out/
-*.iso
+*.iso
+
+# PACKAGES
+# local repository files
+localrepo/*
+localrepo/localrepo.db
+localrepo/localrepo.files
+# wlogout package files
+localrepo/wlogout-1.2.2-0-x86_64.pkg.tar.zst
+localrepo/wlogout-debug-1.2.2-0-x86_64.pkg.tar.zst
+packages/wlogout/pkg
+packages/wlogout/src
+packages/wlogout/wlogout-1.2.2.tar.gz
+packages/wlogout/wlogout-1.2.2.tar.gz.sig

Dockerfile

@@ -6,23 +6,10 @@ RUN useradd -m builder && echo "builder ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.
 
 WORKDIR /profile
 COPY . /profile
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+RUN chmod +x /profile/mkpkgs.sh
 RUN chmod +x /profile/mkiso.sh
 RUN chown -R builder:builder /profile
 
-USER builder
-RUN gpg --keyserver keyserver.ubuntu.com --recv-keys F4FDB18A9937358364B276E9E25D679AF73C6D2F
-
-ENV PKGDEST=/profile/pkgbuilds
-RUN mkdir -p "$PKGDEST" && chmod -R 777 "$PKGDEST"
-
-WORKDIR /profile/packages/wlogout
-RUN makepkg -s --noconfirm
-
-USER root
-WORKDIR /profile
-RUN mkdir -p /profile/airootfs/var/cache/pacman/localrepo
-RUN repo-add /profile/airootfs/var/cache/pacman/localrepo/localrepo.db.tar.gz /profile/pkgbuilds/*.pkg.tar.zst
-RUN mv /profile/airootfs/var/cache/pacman/localrepo/localrepo.db.tar.gz /profile/airootfs/var/cache/pacman/localrepo/localrepo.db
-RUN mv /profile/airootfs/var/cache/pacman/localrepo/localrepo.files.tar.gz /profile/airootfs/var/cache/pacman/localrepo/localrepo.files
-RUN mkdir -p /var/cache/pacman/localrepo && cp /profile/airootfs/var/cache/pacman/localrepo/* /var/cache/pacman/localrepo/
-RUN echo -e "\n[localrepo]\nSigLevel = Optional TrustAll\nServer = file:///var/cache/pacman/localrepo" >> /profile/pacman.conf
+ENTRYPOINT ["/entrypoint.sh"]

run-container.sh build.shrun-container.sh renamed to build.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+cd /profile
+./mkpkgs.sh && \
+./mkiso.sh

entrypoint.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-mkarchiso -r -w /tmp/work -o out -m iso -v .
+mkarchiso -r -w work -o out -m iso -v .

mkiso.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+su builder << 'EOF'
+gpg --keyserver keyserver.ubuntu.com --recv-keys F4FDB18A9937358364B276E9E25D679AF73C6D2F
+export PKGDEST=/profile/localrepo
+mkdir -p "$PKGDEST" && chmod -R 777 "$PKGDEST"
+cd /profile/packages/wlogout
+makepkg -s -f --noconfirm
+EOF
+
+cd /profile
+repo-add /profile/localrepo/localrepo.db.tar.gz /profile/localrepo/*.pkg.tar.zst
+mv /profile/localrepo/localrepo.db.tar.gz /profile/localrepo/localrepo.db
+mv /profile/localrepo/localrepo.files.tar.gz /profile/localrepo/localrepo.files
+echo -e "\n[localrepo]\nSigLevel = Optional TrustAll\nServer = file:///profile/localrepo" >> /profile/pacman.conf

mkpkgs.sh

@@ -98,3 +98,19 @@ Include = /etc/pacman.d/mirrorlist
 #[custom]
 #SigLevel = Optional TrustAll
 #Server = file:///home/custompkgs
+
+[localrepo]
+SigLevel = Optional TrustAll
+Server = file:///profile/localrepo
+
+[localrepo]
+SigLevel = Optional TrustAll
+Server = file:///profile/localrepo
+
+[localrepo]
+SigLevel = Optional TrustAll
+Server = file:///profile/localrepo
+
+[localrepo]
+SigLevel = Optional TrustAll
+Server = file:///profile/localrepo

pacman.conf

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+qemu-system-x86_64 -cdrom out/archlinux-$(date +"%Y.%m.%d")-x86_64.iso -m 2G -enable-kvm -smp 2 -bios /usr/share/ovmf/OVMF.fd -boot d -display gtk,gl=on,grab-on-hover=on,zoom-to-fit=on