Fix some container builds

saltstack · Nov 12, 2024 · bcb15f4 · bcb15f4
1 parent c0d8508
commit bcb15f4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/custom/testing/fedora-40.Dockerfile b/custom/testing/fedora-40.Dockerfile
@@ -15,7 +15,6 @@ RUN <<EOF
   fi
 
   yum update -y
-  yum install -y epel-release
   yum install -y curl wget tar xz patchelf
 
   wget https://packages.broadcom.com/artifactory/saltproject-generic/onedir/3007.1/salt-3007.1-onedir-linux-$ARCH.tar.xz

diff --git a/custom/testing/golden-state-tree/python-pkgs/init.sls b/custom/testing/golden-state-tree/python-pkgs/init.sls
@@ -1,6 +1,8 @@
+{#-
 include:
   - .nox
   - .pyyaml
+#}
 
 provision-python-packages:
   test.show_notification:

diff --git a/custom/testing/photon-4.Dockerfile b/custom/testing/photon-4.Dockerfile
@@ -7,17 +7,21 @@ 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 epel-release
-  yum install -y curl wget tar xz patchelf
+
+  tdnf update -y
+  tdnf install -y curl wget tar xz  # 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
+
   ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+
   rm -rf salt
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree

diff --git a/custom/testing/photon-5.Dockerfile b/custom/testing/photon-5.Dockerfile
@@ -7,17 +7,21 @@ 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 epel-release
-  yum install -y curl wget tar xz patchelf
+
+  tdnf update -y
+  tdnf install -y curl wget tar xz  # 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
+
   ./salt/salt-call --local --pillar-root=/golden-pillar-tree --file-root=/golden-state-tree state.apply provision
+
   rm -rf salt
   rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
   rm -rf golden-pillar-tree

diff --git a/custom/testing/systemd-ubuntu-22.04.Dockerfile b/custom/testing/systemd-ubuntu-22.04.Dockerfile
@@ -21,7 +21,6 @@ RUN apt update -y \
   && 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 \
-  && chmod +x entrypoint.py \
   && mv /usr/bin/tail /usr/bin/tail.real
 
 # Set the root password, this was done before single user mode worked.
@@ -42,8 +41,9 @@ COPY rescue.service /etc/systemd/system/rescue.service.d/override.conf
 # essentially doing the same thing as entrypoint.py. When pid is not 1 we just
 # run tail.
 COPY tail /usr/bin/tail
+COPY entrypoint.py /entrypoint.py
 
-RUN chmod +x /usr/bin/tail
+RUN chmod +x /usr/bin/tail /entrypoint.py
 
 ENTRYPOINT [ "/entrypoint.py" ]
 CMD [ "/bin/bash" ]