diff options
| author | sickcodes <[email protected]> | 2021-02-07 19:25:59 +0000 |
|---|---|---|
| committer | sickcodes <[email protected]> | 2021-02-07 19:25:59 +0000 |
| commit | 7eb821dcc3145d5f3f39075327f0cf2804526480 (patch) | |
| tree | e963f990e2b7d4802bccc475fde6022df1ea3618 /Dockerfile.naked | |
| parent | Remove pacman -Scc until later. (diff) | |
| download | docker-osx-7eb821dcc3145d5f3f39075327f0cf2804526480.tar.xz docker-osx-7eb821dcc3145d5f3f39075327f0cf2804526480.zip | |
Add -e NOPICKER=false for the :naked image to be able to enter boot menu.
Diffstat (limited to 'Dockerfile.naked')
| -rw-r--r-- | Dockerfile.naked | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/Dockerfile.naked b/Dockerfile.naked index 9966c33..feae2b4 100644 --- a/Dockerfile.naked +++ b/Dockerfile.naked @@ -55,15 +55,25 @@ RUN if [[ "${RANKMIRRORS}" ]]; then { pacman -Sy wget --noconfirm || pacman -Syu && tee -a /etc/pacman.d/mirrorlist <<< 'Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch' \ && cat /etc/pacman.d/mirrorlist ; fi -RUN pacman -Syu xorg-server-xvfb xterm xorg-xhost xorg-xrandr xdotool sshpass scrot base-devel --noconfirm - -RUN git clone https://github.com/stolk/imcat.git \ - && cd imcat \ - && make \ - && sudo cp imcat /usr/bin/imcat \ - && touch /usr/bin/scrotcat \ - && tee -a /usr/bin/scrotcat <<< '/usr/bin/imcat <(scrot -o /dev/stdout)' \ - && chmod +x /usr/bin/scrotcat +# 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 \ + && if [[ "${SCROT}" ]]; then \ + pacman -Syu scrot base-devel --noconfirm \ + && git clone https://github.com/stolk/imcat.git \ + && cd imcat \ + && make \ + && sudo cp imcat /usr/bin/imcat \ + && touch /usr/bin/scrotcat \ + && tee -a /usr/bin/scrotcat <<< '/usr/bin/imcat <(scrot -o /dev/stdout)' \ + && chmod +x /usr/bin/scrotcat \ + ; else \ + touch /usr/bin/scrotcat \ + && echo echo >> /usr/bin/scrotcat \ + && chmod +x /usr/bin/scrotcat \ + ; fi \ + ; yes | pacman -Scc USER arch @@ -79,16 +89,17 @@ RUN mkdir -p ~/.ssh \ WORKDIR /home/arch/OSX-KVM -ARG NOPICKER=true - -RUN [[ "${NOPICKER}" = true ]] && mv ./Launch-nopicker.sh ./Launch.sh +ENV NOPICKER=true ENV DISPLAY=:99 ENV IMAGE_PATH=/image -CMD [[ "${DISPLAY}" = ':99' ]] && { nohup Xvfb :99 -screen 0 1920x1080x16 \ - & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done ; } \ +CMD [[ "${DISPLAY}" = ':99' ]] && { \ + nohup Xvfb :99 -screen 0 1920x1080x16 \ + & until [[ "$(xrandr --query 2>/dev/null)" ]]; do sleep 1 ; done \ + ; } \ ; sudo chown "$(id -u)":"$(id -g)" "${IMAGE_PATH}" 2>/dev/null || true \ ; ./enable-ssh.sh \ + ; [[ "${NOPICKER}" == true ]] && mv ./Launch-nopicker.sh ./Launch.sh \ ; envsubst < ./Launch.sh | bash |