Converting from /build-mount -> /build, adding /code mount

Author: sc2automation

README.md

@@ -43,7 +43,7 @@ TODO: There appears to be an issue connecting on the exposed port
     cd build && ./all.sh
 ~~~
 
-This builds the API and puts binary artifacts into the build-mount volume.
+This builds the API and puts binary artifacts into the build volume.
 
 4. Test the containers
 

build/all.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 # Clones the git repo, makes the build container, builds the API and copies the
-# artifacts to the build-mount volume
+# artifacts to the build volume
 ./clone.sh && ./make-container.sh && ./build-copy.sh

build/api-copy.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
-echo "Copying built artifacts into /build-mount"
+echo "Copying built artifacts into /build"
 ls /s2client-api/s2client-api-*
-cp /s2client-api/s2client-api-* /build-mount/
+cp /s2client-api/s2client-api-* /build/

build/build-copy.sh

@@ -3,5 +3,5 @@
 SCRIPT_PATH=${0%/*}
 . ${SCRIPT_PATH}/../config.sh
 
-# Build the API artifacts in the build-mount folder
-docker run -it -v build-mount:/build-mount --entrypoint="/s2client-api/api-all.sh" s2client-api
+# Build the API artifacts in the build folder
+docker run -it -v build:/build --entrypoint="/s2client-api/api-all.sh" s2client-api

dev/Dockerfile

@@ -42,7 +42,7 @@ RUN git config --global user.email "$GIT_EMAIL"
 # Generate a new SSH key pair without user input
 RUN cat /dev/zero | ssh-keygen -q -N "" > /dev/null
 
-# Add the code
+# Set the starting directory
 WORKDIR /home/$SYSTEM_USER_NAME
 
 # Override the s2client-game entrypoint

dev/make-container.sh

@@ -19,6 +19,7 @@ docker build ${SCRIPT_PATH} \
     --build-arg GIT_EMAIL="${GIT_EMAIL}" \
     -t ${IMAGE_NAME}
 
+echo ==== Code mount created at /code in the container
 echo ==== Your github.com SSH public key for the container is:
 
 # Output the key for usage on github.com

dev/run-dev.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
 docker run \
-    -v build-mount:/build-mount \
+    -v code:/code \
+    -v build:/build \
     -it s2client-dev

dev/run-user.sh

@@ -2,5 +2,6 @@
 
 # This runs the user dev container
 docker run \
-    -v build-mount:/build-mount \
+    -v code:/code \
+    -v build:/build \
     -it s2client-`whoami`

game/download.sh

@@ -12,6 +12,15 @@ mkdir -p downloads/
 
 pushd downloads
 
+# Just clone the base repository for the maps
+if [ ! -d s2client-api ]; then
+    git clone [email protected]:Blizzard/s2client-api.git
+else
+    pushd s2client-api
+    git pull -r 
+    popd
+fi 
+
 ${WGET_CMD} http://blzdistsc2-a.akamaihd.net/Linux/SC2.${GAME_VERSION}.zip
 ${WGET_CMD} http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season1.zip
 ${WGET_CMD} http://blzdistsc2-a.akamaihd.net/MapPacks/Ladder2017Season2.zip

game/run-interactive.sh

@@ -1,4 +1,8 @@
 #!/usr/bin/env bash
 
-# Run an interactive container with the build-mount (see build/all.sh)
-docker run --entrypoint="/bin/bash" -v build-mount:/build-mount -it s2client-game
+# Run an interactive container with the build (see build/all.sh)
+docker run \
+    --entrypoint="/bin/bash" \
+    -v code:/code
+    -v build:/build 
+    -it s2client-game