From b8e322d7be2f40b7849f61cc2f9796ed826bddfe Mon Sep 17 00:00:00 2001 From: usr0 Date: Wed, 11 Feb 2026 15:48:55 +0100 Subject: [PATCH] at least now nginx starts. --- dockercompose/docker-compose.yml | 2 ++ dockerfiles/front/Dockerfile | 2 +- dockerfiles/nginx/Dockerfile | 9 ++++++++- index.html | 12 ++++++++++++ nginx.conf | 26 ++++++++++++++++++++++++++ 5 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 index.html diff --git a/dockercompose/docker-compose.yml b/dockercompose/docker-compose.yml index fe98503..f824a3b 100644 --- a/dockercompose/docker-compose.yml +++ b/dockercompose/docker-compose.yml @@ -8,6 +8,7 @@ services: depends_on: - db - etherpad + - back networks: - app-network @@ -18,6 +19,7 @@ services: ports: - "5000:5000" + - "5080:80" volumes: - ../doodlestudent/front:/app environment: diff --git a/dockerfiles/front/Dockerfile b/dockerfiles/front/Dockerfile index 0515c40..9e9b705 100644 --- a/dockerfiles/front/Dockerfile +++ b/dockerfiles/front/Dockerfile @@ -14,7 +14,7 @@ FROM nginx:alpine COPY --from=build /app/dist/tlcfront /usr/share/nginx/html -EXPOSE 80 5000 +EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] diff --git a/dockerfiles/nginx/Dockerfile b/dockerfiles/nginx/Dockerfile index 6cdee7f..3ddb6a3 100644 --- a/dockerfiles/nginx/Dockerfile +++ b/dockerfiles/nginx/Dockerfile @@ -1,2 +1,9 @@ FROM nginx:latest -COPY dockerfiles/nginx/nginx.conf /etc/nginx/conf.d/default.conf \ No newline at end of file + +COPY nginx.conf /etc/nginx/conf.d/default.conf + +COPY index.html /usr/share/nginx/html/ + +EXPOSE 80 + +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/index.html b/index.html new file mode 100644 index 0000000..8c5e31f --- /dev/null +++ b/index.html @@ -0,0 +1,12 @@ + + + + + + yippee + + +

Hello, people!

+

coolz

+ + \ No newline at end of file diff --git a/nginx.conf b/nginx.conf index e69de29..3c9d636 100644 --- a/nginx.conf +++ b/nginx.conf @@ -0,0 +1,26 @@ +server { + listen 80; + server_name _; + + root /usr/share/nginx/html; + index index.html; + + ########################## + # Proxy API requests to the back service + ########################## + location /api/ { + proxy_pass http://back:8080/api/; + 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 / { + try_files $uri $uri/ /index.html; + } +}