diff --git a/.gitignore b/.gitignore index abd8758..0b2c823 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ secret.env privkey.pem fullchain.pem +gin.log # Editor directories and files .vscode/* diff --git a/compose.yml b/compose.yml index 46434f8..d952794 100644 --- a/compose.yml +++ b/compose.yml @@ -15,6 +15,9 @@ services: - 127.0.0.1:9876:9876 networks: - app-network + environment: + - ENV=docker + - DOMAIN=localhost restart: unless-stopped networks: diff --git a/enshi/Dockerfile b/enshi/Dockerfile index fd33ec3..119c7a6 100644 --- a/enshi/Dockerfile +++ b/enshi/Dockerfile @@ -2,6 +2,7 @@ FROM node:18-alpine as builder WORKDIR /app +ENV VITE_ENV=docker COPY package*.json ./ RUN npm ci COPY . . diff --git a/enshi/src/api/axios/axios.ts b/enshi/src/api/axios/axios.ts index f92d541..f4b6de0 100644 --- a/enshi/src/api/axios/axios.ts +++ b/enshi/src/api/axios/axios.ts @@ -1,8 +1,12 @@ import axios from "axios"; +const environment = import.meta.env.VITE_ENV || 'development'; +// const environment = "docker" +const baseURL = environment === "docker" ? "https://localhost/api/v1/" : "http://localhost:9876/"; + export const axiosLocalhost = axios.create( { - baseURL: `https://localhost/api/v1/`, + baseURL: baseURL, withCredentials: true, headers: { diff --git a/enshi_back/global/globalVars.go b/enshi_back/global/globalVars.go index 819c067..fae122b 100644 --- a/enshi_back/global/globalVars.go +++ b/enshi_back/global/globalVars.go @@ -1,9 +1,32 @@ package global -const PathForCookies = "/" -const DomainForCookies = "127.0.0.1" +import ( + "fmt" + "os" +) + +var PathForCookies = "/" +var DomainForCookies = "127.0.0.1" + const SecureForCookies = false const HttpOnlyForCookies = false // Change to 0.0.0.0 when docker this const GinWorkPath = "127.0.0.1:9876" + +func GetGinWorkPath() string { + + if os.Getenv("DOMAIN") != "" { + DomainForCookies = os.Getenv("DOMAIN") + PathForCookies = "/api/v1/" + fmt.Println("DomainForCookies is", DomainForCookies) + } + + if os.Getenv("ENV") == "docker" { + fmt.Println("GinWorkPath is docker 0.0.0.0:9876") + return "0.0.0.0:9876" + } + + fmt.Println("GinWorkPath is local 127.0.0.1:9876") + return GinWorkPath +} diff --git a/enshi_back/main.go b/enshi_back/main.go index 551046c..ccc8a2c 100644 --- a/enshi_back/main.go +++ b/enshi_back/main.go @@ -43,7 +43,7 @@ func main() { return } - // Transaction + // Test Transaction tx, _ := db_connection.Dbx.Begin(context.Background()) defer tx.Rollback(context.Background()) @@ -59,7 +59,7 @@ func main() { return } - router.Run(global.GinWorkPath) + router.Run(global.GetGinWorkPath()) fmt.Printf("Hey!, %v", "you") }