From c7be7e2cea9d7675a88b820cd914d227d4d08e53 Mon Sep 17 00:00:00 2001
From: admin <fakc445@gmail.com>
Date: Fri, 4 Jul 2025 15:15:39 +0300
Subject: [PATCH] Enhance Docker setup and configuration loading for improved
 environment management

---
 cmd/server/Dockerfile       |  5 +++++
 cmd/server/main.go          |  1 -
 cmd/tasks_server/Dockerfile |  5 +++++
 docker-compose.yml          | 12 ++++++++++++
 internal/config/config.go   |  5 +----
 5 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 cmd/server/Dockerfile
 create mode 100644 cmd/tasks_server/Dockerfile

diff --git a/cmd/server/Dockerfile b/cmd/server/Dockerfile
new file mode 100644
index 0000000..59bbd6a
--- /dev/null
+++ b/cmd/server/Dockerfile
@@ -0,0 +1,5 @@
+FROM alpine:latest
+WORKDIR /app
+COPY main .
+RUN apk add gcompat
+CMD ["./main"]
\ No newline at end of file
diff --git a/cmd/server/main.go b/cmd/server/main.go
index 90f1d44..07ccef4 100755
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -99,7 +99,6 @@ func main() {
 	err := initDotenv()
 	if err != nil {
 		logMessage("error", "Failed to load .env file: %v", err)
-		return
 	}
 	logMessage("info", "Starting the SIPRO Marketplace Server... 🚀1")
 	ctx := context.Background()
diff --git a/cmd/tasks_server/Dockerfile b/cmd/tasks_server/Dockerfile
new file mode 100644
index 0000000..59bbd6a
--- /dev/null
+++ b/cmd/tasks_server/Dockerfile
@@ -0,0 +1,5 @@
+FROM alpine:latest
+WORKDIR /app
+COPY main .
+RUN apk add gcompat
+CMD ["./main"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index e50e52c..9cf510e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,10 +2,22 @@ version: '3.8'
 services:
   app:
     image: git.denco.store/fakz9/sipro-marketplaces:latest
+    env_file:
+      - .env
     depends_on:
       - redis
     networks:
       - appnet
+    ports:
+        - "8080:8080"
+  worker:
+    image: git.denco.store/fakz9/sipro-marketplaces-worker:latest
+    env_file:
+      - .env
+    depends_on:
+      - app
+    networks:
+      - appnet
   redis:
     image: redis
     networks:
diff --git a/internal/config/config.go b/internal/config/config.go
index af87f59..451f688 100755
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -8,10 +8,7 @@ type Config struct {
 }
 
 func LoadConfig() (*Config, error) {
-	err := godotenv.Load()
-	if err != nil {
-		return nil, err
-	}
+	_ = godotenv.Load()
 	redisConfig := LoadRedisConfig()
 	databaseConfig := LoadDatabaseConfig()
 	return &Config{Redis: redisConfig, Database: databaseConfig}, nil