Add more systemd containers

README.md

@@ -102,14 +102,16 @@ will be commited.
 ### [![Salt Testing](https://github.com/saltstack/salt-ci-containers/actions/workflows/testing-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/testing-containers.yml)
 
 - testing:amazonlinux-2 - `ghcr.io/saltstack/salt-ci-containers/testing:amazonlinux-2`
-- testing:amazonlinux-2023 - `ghcr.io/saltstack/salt-ci-containers/testing:amazonlinux-2023`
 - testing:debian-11 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-11`
 - testing:debian-12 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-12`
 - testing:fedora-40 - `ghcr.io/saltstack/salt-ci-containers/testing:fedora-40`
 - testing:photon-4 - `ghcr.io/saltstack/salt-ci-containers/testing:photon-4`
 - testing:photon-5 - `ghcr.io/saltstack/salt-ci-containers/testing:photon-5`
 - testing:rockylinux-8 - `ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8`
 - testing:rockylinux-9 - `ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-9`
+- testing:systemd-amazonlinux-2 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-amazonlinux-2`
+- testing:systemd-debian-11 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-debian-11`
+- testing:systemd-debian-12 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-debian-12`
 - testing:systemd-photon-5 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5`
 - testing:systemd-rockylinux-8 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-8`
 - testing:systemd-rockylinux-9 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-9`

containers.yml

@@ -58,10 +58,14 @@ custom:
       - photon-5
       - systemd-photon-5
       - debian-11
+      - systemd-debian-11
       - debian-12
+      - systemd-debian-12
       - fedora-40
       - amazonlinux-2
+      - systemd-amazonlinux-2
       # - amazonlinux-2023
+      # - systemd-amazonlinux-2023
 # <---- Custom Containers ---------------------------------------------------------------------------------
 
 # ----- Mirrored Containers ------------------------------------------------------------------------------>

custom/testing/README.md

@@ -1,14 +1,16 @@
 # [![Salt Testing](https://github.com/saltstack/salt-ci-containers/actions/workflows/testing-containers.yml/badge.svg)](https://github.com/saltstack/salt-ci-containers/actions/workflows/testing-containers.yml)
 
 - testing:amazonlinux-2 - `ghcr.io/saltstack/salt-ci-containers/testing:amazonlinux-2`
-- testing:amazonlinux-2023 - `ghcr.io/saltstack/salt-ci-containers/testing:amazonlinux-2023`
 - testing:debian-11 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-11`
 - testing:debian-12 - `ghcr.io/saltstack/salt-ci-containers/testing:debian-12`
 - testing:fedora-40 - `ghcr.io/saltstack/salt-ci-containers/testing:fedora-40`
 - testing:photon-4 - `ghcr.io/saltstack/salt-ci-containers/testing:photon-4`
 - testing:photon-5 - `ghcr.io/saltstack/salt-ci-containers/testing:photon-5`
 - testing:rockylinux-8 - `ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-8`
 - testing:rockylinux-9 - `ghcr.io/saltstack/salt-ci-containers/testing:rockylinux-9`
+- testing:systemd-amazonlinux-2 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-amazonlinux-2`
+- testing:systemd-debian-11 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-debian-11`
+- testing:systemd-debian-12 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-debian-12`
 - testing:systemd-photon-5 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-photon-5`
 - testing:systemd-rockylinux-8 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-8`
 - testing:systemd-rockylinux-9 - `ghcr.io/saltstack/salt-ci-containers/testing:systemd-rockylinux-9`

custom/testing/systemd-amazonlinux-2.Dockerfile

@@ -0,0 +1,39 @@
+FROM amazonlinux:2
+
+COPY golden-pillar-tree golden-pillar-tree
+COPY golden-state-tree golden-state-tree
+
+SHELL ["/bin/bash", "-c"]
+
+RUN <<EOF
+  set -e
+
+  if [ $(uname -m) = "x86_64" ]; then
+    export ARCH=x86_64
+  else
+    export ARCH=arm64
+  fi
+
+  yum update -y
+  yum install -y wget tree tar xz patchelf util-linux openssl openssl-pkcs11 systemd
+
+  wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
+  tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
+
+  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply python
+
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
+
+  mv /usr/bin/tail /usr/bin/tail.real
+EOF
+
+COPY rescue.service /etc/systemd/system/rescue.service.d/override.conf
+COPY tail /usr/bin/tail
+COPY entrypoint.py /entrypoint.py
+RUN chmod +x /usr/bin/tail /entrypoint.py
+
+ENTRYPOINT [ "/entrypoint.py" ]
+CMD ["/bin/bash"]

custom/testing/systemd-amazonlinux-2023.Dockerfile

