diff options
| author | Ugo Mignon <[email protected]> | 2022-09-01 08:38:59 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-09-01 08:38:59 +0200 |
| commit | 40a7e0d20010f2bede3432307b1c6ed123a2d5bc (patch) | |
| tree | 5ea08dbb68fb641b5295f8505bbca56cdad110a8 | |
| parent | Fixes #510 missing keyservers (diff) | |
| download | docker-osx-40a7e0d20010f2bede3432307b1c6ed123a2d5bc.tar.xz docker-osx-40a7e0d20010f2bede3432307b1c6ed123a2d5bc.zip | |
fix: sshpass install and label
| -rw-r--r-- | Dockerfile.auto | 7 | ||||
| -rw-r--r-- | Dockerfile.monterey | 2 | ||||
| -rw-r--r-- | Dockerfile.naked | 2 | ||||
| -rw-r--r-- | 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 |