Merge pull request #2 from vikinganalytics/improved-script-compatability

Improved script compatability

Author: OskarLiew

python38-slim/Dockerfile

@@ -3,7 +3,9 @@ FROM python:3.8-slim
 
 LABEL maintainer="Viking Analytics AB"
 
-ENV BUILDER_VERSION 1.0
+ENV BUILDER_VERSION=1.0 \
+    APP_ROOT="/app_root" \
+    STI_SCRIPTS_PATH="/.s2i/bin"
 
 # Set labels used in OpenShift to describe the builder image
 LABEL io.k8s.description="Platform for building Daeploy images with reduced size" \

python38-slim/s2i/bin/assemble

@@ -13,13 +13,14 @@ if [[ "$1" == "-h" ]]; then
 fi
 
 echo "---> Installing application source ..."
-mv /tmp/src/* "$HOME"
+mkdir -p "$APP_ROOT/src"
+mv /tmp/src/* "$APP_ROOT/src"
 
 # Install dependencies
 echo "---> Upgrading pip and setuptools"
 pip install -U pip setuptools
 
-cd $HOME
+cd "$APP_ROOT/src"
 if [[ -f requirements.txt ]]; then
   echo "---> Installing dependencies..."
   python -m pip install -r requirements.txt

python38-slim/s2i/bin/run

@@ -7,7 +7,7 @@
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
 
-cd $HOME
+cd "$APP_ROOT/src"
 
 if [ -z "$APP_SCRIPT" ] && [ -z "$APP_FILE" ] && [ -z "$APP_MODULE" ]; then
   # Set default values for APP_SCRIPT and APP_FILE only when all three APP_
@@ -24,8 +24,9 @@ if [ ! -z "$APP_SCRIPT" ]; then
   if [[ -f "$APP_SCRIPT" ]]; then
     echo "---> Running application from script ($APP_SCRIPT) ..."
     if [[ "$APP_SCRIPT" != /* ]]; then
-      APP_SCRIPT="$HOME/$APP_SCRIPT"
+      APP_SCRIPT="$APP_ROOT/src/$APP_SCRIPT"
     fi
+    chmod +x "$APP_SCRIPT"
     "$APP_SCRIPT"
   elif [[ -z "$APP_SCRIPT_DEFAULT" ]]; then
     echo "ERROR: file '$APP_SCRIPT' not found." && exit 1
@@ -35,7 +36,7 @@ fi
 if [ ! -z "$APP_FILE" ]; then
   if [[ -f "$APP_FILE" ]]; then
     echo "---> Running application from Python script ($APP_FILE) ..."
-    python "$HOME/$APP_FILE"
+    python "$APP_FILE"
   elif [[ -z "$APP_FILE_DEFAULT" ]]; then
     echo "ERROR: file '$APP_FILE' not found." && exit 1
   fi