@@ -0,0 +1,39 @@
+FROM amazonlinux:2023
+
+COPY golden-pillar-tree golden-pillar-tree
+COPY golden-state-tree golden-state-tree
+
+SHELL ["/bin/bash", "-c"]
+
+RUN <<EOF
+  set -e
+
+  if [ $(uname -m) = "x86_64" ]; then
+    export ARCH=x86_64
+  else
+    export ARCH=arm64
+  fi
+
+  yum update -y
+  yum install -y wget tree tar xz patchelf util-linux openssl openssl-pkcs11 systemd
+
+  wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
+  tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
+
+  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply python
+
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
+
+  mv /usr/bin/tail /usr/bin/tail.real
+EOF
+
+COPY rescue.service /etc/systemd/system/rescue.service.d/override.conf
+COPY tail /usr/bin/tail
+COPY entrypoint.py /entrypoint.py
+RUN chmod +x /usr/bin/tail /entrypoint.py
+
+ENTRYPOINT [ "/entrypoint.py" ]
+CMD ["/bin/bash"]

custom/testing/systemd-debian-11.Dockerfile

@@ -0,0 +1,45 @@
+FROM debian:11
+
+COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
+COPY golden-pillar-tree golden-pillar-tree
+COPY golden-state-tree golden-state-tree
+
+SHELL ["/bin/bash", "-c"]
+
+RUN <<EOF
+  set -e
+
+  if [ $(uname -m) = "x86_64" ]; then
+    export ARCH=x86_64
+  else
+    export ARCH=arm64
+  fi
+
+  echo 'tzdata tzdata/Areas select America' | debconf-set-selections
+  echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections
+
+  export DEBIAN_FRONTEND="noninteractive"
+
+  apt update -y
+  apt install -y tar wget xz-utils vim-nox apt-utils systemd
+
+  wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
+  tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
+
+  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply python
+
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
+
+  mv /usr/bin/tail /usr/bin/tail.real
+EOF
+
+COPY rescue.service /etc/systemd/system/rescue.service.d/override.conf
+COPY tail /usr/bin/tail
+COPY entrypoint.py /entrypoint.py
+RUN chmod +x /usr/bin/tail /entrypoint.py
+
+ENTRYPOINT [ "/entrypoint.py" ]
+CMD [ "/bin/bash" ]

custom/testing/systemd-debian-12.Dockerfile

@@ -0,0 +1,45 @@
+FROM debian:12
+
+COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
+COPY golden-pillar-tree golden-pillar-tree
+COPY golden-state-tree golden-state-tree
+
+SHELL ["/bin/bash", "-c"]
+
+RUN <<EOF
+  set -e
+
+  if [ $(uname -m) = "x86_64" ]; then
+    export ARCH=x86_64
+  else
+    export ARCH=arm64
+  fi
+
+  echo 'tzdata tzdata/Areas select America' | debconf-set-selections
+  echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections
+
+  export DEBIAN_FRONTEND="noninteractive"
+
+  apt update -y
+  apt install -y tar wget xz-utils vim-nox apt-utils systemd
+
+  wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
+  tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
+
+  ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply python
+
+  rm -rf salt
+  rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
+  rm -rf golden-pillar-tree
+  rm -rf golden-state-tree
+
+  mv /usr/bin/tail /usr/bin/tail.real
+EOF
+
+COPY rescue.service /etc/systemd/system/rescue.service.d/override.conf
+COPY tail /usr/bin/tail
+COPY entrypoint.py /entrypoint.py
+RUN chmod +x /usr/bin/tail /entrypoint.py
+
+ENTRYPOINT [ "/entrypoint.py" ]
+CMD [ "/bin/bash" ]

custom/testing/systemd-photon-5.Dockerfile

@@ -15,7 +15,7 @@ RUN <<EOF
   fi
 
   tdnf update -y
-  tdnf install -y curl wget tar xz systemd # patchelf
+  tdnf install -y curl wget tar tree xz systemd # patchelf
 
   wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
   tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz

custom/testing/systemd-rockylinux-8.Dockerfile

@@ -16,7 +16,7 @@ RUN <<EOF
 
   yum update -y
   yum install -y epel-release
-  yum install -y wget tar xz patchelf systemd
+  yum install -y wget tar xz patchelf systemd tree
 
   wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
   tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz

custom/testing/systemd-ubuntu-22.04.Dockerfile

@@ -18,9 +18,9 @@ RUN <<EOF
   apt update -y
   echo 'tzdata tzdata/Areas select America' | debconf-set-selections
   echo 'tzdata tzdata/Zones/America select Phoenix' | debconf-set-selections
-  DEBIAN_FRONTEND="noninteractive" apt install -y coreutils tree tar \
-    wget xz-utils apt-utils systemd python3 python3-pip python3-venv git
-
+  export DEBIAN_FRONTEND="noninteractive"
+  apt install -y coreutils tree tar wget xz-utils apt-utils systemd python3 \
+    python3-pip python3-venv git systemd
 
   wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz
   tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz