CHORE: Exposed correct port in docker file

Cicd

See merge request u5500327/wmgzon!1

.env

@@ -0,0 +1,13 @@
+# Environment Variables used to configure WMGZON
+
+# ENVIRON: Used to incidicate the type of environment the app is running in.
+# DEFAULT = prod
+
+ENVIRON=prod
+# ENVIRON=test
+
+# App secret used to encrpy client-side cookies
+APPSECRET=test
+
+# Filestore for product photos
+FILESTORE=static/assets/img/products/

.gitignore

@@ -17,7 +17,6 @@ cicd/runner-data
 instance/*
 !instance/.gitignore
 .webassets-cache
-.env
 
 ### Flask.Python Stack ###
 # Byte-compiled / optimized / DLL files

.gitlab-ci.yml

@@ -1,7 +1,4 @@
 variables:
-    APPSECRET: "test"
-    ENVIRON: "test"
-    FILESTORE: "static/assets/img/products/"
     DOCKER_HOST: tcp://docker:2375/
     DOCKER_DRIVER: overlay2
     DOCKER_TLS_CERTDIR: ""
@@ -19,13 +16,13 @@ deploy:
     stage: deploy
     tags:
         - docker
-    image: docker:20.10.16
+    image: docker:latest
     services:
-        - name: docker:20.10.16-dind
+        - name: docker:dind
           alias: docker
     script:
         - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-        - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA .
+        - docker buildx build --platform linux/amd64 -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA .
         - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
         - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA $CI_REGISTRY_IMAGE:latest
         - docker push $CI_REGISTRY_IMAGE:latest

README.md

@@ -41,3 +41,24 @@ docker-compose up -d
 ```
 
 to run the container in a detatched mode.
+
+
+### Container
+Alternatively, to deploy the app from the lastest published container:
+
+```yml
+version: '3.8'
+
+services:
+  wmgzon:
+    container_name: "wmgzon"
+    image: lukeelse/wmgzon:latest
+    environment:
+      - FILESTORE=static/assets/img/products/
+    tty: true
+    ports:
+      - "8080:8080"
+    volumes:
+      - ./files:/app/$FILESTORE
+    restart: unless-stopped
+```

app.py

@@ -1,5 +1,6 @@
 from flask import Flask
 from os import environ
+from dotenv import load_dotenv
 from controllers.web.endpoints import blueprint
 
 '''
@@ -11,6 +12,7 @@ from controllers.web.endpoints import blueprint
 app: Flask = Flask(__name__)
 
 # Set app secret key to sign session cookies
+load_dotenv()
 secret_key = environ.get("APPSECRET")
 if secret_key is None:
     # NO Secret Key set!

cicd/Deployment/docker-compose.yml

@@ -0,0 +1,13 @@
+version: '3.8'
+
+services:
+  wmgzon:
+    container_name: "wmgzon"
+    image: lukeelse/wmgzon:latest
+    tty: true
+    ports:
+      - "8080:8080"
+    volumes:
+      - ./files:/app/static/assets/img/products/
+      - ./data:/app/data/
+    restart: unless-stopped

docker-compose.yml

@@ -5,14 +5,12 @@ services:
         container_name: "wmgzon"
         build: .
         environment:
-            - APPSECRET=test
             - ENVIRON=test
-            #- ENVIRON=prod
-            - FILESTORE=static/assets/img/products/
         tty: true
         ports:
             - "8080:8080"
+        # Dev container -> Copies complete root directory with latest
+        # code into the container
         volumes:
             - .:/app
         restart: unless-stopped
-        

dockerfile

@@ -4,4 +4,5 @@ WORKDIR /app
 RUN pip install -r requirements.txt
 COPY . /app
 RUN chmod +x scripts/run.bash
-CMD ["bash", "scripts/run.bash"]
+EXPOSE 8080
+ENTRYPOINT ["scripts/run.bash"]

requirements.txt

@@ -24,3 +24,4 @@ virtualenv==20.24.6
 waitress==2.1.2
 Werkzeug==3.0.1
 pycodestyle==2.11.1
+python-dotenv==1.0.1

scripts/run.bash

@@ -1,24 +1,26 @@
-#! /bin/bash
+#!/bin/bash
 pytest --disable-warnings
 python ./scripts/create_database.py
 
+
 EXPECTED_VALUE="test"
 
 if [ -z "$ENVIRON" ]; then
   echo "ENVIRON is not set."
-else
+  echo "Using DEFAULT Environ Value: prod"
-    echo "ENVIRON is set to: $ENVIRON"
 
-  # Trim leading and trailing whitespaces
+  export ENVIRON=prod
-  ACTUAL_VALUE=$(echo "$ENVIRON" | tr -d '[:space:]')
-
-  if [ "$ACTUAL_VALUE" = "$EXPECTED_VALUE" ]; then
-    echo "Launching DEV Server"
-    python ./app.py 
-  else
-    echo "Launching PROD Server"
-    waitress-serve --host 0.0.0.0 app:app
-  fi
 fi
 
+echo "ENVIRON is set to: $ENVIRON"
 
+# Trim leading and trailing whitespaces
+ACTUAL_VALUE=$(echo "$ENVIRON" | tr -d '[:space:]')
+
+if [ "$ACTUAL_VALUE" = "$EXPECTED_VALUE" ]; then
+  echo "Launching DEV Server"
+  python ./app.py 
+else
+  echo "Launching PROD Server"
+  waitress-serve --host 0.0.0.0 app:app
+fi

tests/__init__.py

@@ -1,6 +1,8 @@
 import os
+from dotenv import load_dotenv
 
 # Setup test environment variables
+load_dotenv()
 
 # Capture environment variables at start of testing so we can
 # Monitor current setting during tests