Using apache as foward (not serving files)

This commit is contained in:
Marc Ducobu
2021-05-31 22:12:38 +02:00
parent c501700bc4
commit ef3766ae1c
7 changed files with 144 additions and 60 deletions

View File

@@ -28,11 +28,17 @@ services:
- ./patches/settings.ini:/home/appuser/citizen/config/settings.ini
- ./patches/frontend/src/conf:/home/appuser/citizen/frontend/src/conf
- ./patches/frontend/src/assets:/home/appuser/citizen/frontend/src/assets
- ./dist/browser:/home/appuser/citizen/frontend/dist/browser
- ./patches/frontend/server.ts:/home/appuser/citizen/frontend/server.ts
- ./dist:/home/appuser/citizen/frontend/dist
# re files installed by npm install
- ./node_modules:/home/appuser/citizen/frontend/node_modules
ports:
- "4000:4000"
- "4200:4200"
command: npm run serve:ssr
environment:
# avoid goodle analytics question
- "NG_CLI_ANALYTICS=false"
citizen-back:
build:
dockerfile: ./Dockerfile-back
@@ -67,9 +73,7 @@ services:
apache:
build:
context: ./apache
dockerfile: ./Dockerfile
image: registry.gitlab.com/champs-libres/geonature-citizen/apache
ports:
- "8080:80"
volumes:
- ./dist/browser:/home/appuser/citizen/frontend/dist/browser
- ./apache/my-httpd.conf /usr/local/apache2/conf/httpd.conf