Skip to content

Commit

Permalink
Remove unwanted files
Browse files Browse the repository at this point in the history
  • Loading branch information
dwoz committed Nov 10, 2024
1 parent 207546a commit a7a0825
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 33 deletions.
3 changes: 0 additions & 3 deletions custom/testing/golden-state-tree/python/init.sls

This file was deleted.

30 changes: 0 additions & 30 deletions custom/testing/golden-state-tree/python/map.sls

This file was deleted.

15 changes: 15 additions & 0 deletions custom/testing/systemd-ubuntu-22.04.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ FROM ubuntu:22.04
COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc
COPY entrypoint.py entrypoint.py



# init and systemd are the only real requirements for systemd.
#
# tar wget x-utils can be used to fetch and extract a salt onedir.
Expand All @@ -23,8 +25,21 @@ RUN apt update -y \

# Set the root password, this was done before single user mode worked.
# RUN echo "root\nroot" | passwd -q root

# XXX: Force shell to tty1 verify this works.
# RUN echo "systemd.debug_shell=tty1" >> /etc/sysctl.conf

# XXX: Override the rescue service. It would be better to not tamper with this
# and instead create our own service. That requires working out wants and such
# to make everything work correctly.
COPY rescue.service /etc/systemd/system/rescue.service.d/override.conf


# We've renamed /usr/bin/tail to /usr/bin/tail.real Now put our shim tail in
# place. This is needed because github actions always set the container's
# entrypoint to 'tail'. Our tail shim will launch systemd if it's pid is 1,
# essentially doing the same thing as entrypoint.py. When pid is not 1 we just
# run tail.
COPY tail /usr/bin/tail

RUN chmod +x /usr/bin/tail
Expand Down

0 comments on commit a7a0825

Please sign in to comment.