Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up salt remnants #94

Merged
merged 1 commit into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions custom/testing/amazonlinux-2.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ RUN <<EOF
rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
rm -rf golden-pillar-tree
rm -rf golden-state-tree

rm -rf /var/log/salt
rm -rf /var/cache/salt
rm -rf /etc/salt
EOF

CMD ["/bin/bash"]
20 changes: 12 additions & 8 deletions custom/testing/amazonlinux-2023.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM amazonlinux:2023

#COPY golden-pillar-tree golden-pillar-tree
#COPY golden-state-tree golden-state-tree
COPY golden-pillar-tree golden-pillar-tree
COPY golden-state-tree golden-state-tree

SHELL ["/bin/bash", "-c"]

Expand All @@ -20,12 +20,16 @@ RUN <<EOF
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 --log-level=debug --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
# rm -rf golden-state-tree
./salt/salt-call --log-level=debug --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
rm -rf golden-state-tree

rm -rf /var/log/salt
rm -rf /var/cache/salt
rm -rf /etc/salt
EOF

CMD ["/bin/bash"]
4 changes: 4 additions & 0 deletions custom/testing/debian-11.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ RUN <<EOF
rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
rm -rf golden-pillar-tree
rm -rf golden-state-tree

rm -rf /var/log/salt
rm -rf /var/cache/salt
rm -rf /etc/salt
EOF

CMD ["/bin/bash"]
4 changes: 4 additions & 0 deletions custom/testing/debian-12.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ tar xf salt-3007.1-onedir-linux-$ARCH.tar.xz
rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
rm -rf golden-pillar-tree
rm -rf golden-state-tree

rm -rf /var/log/salt
rm -rf /var/cache/salt
rm -rf /etc/salt
EOF

CMD ["/bin/bash"]
4 changes: 4 additions & 0 deletions custom/testing/fedora-40.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ RUN <<EOF
rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
rm -rf golden-pillar-tree
rm -rf golden-state-tree

rm -rf /var/log/salt
rm -rf /var/cache/salt
rm -rf /etc/salt
EOF

CMD ["/bin/bash"]
4 changes: 4 additions & 0 deletions custom/testing/photon-4.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ RUN <<EOF
rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
rm -rf golden-pillar-tree
rm -rf golden-state-tree

rm -rf /var/log/salt
rm -rf /var/cache/salt
rm -rf /etc/salt
EOF

CMD ["/bin/bash"]
4 changes: 4 additions & 0 deletions custom/testing/photon-5.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ RUN <<EOF
rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
rm -rf golden-pillar-tree
rm -rf golden-state-tree

rm -rf /var/log/salt
rm -rf /var/cache/salt
rm -rf /etc/salt
EOF

CMD ["/bin/bash"]
4 changes: 4 additions & 0 deletions custom/testing/rockylinux-8.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ RUN <<EOF
rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
rm -rf golden-pillar-tree
rm -rf golden-state-tree

rm -rf /var/log/salt
rm -rf /var/cache/salt
rm -rf /etc/salt
EOF

CMD ["/bin/bash"]
4 changes: 4 additions & 0 deletions custom/testing/rockylinux-9.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ RUN <<EOF
rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
rm -rf golden-pillar-tree
rm -rf golden-state-tree

rm -rf /var/log/salt
rm -rf /var/cache/salt
rm -rf /etc/salt
EOF

CMD ["/bin/bash"]
4 changes: 4 additions & 0 deletions custom/testing/systemd-photon-5.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ RUN <<EOF
rm -rf golden-pillar-tree
rm -rf golden-state-tree

rm -rf /var/log/salt
rm -rf /var/cache/salt
rm -rf /etc/salt

mv /usr/bin/tail /usr/bin/tail.real
EOF

Expand Down
4 changes: 4 additions & 0 deletions custom/testing/systemd-rockylinux-8.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ RUN <<EOF
rm -rf golden-pillar-tree
rm -rf golden-state-tree

rm -rf /var/log/salt
rm -rf /var/cache/salt
rm -rf /etc/salt

mv /usr/bin/tail /usr/bin/tail.real
EOF

Expand Down
4 changes: 4 additions & 0 deletions custom/testing/systemd-rockylinux-9.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ RUN <<EOF
rm -rf golden-pillar-tree
rm -rf golden-state-tree

rm -rf /var/log/salt
rm -rf /var/cache/salt
rm -rf /etc/salt

mv /usr/bin/tail /usr/bin/tail.real
EOF

Expand Down
4 changes: 4 additions & 0 deletions custom/testing/systemd-ubuntu-22.04.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ RUN <<EOF
rm -rf golden-pillar-tree
rm -rf golden-state-tree

rm -rf /var/log/salt
rm -rf /var/cache/salt
rm -rf /etc/salt

mv /usr/bin/tail /usr/bin/tail.real
EOF

Expand Down
4 changes: 4 additions & 0 deletions custom/testing/ubuntu-20.04.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ RUN <<EOF
rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
rm -rf golden-pillar-tree
rm -rf golden-state-tree

rm -rf /var/log/salt
rm -rf /var/cache/salt
rm -rf /etc/salt
EOF

CMD ["/bin/bash"]
4 changes: 4 additions & 0 deletions custom/testing/ubuntu-22.04.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ RUN <<EOF
rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
rm -rf golden-pillar-tree
rm -rf golden-state-tree

rm -rf /var/log/salt
rm -rf /var/cache/salt
rm -rf /etc/salt
EOF

CMD ["/bin/bash"]
4 changes: 4 additions & 0 deletions custom/testing/ubuntu-24.04.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ RUN <<EOF
rm -rf salt-3007.1-onedir-linux-$ARCH.tar.xz
rm -rf golden-pillar-tree
rm -rf golden-state-tree

rm -rf /var/log/salt
rm -rf /var/cache/salt
rm -rf /etc/salt
EOF

CMD ["/bin/bash"]
Loading