Merge pull request #403 from Paraphraser/20210908-python-master

20210908 Python - master branch - PR 1 of 2

Author: Slyke

.templates/python/Dockerfile

@@ -1,9 +1,48 @@
 FROM python:3
 
-WORKDIR /usr/src/app
+# user+group ID defaults for IOTstack
+ENV IOTSTACK_UID=1000
+ENV IOTSTACK_GID=1000
 
-COPY requirements.txt ./
+# the template folder is named
+ENV TEMPLATE="app"
 
-RUN pip install --no-cache-dir -r requirements.txt
+# where IOTstack template files are stored
+ENV PYTHON_DEFAULTS="/iotstack_defaults/${TEMPLATE}"
 
-CMD [ "python", "./app.py" ]
+# ensure the defaults directory exists
+RUN mkdir -p ${PYTHON_DEFAULTS}
+
+# copy template files to defaults directory in image
+COPY ${TEMPLATE} ${PYTHON_DEFAULTS}
+
+# the requirements file (if it exists) is
+ENV REQUIREMENTS="${PYTHON_DEFAULTS}/requirements.txt"
+
+# set up requirements (if the file exists)
+RUN if [ -e ${REQUIREMENTS} ] ; then pip3 install --no-cache-dir -r ${REQUIREMENTS} ; fi
+
+# the python working directory is 
+ENV PYTHON_WORKDIR="/usr/src/${TEMPLATE}"
+
+# ensure the working directory exists
+RUN mkdir -p ${PYTHON_WORKDIR}
+
+# add an entry-point script
+ENV ENTRY_POINT="docker-entrypoint.sh"
+COPY ${ENTRY_POINT} /${ENTRY_POINT}
+RUN chmod 755 /${ENTRY_POINT}
+
+# unset variables that are not needed
+ENV TEMPLATE=
+ENV REQUIREMENTS=
+ENV ENTRY_POINT=
+
+# set the working directory
+WORKDIR ${PYTHON_WORKDIR}
+
+# away we go
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD ["/usr/local/bin/python", "./app.py"]
+
+# EOF

.templates/python/app/app.py

@@ -1 +1,8 @@
-print("hello world")
+import time
+
+print("The world is born. Hello World.", flush=True)
+
+while True:
+
+   time.sleep(10)
+   print("The world is re-born. Hello World.", flush=True)

.templates/python/app/requirements.txt

@@ -89,14 +89,11 @@ def preBuild():
     if not os.path.exists(serviceService):
       os.makedirs(serviceService, exist_ok=True)
 
-    # Files copy
+    # copy supporting files
     shutil.copy(r'%s/Dockerfile' % serviceTemplate, r'%s/Dockerfile' % serviceService)
+    shutil.copy(r'%s/docker-entrypoint.sh' % serviceTemplate, r'%s/docker-entrypoint.sh' % serviceService)
+    shutil.copytree(r'%s/app' % serviceTemplate, r'%s/app' % serviceService)
 
-    print("sudo mkdir -p " + serviceVolume + "/app ")
-    subprocess.call("user=$(whoami) && sudo mkdir -p " + serviceVolume + "/app && sudo chown -R $user:$user " + serviceVolume, shell=True)
-    print("sudo chown -R $user:$user ./volumes/python")
-    shutil.copy(r'%s/app/requirements.txt' % serviceTemplate, r'%s/app/requirements.txt' % serviceVolume)
-    shutil.copy(r'%s/app/app.py' % serviceTemplate, r'%s/app/app.py' % serviceVolume)
     return True
 
   # #####################################

.templates/python/build.py

@@ -0,0 +1,21 @@
+#!/bin/bash
+set -e
+
+# does the working directory exist (something is badly wrong if it does not)
+if [ -d "$PYTHON_WORKDIR" ] ; then
+
+   # are self-healing defaults available?
+   if [ -d "$PYTHON_DEFAULTS" ] ; then
+
+      # yes! replace anything that has gone missing
+      cp -an "$PYTHON_DEFAULTS"/* "$PYTHON_WORKDIR"
+
+   fi
+
+   # set appropriate ownership throughout
+   chown -R "$IOTSTACK_UID:$IOTSTACK_GID" "$PYTHON_WORKDIR"
+
+fi
+
+# start python
+exec "$@"

.templates/python/docker-entrypoint.sh

@@ -2,6 +2,13 @@ python:
   container_name: python
   build: ./services/python/.
   restart: unless-stopped
-  network_mode: host
+  environment:
+    - TZ=Etc/UTC
+    - IOTSTACK_UID=1000
+    - IOTSTACK_GID=1000
+  # ports:
+  #   - "external:internal"
   volumes:
     - ./volumes/python/app:/usr/src/app
+  networks:
+    - iotstack_nw