Staging #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

diyor28 merged 10 commits into main from staging

Nov 18, 2024

.github/workflows/build.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,20 +2,23 @@ name: Build and Deploy @@
     on:
       push:
-        branches:
-          - main
+        branches: [ main, staging ]
+    env:
+      DEPLOYMENT_ENV: ${{ github.ref == 'refs/heads/main' && 'production' || 'staging' }}
     jobs:
       build:
-        runs-on: self-hosted
+        runs-on: ${{ github.ref == 'refs/heads/main' && 'self-hosted' || 'gcidp' }}
         steps:
           - name: Checkout repo
             uses: actions/checkout@v3
           - name: Build
             env:
               POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
-            run: docker compose up --build -d
+              COMMIT_SHA: ${{ github.sha }}
+            run: docker compose -f docker-compose.${{ env.DEPLOYMENT_ENV }}.yml up -d --build
           - name: Cleanup
             run: docker system prune -f

.github/workflows/lint.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,4 +11,4 @@ jobs: @@
             uses: actions/checkout@v3
           - name: Build
-            run: docker compose build
+            run: docker compose -f docker-compose.production.yml build

Dockerfile

-Original file line number
+Diff line change
@@ -0,0 +1,4 @@
+    FROM nginx:1.21.6 AS nginx
+    COPY nginx/default.conf /etc/nginx/conf.d/default.conf
+    COPY nginx/nginx.conf /etc/nginx/nginx.conf
+    CMD ["nginx", "-g", "daemon off;"]

app/Dockerfile

-Original file line number
+Diff line change
@@ -1,17 +1,14 @@
-    FROM node:20-alpine as build-stage
+    FROM node:20-alpine AS build-stage
     WORKDIR /app
     RUN npm install -g pnpm@8.15.2
     COPY package.json pnpm-lock.yaml .npmrc ./
     RUN pnpm i --frozen-lockfile
     COPY . .
-    FROM build-stage as prod
+    FROM build-stage AS prod
+    ARG NUXT_PUBLIC_API_URL
+    ENV NUXT_PUBLIC_API_URL=$NUXT_PUBLIC_API_URL
     RUN pnpm build
     CMD pnpm start:prod
-    FROM nginx:1.21.6 as nginx
-    COPY nginx/default.conf /etc/nginx/conf.d/default.conf
-    COPY nginx/nginx.conf /etc/nginx/nginx.conf
-    COPY --from=node /app/.output/public /usr/share/nginx/html
-    CMD ["nginx", "-g", "daemon off;"]

app/pages/positions/import.vue

-Original file line number
+Diff line change
@@ Expand Up / @@ -74,7 +74,8 @@ async function upload() { @@
         loading.value = true;
         try {
             const {error} = await rpcService.create({
-                method: 'UploadPositionsFromExcel', params: {
+                method: 'UploadPositionsFromExcel',
+                params: {
                     fileId: fileId.value
                 }
             }).exec();
@@ Expand Down @@

back/config/config.json

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ @@
         "password": "postgres",
         "username": "postgres"
       },
-      "gcidp": {
+      "staging": {
         "database": "elxolding",
         "dialect": "postgres",
         "host": "elxolding_db",
@@ Expand Down @@

back/config/gcidp.json

This file was deleted.

back/config/staging.json

-Original file line number
+Diff line change
@@ -0,0 +1,6 @@
+    {
+      "host": "api-elxolding.ci.iota.uz",
+      "port": 3030,
+      "images_url": "https://api-elxolding.ci.iota.uz/media/",
+      "postgres": "postgres://postgres:postgres@elxolding_db/elxolding"
+    }

docker-compose.yml → docker-compose.production.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,10 +6,22 @@ services: @@
         build:
           context: ./app
           target: prod
+          args:
+            - NUXT_PUBLIC_API_URL=/api
+      nginx:
+        restart: always
+        image: nginx:1.21.3
+        build:
+          context: ./
+          target: nginx
         volumes:
+          - ./nginx/nginx.conf:/etc/nginx/nginx.conf
           - ~/volumes/elxolding/uploads:/www/media
         ports:
           - "80:80"
+        depends_on:
+          - back
       back:
         restart: always
@@ Expand Down @@

docker-compose.staging.yml

-Original file line number
+Diff line change
@@ -0,0 +1,67 @@
+    version: '3.8'
+    services:
+      front:
+        restart: always
+        build:
+          context: ./app
+          target: prod
+          args:
+            - NUXT_PUBLIC_API_URL=https://api-elxolding.ci.iota.uz
+        environment:
+          - NUXT_PUBLIC_API_URL=https://api-elxolding.ci.iota.uz
+        labels:
+          - "traefik.enable=true"
+          - "traefik.docker.network=app"
+          - "traefik.http.routers.${COMMIT_SHA}-front.rule=Host(`elxolding.ci.iota.uz`)"
+          - "traefik.http.routers.${COMMIT_SHA}-front.tls=true"
+          - "traefik.http.routers.${COMMIT_SHA}-front.tls.certresolver=letsencrypt"
+          - "traefik.http.routers.${COMMIT_SHA}-front.tls.domains[0].main=iota.uz"
+          - "traefik.http.routers.${COMMIT_SHA}-front.tls.domains[0].sans=*.ci.iota.uz"
+          - "traefik.http.services.${COMMIT_SHA}-front.loadbalancer.server.port=80"
+        volumes:
+          - ~/volumes/elxolding/uploads:/www/media
+        networks:
+          - app
+      back:
+        restart: always
+        build:
+          context: ./back
+          target: prod
+        environment:
+          NODE_ENV: staging
+        labels:
+          - "traefik.enable=true"
+          - "traefik.docker.network=app"
+          - "traefik.http.routers.${COMMIT_SHA}-back.rule=Host(`api-elxolding.ci.iota.uz`)"
+          - "traefik.http.routers.${COMMIT_SHA}-back.tls=true"
+          - "traefik.http.routers.${COMMIT_SHA}-back.tls.certresolver=letsencrypt"
+          - "traefik.http.routers.${COMMIT_SHA}-back.tls.domains[0].main=iota.uz"
+          - "traefik.http.routers.${COMMIT_SHA}-back.tls.domains[0].sans=*.ci.iota.uz"
+          - "traefik.http.services.${COMMIT_SHA}-back.loadbalancer.server.port=3030"
+        volumes:
+          - ~/volumes/elxolding/postgres:/app/uploads
+        depends_on:
+          - db
+        networks:
+          - app
+      db:
+        restart: always
+        image: postgres:15.1
+        hostname: elxolding_db
+        environment:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: elxolding
+        ports:
+          - "17565:5432"
+        volumes:
+          - ~/volumes/elxolding/postgres:/var/lib/postgresql/data
+        networks:
+          - app
+    networks:
+      app:
+        external: true

app/nginx/default.conf → nginx/default.conf

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,9 +2,12 @@ server { @@
         listen 80;
         listen [::]:80;
+        location /api/ {
+            proxy_pass http://back:3030/;
+        }
         location / {
-            alias /usr/share/nginx/html;
-            try_files $uri @node;
+            proxy_pass http://front:80;
         }
         location /uploads/media/ {
@@ Expand Down @@

0 app/nginx/nginx.conf → nginx/nginx.conf

File renamed without changes.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Staging #3

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!