From fecad5a0cd82441702e7e26595fd4c57eb76c6de Mon Sep 17 00:00:00 2001 From: dgjinsu Date: Fri, 5 Apr 2024 15:27:15 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20(=EB=91=90=EA=B0=9C=EC=9D=98=20?= =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80=EB=A5=BC=20push)=20=3D>=20=ED=83=9C?= =?UTF-8?q?=EA=B7=B8=EB=A1=9C=20=EA=B5=AC=EB=B6=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 14 +++++++------- docker-compose.a.yml | 2 +- docker-compose.b.yml | 2 +- .../java/jikgong/global/config/SwaggerConfig.java | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index de85f85..d77bb25 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -44,16 +44,16 @@ jobs: # 무중단 배포 시 기존 이미지로 실행되는 것을 막기 위해 a, b로 나눔 - name: Build jikgong-a Docker Image - run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/jikgong-a . + run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/jikgong:latest . - name: Push jikgong-a Docker Image - run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/jikgong-a + run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/jikgong:latest - - name: Build jikgong-b Docker Image - run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/jikgong-b . - - - name: Push jikgong-b Docker Image - run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/jikgong-b +# - name: Build jikgong-b Docker Image +# run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/jikgong-b . +# +# - name: Push jikgong-b Docker Image +# run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/jikgong-b cd-pipeline: needs: ci-pipeline diff --git a/docker-compose.a.yml b/docker-compose.a.yml index cc26071..24f5eb3 100644 --- a/docker-compose.a.yml +++ b/docker-compose.a.yml @@ -2,7 +2,7 @@ version: "3.8" services: jikgong-a: container_name: jikgong-a - image: ${DOCKERHUB_USERNAME}/jikgong-a + image: ${DOCKERHUB_USERNAME}/jikgong:latest volumes: - ./logs:/logs env_file: diff --git a/docker-compose.b.yml b/docker-compose.b.yml index 087574c..4f04458 100644 --- a/docker-compose.b.yml +++ b/docker-compose.b.yml @@ -2,7 +2,7 @@ version: "3.8" services: jikgong-b: container_name: jikgong-b - image: ${DOCKERHUB_USERNAME}/jikgong-b + image: ${DOCKERHUB_USERNAME}/jikgong:latest volumes: - ./logs:/logs env_file: diff --git a/src/main/java/jikgong/global/config/SwaggerConfig.java b/src/main/java/jikgong/global/config/SwaggerConfig.java index 2940325..1e94624 100644 --- a/src/main/java/jikgong/global/config/SwaggerConfig.java +++ b/src/main/java/jikgong/global/config/SwaggerConfig.java @@ -14,7 +14,7 @@ @OpenAPIDefinition( info = @Info(title = "jikgong API 명세서", - description = "기업 계정: 아래 1개 " + + description = "**기업 계정: 아래 1개 " + "\neyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpbklkIjoiYWJjZGVmZzAiLCJleHAiOjE3MTU2OTY0NDh9.KdnJdTOzOsCD_AJi8SJOpmiRaO4mrAXVPswvCCzRMoI " + "\n노동자 계정: 아래 4개 " + "\neyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpbklkIjoiYWJjZGVmZzEiLCJleHAiOjE3MTU2OTY0NzJ9.EcdUqjdAYuT_n_dMBzecHIg-ZhXl1g-LEb7ZRZtK4VA " +