IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Friedland 2021-12-12 11:06:59 +01:00 committed by GitHub
commit 1180f28d21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
database/Dockerfile
View File

@ -1,7 +1,7 @@
################################################################################## ##################################################################################
# BASE ########################################################################### # 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) # 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 ## 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" ENV BUILD_COMMIT="0000000"
## SET NODE_ENV ## SET NODE_ENV
ENV NODE_ENV="production" ENV NODE_ENV="production"
## App relevant Envs
#ENV PORT="4000"
# Labels # Labels
LABEL org.label-schema.build-date="${BUILD_DATE}" LABEL org.label-schema.build-date="${BUILD_DATE}"
@ -34,10 +32,6 @@ LABEL maintainer="support@gradido.net"
## install: git ## install: git
#RUN apk --no-cache add git #RUN apk --no-cache add git
# Settings
## Expose Container Port
# EXPOSE ${PORT}
## Workdir ## Workdir
RUN mkdir -p ${DOCKER_WORKDIR} RUN mkdir -p ${DOCKER_WORKDIR}
WORKDIR ${DOCKER_WORKDIR} WORKDIR ${DOCKER_WORKDIR}
@ -99,7 +93,7 @@ FROM base as production
# Copy "binary"-files from build image # Copy "binary"-files from build image
COPY --from=build ${DOCKER_WORKDIR}/build ./build COPY --from=build ${DOCKER_WORKDIR}/build ./build
# We also copy the node_modules express and serve-static for the run script # 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 static files
# COPY --from=build ${DOCKER_WORKDIR}/public ./public # COPY --from=build ${DOCKER_WORKDIR}/public ./public
# Copy package.json for script definitions (lock file should not be needed) # Copy package.json for script definitions (lock file should not be needed)

3
docker-compose.override.yml
View File

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

4
docker-compose.yml
View File

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