From 8d5128a75084b01c73ba4f46077ff220d6c91b26 Mon Sep 17 00:00:00 2001
From: darius <darius.klein@student.hu.nl>
Date: Tue, 25 Feb 2025 21:50:38 +0100
Subject: [PATCH] improved env in deploy

---
 .github/workflows/Deploy-docker.yml |  4 ++--
 Dockerfile                          |  2 ++
 main.go                             | 13 ++++---------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/Deploy-docker.yml b/.github/workflows/Deploy-docker.yml
index f8af782..d3a13dc 100644
--- a/.github/workflows/Deploy-docker.yml
+++ b/.github/workflows/Deploy-docker.yml
@@ -17,12 +17,12 @@ jobs:
       - name: 'Create env file'
         run: |
           touch .env
-          echo JWT_SECRET=${{secrets.jwt_secret}} >> .env
+          echo JWT_SECRET=${{secrets.JWT_SECRET}} >> .env
           echo POSTGRES_HOST=192.168.1.200 >> .env
           echo POSTGRES_PORT=5099 >> .env
           echo POSTGRES_USER=postgres >> .env
           echo POSTGRES_DB=portfolio >> .env
-          echo POSTGRES_PASSWORD=${{secrets.database_password}} >> .env
+          echo POSTGRES_PASSWORD=${{secrets.POSTGRES_PASSWORD}} >> .env
           echo SSL_MODE=true >> .env
           echo ENVIRONMENT=docker >> .env
           cat .env
diff --git a/Dockerfile b/Dockerfile
index 136ea8e..1def343 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,8 @@ WORKDIR .
 # Copy the current directory contents into the container at /app
 COPY . .
 
+COPY .env .env
+
 # Download and install any required dependencies
 RUN go mod download
 
diff --git a/main.go b/main.go
index a4d40f0..a35c16f 100644
--- a/main.go
+++ b/main.go
@@ -5,21 +5,16 @@ import (
 	"github.com/rs/cors"
 	"log"
 	"net/http"
-	"os"
 	"portfolio/api"
 	"portfolio/database"
 	"portfolio/web"
 )
 
 func main() {
-	println(os.Getenv("ENVIRONMENT"))
-	// load .env in runtime environment
-	if os.Getenv("ENVIRONMENT") != "docker" {
-		err := godotenv.Load()
-		if err != nil {
-			log.Fatalf(".env not found: %v", err)
-			return
-		}
+	err := godotenv.Load()
+	if err != nil {
+		log.Fatalf(".env not found: %v", err)
+		return
 	}
 
 	//connect to database and migrate