From 40a7e0d20010f2bede3432307b1c6ed123a2d5bc Mon Sep 17 00:00:00 2001
From: Ugo Mignon <56931733+TartanLeGrand@users.noreply.github.com>
Date: Thu, 1 Sep 2022 08:38:59 +0200
Subject: [PATCH] fix: sshpass install and label

---
 Dockerfile.auto       | 7 +++++--
 Dockerfile.monterey   | 2 +-
 Dockerfile.naked      | 2 +-
 Dockerfile.naked-auto | 7 +++++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Dockerfile.auto b/Dockerfile.auto
index aae6e2f..f5b3528 100644
--- a/Dockerfile.auto
+++ b/Dockerfile.auto
@@ -42,7 +42,7 @@
 
 FROM sickcodes/docker-osx:latest
 
-MAINTAINER 'https://twitter.com/sickcodes' <https://sick.codes>
+LABEL maintainer='https://twitter.com/sickcodes <https://sick.codes>'
 
 USER root
 
@@ -71,7 +71,7 @@ RUN if [[ "${RANKMIRRORS}" ]]; then \
     ; fi \
     ; yes | pacman -Scc
 
-RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noconfirm \
+RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr --noconfirm \
     && if [[ "${SCROT}" ]]; then \
         pacman -Syu scrot base-devel --noconfirm \
         && git clone --recurse-submodules --depth 1 https://github.com/stolk/imcat.git \
@@ -88,6 +88,9 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
     ; fi \
     ; yes | pacman -Scc
 
+RUN pacman -S sshpass --noconfirm \
+    && yes | pacman -Scc
+
 USER arch
 
 ENV USER arch
diff --git a/Dockerfile.monterey b/Dockerfile.monterey
index 0edba12..6d7718d 100644
--- a/Dockerfile.monterey
+++ b/Dockerfile.monterey
@@ -21,7 +21,7 @@
 
 FROM sickcodes/docker-osx
 
-MAINTAINER 'https://twitter.com/sickcodes' <https://sick.codes>
+LABEL maintainer='https://twitter.com/sickcodes <https://sick.codes>'
 
 SHELL ["/bin/bash", "-c"]
 
diff --git a/Dockerfile.naked b/Dockerfile.naked
index fe9c5a7..694f14d 100644
--- a/Dockerfile.naked
+++ b/Dockerfile.naked
@@ -32,7 +32,7 @@
 
 FROM sickcodes/docker-osx:latest
 
-MAINTAINER 'https://twitter.com/sickcodes' <https://sick.codes>
+LABEL maintainer='https://twitter.com/sickcodes <https://sick.codes>'
 
 USER root
 
diff --git a/Dockerfile.naked-auto b/Dockerfile.naked-auto
index 43dfdc5..e693eb9 100644
--- a/Dockerfile.naked-auto
+++ b/Dockerfile.naked-auto
@@ -18,7 +18,7 @@
 
 FROM sickcodes/docker-osx:latest
 
-MAINTAINER 'https://twitter.com/sickcodes' <https://sick.codes>
+LABEL maintainer='https://twitter.com/sickcodes <https://sick.codes>'
 
 USER root
 
@@ -52,7 +52,7 @@ RUN if [[ "${RANKMIRRORS}" ]]; then \
 # For taking screenshots of the Xfvb screen, useful during development.
 ARG SCROT
 
-RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noconfirm \
+RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr --noconfirm \
     && if [[ "${SCROT}" ]]; then \
         pacman -Syu scrot base-devel --noconfirm \
         && git clone --recurse-submodules --depth 1 https://github.com/stolk/imcat.git \
@@ -69,6 +69,9 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
     ; fi \
     ; yes | pacman -Scc
 
+RUN pacman -S sshpass --noconfirm \
+    && yes | pacman -Scc
+
 USER arch
 
 ENV USER arch