From 2da1665a9c21c937af52be7420e53437b3dbdea7 Mon Sep 17 00:00:00 2001
From: Dulyawat Khamkaew <6430127621@student.chula.ac.th>
Date: Fri, 1 Nov 2024 14:18:14 +0700
Subject: [PATCH] fix yamlfile
change env in use server
cookie sameSite
change env path in docker-compose
---
.dockerignore | 3 +-
.env.example | 4 +-
.github/workflows/build-web.yaml | 9 --
apps/web/src/app/page.tsx | 5 -
apps/web/src/app/trpc.ts | 2 +-
apps/web/src/service/auth.ts | 7 +-
pnpm-lock.yaml | 184 ++++++++++++++++++++++++++-----
turbo.json | 4 +-
8 files changed, 168 insertions(+), 50 deletions(-)
diff --git a/.dockerignore b/.dockerignore
index 3b502a79..1af289fa 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,4 +5,5 @@ dist
.gitignore
docker-compose.yml
**/.next
-**/.env
\ No newline at end of file
+**/.env
+**/.env.local
\ No newline at end of file
diff --git a/.env.example b/.env.example
index a526ca8e..e5535b86 100644
--- a/.env.example
+++ b/.env.example
@@ -4,4 +4,6 @@ INTANIA_AUTH_APP_ID=
INTANIA_AUTH_SECRET=
INTANIA_AUTH_REDIRECT_URL=
-JWT_SECRET=
\ No newline at end of file
+JWT_SECRET=
+
+NEXT_PUBLIC_NODE_ENV=
\ No newline at end of file
diff --git a/.github/workflows/build-web.yaml b/.github/workflows/build-web.yaml
index 83242f68..5f6f07d8 100644
--- a/.github/workflows/build-web.yaml
+++ b/.github/workflows/build-web.yaml
@@ -10,10 +10,6 @@ on:
env:
IMAGE_NAME: ${{ github.repository }}-web
- #NEXT_PUBLIC_API_SERVER_URL: ${{ secrets.NEXT_PUBLIC_API_SERVER_URL }}
- #INTANIA_AUTH_APP_ID: ${{ secrets.INTANIA_AUTH_APP_ID }}
- #INTANIA_AUTH_REDIRECT_URL: ${{ secrets.INTANIA_AUTH_REDIRECT_URL }}
- #JWT_SECRET: ${{ secrets.JWT_SECRET }}
jobs:
build:
@@ -56,11 +52,6 @@ jobs:
echo "tags = $RESULT"
echo "tags=$RESULT" >> "$GITHUB_OUTPUT"
- #- name: Create env File
- # run: |
- # touch .env
- # echo NEXT_PUBLIC_API_SERVER_URL=${{ secrets.NEXT_PUBLIC_API_SERVER_URL }} >> .env
-
- name: Build Docker image with multiple tags
run: |
tags="${{ steps.tags.outputs.tags }}"
diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/page.tsx
index c356df68..00b3568a 100644
--- a/apps/web/src/app/page.tsx
+++ b/apps/web/src/app/page.tsx
@@ -23,11 +23,6 @@ export default function Page() {
ครบจบทุกกระบวนการ มาเริ่มต้นเอกสารกัน !
-
- debugs: {env('NEXT_PUBLIC_API_SERVER_URL')}{' '}
- {env('INTANIA_AUTH_REDIRECT_URL')} {env('INTANIA_AUTH_APP_ID')}{' '}
- {env('JWT_SECRET')} {env('INTANIA_AUTH_SECRET')}
-