Compare commits

..
Author SHA1 Message Date
marc 3d488c4b93 numerisisep
Docker build test / build-back (push) Canceled after 0s
Docker build test / build-front (push) Canceled after 0s
2022-10-12 10:00:55 +02:00
marc 0c84e17f8b fix dockerhub 2022-10-12 05:36:49 +02:00
marc 86527485a9 connection upgrade 2022-10-12 05:29:18 +02:00
marc cc37495dd6 fix-nginx 2022-10-12 05:27:59 +02:00
4 changed files with 10 additions and 3 deletions
+2
View File
@@ -30,6 +30,7 @@ services:
- ./var/mysql:/var/lib/mysql
back:
image: numerisisep/numeris-back
container_name: numeris_back
restart: unless-stopped
build:
@@ -50,6 +51,7 @@ services:
caddy.reverse_proxy.header_down: -Access-Control-Allow-Origin
front:
image: numerisisep/numeris-back
container_name: numeris_front
build:
context: ./front
+2 -2
View File
@@ -23,7 +23,7 @@ services:
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
back:
image: numeris-back
image: numerisisep/numeris-back
container_name: numeris_back
restart: unless-stopped
build:
@@ -44,7 +44,7 @@ services:
- mysql
front:
image: numeris-front
image: numerisisep/numeris-front
container_name: numeris_front
restart: unless-stopped
build:
+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", "--port", "80" ]
ENTRYPOINT [ "ng", "s", "--host", "0.0.0.0" ]
FROM nginx
COPY nginx.conf /etc/nginx/conf.d/default.conf
+5
View File
@@ -15,5 +15,10 @@ server {
location / {
try_files $uri $uri/ /index.html =404;
proxy_pass http://api.numeris-isep.fr;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
proxy_set_header Host $host;
}
}