amass/Docker-OSX
1
0
Fork 0
mirror of https://github.com/sickcodes/Docker-OSX.git synced 2024-11-26 04:01:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: sshpass install and label

Browse Source
This commit is contained in:
Ugo Mignon 2022-09-01 08:38:59 +02:00 committed by GitHub
parent 1fa728b08d
commit 40a7e0d200
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile.auto
View File

@ -42,7 +42,7 @@
FROM sickcodes/docker-osx:latest FROM sickcodes/docker-osx:latest
MAINTAINER 'https://twitter.com/sickcodes' <https://sick.codes> LABEL maintainer='https://twitter.com/sickcodes <https://sick.codes>'
USER root USER root
@ -71,7 +71,7 @@ RUN if [[ "${RANKMIRRORS}" ]]; then \
; fi \ ; fi \
; yes | pacman -Scc ; 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 \ && if [[ "${SCROT}" ]]; then \
pacman -Syu scrot base-devel --noconfirm \ pacman -Syu scrot base-devel --noconfirm \
&& git clone --recurse-submodules --depth 1 https://github.com/stolk/imcat.git \ && 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 \ ; fi \
; yes | pacman -Scc ; yes | pacman -Scc
RUN pacman -S sshpass --noconfirm \
&& yes | pacman -Scc
USER arch USER arch
ENV USER arch ENV USER arch

2
Dockerfile.monterey
View File

@ -21,7 +21,7 @@
FROM sickcodes/docker-osx 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"] SHELL ["/bin/bash", "-c"]

2
Dockerfile.naked
View File

@ -32,7 +32,7 @@
FROM sickcodes/docker-osx:latest FROM sickcodes/docker-osx:latest
MAINTAINER 'https://twitter.com/sickcodes' <https://sick.codes> LABEL maintainer='https://twitter.com/sickcodes <https://sick.codes>'
USER root USER root

7
Dockerfile.naked-auto
View File

@ -18,7 +18,7 @@
FROM sickcodes/docker-osx:latest FROM sickcodes/docker-osx:latest
MAINTAINER 'https://twitter.com/sickcodes' <https://sick.codes> LABEL maintainer='https://twitter.com/sickcodes <https://sick.codes>'
USER root USER root
@ -52,7 +52,7 @@ RUN if [[ "${RANKMIRRORS}" ]]; then \
# For taking screenshots of the Xfvb screen, useful during development. # For taking screenshots of the Xfvb screen, useful during development.
ARG SCROT 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 \ && if [[ "${SCROT}" ]]; then \
pacman -Syu scrot base-devel --noconfirm \ pacman -Syu scrot base-devel --noconfirm \
&& git clone --recurse-submodules --depth 1 https://github.com/stolk/imcat.git \ && 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 \ ; fi \
; yes | pacman -Scc ; yes | pacman -Scc
RUN pacman -S sshpass --noconfirm \
&& yes | pacman -Scc
USER arch USER arch
ENV USER arch ENV USER arch