Skip to content

Commit

Permalink
🐧 Remove RUN commands that change /etc/network/interfaces (#831)
Browse files Browse the repository at this point in the history
Remove `RUN` commands that change `/etc/network/interfaces`

This file is not used by `systemd-networkd`, but these images enable
`systemd-networkd`.  This change removes the `RUN` commands since the
file should be unused.

This was originally identified in #821.

Signed-off-by: Shawn Wilsher <[email protected]>
  • Loading branch information
sdwilsh authored Feb 7, 2023
1 parent c1e2e90 commit aa97ca1
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 8 deletions.
2 changes: 0 additions & 2 deletions images/Dockerfile.debian
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ RUN ln -s /usr/sbin/grub-install /usr/sbin/grub2-install
RUN ln -s /usr/bin/grub-editenv /usr/bin/grub2-editenv
RUN systemctl enable systemd-networkd
RUN systemctl enable ssh
RUN echo "auto lo" > /etc/network/interfaces
RUN echo "iface lo inet loopback" >> /etc/network/interfaces

# workaround https://github.com/systemd/systemd/issues/12231
# see also: https://github.com/OSInside/kiwi/issues/1015
Expand Down
2 changes: 0 additions & 2 deletions images/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ RUN ln -s /usr/sbin/grub-install /usr/sbin/grub2-install
RUN ln -s /usr/bin/grub-editenv /usr/bin/grub2-editenv
RUN systemctl enable systemd-networkd
RUN systemctl enable ssh
RUN echo "auto lo" > /etc/network/interfaces
RUN echo "iface lo inet loopback" >> /etc/network/interfaces

# Enable tmp
RUN cp -v /usr/share/systemd/tmp.mount /etc/systemd/system/
Expand Down
2 changes: 0 additions & 2 deletions images/Dockerfile.ubuntu-20-lts
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ RUN ln -s /usr/sbin/grub-install /usr/sbin/grub2-install
RUN ln -s /usr/bin/grub-editenv /usr/bin/grub2-editenv
RUN systemctl enable systemd-networkd
RUN systemctl enable ssh
RUN echo "auto lo" > /etc/network/interfaces
RUN echo "iface lo inet loopback" >> /etc/network/interfaces

# Enable tmp
RUN cp -v /usr/share/systemd/tmp.mount /etc/systemd/system/
Expand Down
2 changes: 0 additions & 2 deletions images/Dockerfile.ubuntu-22-lts
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ RUN ln -s /usr/sbin/grub-install /usr/sbin/grub2-install
RUN ln -s /usr/bin/grub-editenv /usr/bin/grub2-editenv
RUN systemctl enable systemd-networkd
RUN systemctl enable ssh
RUN echo "auto lo" > /etc/network/interfaces
RUN echo "iface lo inet loopback" >> /etc/network/interfaces

# Enable tmp
RUN cp -v /usr/share/systemd/tmp.mount /etc/systemd/system/
Expand Down

0 comments on commit aa97ca1

Please sign in to comment.