fix: some deploy changes

This commit is contained in:
skeris 2023-05-06 21:18:00 +03:00
parent b4ab84c445
commit de5c18b128
3 changed files with 21704 additions and 2 deletions

@ -6,8 +6,8 @@ build-hub:
build-templategen: build-templategen:
docker compose up --force-recreate --no-deps -d docs docker compose up --force-recreate --no-deps -d docs
build-proxy: build-proxy:
docker context use phub docker context use hub
docker build -f ./Proxy -t nginx-proxy . docker build -f ./Proxy -t nginx-proxy .
docker compose up --force-recreate --no-deps -d router docker-compose up --force-recreate --no-deps -d router
deploy: deploy:
docker compose up -d docker compose up -d

@ -5,12 +5,21 @@ server {
server_name _; # managed by Certbot server_name _; # managed by Certbot
location /auth { location /auth {
if ($request_method = OPTIONS) {
add_header Access-Control-Allow-Origin $http_origin always;
add_header Access-Control-Allow-Credentials true always;
add_header Access-Control-Allow-Headers content-type always;
return 200;
}
if ($host = admin.pena.digital) { if ($host = admin.pena.digital) {
proxy_pass http://admin-auth-service:8080; proxy_pass http://admin-auth-service:8080;
} }
if ($host != admin.pena.digital) { if ($host != admin.pena.digital) {
proxy_pass http://pena-auth-service:8080; proxy_pass http://pena-auth-service:8080;
} }
proxy_hide_header Access-Control-Allow-Origin;
add_header Access-Control-Allow-Origin $http_origin always;
add_header Access-Control-Allow-Credentials true always;
} }
location /user { location /user {
proxy_pass http://pena-auth-service:8080; proxy_pass http://pena-auth-service:8080;
@ -19,6 +28,12 @@ server {
location /swagger/ { location /swagger/ {
proxy_pass http://pena-auth-service:8080/; proxy_pass http://pena-auth-service:8080/;
} }
location /cookie {
add_header Access-Control-Allow-Origin $http_origin;
add_header Access-Control-Allow-Credentials true;
add_header Set-Cookie "test=sameshit;SameSite=None;HttpOnly;Secure;";
return 200;
}
location /heruvym/ { location /heruvym/ {
proxy_set_header Referer $host; proxy_set_header Referer $host;
@ -34,6 +49,10 @@ server {
location /strator/ { location /strator/ {
proxy_pass http://hub-admin-backend-service:8005/; proxy_pass http://hub-admin-backend-service:8005/;
} }
location /feedback/ {
proxy_set_header Host $host;
proxy_pass http://10.6.0.31:8006/;
}
location / { location / {
if ($host = hub.pena.digital) { if ($host = hub.pena.digital) {

21683
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff