Skip to content

Commit

Permalink
Move nfs-common to common build target in ubuntu flavor (#2340)
Browse files Browse the repository at this point in the history
  • Loading branch information
kaiehrhardt committed Mar 15, 2024
1 parent ab0f450 commit ac3c062
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions images/Dockerfile.kairos-ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ RUN apt-get update \
lvm2 \
nano \
nbd-client \
nfs-common \
open-iscsi \
open-vm-tools \
openssh-server \
Expand Down Expand Up @@ -117,7 +118,7 @@ RUN apt-get update \
grub2-common \
kbd \
lldpd \
neovim \
neovim \
# this brings grub as a dependency
shim-signed \
snmpd \
Expand Down Expand Up @@ -188,7 +189,6 @@ RUN apt-get update \
mdadm \
ncurses-term \
networkd-dispatcher \
nfs-common \
packagekit-tools \
publicsuffix \
thermald \
Expand Down
6 changes: 3 additions & 3 deletions images/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ RUN apt-get update \
lvm2 \
nano \
nbd-client \
nfs-common \
open-iscsi \
open-vm-tools \
openssh-server \
Expand Down Expand Up @@ -118,7 +119,7 @@ RUN apt-get update \
grub2-common \
kbd \
lldpd \
neovim \
neovim \
# this brings grub as a dependency
shim-signed \
snmpd \
Expand Down Expand Up @@ -189,7 +190,6 @@ RUN apt-get update \
mdadm \
ncurses-term \
networkd-dispatcher \
nfs-common \
packagekit-tools \
publicsuffix \
thermald \
Expand Down Expand Up @@ -341,4 +341,4 @@ RUN systemctl enable systemd-networkd
RUN systemctl enable ssh

# Fixup sudo perms
RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo
RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo

0 comments on commit ac3c062

Please sign in to comment.