diff --git a/.env b/.env index 0f2c98b0..87221c0f 100644 --- a/.env +++ b/.env @@ -3,5 +3,6 @@ MY_PATH_API_MY_LIB=http://172.17.0.1:8090 KEYCLOAK_URL= KEYCLOAK_REALM=aiod KEYCLOAK_CLIENT_ID=marketplace -MY_PATH_MARKETPLACE= +MY_PATH_MARKETPLACE=http://mylibrary-nginx-frontend:80/ +NGINX_PORT= #ML_REDIRECT_URI=mylibrary/ #must end with / \ No newline at end of file diff --git a/docker-compose-proxy.yml b/docker-compose-proxy.yml deleted file mode 100644 index 6e8ff7cf..00000000 --- a/docker-compose-proxy.yml +++ /dev/null @@ -1,34 +0,0 @@ -version: '3.8' - -services: - nginx: - image: nginx:1.25.5 - container_name: nginx - restart: unless-stopped - env_file: - - .env - environment: - MY_PATH_API_AIOD_CATALOGUE: ${MY_PATH_API_AIOD_CATALOGUE} - MY_PATH_API_MY_LIB: ${MY_PATH_API_MY_LIB} - MY_PATH_MARKETPLACE: ${MY_PATH_MARKETPLACE} - volumes: - - ./docker/marketplace/script.sh:/etc/nginx/script.sh - - ./docker/nginx/nginx-proxy-prod.conf.template:/etc/nginx/templates/default.conf.template - ports: - - 9092:80 - - mylibrary-nginx-frontend: - container_name: mylibrary-nginx-frontend - build: - context: . - dockerfile: docker/marketplace/prod/Dockerfile - env_file: - - .env - environment: - MY_PATH_API_AIOD_CATALOGUE: ${MY_PATH_API_AIOD_CATALOGUE} - MY_PATH_API_MY_LIB: ${MY_PATH_API_MY_LIB} - KEYCLOAK_URL: ${KEYCLOAK_URL} - KEYCLOAK_REALM: ${KEYCLOAK_REALM} - KEYCLOAK_CLIENT_ID: ${KEYCLOAK_CLIENT_ID} - ports: - - 9094:80 \ No newline at end of file diff --git a/docker-compose-redirect.yml b/docker-compose-redirect.yml index 78f3eaf1..cec84bb2 100644 --- a/docker-compose-redirect.yml +++ b/docker-compose-redirect.yml @@ -13,7 +13,7 @@ services: - ./docker/marketplace/script.sh:/etc/nginx/script.sh - ./docker/nginx/nginx-redirect-prod.conf.template:/etc/nginx/templates/default.conf.template ports: - - 80:80 + - ${NGINX_PORT}:80 mylibrary-nginx-frontend: container_name: mylibrary-nginx-frontend diff --git a/docker/nginx/nginx-proxy-prod.conf.template b/docker/nginx/nginx-proxy-prod.conf.template deleted file mode 100644 index 2f7effeb..00000000 --- a/docker/nginx/nginx-proxy-prod.conf.template +++ /dev/null @@ -1,34 +0,0 @@ -server { - listen 80; - server_name ""; - location /api-library/ { - rewrite ^/api-library/(.*) /$1 break; - proxy_pass ${MY_PATH_API_MY_LIB}; - proxy_redirect off; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - proxy_ssl_server_name on; - proxy_hide_header 'access-control-allow-origin'; - proxy_hide_header 'access-control-allow-Methods'; - } - location /api-metadata/ { - rewrite ^/api-metadata/(.*) /$1 break; - proxy_pass ${MY_PATH_API_AIOD_CATALOGUE}; - proxy_redirect off; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - proxy_ssl_server_name on; - proxy_hide_header 'access-control-allow-origin'; - proxy_hide_header 'access-control-allow-Methods'; - } - location / { - proxy_pass ${MY_PATH_MARKETPLACE}; - 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 http; - proxy_buffer_size 12k; - } -} \ No newline at end of file diff --git a/docker/nginx/nginx-redirect-prod.conf.template b/docker/nginx/nginx-redirect-prod.conf.template index 33532e91..513000bd 100644 --- a/docker/nginx/nginx-redirect-prod.conf.template +++ b/docker/nginx/nginx-redirect-prod.conf.template @@ -25,7 +25,7 @@ server { } location /${ML_REDIRECT_URI} { - proxy_pass "http://mylibrary-nginx-frontend:80/"; + proxy_pass ${MY_PATH_MARKETPLACE}; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;