Fix/docker variables (#201)

Updated docker to use some variables

Author: TreyWW

.github/workflows/run_tests.yml

@@ -59,8 +59,11 @@ jobs:
       #       run docker compose & tests
       #----------------------------------------------
       - name: Build and run docker-compose.ci.yml
-        run: docker compose up -d --wait --wait-timeout 30
+        run: |
+          export TESTING=true
+          docker compose up -d --wait --wait-timeout 30
 
       - name: Run the test scripts
         run: |
+          export TESTING=true
           docker compose exec -T myfinances_django ./infrastructure/backend/scripts/tests/views.sh

infrastructure/backend/Dockerfile

@@ -11,15 +11,34 @@ WORKDIR /MyFinances
 
 COPY . .
 
-RUN apk --no-cache --update add \
-    mariadb-connector-c-dev \
-    py-pip \
-    musl-dev \
-    gcc \
-    mariadb-dev \
-    libffi-dev
-
-RUN poetry install --without dev,mysql --no-root && rm -rf $POETRY_CACHE_DIR
+#RUN #apk --no-cache --update add \
+#    mariadb-connector-c-dev \
+#    py-pip \
+#    musl-dev \
+#    gcc \
+#    mariadb-dev \
+#    libffi-dev
+
+
+# Install build dependencies
+RUN apk add --no-cache --virtual .build-deps py-pip musl-dev gcc
+
+# Install MySQL dependencies and packages if DATABASE_TYPE is mysql
+RUN if [ "${DATABASE_TYPE}" = "mysql" ]; then \
+        apk add --no-cache mariadb-dev && \
+        poetry install --only mysql; \
+    fi
+
+# Install PostgreSQL dependencies and packages if TESTING is not true or DATABASE_TYPE is postgres
+RUN if [ "${TESTING}" != "true" ] || [ "${DATABASE_TYPE}" = "postgres" ]; then \
+        apk add --no-cache postgresql-dev && \
+        poetry install --only postgres; \
+    fi
+
+# Clean up build dependencies
+RUN apk del .build-deps
+
+RUN poetry install --without dev,mysql,postgres --no-root && rm -rf $POETRY_CACHE_DIR
 
 RUN chmod +x infrastructure/backend/scripts/*
 RUN chmod +x infrastructure/backend/scripts/tests/*

infrastructure/backend/docker-compose.ci.yml

@@ -16,4 +16,4 @@ services:
       PROXY_IP: "localhost"
       BRANCH: "debug"
       DEBUG: "true"
-      DATABASE_TYPE: "sqlite3"
+      DATABASE_TYPE: "sqlite3"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "myfinances",
-  "version": "0.1.2",
+  "version": "0.2.1",
   "description": "",
   "main": "index.js",
   "scripts": {

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "MyFinances"
-version = "0.1.1"
+version = "0.2.1"
 description = "github.com/TreyWW/MyFinances"
 authors = []
 readme = "README.md"

pyproject.toml

@@ -32,9 +32,13 @@
         "HOST": os.environ.get("DATABASE_HOST") or "localhost",
         "PORT": os.environ.get("DATABASE_PORT")
         or (3306 if DB_TYPE == "mysql" else 5432),
-        "OPTIONS": {
-            "sql_mode": "traditional",
-        },
+        "OPTIONS": (
+            {
+                "sql_mode": "traditional",
+            }
+            if DB_TYPE == "mysql"
+            else {}
+        ),
     }
 }