Merge pull request #3 from vikinganalytics/mv-hidden-files

Mv hidden files

Author: OskarLiew

python38-slim/Dockerfile

@@ -4,25 +4,32 @@ FROM python:3.8-slim
 LABEL maintainer="Viking Analytics AB"
 
 ENV BUILDER_VERSION=1.0 \
-    APP_ROOT="/app_root" \
-    STI_SCRIPTS_PATH="/.s2i/bin"
+    APP_ROOT="/opt/app-root" \
+    HOME="/opt/app-root/src" \
+    STI_SCRIPTS_PATH="/usr/libexec/s2i"
 
 # Set labels used in OpenShift to describe the builder image
-LABEL io.k8s.description="Platform for building Daeploy images with reduced size" \
+LABEL io.k8s.description="Platform for building lightweight Daeploy images" \
     io.k8s.display-name="Daeploy python builder" \
     io.openshift.expose-services="8080:http" \
     io.openshift.tags="builder,daeploy,python." \
-    io.openshift.s2i.scripts-url="image://.s2i/bin"
+    io.openshift.s2i.scripts-url="image://${STI_SCRIPTS_PATH}"
 
 # Setup virtualenv
 RUN python -m venv /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"
 
 # Copy the S2I scripts to the image
-COPY ./s2i/bin/ .s2i/bin
+COPY ./s2i/bin/ $STI_SCRIPTS_PATH
 
-# TODO: Set the default port for applications built using this image
+# Set the default port for applications built using this image
 EXPOSE 8080
 
-# TODO: Set the default CMD for the image
-CMD [".s2i/bin/usage"]
+# Setup file system
+RUN mkdir -p ${APP_ROOT} && \
+    mkdir -p ${HOME}
+
+WORKDIR $HOME
+
+# Set the default CMD for the image
+CMD ["$STI_SCRIPTS_PATH/usage"]

python38-slim/s2i/bin/assemble

@@ -9,18 +9,17 @@
 
 # If the 'daeploy/s2i-python' assemble script is executed with the '-h' flag, print the usage.
 if [[ "$1" == "-h" ]]; then
-	exec /usr/lib/s2i/usage
+	exec $STI_SCRIPTS_PATH/usage
 fi
 
 echo "---> Installing application source ..."
-mkdir -p "$APP_ROOT/src"
-mv /tmp/src/* "$APP_ROOT/src"
+shopt -s dotglob
+mv /tmp/src/* "$HOME"
 
 # Install dependencies
 echo "---> Upgrading pip and setuptools"
-pip install -U pip setuptools
+pip install -U pip
 
-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 "$APP_ROOT/src"
+cd $HOME
 
 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_