From cf5d311731907fedb537504cec739af62ed25c70 Mon Sep 17 00:00:00 2001
From: JuLi0n21 <julianschlueterbusiness21@gmail.com>
Date: Sun, 22 Sep 2024 11:50:48 +0200
Subject: [PATCH] updating dockerfiles and minor things

---
 data/.gitkeep    |   0
 data/database.db | Bin 0 -> 20480 bytes
 proxy/Dockerfile |   6 +++---
 proxy/db.go      |   2 +-
 proxy/main.go    |  14 +++++++++++---
 start.sh         |   6 +++---
 6 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 data/.gitkeep
 create mode 100644 data/database.db

diff --git a/data/.gitkeep b/data/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/data/database.db b/data/database.db
new file mode 100644
index 0000000000000000000000000000000000000000..7b65e3d9eaedeede6c3eefbc2c1def0704dafbef
GIT binary patch
literal 20480
zcmeI%%}(1u5C`ye2p@?Q;O1lIz#$P)CDcAZ-7p{v<ACEx<Yc+=qPhf|*bd?fH(rmo
z>8-miahgc&iBt4nY3<puca!<;Y31Ry6Bm+h)9gMh=(9K!h9SNZ2_b5#Z>zp&dR$)&
z)ZO?i{#RHNpB`UZ2R%`5y@`V_`$zk~RDcEn2tWV=5P$##AOHafKmY<CAaGURF^`Xp
zaS?u>%6v9e$Gaexv$;$r>%;B7$Cl6JTi+a}wRby7crSZuX7|~v?V9bj@sgKoPSW%)
zmOsO+3bt0(snXPGHX3n6w(IjbdvxX5mzFoC3m%g-@&~r7=3TPu_tbmyTxP-YWu5x7
z5cz!LlRHp-<Tx~P?duWi$7chN?Q>Tz*Lk1aC6CY8W4F&k(z(17M_n2ubjl8^O8eHZ
zZ=G_p(LLGPF}ZDsIEm!bd+Fi4NXv0h)exLip+5WW=?!|eja}0;jh9*JQT|SOsjWDa
zss9-)YSP7M?A1zjRwmJd`bS0iL?^<>un4nYo=umjiQ3mZDAGHbRLM-<W-|Y=mX%Kr
zaVCQ(R40C|su)_jphJB@g8&2|009U<00Izz00bZa0SG`~Qw4DT-_)H&T@Zi(1Rwwb
z2tWV=5P$##AOL}-KvReK{=Wo41OW&@00Izz00bZa0SG_<0ub0h0et`8z)eL-5P$##
UAOHafKmY;|fB*y_0D(1u-#a$4@c;k-

literal 0
HcmV?d00001

diff --git a/proxy/Dockerfile b/proxy/Dockerfile
index 6830baf..3ef463d 100644
--- a/proxy/Dockerfile
+++ b/proxy/Dockerfile
@@ -7,13 +7,13 @@ RUN go mod download
 
 COPY . .
 
-RUN CGO_ENABLED=0 GOOS=linux go build -o main .
-
-FROM gcr.io/distroless/base-debian11
+RUN CGO_ENABLED=1 GOOS=linux go build -o main .
 
+FROM ubuntu:latest
 WORKDIR /app
 
 COPY --from=builder /app/main .
+COPY --from=builder /app/dev.env .
 
 EXPOSE 80
 
diff --git a/proxy/db.go b/proxy/db.go
index 505404c..eac6314 100644
--- a/proxy/db.go
+++ b/proxy/db.go
@@ -32,7 +32,7 @@ const (
 
 func InitDB() {
 	var err error
-	db, err = sql.Open("sqlite3", "database.db")
+	db, err = sql.Open("sqlite3", "data/database.db")
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/proxy/main.go b/proxy/main.go
index 2dc5924..7e3c129 100644
--- a/proxy/main.go
+++ b/proxy/main.go
@@ -2,16 +2,24 @@ package main
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/joho/godotenv"
 )
 
 func main() {
 
-	if ok := godotenv.Load("dev.env"); ok != nil {
-		panic(".env not found")
-	}
+	if value := os.Getenv("ENV"); value == "prod" {
+		if ok := godotenv.Load(".env"); ok != nil {
+			panic(".env not found")
+		}
+	} else {
+		fmt.Println("Not Produktion Enviorment fallback to dev.env")
+		if ok := godotenv.Load("dev.env"); ok != nil {
+			panic("dev.env not found")
+		}
 
+	}
 	InitDB()
 
 	err := run()
diff --git a/start.sh b/start.sh
index 80e5a0a..b64f921 100644
--- a/start.sh
+++ b/start.sh
@@ -23,14 +23,14 @@ docker build -t "$BACKEND_IMAGE" "$REPO_DIR/proxy" # Assuming proxy is the backe
 echo "Building frontend Docker image..."
 docker build -t "$FRONTEND_IMAGE" "$REPO_DIR/frontend" # Assuming frontend is the frontend directory
 
-if [ "$(docker ps -q -f name=$BACKEND_CONTAINER)" ]; then
+if [ "$(docker ps -aq -f name=$BACKEND_CONTAINER)" ]; then
   echo "Stopping old backend container..."
   docker stop "$BACKEND_CONTAINER"
   echo "Removing old backend container..."
   docker rm "$BACKEND_CONTAINER"
 fi
 
-if [ "$(docker ps -q -f name=$FRONTEND_CONTAINER)" ]; then
+if [ "$(docker ps -aq -f name=$FRONTEND_CONTAINER)" ]; then
   echo "Stopping old frontend container..."
   docker stop "$FRONTEND_CONTAINER"
   echo "Removing old frontend container..."
@@ -38,7 +38,7 @@ if [ "$(docker ps -q -f name=$FRONTEND_CONTAINER)" ]; then
 fi
 
 echo "Running new backend container..."
-docker run -d -p "$BACKEND_PORT":80 --name "$BACKEND_CONTAINER" "$BACKEND_IMAGE"
+docker run -d -p "$BACKEND_PORT":80 --name "$BACKEND_CONTAINER" -v "$REPO_DIR/data:/app/data" "$BACKEND_IMAGE"
 
 echo "Running new frontend container..."
 docker run -d -p "$FRONTEND_PORT":80 --name "$FRONTEND_CONTAINER" "$FRONTEND_IMAGE"