Merge pull request #547 from MetaCell/feature/546

CloudHarness Django & FastAPI images fixes
MetaCell · Aug 10, 2022 · 81c7185 · 81c7185
2 parents 7467b39 + ec408f0
commit 81c7185
Show file tree

Hide file tree

Showing 47 changed files with 19 additions and 695 deletions.
diff --git a/infrastructure/common-images/cloudharness-django-debian/Dockerfile b/infrastructure/common-images/cloudharness-django-debian/Dockerfile
diff --git a/infrastructure/common-images/cloudharness-django-debian/README.md b/infrastructure/common-images/cloudharness-django-debian/README.md
diff --git a/infrastructure/common-images/cloudharness-django/Dockerfile b/infrastructure/common-images/cloudharness-django/Dockerfile
@@ -1,5 +1,5 @@
-ARG CLOUDHARNESS_BASE
-FROM $CLOUDHARNESS_BASE
+ARG CLOUDHARNESS_BASE_DEBIAN
+FROM $CLOUDHARNESS_BASE_DEBIAN
 
 ENV MODULE_NAME=backend
 ENV PORT=8080
@@ -8,11 +8,14 @@ ENV APP_DIR=/usr/src/app
 
 ENV PRODUCTION=true
 
-COPY libraries/cloudharness-django /libraries/cloudharness-django
+RUN  apt install -y libjpeg-dev zlib1g-dev git
+
+RUN  python3 -m pip install --upgrade pip
+
 COPY libraries/fastapi/requirements.txt /tmp
 
-RUN  apk add jpeg-dev zlib-dev git && \
-     python3 -m pip install --upgrade pip && \
-     python3 -m pip install -r /tmp/requirements.txt && \
-     python3 -m pip install -e /libraries/cloudharness-django --no-cache-dir --upgrade && \
+RUN  python3 -m pip install -r /tmp/requirements.txt && \
      rm /tmp/requirements.txt
+
+COPY libraries/cloudharness-django /libraries/cloudharness-django
+RUN  python3 -m pip install -e /libraries/cloudharness-django --no-cache-dir --upgrade
diff --git a/infrastructure/common-images/cloudharness-django/README.md b/infrastructure/common-images/cloudharness-django/README.md
@@ -1,3 +1,3 @@
-# CloudHarness-Django Base image
+# CloudHarness-Django Base Debian image
 
 Use this image to bring the package cloudharness-django into your image.
diff --git a/libraries/cloudharness-django/LICENSE → ...ngo/libraries/cloudharness-django/LICENSE b/libraries/cloudharness-django/LICENSE → ...ngo/libraries/cloudharness-django/LICENSE
diff --git a/libraries/cloudharness-django/MANIFEST.in → ...libraries/cloudharness-django/MANIFEST.in b/libraries/cloudharness-django/MANIFEST.in → ...libraries/cloudharness-django/MANIFEST.in
diff --git a/...ness-django/cloudharness_django/README.md → ...ness-django/cloudharness_django/README.md b/...ness-django/cloudharness_django/README.md → ...ness-django/cloudharness_django/README.md
diff --git a/...build/lib/cloudharness_django/__init__.py → ...ss-django/cloudharness_django/__init__.py b/...build/lib/cloudharness_django/__init__.py → ...ss-django/cloudharness_django/__init__.py
diff --git a/...go/build/lib/cloudharness_django/admin.py → ...rness-django/cloudharness_django/admin.py b/...go/build/lib/cloudharness_django/admin.py → ...rness-django/cloudharness_django/admin.py
diff --git a/...ngo/build/lib/cloudharness_django/apps.py → ...arness-django/cloudharness_django/apps.py b/...ngo/build/lib/cloudharness_django/apps.py → ...arness-django/cloudharness_django/apps.py
diff --git a/...ild/lib/cloudharness_django/exceptions.py → ...-django/cloudharness_django/exceptions.py b/...ild/lib/cloudharness_django/exceptions.py → ...-django/cloudharness_django/exceptions.py
diff --git a/...-django/cloudharness_django/middleware.py → ...-django/cloudharness_django/middleware.py b/...-django/cloudharness_django/middleware.py → ...-django/cloudharness_django/middleware.py
diff --git a/...harness_django/migrations/0001_initial.py → ...harness_django/migrations/0001_initial.py b/...harness_django/migrations/0001_initial.py → ...harness_django/migrations/0001_initial.py
diff --git a/...loudharness_django/migrations/__init__.py → ...loudharness_django/migrations/__init__.py b/...loudharness_django/migrations/__init__.py → ...loudharness_django/migrations/__init__.py
diff --git a/...o/build/lib/cloudharness_django/models.py → ...ness-django/cloudharness_django/models.py b/...o/build/lib/cloudharness_django/models.py → ...ness-django/cloudharness_django/models.py
diff --git a/.../cloudharness_django/services/__init__.py → .../cloudharness_django/services/__init__.py b/.../cloudharness_django/services/__init__.py → .../cloudharness_django/services/__init__.py
diff --git a/.../lib/cloudharness_django/services/auth.py → ...ango/cloudharness_django/services/auth.py b/.../lib/cloudharness_django/services/auth.py → ...ango/cloudharness_django/services/auth.py
diff --git a/...go/cloudharness_django/services/events.py → ...go/cloudharness_django/services/events.py b/...go/cloudharness_django/services/events.py → ...go/cloudharness_django/services/events.py
diff --git a/.../lib/cloudharness_django/services/user.py → ...ango/cloudharness_django/services/user.py b/.../lib/cloudharness_django/services/user.py → ...ango/cloudharness_django/services/user.py
diff --git a/...build/lib/cloudharness_django/settings.py → ...ss-django/cloudharness_django/settings.py b/...build/lib/cloudharness_django/settings.py → ...ss-django/cloudharness_django/settings.py
diff --git a/...go/build/lib/cloudharness_django/tests.py → ...rness-django/cloudharness_django/tests.py b/...go/build/lib/cloudharness_django/tests.py → ...rness-django/cloudharness_django/tests.py
diff --git a/...go/build/lib/cloudharness_django/views.py → ...rness-django/cloudharness_django/views.py b/...go/build/lib/cloudharness_django/views.py → ...rness-django/cloudharness_django/views.py
diff --git a/libraries/cloudharness-django/pyproject.toml → ...raries/cloudharness-django/pyproject.toml b/libraries/cloudharness-django/pyproject.toml → ...raries/cloudharness-django/pyproject.toml
diff --git a/libraries/cloudharness-django/setup.cfg → ...o/libraries/cloudharness-django/setup.cfg b/libraries/cloudharness-django/setup.cfg → ...o/libraries/cloudharness-django/setup.cfg
diff --git a/libraries/cloudharness-django/setup.py → ...go/libraries/cloudharness-django/setup.py b/libraries/cloudharness-django/setup.py → ...go/libraries/cloudharness-django/setup.py
diff --git a/libraries/fastapi/requirements.txt → ...django/libraries/fastapi/requirements.txt b/libraries/fastapi/requirements.txt → ...django/libraries/fastapi/requirements.txt
diff --git a/infrastructure/common-images/cloudharness-fastapi-debian/Dockerfile b/infrastructure/common-images/cloudharness-fastapi-debian/Dockerfile
diff --git a/infrastructure/common-images/cloudharness-fastapi-debian/README.md b/infrastructure/common-images/cloudharness-fastapi-debian/README.md
diff --git a/infrastructure/common-images/cloudharness-fastapi/Dockerfile b/infrastructure/common-images/cloudharness-fastapi/Dockerfile
@@ -1,5 +1,5 @@
-ARG CLOUDHARNESS_BASE
-FROM $CLOUDHARNESS_BASE
+ARG CLOUDHARNESS_BASE_DEBIAN
+FROM $CLOUDHARNESS_BASE_DEBIAN
 
 ENV MODULE_NAME=backend
 ENV PORT=8080
