aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsickcodes <[email protected]>2021-02-08 00:58:07 +0000
committersickcodes <[email protected]>2021-02-08 00:58:07 +0000
commit8401069229fd761209215f0e56f1b2bf95f74d81 (patch)
tree4a4a12fe82c4496837be9eefed5d106a77f2b92c
parentMerge pull request #145 from sickcodes/mac_address (diff)
downloaddocker-osx-8401069229fd761209215f0e56f1b2bf95f74d81.tar.xz
docker-osx-8401069229fd761209215f0e56f1b2bf95f74d81.zip
Fixed cwd bug
-rw-r--r--Dockerfile.auto4
-rw-r--r--Dockerfile.naked4
-rw-r--r--README.md2
3 files changed, 5 insertions, 5 deletions
diff --git a/Dockerfile.auto b/Dockerfile.auto
index 5051a0e..bfdfadb 100644
--- a/Dockerfile.auto
+++ b/Dockerfile.auto
@@ -88,6 +88,8 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
USER arch
+WORKDIR /home/arch/OSX-KVM
+
RUN mkdir -p ~/.ssh \
&& touch ~/.ssh/authorized_keys \
&& touch ~/.ssh/config \
@@ -98,8 +100,6 @@ RUN mkdir -p ~/.ssh \
&& tee -a ~/.ssh/config <<< ' StrictHostKeyChecking no' \
&& tee -a ~/.ssh/config <<< ' UserKnownHostsFile=/dev/null'
-WORKDIR /home/arch/OSX-KVM
-
ARG COMPLETE=true
# Feel free to take a copy of this image and then host it internally
diff --git a/Dockerfile.naked b/Dockerfile.naked
index feae2b4..1b8618a 100644
--- a/Dockerfile.naked
+++ b/Dockerfile.naked
@@ -77,6 +77,8 @@ RUN pacman -Syu xorg-server-xvfb wget xterm xorg-xhost xorg-xrandr sshpass --noc
USER arch
+WORKDIR /home/arch/OSX-KVM
+
RUN mkdir -p ~/.ssh \
&& touch ~/.ssh/authorized_keys \
&& touch ~/.ssh/config \
@@ -87,8 +89,6 @@ RUN mkdir -p ~/.ssh \
&& tee -a ~/.ssh/config <<< ' StrictHostKeyChecking no' \
&& tee -a ~/.ssh/config <<< ' UserKnownHostsFile=/dev/null'
-WORKDIR /home/arch/OSX-KVM
-
ENV NOPICKER=true
ENV DISPLAY=:99
diff --git a/README.md b/README.md
index 57ad3fc..b968e6f 100644
--- a/README.md
+++ b/README.md
@@ -544,7 +544,7 @@ This file builds on top of the work done by Dhiru Kholia and many others on the
* Shut down the VM and copy out the qcow image with `docker cp stoppedcontainer:/home/arch/OSX-KVM/mac_hdd_ng.img .`
* Run `qemu-img check -r all mac_hdd_ng.img` to fix any errors.
* Run `qemu-img convert -O qcow2 mac_hdd_ng.img deduped.img` and check for errors again
-* OPTIONAL: Run `qemu-img -c -O qcow2 deduped.img compressed.img` to further compress the image. This may reduce the runtime speed though, but it should reduce the size by roughly 25%.
+* OPTIONAL: Run `qemu-img convert -c -O qcow2 deduped.img compressed.img` to further compress the image. This may reduce the runtime speed though, but it should reduce the size by roughly 25%.
* Check for errors again, and build a fresh docker image. E.g. with this Dockerfile
```