From 0b6c55e7197f2c5f5b2cb98461d2190d6fab0485 Mon Sep 17 00:00:00 2001 From: hyuna Date: Tue, 13 Aug 2024 23:53:18 +0900 Subject: [PATCH 1/6] =?UTF-8?q?chore=20::=20env=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 08c0e48..7aba993 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ RUN yarn build ARG BASE_URL ENV NEXT_PUBLIC_API_KEY $BASE_URL +ENV NEXT_PUBLIC_FILE_APP $NEXT_PUBLIC_FILE_APP EXPOSE 3000 From f5abeb331f2713a5c9af126f0146c0ad9c9250fe Mon Sep 17 00:00:00 2001 From: hyuna Date: Wed, 14 Aug 2024 08:53:23 +0900 Subject: [PATCH 2/6] =?UTF-8?q?chore=20::=20env=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7aba993..27c5fc1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,8 +11,9 @@ COPY . . RUN yarn build ARG BASE_URL +ARG FILE_URL ENV NEXT_PUBLIC_API_KEY $BASE_URL -ENV NEXT_PUBLIC_FILE_APP $NEXT_PUBLIC_FILE_APP +ENV NEXT_PUBLIC_FILE_APP $FILE_URL EXPOSE 3000 From ccafe044cee6f005bc627e8e46b0b848f50ee893 Mon Sep 17 00:00:00 2001 From: hyuna Date: Wed, 14 Aug 2024 08:56:52 +0900 Subject: [PATCH 3/6] =?UTF-8?q?chore=20::=20base=5Ffile=5Furl=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/GitAction.yml | 1 + .github/workflows/stagGitAction.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/GitAction.yml b/.github/workflows/GitAction.yml index c544b09..7dc6a1b 100644 --- a/.github/workflows/GitAction.yml +++ b/.github/workflows/GitAction.yml @@ -23,3 +23,4 @@ jobs: github_token: ${{ secrets.PICK_WEB_ADMIN }} buildargs: | BASE_URL=${{ secrets.BASE_URL }} + FILE_URL=${{ secrets.FILE_URL }} diff --git a/.github/workflows/stagGitAction.yml b/.github/workflows/stagGitAction.yml index 2e3ced0..481aa28 100644 --- a/.github/workflows/stagGitAction.yml +++ b/.github/workflows/stagGitAction.yml @@ -23,3 +23,4 @@ jobs: github_token: ${{ secrets.PICK_WEB_ADMIN }} buildargs: | BASE_URL=${{ secrets.STAG_BASE_URL }} + FILE_URL=${{ secrets.STAG_FILE_URL }} From acd8f4295dd580537cc2abb8754d33d057da24cf Mon Sep 17 00:00:00 2001 From: hyuna Date: Wed, 14 Aug 2024 09:35:42 +0900 Subject: [PATCH 4/6] =?UTF-8?q?chore=20::=20env=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/stagGitAction.yml | 4 ++-- Dockerfile | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/stagGitAction.yml b/.github/workflows/stagGitAction.yml index 481aa28..e8b2f7b 100644 --- a/.github/workflows/stagGitAction.yml +++ b/.github/workflows/stagGitAction.yml @@ -22,5 +22,5 @@ jobs: access_key: ${{ secrets.XQUAER_ACCESS_KEY }} github_token: ${{ secrets.PICK_WEB_ADMIN }} buildargs: | - BASE_URL=${{ secrets.STAG_BASE_URL }} - FILE_URL=${{ secrets.STAG_FILE_URL }} + NEXT_PUBLIC_API_KEY=${{ secrets.STAG_BASE_URL }} + NEXT_PUBLIC_FILE_APP=${{ secrets.STAG_FILE_URL }} diff --git a/Dockerfile b/Dockerfile index 27c5fc1..2fc5e61 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,11 +10,11 @@ COPY . . RUN yarn build -ARG BASE_URL -ARG FILE_URL -ENV NEXT_PUBLIC_API_KEY $BASE_URL -ENV NEXT_PUBLIC_FILE_APP $FILE_URL +ARG NEXT_PUBLIC_API_KEY +ENV NEXT_PUBLIC_API_KEY=${NEXT_PUBLIC_API_KEY} +ARG NEXT_PUBLIC_FILE_APP +ENV NEXT_PUBLIC_FILE_APP=${NEXT_PUBLIC_FILE_APP} EXPOSE 3000 CMD ["yarn", "dev"] From 49adfc7ab94345d9363a72e4d8f2ab3a2e0d8cb1 Mon Sep 17 00:00:00 2001 From: hyuna Date: Wed, 14 Aug 2024 09:39:32 +0900 Subject: [PATCH 5/6] =?UTF-8?q?fix=20::=20env=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/stagGitAction.yml | 3 --- Dockerfile | 5 ----- 2 files changed, 8 deletions(-) diff --git a/.github/workflows/stagGitAction.yml b/.github/workflows/stagGitAction.yml index e8b2f7b..2584897 100644 --- a/.github/workflows/stagGitAction.yml +++ b/.github/workflows/stagGitAction.yml @@ -21,6 +21,3 @@ jobs: environment: stag access_key: ${{ secrets.XQUAER_ACCESS_KEY }} github_token: ${{ secrets.PICK_WEB_ADMIN }} - buildargs: | - NEXT_PUBLIC_API_KEY=${{ secrets.STAG_BASE_URL }} - NEXT_PUBLIC_FILE_APP=${{ secrets.STAG_FILE_URL }} diff --git a/Dockerfile b/Dockerfile index 2fc5e61..cd554ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,11 +10,6 @@ COPY . . RUN yarn build -ARG NEXT_PUBLIC_API_KEY -ENV NEXT_PUBLIC_API_KEY=${NEXT_PUBLIC_API_KEY} - -ARG NEXT_PUBLIC_FILE_APP -ENV NEXT_PUBLIC_FILE_APP=${NEXT_PUBLIC_FILE_APP} EXPOSE 3000 CMD ["yarn", "dev"] From 45c65f9fa3cfc209f735414847435f274826cf2a Mon Sep 17 00:00:00 2001 From: hyuna Date: Wed, 14 Aug 2024 09:44:06 +0900 Subject: [PATCH 6/6] =?UTF-8?q?fix=20::=20prod=20env=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/GitAction.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/GitAction.yml b/.github/workflows/GitAction.yml index 7dc6a1b..858a9ff 100644 --- a/.github/workflows/GitAction.yml +++ b/.github/workflows/GitAction.yml @@ -21,6 +21,3 @@ jobs: environment: prod access_key: ${{ secrets.XQUAER_ACCESS_KEY }} github_token: ${{ secrets.PICK_WEB_ADMIN }} - buildargs: | - BASE_URL=${{ secrets.BASE_URL }} - FILE_URL=${{ secrets.FILE_URL }}