change to inotify for hot reloads; add build and install back to dockerfile to get REPL third-party support working correctly

Author: zachgrayio

Dockerfile

@@ -4,6 +4,8 @@ LABEL Description="An STS Application"
 
 WORKDIR /usr/src
 
+RUN apt-get update && apt-get install inotify-tools -y && rm -rf /var/cache/apk/*
+
 # Cache this step
 COPY Package.swift /usr/src
 RUN swift package update
@@ -17,4 +19,10 @@ ENV CONFIG=debug
 # user can pass in LIVE=true
 ENV LIVE=false
 
+RUN swift build --configuration ${CONFIG}
+
+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 ./entrypoint $CONFIG $LIVE

entrypoint

@@ -2,11 +2,6 @@
 
 CONFIG=$1
 LIVE=$2
-KILL=false
-
-handle_interrupt() {
-    KILL=true
-}
 
 build() {
     swift build --configuration ${CONFIG}
@@ -27,18 +22,16 @@ build_and_run() {
 }
 
 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
+    inotifywait --quiet --recursive --monitor --event modify --format "%w%f" . \
+    | while read file change; do
+        if [[ ${file} = *".swift" ]] ; then
+            echo "Changes in file: $file, building..."
+            if [[ ${file} = *"Package.swift" ]] ; then
                 swift package update
             fi
             build_and_run
             echo "Waiting for changes to run application again."
         fi
-        sleep 2
     done
 }
 
@@ -47,7 +40,7 @@ entrypoint() {
 }
 
 live_entrypoint() {
-    build_and_run
+    run_application
     echo "Waiting for changes to run application again."
     watch_files &
     wait

sts

@@ -60,7 +60,7 @@ else
     STS_BUILD_COMMAND="docker build -t ${STS_NAME} ."
 fi
 
-# live flag
+# live flag TODO: Fix conflict edge case with volume and live flags
 if [ "$STS_LIVE_ENABLED" = true ] ; then
     STS_VOLUME_FLAG="-v $PWD:/usr/src"
     STS_LIVE_FLAG="-e LIVE=true"
@@ -80,6 +80,9 @@ case ${STS_COMMAND} in
         RUN_COMMAND="docker run --rm -it ${STS_LIVE_FLAG} ${STS_VOLUME_FLAG} ${STS_NAME}"
         ;;
         repl)
+        if [ "$STS_LIVE_ENABLED" = true ] ; then
+            echo -e "[STS][run][${STS_COMMAND_ARG}] ignoring unsupported flag: ${TXT_YELLOW}-l|--live${TXT_NC}"
+        fi
         RUN_COMMAND="docker run --rm ${STS_VOLUME_FLAG} --security-opt seccomp:unconfined -it \
             --entrypoint /usr/bin/swift \
             ${STS_NAME} \
@@ -91,9 +94,16 @@ case ${STS_COMMAND} in
             -lswiftTensorFlow"
         ;;
         test|tests)
-        RUN_COMMAND="docker run --rm ${STS_VOLUME_FLAG} --entrypoint "/usr/bin/swift" ${STS_NAME} test"
+        # TODO: Finish live reloaded tests; need to think about the --entrypoint usage
+        if [ "$STS_LIVE_ENABLED" = true ] ; then
+            echo -e "[STS][test][${STS_COMMAND_ARG}] ignoring unsupported flag: ${TXT_YELLOW}-l|--live${TXT_NC}"
+        fi
+        RUN_COMMAND="docker run --rm -it ${STS_LIVE_FLAG} ${STS_VOLUME_FLAG} --entrypoint "/usr/bin/swift" ${STS_NAME} test"
         ;;
         xcode)
+        if [ "$STS_LIVE_ENABLED" = true ] ; then
+            echo -e "[STS][run][${STS_COMMAND_ARG}] ignoring unsupported flag: ${TXT_YELLOW}-l|--live${TXT_NC}"
+        fi
         RUN_COMMAND="docker run --rm -v ${PWD}:/usr/src \
             --entrypoint /usr/bin/swift \
             ${STS_NAME} \