@@ -8,5 +8,5 @@ ENV APP_DIR=/usr/src/app
 
 COPY libraries/fastapi/requirements.txt /tmp
 RUN  python3 -m pip install --upgrade pip && \
-     python3 -m pip install -r /tmp/requirements.txt && \
+     python3 -m pip install -r /tmp/requirements.txt --no-cache-dir && \
      rm /tmp/requirements.txt
diff --git a/infrastructure/common-images/cloudharness-fastapi/README.md b/infrastructure/common-images/cloudharness-fastapi/README.md
@@ -1,3 +1,3 @@
-# CloudHarness-FastAPI Base image
+# CloudHarness-FastAPI Base Debian image
 
 Use this image for FastAPI based microservices.
diff --git a/infrastructure/common-images/cloudharness-fastapi/libraries/fastapi/requirements.txt b/infrastructure/common-images/cloudharness-fastapi/libraries/fastapi/requirements.txt
@@ -0,0 +1,3 @@
+fastapi==0.77.1
+fastapi-code-generator==0.3.5
+uvicorn==0.17.6
diff --git a/libraries/cloudharness-django/build/lib/cloudharness_django/middleware.py b/libraries/cloudharness-django/build/lib/cloudharness_django/middleware.py
diff --git a/libraries/cloudharness-django/build/lib/cloudharness_django/services/events.py b/libraries/cloudharness-django/build/lib/cloudharness_django/services/events.py
diff --git a/libraries/cloudharness-django/cloudharness_django/__init__.py b/libraries/cloudharness-django/cloudharness_django/__init__.py
diff --git a/libraries/cloudharness-django/cloudharness_django/admin.py b/libraries/cloudharness-django/cloudharness_django/admin.py
diff --git a/libraries/cloudharness-django/cloudharness_django/apps.py b/libraries/cloudharness-django/cloudharness_django/apps.py
diff --git a/libraries/cloudharness-django/cloudharness_django/exceptions.py b/libraries/cloudharness-django/cloudharness_django/exceptions.py
diff --git a/libraries/cloudharness-django/cloudharness_django/migrations/0001_initial.py b/libraries/cloudharness-django/cloudharness_django/migrations/0001_initial.py
diff --git a/libraries/cloudharness-django/cloudharness_django/migrations/__init__.py b/libraries/cloudharness-django/cloudharness_django/migrations/__init__.py
diff --git a/libraries/cloudharness-django/cloudharness_django/models.py b/libraries/cloudharness-django/cloudharness_django/models.py