From b5f761a4c8bf225c25c4ee7665cb8ca0c6bb7e38 Mon Sep 17 00:00:00 2001
From: tdro <tdro@users.noreply.github.com>
Date: Sat, 21 Jan 2023 02:09:40 -0500
Subject: .config/lxc/builds: Fix up

---
 .config/lxc/builds/archlinux.dockerfile          |  4 ++--
 .config/lxc/builds/ubuntu-impish21.10.dockerfile | 19 -------------------
 .config/lxc/builds/ubuntu-lunar23.04.dockerfile  | 21 +++++++++++++++++++++
 .config/lxc/builds/void.dockerfile               |  2 +-
 4 files changed, 24 insertions(+), 22 deletions(-)
 delete mode 100644 .config/lxc/builds/ubuntu-impish21.10.dockerfile
 create mode 100644 .config/lxc/builds/ubuntu-lunar23.04.dockerfile

diff --git a/.config/lxc/builds/archlinux.dockerfile b/.config/lxc/builds/archlinux.dockerfile
index d41ba42..4441ee6 100644
--- a/.config/lxc/builds/archlinux.dockerfile
+++ b/.config/lxc/builds/archlinux.dockerfile
@@ -1,4 +1,4 @@
-FROM  docker.io/library/archlinux:base-devel-20220306.0.49442@sha256:bd9ac4ed9caf9a7e61ae1981d009d5b67fc419027f9cb87f7b2f45af737f44d6
+FROM  docker.io/library/archlinux:base-devel-20230115.0.118859@sha256:d363f036cbbe40976a3b5883712fa56637a7245c24eca278d9afe71d64a93aea
 
 RUN   pacman --noconfirm -Syu wget
 
@@ -54,7 +54,7 @@ RUN   systemctl mask \
       sys-kernel-debug.mount \
       systemd-journald-audit.socket \
       systemd-firstboot.service \
-      tmp.mount \
+      tmp.mount
 
 RUN   printf 'permit :wheel\npermit nopass keepenv root\n' > /etc/doas.conf && chmod 400 /etc/doas.conf
 
diff --git a/.config/lxc/builds/ubuntu-impish21.10.dockerfile b/.config/lxc/builds/ubuntu-impish21.10.dockerfile
deleted file mode 100644
index 1bd8b27..0000000
--- a/.config/lxc/builds/ubuntu-impish21.10.dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM  docker.io/library/ubuntu:impish@sha256:4e4222975b1673cbbff799934fa00dc0b3191d0c9a7711f5b1d0b81fdcbfe6aa
-
-RUN   apt update
-
-RUN   apt install --no-install-recommends --assume-yes \
-      init uuid-runtime neofetch vim-tiny iproute2 dhcpcd5 xauth htop
-
-RUN   systemctl mask sys-kernel-debug.mount
-
-RUN   ln --symbolic --force bash /bin/sh
-
-RUN   printf 'export TERM=linux\n' >> /etc/profile
-RUN   printf 'neofetch\n' >> /etc/profile
-
-RUN   printf '{ [ "$(whoami)" = "root" ] && export PS1='\''(ubuntu) \[\\e[0;31m\]\W\[\\e[0m\] \[\\e[0;31m\]\$\[\\e[0m\] '\''; } || true\n' >> /etc/profile
-RUN   printf '{ [ "$(whoami)" = "user" ] && export PS1='\''(ubuntu) \[\\e[0;32m\]\W\[\\e[0m\] \[\\e[0;32m\]\$\[\\e[0m\] '\''; } || true\n' >> /etc/profile
-RUN   printf 'id --user 1000 > /dev/null 2>&1 || { adduser user --uid 1000 --gecos user --disabled-password && printf ". ./etc/profile\n" >> /home/user/.bashrc; }\n' >> /etc/profile
-
-RUN   usermod --password "$(uuidgen)" root
diff --git a/.config/lxc/builds/ubuntu-lunar23.04.dockerfile b/.config/lxc/builds/ubuntu-lunar23.04.dockerfile
new file mode 100644
index 0000000..c86f47b
--- /dev/null
+++ b/.config/lxc/builds/ubuntu-lunar23.04.dockerfile
@@ -0,0 +1,21 @@
+FROM  docker.io/library/ubuntu:lunar@sha256:a40051efc6b591d38faffb11fdcef157103b9a4143edbc959c47e4b8c7d2e9eb
+
+RUN   apt update
+
+RUN   apt install --no-install-recommends --assume-yes \
+      init uuid-runtime neofetch vim-tiny iproute2 xauth htop
+
+RUN   systemctl mask sys-kernel-debug.mount
+RUN   systemctl enable systemd-networkd
+
+RUN   ln --symbolic --force bash /bin/sh
+
+RUN   printf '[Match]\nName=eth0\n\n[Network]\nDHCP=yes' > /etc/systemd/network/20-wired.network
+RUN   printf 'export TERM=linux\n' >> /etc/profile
+RUN   printf 'neofetch\n' >> /etc/profile
+
+RUN   printf '{ [ "$(whoami)" = "root" ] && export PS1='\''(ubuntu) \[\\e[0;31m\]\W\[\\e[0m\] \[\\e[0;31m\]\$\[\\e[0m\] '\''; } || true\n' >> /etc/profile
+RUN   printf '{ [ "$(whoami)" = "user" ] && export PS1='\''(ubuntu) \[\\e[0;32m\]\W\[\\e[0m\] \[\\e[0;32m\]\$\[\\e[0m\] '\''; } || true\n' >> /etc/profile
+RUN   printf 'id --user 1000 > /dev/null 2>&1 || { adduser user --uid 1000 --gecos user --disabled-password && printf ". ./etc/profile\n" >> /home/user/.bashrc; }\n' >> /etc/profile
+
+RUN   usermod --password "$(uuidgen)" root
diff --git a/.config/lxc/builds/void.dockerfile b/.config/lxc/builds/void.dockerfile
index 07a74f0..155df96 100644
--- a/.config/lxc/builds/void.dockerfile
+++ b/.config/lxc/builds/void.dockerfile
@@ -1,7 +1,7 @@
 FROM docker.io/voidlinux/voidlinux:latest@sha256:26ba972f0c06beadcec4796ec3037e0bec32af4d255edb68a528bd98304c74f4
 
+RUN xbps-install -Syu xbps
 RUN xbps-install -Syu
-
 RUN xbps-install -y openssh dhcpcd iputils iproute2 socklog-void neofetch htop
 
 RUN mkdir --parents /run/runit/runsvdir
-- 
cgit v1.2.3