fix(ci) : env 이름, 도커 버저닝 수정 / admin base url 설정 (#35)

* fix(admin) : viteconfig 설정 base 추가 * fix(ci) : resolve conflict * fix(ci) : 도커 태그
Gosrock · Jan 8, 2023 · 8756089 · 8756089
1 parent 454b7a5
commit 8756089
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 28 deletions.
diff --git a/.github/workflows/admin-deploy.yml b/.github/workflows/admin-deploy.yml
@@ -1,10 +1,11 @@
 name: Build & Docker Push - Admin
 on:
   push:
-    branches: [dev]
-    paths: ['apps/admin/src/**']
+    # branches: [fix/admin-deploy]
+    # paths: ['apps/admin/src/**']
     # Publish semver tags as releases.
-    tags: ['v*.*.*']
+    tags:
+      - Api-v*.*.*
 
 jobs:
   build:
@@ -17,16 +18,13 @@ jobs:
       - name: Create .env file
         run: |
           touch .env
-          echo "${{ secrets.ENV_VARS }}" >> .env
+          echo "${{ secrets.ENV_VARS_ADMIN }}" >> .env
       # 도커 메타데이터 가져오기
-      - name: Docker meta
-        id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v1
-        with:
-          images: david0218/dudoong-admin
-          tag-semver: |
-            {{version}}
-            {{major}}.{{minor}}
+      - name: Get the version
+        id: get_version
+        run: |
+          RELEASE_VERSION_WITHOUT_V="$(cut -d'v' -f2 <<< ${GITHUB_REF#refs/*/})"
+          echo ::set-output name=VERSION::$RELEASE_VERSION_WITHOUT_V
 
       # 도커 빌드 관련 셋업
       - name: Set up Docker Buildx
@@ -45,5 +43,4 @@ jobs:
           file: ./Dockerfile.admin
           platforms: linux/amd64
           push: true
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          labels: ${{ steps.docker_meta.outputs.labels }}
+          tags: ${{ steps.get_version.outputs.tags }}
diff --git a/.github/workflows/ticket-deploy.yml b/.github/workflows/ticket-deploy.yml
@@ -1,10 +1,11 @@
 name: Build & Docker Push - Ticket
 on:
   push:
-    branches: [dev]
-    paths: ['apps/ticket/pages/**']
+    # branches: [dev]
+    # paths: ['apps/ticket/pages/**']
     # Publish semver tags as releases.
-    tags: ['v*.*.*']
+    tags:
+      - Ticket-v*.*.*
 
 jobs:
   build:
@@ -17,16 +18,13 @@ jobs:
       - name: Create .env file
         run: |
           touch .env
-          echo "${{ secrets.ENV_VARS }}" >> .env
+          echo "${{ secrets.ENV_VARS_TICKET }}" >> .env
       # 도커 메타데이터 가져오기
-      - name: Docker meta
-        id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v1
-        with:
-          images: david0218/dudoong-ticket
-          tag-semver: |
-            {{version}}
-            {{major}}.{{minor}}
+      - name: Get the version
+        id: get_version
+        run: |
+          RELEASE_VERSION_WITHOUT_V="$(cut -d'v' -f2 <<< ${GITHUB_REF#refs/*/})"
+          echo ::set-output name=VERSION::$RELEASE_VERSION_WITHOUT_V
 
       # 도커 빌드 관련 셋업
       - name: Set up Docker Buildx
@@ -45,5 +43,4 @@ jobs:
           file: ./Dockerfile.ticket
           platforms: linux/amd64
           push: true
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          labels: ${{ steps.docker_meta.outputs.labels }}
+          tags: ${{ steps.get_version.outputs.tags }}
diff --git a/apps/admin/vite.config.ts b/apps/admin/vite.config.ts
@@ -19,4 +19,5 @@ export default defineConfig({
       { find: '@store', replacement: '/src/store' },
     ],
   },
+  base: '/admin/',
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,4 +19,5 @@ export default defineConfig({ @@
           { find: '@store', replacement: '/src/store' },
         ],
       },
+      base: '/admin/',
     });