Merge pull request #58 from ScilifelabDataCentre/updates

Updates
ScilifelabDataCentre · Jul 2, 2023 · 1301ded · 1301ded
2 parents 64bfeb6 + fc32092
commit 1301ded
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/Dockerfiles/Dockerfile.backend b/Dockerfiles/Dockerfile.backend
@@ -2,7 +2,7 @@ FROM python:3.11-alpine AS base
 
 RUN apk update && apk upgrade && apk add build-base
 
-LABEL org.opencontainers.image.description "Menu aggregator - backend (Fastapi instead of Flask)"
+LABEL org.opencontainers.image.description "The backend part of the SciLifeLab lunch menu aggregator."
 
 RUN mkdir /code
 COPY ./backend/requirements.txt /code/
@@ -30,4 +30,4 @@ ARG version
 ENV VERSION=$version
 EXPOSE 8000
 
-USER 10000
+USER 10000
diff --git a/Dockerfiles/Dockerfile.frontend b/Dockerfiles/Dockerfile.frontend
@@ -1,9 +1,7 @@
-FROM node:18-alpine as base
+FROM node:20-alpine as base
 
 RUN yarn global add @quasar/cli
 
-LABEL org.opencontainers.image.description "Menu aggregator - frontend"
-
 COPY ./frontend/package.json /package.json
 COPY ./frontend/yarn.lock /yarn.lock
 WORKDIR /
@@ -22,9 +20,16 @@ RUN quasar build
 
 FROM nginxinc/nginx-unprivileged:alpine as production
 
+LABEL org.opencontainers.image.description "The frontend part of the SciLifeLab menu aggregator."
+
+USER root
+RUN apk update && apk upgrade
+
 COPY --from=build /code/dist/spa/ /usr/share/nginx/html/
 COPY ./Dockerfiles/nginx.conf /etc/nginx/conf.d/default.conf
 
+USER nginx
+
 EXPOSE 8080
 
 

diff --git a/frontend/src/store/main/mutations.js b/frontend/src/store/main/mutations.js
@@ -1,5 +1,6 @@
 export function updateRestaurants (state, payload) {
-  state.restaurants = payload;
+  if(typeof payload !== "undefined")
+    state.restaurants = payload;
 }
 
 export function updateRegion (state, payload) {