From e222bef5775a5cef54edf7a28b160c0dd9c37f64 Mon Sep 17 00:00:00 2001 From: Ammar Qaffaf Date: Mon, 11 Mar 2024 06:24:52 -0400 Subject: [PATCH 01/10] move to rest --- .github/workflows/dev_syncrow(dev).yml | 7 ++--- Dockerfile | 6 +--- nginx.conf | 38 -------------------------- src/main.ts | 2 +- 4 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 nginx.conf diff --git a/.github/workflows/dev_syncrow(dev).yml b/.github/workflows/dev_syncrow(dev).yml index 8373a4f..d38510c 100644 --- a/.github/workflows/dev_syncrow(dev).yml +++ b/.github/workflows/dev_syncrow(dev).yml @@ -1,4 +1,4 @@ -name: Auth and Backend using Docker to Azure App Service +name: Backend deployment to Azure App Service on: push: @@ -30,9 +30,6 @@ jobs: npm install npm run build - - name: List build output - run: ls -R dist/apps/ - - name: Log in to Azure uses: azure/login@v1 with: @@ -42,7 +39,7 @@ jobs: run: az acr login --name ${{ env.ACR_REGISTRY }} - name: List build output - run: ls -R dist/apps/ + run: ls -R dist/ - name: Build and push Docker image run: | diff --git a/Dockerfile b/Dockerfile index 8783b8c..8bd0930 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,5 @@ FROM node:20-alpine -RUN apk add --no-cache nginx - -COPY nginx.conf /etc/nginx/nginx.conf - WORKDIR /app COPY package*.json ./ @@ -14,6 +10,6 @@ COPY . . RUN npm run build -EXPOSE 8080 +EXPOSE 4000 CMD ["sh", "-c", "nginx -g 'daemon off;' & npm run start:all"] diff --git a/nginx.conf b/nginx.conf deleted file mode 100644 index 0ccf92e..0000000 --- a/nginx.conf +++ /dev/null @@ -1,38 +0,0 @@ -worker_processes 1; - -events { - worker_connections 1024; -} - -http { - include mime.types; - default_type application/octet-stream; - sendfile on; - keepalive_timeout 65; - - server { - listen 8080; - - location /auth { - proxy_pass http://localhost:4001; - 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 $scheme; - } - - location / { - proxy_pass http://localhost:4000; - 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 $scheme; - } - - # error pages - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } - } -} diff --git a/src/main.ts b/src/main.ts index ed08082..dc73a00 100644 --- a/src/main.ts +++ b/src/main.ts @@ -33,7 +33,7 @@ async function bootstrap() { app.useGlobalPipes(new ValidationPipe()); - await app.listen(4001); + await app.listen(4000); } console.log('Starting auth at port 4001...'); bootstrap(); From 5ed60d970f5823afc7888dc2f6790a0fc0961177 Mon Sep 17 00:00:00 2001 From: Ammar Qaffaf Date: Mon, 11 Mar 2024 06:45:55 -0400 Subject: [PATCH 02/10] fix dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8bd0930..9d436d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,4 +12,4 @@ RUN npm run build EXPOSE 4000 -CMD ["sh", "-c", "nginx -g 'daemon off;' & npm run start:all"] +CMD ["sh", "-c", "npm run start:dev"] From 5c1e8fc823b8c7e55f789060a756fd83c0004f0b Mon Sep 17 00:00:00 2001 From: Ammar Qaffaf Date: Mon, 11 Mar 2024 18:36:05 -0400 Subject: [PATCH 03/10] deploy From 2f9d9c2f6684d20e1ba50691335f0ed683ab3dab Mon Sep 17 00:00:00 2001 From: Ammar Qaffaf Date: Mon, 11 Mar 2024 18:47:13 -0400 Subject: [PATCH 04/10] deploy From c264ad521e16786be4907e429b2240a12179b930 Mon Sep 17 00:00:00 2001 From: Ammar Qaffaf Date: Mon, 11 Mar 2024 18:53:36 -0400 Subject: [PATCH 05/10] deploy From 404a7013375ef1b45183aa20cfe0cb81aa4d0104 Mon Sep 17 00:00:00 2001 From: Ammar Qaffaf Date: Mon, 11 Mar 2024 18:59:24 -0400 Subject: [PATCH 06/10] nest cli --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 9d436d3..680427b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ WORKDIR /app COPY package*.json ./ RUN npm install +RUN npm install -g @nestjs/cli COPY . . From 66cdee665ae115136ed710ca4ac94014dc2fe90c Mon Sep 17 00:00:00 2001 From: Ammar Qaffaf Date: Mon, 11 Mar 2024 19:09:16 -0400 Subject: [PATCH 07/10] fix port --- Dockerfile | 2 +- package-lock.json | 2 +- package.json | 2 +- src/main.ts | 8 +------- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 680427b..4be2071 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,4 +13,4 @@ RUN npm run build EXPOSE 4000 -CMD ["sh", "-c", "npm run start:dev"] +CMD ["npm", "run", "start"] diff --git a/package-lock.json b/package-lock.json index 52f47cd..a41b90f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -35,7 +35,7 @@ "typeorm": "^0.3.20" }, "devDependencies": { - "@nestjs/cli": "^10.0.0", + "@nestjs/cli": "^10.3.2", "@nestjs/schematics": "^10.0.0", "@nestjs/testing": "^10.0.0", "@types/express": "^4.17.17", diff --git a/package.json b/package.json index 1cd47fb..46f189f 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "typeorm": "^0.3.20" }, "devDependencies": { - "@nestjs/cli": "^10.0.0", + "@nestjs/cli": "^10.3.2", "@nestjs/schematics": "^10.0.0", "@nestjs/testing": "^10.0.0", "@types/express": "^4.17.17", diff --git a/src/main.ts b/src/main.ts index dc73a00..423dd9e 100644 --- a/src/main.ts +++ b/src/main.ts @@ -8,12 +8,6 @@ import { ValidationPipe } from '@nestjs/common'; async function bootstrap() { const app = await NestFactory.create(AuthModule); - // Enable 'trust proxy' setting - app.use((req, res, next) => { - app.getHttpAdapter().getInstance().set('trust proxy', 1); - next(); - }); - app.enableCors(); app.use( @@ -33,7 +27,7 @@ async function bootstrap() { app.useGlobalPipes(new ValidationPipe()); - await app.listen(4000); + await app.listen(process.env.PORT || 4000); } console.log('Starting auth at port 4001...'); bootstrap(); From 7cd508383f96252e0eec1dee33ee49a96ca57dd3 Mon Sep 17 00:00:00 2001 From: Ammar Qaffaf Date: Mon, 11 Mar 2024 19:16:41 -0400 Subject: [PATCH 08/10] port --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 46f189f..759b7e8 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "scripts": { "build": "npx nest build", "format": "prettier --write \"apps/**/*.ts\" \"libs/**/*.ts\"", - "start": "npx nest start", + "start": "node dist/main", "start:dev": "npx nest start --watch", "start:debug": "npx nest start --debug --watch", "start:prod": "node dist/main", From 63d1d427b3cb1606791ed1f2352048712bdec6b6 Mon Sep 17 00:00:00 2001 From: Ammar Qaffaf Date: Mon, 11 Mar 2024 19:28:02 -0400 Subject: [PATCH 09/10] port --- src/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.ts b/src/main.ts index 423dd9e..95f8ed1 100644 --- a/src/main.ts +++ b/src/main.ts @@ -29,5 +29,5 @@ async function bootstrap() { await app.listen(process.env.PORT || 4000); } -console.log('Starting auth at port 4001...'); +console.log('Starting auth at port ...', process.env.PORT || 4000); bootstrap(); From fa3f6a9e013ebc9b45c2d095b9b3404d95b84997 Mon Sep 17 00:00:00 2001 From: Ammar Qaffaf Date: Mon, 11 Mar 2024 19:35:11 -0400 Subject: [PATCH 10/10] port