diff options
| author | sickcodes <[email protected]> | 2021-02-21 06:38:27 +0000 |
|---|---|---|
| committer | sickcodes <[email protected]> | 2021-02-21 06:38:27 +0000 |
| commit | 6f40c4c4de8e5c2aea704c7b215dd3b2c1b593a8 (patch) | |
| tree | 0edc617d62adc64f4ace5b10412373ebe53fc76a /Dockerfile | |
| parent | Merge pull request #151 from sickcodes/docker-osx-kubernetes (diff) | |
| download | docker-osx-6f40c4c4de8e5c2aea704c7b215dd3b2c1b593a8.tar.xz docker-osx-6f40c4c4de8e5c2aea704c7b215dd3b2c1b593a8.zip | |
3.1. base-devel image to skip simple packages. Add glibc overrides after every pacman -Syu which is currently required for non-Arch builds.
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 26 |
1 files changed, 19 insertions, 7 deletions
@@ -8,7 +8,7 @@ # Repo: https://github.com/sickcodes/Docker-OSX/ # Title: Mac on Docker (Docker-OSX) # Author: Sick.Codes https://sick.codes/ -# Version: 3.0 +# Version: 3.1 # License: GPLv3+ # # All credits for OSX-KVM and the rest at @Kholia's repo: https://github.com/kholia/osx-kvm @@ -50,7 +50,7 @@ # docker run ... -e EXTRA="-usb -device usb-host,hostbus=1,hostaddr=8" ... # # you will also need to pass the device to the container -FROM archlinux:latest +FROM archlinux:base-devel MAINTAINER 'https://sick.codes' <https://sick.codes> @@ -68,8 +68,8 @@ ARG MIRROR_COUNT=10 # TEMP-FIX for pacman issue RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \ - && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/$patched_glibc" \ - && bsdtar -C / -xvf "$patched_glibc" + && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \ + && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine." # TEMP-FIX for pacman issue RUN if [[ "${RANKMIRRORS}" ]]; then \ @@ -88,16 +88,22 @@ RUN if [[ "${RANKMIRRORS}" ]]; then \ # This fails on hub.docker.com, useful for debugging in cloud # RUN [[ $(egrep -c '(svm|vmx)' /proc/cpuinfo) -gt 0 ]] || { echo KVM not possible on this host && exit 1; } -RUN tee -a /etc/pacman.conf <<< '[community-testing]' \ - && tee -a /etc/pacman.conf <<< 'Include = /etc/pacman.d/mirrorlist' +# RUN tee -a /etc/pacman.conf <<< '[community-testing]' \ +# && tee -a /etc/pacman.conf <<< 'Include = /etc/pacman.d/mirrorlist' -RUN pacman -Syu sudo git vim nano alsa-utils openssh --noconfirm \ +RUN pacman -Syu git vim nano alsa-utils openssh --noconfirm \ && ln -s /bin/vim /bin/vi \ && useradd arch -p arch \ && tee -a /etc/sudoers <<< 'arch ALL=(ALL) NOPASSWD: ALL' \ && mkdir /home/arch \ && chown arch:arch /home/arch +# TEMP-FIX for pacman issue +RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \ + && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \ + && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine." +# TEMP-FIX for pacman issue + # allow ssh to container RUN mkdir -m 700 /root/.ssh @@ -147,6 +153,12 @@ RUN touch enable-ssh.sh \ RUN yes | sudo pacman -Syu qemu libvirt dnsmasq virt-manager bridge-utils openresolv jack ebtables edk2-ovmf netctl libvirt-dbus --overwrite --noconfirm \ && yes | sudo pacman -Scc +# TEMP-FIX for pacman issue +RUN patched_glibc=glibc-linux4-2.33-4-x86_64.pkg.tar.zst \ + && curl -LO "https://raw.githubusercontent.com/sickcodes/Docker-OSX/master/${patched_glibc}" \ + && bsdtar -C / -xvf "${patched_glibc}" || echo "Everything is fine." +# TEMP-FIX for pacman issue + # RUN sudo systemctl enable libvirtd.service # RUN sudo systemctl enable virtlogd.service |