Compare commits

...
Author SHA1 Message Date
marc 0c6e5d29d1 port 80
Docker build test / build-back (push) Canceled after 0s
Docker build test / build-front (push) Canceled after 0s
2022-10-12 04:50:53 +02:00
marc 8b2df44fc3 wrong place 2022-10-06 23:28:07 +02:00
marc 47078b0d9c bypass cors for now 2022-10-06 23:23:45 +02:00
marc df412eb512 s 2022-10-04 15:29:36 +02:00
marc a3ae179ad6 db 2022-10-04 15:28:25 +02:00
marc 5c7b20e374 clean docker-compose.yml 2022-10-04 15:26:24 +02:00
marc 093d45a679 caddy ingress net 2022-10-04 15:08:50 +02:00
2 changed files with 9 additions and 3 deletions
+8 -2
View File
@@ -7,6 +7,8 @@ services:
restart: unless-stopped
ports:
- 3000:80
links:
- mysql:db
depends_on:
- mysql
networks:
@@ -39,12 +41,13 @@ services:
env_file:
- .env
depends_on:
- mysql
- mysql
networks:
caddy:
- caddy
labels:
caddy: api.numeris-isep.fr
caddy.reverse_proxy: "{{upstreams 80}}"
caddy.reverse_proxy.header_down: -Access-Control-Allow-Origin
front:
container_name: numeris_front
@@ -59,9 +62,12 @@ services:
caddy: numeris-isep.fr
caddy.reverse_proxy: "{{upstreams 80}}"
caddy:
image: lucaslorentz/caddy-docker-proxy:ci-alpine
restart: unless-stopped
environment:
CADDY_INGRESS_NETWORKS: caddy
ports:
- "80:80"
- "443:443"
+1 -1
View File
@@ -7,7 +7,7 @@ RUN npm install -g @angular/cli@7.3.9
COPY . .
RUN npm rebuild node-sass
RUN npm run build-prod
ENTRYPOINT [ "ng", "s", "--host", "0.0.0.0" ]
ENTRYPOINT [ "ng", "s", "--host", "0.0.0.0", "--port", "80" ]
FROM nginx
COPY nginx.conf /etc/nginx/conf.d/default.conf