From e25e03d091a0c6285e9acd37f2fd2fc5281eed2b Mon Sep 17 00:00:00 2001 From: Hoan Nguyen Date: Thu, 29 Aug 2024 14:05:39 +0700 Subject: [PATCH] Fix nginx forward protocol Sync version for package json lock --- marketplace-build/config/nginx/nginx.conf | 2 ++ marketplace-build/release/docker-compose.yml | 2 ++ marketplace-ui/package-lock.json | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/marketplace-build/config/nginx/nginx.conf b/marketplace-build/config/nginx/nginx.conf index 8eb6752b6..72347419b 100644 --- a/marketplace-build/config/nginx/nginx.conf +++ b/marketplace-build/config/nginx/nginx.conf @@ -17,6 +17,8 @@ http { location /marketplace-service { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-NginX-Proxy true; proxy_pass http://service:8080/marketplace-service; proxy_ssl_session_reuse off; diff --git a/marketplace-build/release/docker-compose.yml b/marketplace-build/release/docker-compose.yml index a878ae57b..afb6b5825 100644 --- a/marketplace-build/release/docker-compose.yml +++ b/marketplace-build/release/docker-compose.yml @@ -17,6 +17,8 @@ services: ui: image: ghcr.io/axonivy-market/marketplace-ui:${RELEASE_VERSION} + volumes: + - ../config/nginx/nginx.conf:/etc/nginx/nginx.conf restart: always ports: - "80:80" diff --git a/marketplace-ui/package-lock.json b/marketplace-ui/package-lock.json index 387dcdd81..d5ba90e32 100644 --- a/marketplace-ui/package-lock.json +++ b/marketplace-ui/package-lock.json @@ -1,12 +1,12 @@ { "name": "marketplace-ui", - "version": "0.0.0", + "version": "1.0.0-SNAPSHOT", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "marketplace-ui", - "version": "0.0.0", + "version": "1.0.0-SNAPSHOT", "dependencies": { "@angular/animations": "^18.1.2", "@angular/common": "^18.1.2",