vuminh224/projet-tlc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix etherpad injoignable

Browse Source
This commit is contained in:
Alexandre Chevalier
2026-02-12 16:19:35 +01:00
parent 2c1b591fa6
commit 06e7275682
6 changed files with 20 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dockerfiles/back/DockerfileUsingApiNative
View File

@@ -29,10 +29,12 @@ RUN chown 1001 /work \
EXPOSE 8080
USER 1001
#ENV quarkus_datasource_jdbc_url "jdbc:mysql://db:3306/tlc?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true&serverTimezone=Europe/Paris"
ENV quarkus_datasource_jdbc_url "jdbc:mysql://db:3306/tlc?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&createDatabaseIfNotExist=true&serverTimezone=Europe/Paris"
ENV quarkus_datasource_username tlc
ENV quarkus_datasource_password tlc
ENV QUARKUS_HIBERNATE_ORM_DATABASE_GENERATION update
ENV doodle_internalPadUrl "http://etherpad:9001/"
ENV doodle_externalPadUrl "http://etherpad:9001/"
ENV mailer_host mail
ENV mailer_port 25
CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]

33
dockerfiles/front/nginx.conf
View File

@@ -1,33 +0,0 @@
server {
listen 80;
server_name _;
root /usr/share/nginx/html;
index index.html;
# Proxy /api and all subpaths to backend service (back container on port 8080)
location /api/ {
proxy_pass http://back:8080/api/;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_http_version 1.1;
proxy_set_header Connection "";
}
# Also handle /api without trailing slash
location = /api {
proxy_pass http://back:8080/api;
}
# SPA fallback for client-side routing
location / {
try_files $uri $uri/ /index.html;
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /usr/share/nginx/html;
}
}

2
dockerfiles/nginx/Dockerfile
View File

@@ -1,6 +1,6 @@
FROM nginx:latest
COPY nginxFront.conf /etc/nginx/conf.d/default.conf
COPY nginx.conf /etc/nginx/conf.d/default.conf
COPY index.html /usr/share/nginx/html/

75
dockerfiles/nginx/nginx.conf
View File

@@ -1,75 +0,0 @@
##########################
## FRONTEND + API
##########################
server {
listen 80;
listen [::]:80;
server_name _;
root /usr/share/nginx/html;
index index.html;
##########################
# Proxy API requests to the back service
##########################
location /api/polls {
proxy_pass http://back:8080/;
proxy_http_version 1.1;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Connection "";
}
##########################
# FrontEnd returns
##########################
location / {
proxy_pass http://front:5080;
proxy_http_version 1.1;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Connection "";
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /usr/share/nginx/html;
}
}
##
## BACKEND
##
server {
listen 80;
listen [::]:80;
server_name _;
location / {
proxy_pass http://back:8080;
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
}
}
##
## ETHERPAD
##
server {
listen 80;
listen [::]:80;
server_name _;
location / {
proxy_pass http://etherpad:9001;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr;
}
}