rparodi/ft_transcendence
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(infra): reworked everything so that a single docker builds all + made sure everything works

Browse source
This commit is contained in:
Maieul BOYER 2025-07-29 14:01:01 +02:00
parent 68f8d87477
commit 157b06ea4b
7 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nginx/Dockerfile
View file

@ -6,7 +6,7 @@
# By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2025/06/12 16:42:38 by maiboyer #+# #+# #
# Updated: 2025/06/16 21:21:16 by maiboyer ### ########.fr #
# Updated: 2025/07/29 13:58:39 by maiboyer ### ########.fr #
# #
# **************************************************************************** #
@ -22,6 +22,8 @@ RUN \
-keyout /etc/ssl/private/nginx-selfsigned.key \
-out /etc/ssl/certs/nginx-selfsigned.crt \
-subj "/C=FR/OU=student/CN=${NGINX_DOMAIN}"
COPY ./15-local-resolvers.envsh /docker-entrypoint.d/
COPY ./17-add-template-prefix.sh /docker-entrypoint.d/
COPY ./conf /etc/nginx/templates

2
nginx/conf/default.conf
View file

@ -18,8 +18,8 @@ server {
charset UTF-8;
listen [::]:443 ssl;
listen 443 ssl;
server_name $NGINX_DOMAIN;
resolver $NGINX_RESOLVERS;
server_name $NGINX_DOMAIN;
ssl_certificate /etc/ssl/certs/nginx-selfsigned.crt;
ssl_certificate_key /etc/ssl/private/nginx-selfsigned.key;

4
nginx/conf/locations/icons.conf
View file

@ -1,8 +1,10 @@
#forward the post request to the microservice
location /api/icons/set/ {
rewrite ^/api/icons/set/(.*) $1 break;
proxy_pass http://icons-service/set/$uri;
proxy_pass http://icons/set/$uri;
}
#handle the get request with nginx, since it does this well
location /api/icons/get/ {
rewrite ^/api/icons/get/(.*) /$1 break;
root /volumes/icons;