Check in built bundles

.github/workflows/build-images.yaml

@@ -25,10 +25,10 @@ jobs:
 
       - name: Saving Results
         run: |
-          
+
           REPOSITORY_LC=$(echo "$REPOSITORY" | tr '[:upper:]' '[:lower:]')
           GitVersion_FullSemVer_Docker=$(echo "$GitVersion_FullSemVer" | tr '+' '.')
-          
+
           echo "GitVersion_FullSemVer_Docker=$GitVersion_FullSemVer_Docker" >> gitversion.properties
           echo "GitVersion_FullSemVer=$GitVersion_FullSemVer"               >> gitversion.properties
           echo "GitVersion_LegacySemVer=$GitVersion_LegacySemVer"           >> gitversion.properties
@@ -73,9 +73,9 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           cache-from: |
-            thespaghettidetective/web:base-1.13
+            thespaghettidetective/web:base-1.15
             thespaghettidetective/web:base
-            ghcr.io/${{ env.REPOSITORY_LC }}/web:base-1.13
+            ghcr.io/${{ env.REPOSITORY_LC }}/web:base-1.15
             ghcr.io/${{ env.REPOSITORY_LC }}/web:base
           context: backend
           file: backend/Dockerfile.base
@@ -182,4 +182,4 @@ jobs:
           context: ml_api
           file: ml_api/Dockerfile
           push: true
-          tags: ghcr.io/${{ env.REPOSITORY_LC }}/ml:${{ env.GitVersion_FullSemVer_Docker }}
+          tags: ghcr.io/${{ env.REPOSITORY_LC }}/ml:${{ env.GitVersion_FullSemVer_Docker }}

.gitignore

@@ -133,3 +133,5 @@ docker-compose.override.yml
 
 # generated webpack bundle stats for development
 frontend/webpack-stats.json
+
+.idea/

backend/Dockerfile

@@ -1,8 +1,8 @@
-FROM thespaghettidetective/web:base-1.13
+FROM thespaghettidetective/web:base-1.15
 
 WORKDIR /app
 EXPOSE 3334
 
-ADD . /app
 RUN pip install -U pip
+ADD ./ /app
 RUN pip install -r requirements.txt

backend/Dockerfile.base

@@ -1,12 +1,12 @@
-FROM python:3.7.12-alpine3.14
+FROM python:3.10-alpine3.18
 
 ENV DEBIAN_FRONTEND=noninteractive
 
 WORKDIR /app
 EXPOSE 3334
 RUN apk -U add bash vim ffmpeg postgresql-libs git openjpeg tiff
-RUN apk add --virtual .build-deps g++ musl-dev postgresql-dev zlib-dev jpeg-dev libffi-dev openjpeg-dev tiff-dev \
-    patch curl-dev python3-dev libressl-dev build-base freetype-dev lcms2-dev tk-dev tcl-dev  # Needed by /moonraker/scripts/moonraker-requirements.txt
+RUN apk add --virtual .build-deps g++ musl-dev postgresql-dev zlib-dev jpeg-dev libffi-dev openjpeg-dev tiff-dev openblas-dev \
+    patch curl-dev python3-dev build-base freetype-dev lcms2-dev tk-dev tcl-dev  # Needed by /moonraker/scripts/moonraker-requirements.txt
 
 # Checkout moonraker and lock the version so that we can use the metadata parser
 RUN git clone https://github.com/Arksine/moonraker.git /moonraker
@@ -18,8 +18,4 @@ RUN pip install --upgrade pip
 ADD requirements.txt .
 RUN CRYPTOGRAPHY_DONT_BUILD_RUST=1 pip install -r requirements.txt
 
-RUN pip install tornado==6.2.0 inotify-simple==1.3.5
-# Apparent newer version of importlib-metadata will cause django to fail
-RUN pip install importlib-metadata==4.13.0
-
 RUN apk --purge del .build-deps

backend/Pipfile

@@ -0,0 +1,62 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+ipdb = "*"
+django = "==4.0.*"
+gunicorn = "*"
+dj-database-url = "*"
+psycopg2-binary = "*"
+django-allauth = "*"
+django-widget-tweaks = "*"
+djangorestframework = "*"
+django-extensions = "*"
+redis = "*"
+django-simple-history = "*"
+jsonfield = "*"
+newrelic = "*"
+django-settings-export = "*"
+oauth2client = "*"
+authy = "*"
+phonenumbers = "*"
+twilio = "*"
+django-safedelete = "*"
+pillow = "*"
+django-hijack = "*"
+whitenoise = {extras = ["brotli"], version = "*"}
+celery = {extras = ["redis"], version = "*"}
+asgiref = "*"
+"zope.interface" = "*"
+channels = {extras = ["daphne"], version = "*" }
+channels-redis = "*"
+django-jstemplate = "*"
+"pushbullet.py" = "*"
+pytelegrambotapi = "*"
+# Fork of django_channels_presence adds django 4.x compatibility
+# See https://github.com/mitmedialab/django-channels-presence/issues/23
+django-channels-presence = {ref = "24c15f229372a16c7e8d6e160de89f4817d96c3f", git = "https://github.com/TheSpaghettiDetective/django-channels-presence.git"}
+backoff = "*"
+django-webpack-loader = "*"
+django-qr-code = "*"
+discord-webhook = "*"
+bson = "*"
+firebase-admin = "*"
+django-cors-headers = "*"
+pyjwt = "*"
+django-ipware = "*"
+django-redis = "*"
+sentry-sdk = "*"
+nplusone = "*"
+colorlog = "*"
+packaging = "*"
+numpy = "1.26.0"
+django-debug-toolbar = "*"
+inotify-simple = "*"
+Twisted = {extras = ["tls", "http2"], version = "*" }
+
+[dev-packages]
+
+[requires]
+python_version = "3.10"