Added missing convenience scripts

- Scripts copied & modified from Course 2
- Adjust Dockerfile and path handling to merge convenience scripts with contents of awesomesauce project (scipts are inside project archive in Course 2)
- Dockerfile and script cleanup taking advantage of environment variables

Author: mkarlesky

Dockerfile

@@ -2,6 +2,8 @@ FROM alpine:3.11
 
 MAINTAINER Michael Karlesky <[email protected]>
 
+ENV PROJECT_HOME   /lab
+ENV DR_SURLY_HOME  /home/drsurly
 
 RUN set -ex \
   && apk update \
@@ -19,7 +21,8 @@ RUN set -ex \
 ##
 
 COPY assets/course            /usr/local/bin
-COPY assets/awesomesauce.zip  /home/drsurly/awesomesauce.zip
+COPY assets/start_lab*        $DR_SURLY_HOME/
+COPY assets/awesomesauce.zip  $DR_SURLY_HOME/
 
 RUN chmod +x /usr/local/bin/course
 
@@ -28,10 +31,10 @@ RUN chmod +x /usr/local/bin/course
 ## Programming environment setup
 ##
 
-RUN mkdir /lab
+RUN mkdir $PROJECT_HOME
 
 # Working directory at container launch
-WORKDIR /lab
+WORKDIR $PROJECT_HOME
 
 # When the container launches, run a shell that launches in WORKDIR
 CMD ["/bin/sh"]

assets/course

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 TMP="/tmp/project"
-PROJECT_HOME="/lab"
 PROJECT_ARCHIVE="awesomesauce.zip"
 
 # If no command line parameters given, provide usage banner
@@ -40,11 +39,11 @@ if [ "$(ls -A $PROJECT_HOME)" ]; then
 fi
 
 # Extract archive listing and regex to determine base directory of files
-BASEDIR=`unzip -l /home/drsurly/$PROJECT_ARCHIVE | grep -E -o 'mvandervoord[^/]+' | head -1`
+BASEDIR=`unzip -l $DR_SURLY_HOME/$PROJECT_ARCHIVE | grep -E -o 'mvandervoord[^/]+' | head -1`
 
 # Extract the archive
 echo "> Extracting project..."
-unzip -q "/home/drsurly/$PROJECT_ARCHIVE" -d $TMP
+unzip -q "$DR_SURLY_HOME/$PROJECT_ARCHIVE" -d $TMP
 
 # Delete any git junk -- first files and then directories
 find $TMP -type f -iname ".git*" -delete
@@ -53,6 +52,9 @@ find $TMP -type d -name ".git" -exec rm -rf "{}" \;
 # Move extracted contents below $basedir to new base directory of /lab
 mv "$TMP/$BASEDIR"/* "$PROJECT_HOME"
 
+# Move start_lab convenience scripts inside Docker image to /lab
+mv "$DR_SURLY_HOME"/start_lab* "$PROJECT_HOME"
+
 chmod +x "$PROJECT_HOME"/start_lab
 
 # Clean up temporary directory

assets/start_lab

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker run -it --rm -v $PWD:/lab throwtheswitch/drsurly-course1:latest

assets/start_lab.bat

@@ -0,0 +1 @@
+docker run -it --rm -v "%cd%":/lab throwtheswitch/drsurly-course1:latest