Merge pull request #11 from zachgrayio/feature/hot-reload

Feature/hot reload

Author: zachgrayio

Dockerfile

@@ -12,12 +12,9 @@ RUN swift package update
 ADD ./ /usr/src
 
 # user can pass in CONFIG=release to override
-ARG CONFIG=debug
+ENV CONFIG=debug
 
-RUN swift build --configuration ${CONFIG}
+# user can pass in LIVE=true
+ENV LIVE=false
 
-RUN cp ./.build/${CONFIG}/libSTSLibrary.so /usr/lib/libSTSLibrary.so
-RUN cp ./.build/${CONFIG}/STSLibrary.swiftmodule /usr/lib/STSLibrary.swiftmodule
-RUN cp ./.build/${CONFIG}/STSApplication /usr/bin/STSApplication
-
-ENTRYPOINT /usr/bin/STSApplication
+ENTRYPOINT ./entrypoint $CONFIG $LIVE

Package.resolved

@@ -34,6 +34,7 @@ Projects built with this template will have the following traits:
 2. Quick and easy [REPL](https://github.com/tensorflow/swift/blob/master/Usage.md#repl-read-eval-print-loop) access against the project's Swift for Tensorflow code and third-party libraries
 3. Easily unit testable
 4. Runs anywhere Docker is available with no additional setup necessary - zero conflicts with existing Swift or TensorFlow installations.
+5. Swift code is hot-reloaded on change; third-party libraries are downloaded automatically as well. See the `--live` flag.
 
 This will enable both ease of use during the research phase and a rapid transition to a scalable training solution and beyond (production deployment).
 
@@ -140,6 +141,7 @@ A control script is included for extra convenience for users on macOS/Linux, but
 
 Some example commands:
 
+* `./sts run app --live` - automatically rebuild and run the application on code change; packages are updated automatically as well!
 * `./sts build --release`,  `./sts build -r`,   `./sts build -p`,   `./sts build --prod` - build the image with a release executable
 * `./sts run repl --build --name myrepl -v` - run a REPL in a container named myrepl, mounting the current directory as a volume, building the project first
 * `./sts run test`,  `./sts run tests --name testcontainer` - run unit tests

README.md

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+CONFIG=$1
+LIVE=$2
+KILL=false
+
+handle_interrupt() {
+    KILL=true
+}
+
+build() {
+    swift build --configuration ${CONFIG}
+}
+
+install_application() {
+    cp ./.build/${CONFIG}/libSTSLibrary.so /usr/lib/libSTSLibrary.so
+    cp ./.build/${CONFIG}/STSLibrary.swiftmodule /usr/lib/STSLibrary.swiftmodule
+    cp ./.build/${CONFIG}/STSApplication /usr/bin/STSApplication
+}
+
+run_application() {
+    /usr/bin/STSApplication
+}
+
+build_and_run() {
+    build && install_application && run_application
+}
+
+watch_files() {
+    while [ ${KILL} != true ]
+    do
+        files=`find *.swift -type f -newer /usr/bin/STSApplication`
+        if [[ ${files} != "" ]] ; then
+            echo "Changes in files: $files, building..."
+            if [[ ${files} = *"Package.swift" ]] ; then
+                swift package update
+            fi
+            build_and_run
+            echo "Waiting for changes to run application again."
+        fi
+        sleep 2
+    done
+}
+
+entrypoint() {
+    build_and_run
+}
+
+live_entrypoint() {
+    build_and_run
+    echo "Waiting for changes to run application again."
+    watch_files &
+    wait
+}
+
+if [ ${LIVE} = true ] ; then
+    live_entrypoint
+else
+    entrypoint
+fi

entrypoint

@@ -3,39 +3,43 @@
 POSITIONAL=()
 STS_NAME=sts-application
 STS_BUILD_ENABLED=false
+STS_LIVE_ENABLED=false
 
 TXT_NC='\033[0m'
 TXT_GREEN='\033[0;32m'
 TXT_YELLOW='\033[0;33m'
 TXT_RED='\033[0;31m'
 
-while [[ $# -gt 0 ]]
+while [ $# -gt 0 ]
 do
-key="$1"
-
-case ${key} in
-    -n|--name)
-    STS_NAME="$2"
-    shift
-    shift
-    ;;
-    -v|--volume)
-    STS_VOLUME_ENABLED=true
-    shift
-    ;;
-    -b|--build)
-    STS_BUILD_ENABLED=true
-    shift
-    ;;
-    -p|--prod|-r|--release)
-    STS_RELEASE_CONFIG_ENABLED=true
-    shift
-    ;;
-    *)    # unknown option
-    POSITIONAL+=("$1")
-    shift
-    ;;
-esac
+    key="$1"
+    case ${key} in
+        -n|--name)
+        STS_NAME="$2"
+        shift
+        shift
+        ;;
+        -v|--volume)
+        STS_VOLUME_ENABLED=true
+        shift
+        ;;
+        -b|--build)
+        STS_BUILD_ENABLED=true
+        shift
+        ;;
+        -p|--prod|-r|--release)
+        STS_RELEASE_CONFIG_ENABLED=true
+        shift
+        ;;
+        -l|--live)
+        STS_LIVE_ENABLED=true
+        shift
+        ;;
+        *)    # unknown option
+        POSITIONAL+=("$1")
+        shift
+        ;;
+    esac
 done
 set -- "${POSITIONAL[@]}"
 
@@ -56,6 +60,15 @@ else
     STS_BUILD_COMMAND="docker build -t ${STS_NAME} ."
 fi
 
+# live flag
+if [ "$STS_LIVE_ENABLED" = true ] ; then
+    STS_VOLUME_FLAG="-v $PWD:/usr/src"
+    STS_LIVE_FLAG="-e LIVE=true"
+else
+    STS_VOLUME_FLAG=""
+    STS_LIVE_FLAG=""
+fi
+
 case ${STS_COMMAND} in
     build)
     echo -e "[STS][build] Building with: ${TXT_GREEN}${STS_BUILD_COMMAND}${TXT_NC}"
@@ -64,7 +77,7 @@ case ${STS_COMMAND} in
     run)
     case ${STS_COMMAND_ARG} in
         app)
-        RUN_COMMAND="docker run --rm ${STS_VOLUME_FLAG} ${STS_NAME}"
+        RUN_COMMAND="docker run --rm -it ${STS_LIVE_FLAG} ${STS_VOLUME_FLAG} ${STS_NAME}"
         ;;
         repl)
         RUN_COMMAND="docker run --rm ${STS_VOLUME_FLAG} --security-opt seccomp:unconfined -it \