Merge branch 'develop'

.github/workflows/docker-publish-latest.yml

@@ -39,6 +39,5 @@ jobs:
           publish: true
           imageName: vabene1111/recipes
           tag: latest
-          platform: linux/amd64,linux/arm64
           dockerUser: ${{ secrets.DOCKER_USERNAME }}
           dockerPassword: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/docker-publish-release.yml

@@ -41,7 +41,6 @@ jobs:
           publish: true
           imageName: vabene1111/recipes
           tag: ${{ steps.get_version.outputs.VERSION }}
-          platform: linux/amd64,linux/arm64
           dockerUser: ${{ secrets.DOCKER_USERNAME }}
           dockerPassword: ${{ secrets.DOCKER_PASSWORD }}
       # Send discord notification

Dockerfile

@@ -15,13 +15,12 @@ WORKDIR /opt/recipes
 
 COPY requirements.txt ./
 
-RUN sed -i '/cryptography==/d' ./requirements.txt
-
-RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev libressl-dev python3-dev libffi-dev cargo openldap-dev && \
+RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-dev jpeg-dev libwebp-dev libressl-dev libffi-dev cargo openssl-dev openldap-dev python3-dev && \
     echo -n "INPUT ( libldap.so )" > /usr/lib/libldap_r.so && \
     python -m venv venv && \
     /opt/recipes/venv/bin/python -m pip install --upgrade pip && \
     venv/bin/pip install wheel==0.37.1 && \
+    venv/bin/pip install setuptools_rust==1.1.2 && \
     venv/bin/pip install -r requirements.txt --no-cache-dir &&\
     apk --purge del .build-deps
 

boot.sh

@@ -21,18 +21,23 @@ if [ -z "${SECRET_KEY}" ]; then
     display_warning "The environment variable 'SECRET_KEY' is not set but REQUIRED for running Tandoor!"
 fi
 
-# POSTGRES_PASSWORD must be set in .env file
-if [ -z "${POSTGRES_PASSWORD}" ]; then
-    display_warning "The environment variable 'POSTGRES_PASSWORD' is not set but REQUIRED for running Tandoor!"
-fi
 
 echo "Waiting for database to be ready..."
 
 attempt=0
 max_attempts=20
-while pg_isready --host=${POSTGRES_HOST} -q; status=$?; attempt=$((attempt+1)); [ $status -ne 0 ] && [ $attempt -le $max_attempts ]; do
-    sleep 5
-done
+
+if [ "${DB_ENGINE}" != 'django.db.backends.sqlite3' ]; then
+
+  # POSTGRES_PASSWORD must be set in .env file
+  if [ -z "${POSTGRES_PASSWORD}" ]; then
+      display_warning "The environment variable 'POSTGRES_PASSWORD' is not set but REQUIRED for running Tandoor!"
+  fi
+
+  while pg_isready --host=${POSTGRES_HOST} -q; status=$?; attempt=$((attempt+1)); [ $status -ne 0 ] && [ $attempt -le $max_attempts ]; do
+      sleep 5
+  done
+fi
 
 if [ $attempt -gt $max_attempts ]; then
     echo -e "\nDatabase not reachable. Maximum attempts exceeded."

vue/src/components/MealPlanEditModal.vue

@@ -206,7 +206,7 @@ export default {
             }
             if (!cancel) {
                 this.$bvModal.hide(`edit-modal`)
-                this.$emit("save-entry", { ...this.mealplan_settings, ...this.entryEditing, ...{ addshopping: this.entryEditing.addshopping && !this.autoMealPlan } })
+                this.$emit("save-entry", { ...this.mealplan_settings, ...this.entryEditing, ...{ addshopping: this.mealplan_settings.addshopping && !this.autoMealPlan } })
             }
         },
         deleteEntry() {