Merge branch 'master' into 533-Refactor-menu-remove-tim

database/Dockerfile

@@ -1,7 +1,7 @@
 ##################################################################################
 # BASE ###########################################################################
 ##################################################################################
-FROM node:12.19.0-alpine3.10 as base
+FROM node:17-alpine as base
 
 # ENVs (available in production aswell, can be overwritten by commandline or env file)
 ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame
@@ -14,8 +14,6 @@ ENV BUILD_VERSION="0.0.0.0"
 ENV BUILD_COMMIT="0000000"
 ## SET NODE_ENV
 ENV NODE_ENV="production"
-## App relevant Envs
-#ENV PORT="4000"
 
 # Labels
 LABEL org.label-schema.build-date="${BUILD_DATE}"
@@ -34,10 +32,6 @@ LABEL maintainer="support@gradido.net"
 ## install: git
 #RUN apk --no-cache add git
 
-# Settings
-## Expose Container Port
-# EXPOSE ${PORT}
-
 ## Workdir
 RUN mkdir -p ${DOCKER_WORKDIR}
 WORKDIR ${DOCKER_WORKDIR}
@@ -99,7 +93,7 @@ FROM base as production
 # Copy "binary"-files from build image
 COPY --from=build ${DOCKER_WORKDIR}/build ./build
 # We also copy the node_modules express and serve-static for the run script
- COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
+COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
 # Copy static files
 # COPY --from=build ${DOCKER_WORKDIR}/public ./public
 # Copy package.json for script definitions (lock file should not be needed)

docker-compose.override.yml

@@ -68,9 +68,6 @@ services:
     image: gradido/database:test_up
     build:
       target: test_up
-    #networks:
-    #  - external-net
-    #  - internal-net
     environment:
       - NODE_ENV="development"
     volumes:

docker-compose.yml

@@ -116,12 +116,10 @@ services:
       - mariadb
     networks:
       - internal-net
-    #ports:
-    #  - 4000:4000
+      - external-net # this is required to fetch the packages
     environment:
       # Envs used in Dockerfile
       # - DOCKER_WORKDIR="/app"
-      # - PORT=4000
       - BUILD_DATE
       - BUILD_VERSION
       - BUILD_COMMIT