diff --git a/.github/workflows/instance-deploy-prod.yml b/.github/workflows/instance-deploy-prod.yml index 8b5d722..f4cd26c 100644 --- a/.github/workflows/instance-deploy-prod.yml +++ b/.github/workflows/instance-deploy-prod.yml @@ -128,5 +128,5 @@ jobs: imageToDeploy: onlinestorecontainerregistry.azurecr.io/onlinestore-website:${{ github.sha }} location: 'East US' resourceGroup: onlinestore-shared-rg - targetPort: 8080 + targetPort: 80 environmentVariables: "API__BASEPATH=https://api.rockpal.co.uk" diff --git a/.github/workflows/instance-deploy-test.yml b/.github/workflows/instance-deploy-test.yml index 2035c94..e099908 100644 --- a/.github/workflows/instance-deploy-test.yml +++ b/.github/workflows/instance-deploy-test.yml @@ -131,7 +131,7 @@ jobs: imageToDeploy: onlinestorecontainerregistry.azurecr.io/onlinestore-website:${{ github.sha }} location: 'East US' resourceGroup: onlinestore-shared-rg - targetPort: 8080 + targetPort: 80 environmentVariables: "API__BASEPATH=https://${{ github.head_ref }}-api.rockpal.co.uk" - name: Find Comment uses: peter-evans/find-comment@v1 diff --git a/src/Website/Company.Website/dockerfile b/src/Website/Company.Website/dockerfile index 2690418..e011a6f 100644 --- a/src/Website/Company.Website/dockerfile +++ b/src/Website/Company.Website/dockerfile @@ -17,4 +17,4 @@ COPY /src/Website/Company.Website/nginx.conf /etc/nginx/nginx.conf COPY /src/Website/Company.Website/overwrite-config.sh /docker-entrypoint.d/overwrite-config.sh RUN chmod +x /docker-entrypoint.d/overwrite-config.sh -EXPOSE 8080 +EXPOSE 80 diff --git a/src/Website/Company.Website/nginx.conf b/src/Website/Company.Website/nginx.conf index ca3e958..afa559a 100644 --- a/src/Website/Company.Website/nginx.conf +++ b/src/Website/Company.Website/nginx.conf @@ -5,7 +5,7 @@ events { } application/wasm wasm; } server { - listen 8080; + listen 80; index index.html; location / { root /var/www/web; diff --git a/terraform/instance/container_apps.tf b/terraform/instance/container_apps.tf index eb738da..f30baaa 100644 --- a/terraform/instance/container_apps.tf +++ b/terraform/instance/container_apps.tf @@ -57,7 +57,7 @@ resource "azurerm_container_app" "website" { ingress { external_enabled = true transport = "http" - target_port = 8080 + target_port = 80 traffic_weight { latest_revision = true percentage = 100