Move all the additional recommended packages to the second install block

Signed-off-by: Shawn Wilsher <[email protected]>
kairos-io · Feb 11, 2023 · 2f9a611 · 2f9a611
1 parent 16b057d
commit 2f9a611
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 40 deletions.
diff --git a/images/Dockerfile.ubuntu b/images/Dockerfile.ubuntu
@@ -6,23 +6,8 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
-    dbus-user-session \
-    dmsetup \
     gnupg \
-    krb5-locales \
-    libldap-common \
-    libnss-systemd \
-    libpam-cap \
-    libsasl2-modules \
-    networkd-dispatcher \
-    packagekit-tools \
-    publicsuffix \
-    shared-mime-info \
     software-properties-common \
-    systemd-resolved \
-    systemd-timesyncd \
-    unattended-upgrades \
-    xdg-user-dirs \
   && add-apt-repository ppa:oibaf/test \
   && apt-get update \
   && apt-get install -y --no-install-recommends \
@@ -33,7 +18,9 @@ RUN apt-get update \
     coreutils \
     cryptsetup \
     curl \
+    dbus-user-session \
     debianutils \
+    dmsetup \
     dosfstools \
     dracut \
     dracut-live \
@@ -55,34 +42,47 @@ RUN apt-get update \
     isc-dhcp-common \
     jq \
     kbd \
+    krb5-locales \
     libatm1 \
+    libldap-common \
+    libnss-systemd \
+    libpam-cap \
+    libsasl2-modules \
     linux-image-generic-hwe-22.04 \
     lvm2 \
     mdadm \
     nano \
     nbd-client \
     ncurses-term \
     neovim \
+    networkd-dispatcher \
     nfs-common \
     open-iscsi \
     open-vm-tools \
     openssh-server \
     os-prober \
+    packagekit-tools \
     parted \
     pigz \
     pkg-config \
     polkitd \
+    publicsuffix \
     python3-pynvim \
     rsync \
+    shared-mime-info \
     snapd \
     squashfs-tools \
     ssh-import-id \
     sudo \
     systemd \
     systemd-hwe-hwdb \
+    systemd-resolved \
+    systemd-timesyncd \
     thermald \
+    unattended-upgrades \
     xauth \
     xclip \
+    xdg-user-dirs \
     xxd \
     xz-utils \
     zerofree \

diff --git a/images/Dockerfile.ubuntu-20-lts b/images/Dockerfile.ubuntu-20-lts
@@ -6,21 +6,8 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
-    dmsetup \
-    file \
     gnupg \
-    krb5-locales \
-    libnss-systemd \
-    libpam-cap \
-    libsasl2-modules \
-    networkd-dispatcher \
-    packagekit-tools \
-    publicsuffix \
-    shared-mime-info \
     software-properties-common \
-    unattended-upgrades \
-    xdg-user-dirs \
-    xz-utils \
   && add-apt-repository ppa:oibaf/test \
   && apt-get update \
   && apt-get install -y --no-install-recommends \
@@ -32,12 +19,14 @@ RUN apt-get update \
     cryptsetup \
     curl \
     debianutils \
+    dmsetup \
     dosfstools \
     dracut \
     dracut-network \
     e2fsprogs \
     efibootmgr \
     ethtool \
+    file \
     fuse \
     gawk \
     grub-efi-amd64-bin \
@@ -51,9 +40,13 @@ RUN apt-get update \
     isc-dhcp-common \
     jq \
     kbd \
+    krb5-locales \
     libatm1 \
     libfile-fcntllock-perl \
     liblocale-gettext-perl \
+    libnss-systemd \
+    libpam-cap \
+    libsasl2-modules \
     linux-image-generic-hwe-20.04 \
     lldpd \
     lvm2 \
@@ -62,15 +55,19 @@ RUN apt-get update \
     nbd-client \
     ncurses-term \
     neovim \
+    networkd-dispatcher \
     nfs-common \
     open-iscsi \
     open-vm-tools \
     openssh-server \
     os-prober \
+    packagekit-tools \
     parted \
     policykit-1 \
+    publicsuffix \
     python3-neovim \
     rsync \
+    shared-mime-info \
     snapd \
     snmpd \
     squashfs-tools \
@@ -79,9 +76,12 @@ RUN apt-get update \
     systemd \
     systemd-timesyncd \
     thermald \
+    unattended-upgrades \
     xauth \
     xclip \
+    xdg-user-dirs \
     xxd \
+    xz-utils \
     zerofree \
   && rm -rf /var/lib/apt/lists/*
 

diff --git a/images/Dockerfile.ubuntu-22-lts b/images/Dockerfile.ubuntu-22-lts
@@ -6,20 +6,8 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
-    dmsetup \
     gnupg \
-    libldap-common \
-    libnss-systemd \
-    libpam-cap \
-    libsasl2-modules \
-    networkd-dispatcher \
-    packagekit-tools \
-    publicsuffix \
-    shared-mime-info \
     software-properties-common \
-    systemd-timesyncd \
-    unattended-upgrades \
-    xdg-user-dirs \
   && add-apt-repository ppa:oibaf/test \
   && apt-get update \
   && apt-get install -y --no-install-recommends \
@@ -32,6 +20,7 @@ RUN apt-get update \
     cryptsetup \
     curl \
     debianutils \
+    dmsetup \
     dosfstools \
     dracut \
     dracut-live \
@@ -55,7 +44,11 @@ RUN apt-get update \
     kbd \
     libatm1 \
     libfile-fcntllock-perl \
+    libldap-common \
     liblocale-gettext-perl \
+    libnss-systemd \
+    libpam-cap \
+    libsasl2-modules \
     linux-image-generic-hwe-22.04 \
     lldpd \
     lvm2 \
@@ -64,26 +57,33 @@ RUN apt-get update \
     nbd-client \
     ncurses-term \
     neovim \
+    networkd-dispatcher \
     nfs-common \
     open-iscsi \
     open-vm-tools \
     openssh-server \
     os-prober \
+    packagekit-tools \
     parted \
     pigz \
     polkitd \
+    publicsuffix \
     python3-neovim \
     rsync \
+    shared-mime-info \
     snapd \
     snmpd \
     squashfs-tools \
     ssh-import-id \
     sudo \
     systemd \
     systemd-hwe-hwdb \
+    systemd-timesyncd \
     thermald \
+    unattended-upgrades \
     xauth \
     xclip \
+    xdg-user-dirs \
     xxd \
     xz-utils \
     zerofree \