Merge pull request #121 from PeterDaveHello/ImproveDockerfile
Improve Dockerfile
This commit is contained in:
		
						commit
						05f9555664
					
				|  | @ -28,10 +28,8 @@ | ||||||
| # | # | ||||||
| #       docker run --device /dev/kvm --device /dev/snd -v /tmp/.X11-unix:/tmp/.X11-unix -e "DISPLAY=${DISPLAY:-:0.0}" sickcodes/docker-osx:latest | #       docker run --device /dev/kvm --device /dev/snd -v /tmp/.X11-unix:/tmp/.X11-unix -e "DISPLAY=${DISPLAY:-:0.0}" sickcodes/docker-osx:latest | ||||||
| # | # | ||||||
| # |  | ||||||
| # Run with SSH: | # Run with SSH: | ||||||
| # | # | ||||||
| #  |  | ||||||
| #       docker run --device /dev/kvm --device /dev/snd -e RAM=6 -p 50922:10022 -v /tmp/.X11-unix:/tmp/.X11-unix -e "DISPLAY=${DISPLAY:-:0.0}" sickcodes/docker-osx:latest | #       docker run --device /dev/kvm --device /dev/snd -e RAM=6 -p 50922:10022 -v /tmp/.X11-unix:/tmp/.X11-unix -e "DISPLAY=${DISPLAY:-:0.0}" sickcodes/docker-osx:latest | ||||||
| #       # ssh fullname@localhost -p 50922 | #       # ssh fullname@localhost -p 50922 | ||||||
| # | # | ||||||
|  | @ -49,12 +47,13 @@ | ||||||
| # | # | ||||||
| #       docker run ... -e EXTRA="-usb -device usb-host,hostbus=1,hostaddr=8" ... | #       docker run ... -e EXTRA="-usb -device usb-host,hostbus=1,hostaddr=8" ... | ||||||
| #       # you will also need to pass the device to the container | #       # you will also need to pass the device to the container | ||||||
| # |  | ||||||
| 
 | 
 | ||||||
| FROM archlinux:latest | FROM archlinux:latest | ||||||
| 
 | 
 | ||||||
| MAINTAINER 'https://sick.codes' <https://sick.codes> | MAINTAINER 'https://sick.codes' <https://sick.codes> | ||||||
| 
 | 
 | ||||||
|  | SHELL ["/bin/bash", "-c"] | ||||||
|  | 
 | ||||||
| # change disk size here or add during build, e.g. --build-arg VERSION=10.14.5 --build-arg SIZE=50G | # change disk size here or add during build, e.g. --build-arg VERSION=10.14.5 --build-arg SIZE=50G | ||||||
| ARG SIZE=200G | ARG SIZE=200G | ||||||
| ARG VERSION=10.15.6 | ARG VERSION=10.15.6 | ||||||
|  | @ -82,7 +81,7 @@ RUN tee -a /etc/pacman.conf <<< '[community-testing]' \ | ||||||
|     && tee -a /etc/pacman.conf <<< 'Include = /etc/pacman.d/mirrorlist' |     && tee -a /etc/pacman.conf <<< 'Include = /etc/pacman.d/mirrorlist' | ||||||
| 
 | 
 | ||||||
| RUN pacman -Syu --noconfirm \ | RUN pacman -Syu --noconfirm \ | ||||||
|     && pacman -S sudo git make automake gcc python go autoconf cmake pkgconf alsa-utils fakeroot vim nano --noconfirm \ |     && pacman -S sudo git vim nano --noconfirm \ | ||||||
|     && yes | pacman -Scc \ |     && yes | pacman -Scc \ | ||||||
|     && ln -s /bin/vim /bin/vi \ |     && ln -s /bin/vim /bin/vi \ | ||||||
|     && useradd arch -p arch \ |     && useradd arch -p arch \ | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue