Merge remote-tracking branch 'refs/remotes/upstream/master' into sdwi…

…lsh:debian-hadolint-fixes Signed-off-by: Shawn Wilsher <[email protected]>
kairos-io · Feb 11, 2023 · 5c1a278 · 5c1a278
2 parents 19393f5 + e738e75
commit 5c1a278
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 12 deletions.
diff --git a/Earthfile b/Earthfile
@@ -26,7 +26,7 @@ ARG GOLINT_VERSION=1.47.3
 ARG GO_VERSION=1.18
 # renovate: datasource=docker depName=hadolint/hadolint versioning=docker
 ARG HADOLINT_VERSION=2.12.0-alpine
-# renovate: datasource=docker depName=renovate/renovate
+# renovate: datasource=docker depName=renovate/renovate versioning=docker
 ARG RENOVATE_VERSION=34
 
 all:

diff --git a/images/Dockerfile.debian b/images/Dockerfile.debian
@@ -12,7 +12,9 @@ RUN apt-get update \
     curl \
     debianutils \
     dosfstools \
-    dracut-network dracut-live tar \
+    dracut \
+    dracut-live \
+    dracut-network \
     e2fsprogs \
     gawk \
     grub-efi-amd64-bin \
@@ -28,16 +30,17 @@ RUN apt-get update \
     neovim \
     open-vm-tools \
     openssh-server \
-    parted dracut \
-    polkitd \
+    parted \
     patch \
+    polkitd \
     rsync \
     snapd \
     squashfs-tools \
     sudo \
     systemd \
     systemd-sysv \
     systemd-timesyncd \
+    tar \
     xz-utils \
   && rm -rf /var/lib/apt/lists/*
 

diff --git a/images/Dockerfile.fedora b/images/Dockerfile.fedora
@@ -22,7 +22,8 @@ RUN dnf install -y \
     grub2-efi-x64-modules \
     grub2-pc \
     haveged \
-    kernel kernel-modules \
+    kernel \
+    kernel-modules \
     kernel-modules-extra \
     livecd-tools \
     nano \

diff --git a/images/Dockerfile.rockylinux b/images/Dockerfile.rockylinux
@@ -22,7 +22,9 @@ RUN dnf install -y \
     grub2-efi-x64 \
     grub2-efi-x64-modules \
     grub2-pc \
-    kernel kernel-modules kernel-modules-extra \
+    kernel \
+    kernel-modules \
+    kernel-modules-extra \
     livecd-tools \
     nano \
     NetworkManager \

diff --git a/images/Dockerfile.ubuntu b/images/Dockerfile.ubuntu
@@ -17,7 +17,9 @@ RUN apt-get update \
     curl \
     debianutils \
     dosfstools \
-    dracut-network dracut-live tar \
+    dracut \
+    dracut-live \
+    dracut-network \
     e2fsprogs \
     gawk \
     grub-efi-amd64-bin \
@@ -33,7 +35,7 @@ RUN apt-get update \
     neovim \
     open-vm-tools \
     openssh-server \
-    parted dracut \
+    parted \
     polkitd \
     rsync \
     snapd \

diff --git a/images/Dockerfile.ubuntu-20-lts b/images/Dockerfile.ubuntu-20-lts
@@ -17,7 +17,8 @@ RUN apt-get update \
     curl \
     debianutils \
     dosfstools \
-    dracut-network tar \
+    dracut \
+    dracut-network \
     e2fsprogs \
     gawk \
     grub-efi-amd64-bin \
@@ -34,7 +35,7 @@ RUN apt-get update \
     neovim \
     open-vm-tools \
     openssh-server \
-    parted dracut \
+    parted \
     policykit-1 \
     rsync \
     snapd \

diff --git a/images/Dockerfile.ubuntu-22-lts b/images/Dockerfile.ubuntu-22-lts
@@ -17,7 +17,9 @@ RUN apt-get update \
     curl \
     debianutils \
     dosfstools \
-    dracut-network dracut-live tar \
+    dracut \
+    dracut-live \
+    dracut-network \
     e2fsprogs \
     gawk \
     grub-efi-amd64-bin \
@@ -34,7 +36,7 @@ RUN apt-get update \
     neovim \
     open-vm-tools \
     openssh-server \
-    parted dracut \
+    parted \
     polkitd \
     rsync \
     snapd \