Skip to content

Commit

Permalink
Revert "Change nginx port"
Browse files Browse the repository at this point in the history
This reverts commit 6d76a75.
  • Loading branch information
benchiverton committed Jul 2, 2024
1 parent 6d76a75 commit 7df848a
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/instance-deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion .github/workflows/instance-deploy-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Website/Company.Website/dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/Website/Company.Website/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ events { }
application/wasm wasm;
}
server {
listen 8080;
listen 80;
index index.html;
location / {
root /var/www/web;
Expand Down
2 changes: 1 addition & 1 deletion terraform/instance/container_apps.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7df848a

Please sign in to comment.