From 65469aa3a61212a57a6364a016455b94148eac25 Mon Sep 17 00:00:00 2001
From: skeris <kotilion.95@gmail.com>
Date: Mon, 30 Dec 2024 01:46:06 +0300
Subject: [PATCH] check that gomod dir available before binding

---
 .gitignore                              |  1 +
 Dockerfile                              |  6 +-----
 deployments/staging/docker-compose.yaml | 12 ++++++------
 internal/app/app_verification.go        |  3 ++-
 internal/config/config.go               |  5 -----
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index fc30b05..99d469b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .idea
 main
 .vscode
+DockerTest
diff --git a/Dockerfile b/Dockerfile
index e7d8780..72673bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,17 +2,13 @@ FROM gitea.pena/penadevops/container-images/golang:main as build
 WORKDIR /app
 ENV GOPRIVATE=gitea.pena/PenaSide/common,gitea.pena/PenaSide/linters-golang,gitea.pena/PenaSide/customer,gitea.pena/PenaSide/trashlog,gitea.pena/PenaSide/hlog
 ENV GOINSECURE=gitea.pena/PenaSide/common,gitea.pena/PenaSide/linters-golang,gitea.pena/PenaSide/customer,gitea.pena/PenaSide/trashlog,gitea.pena/PenaSide/hlog
-ENV GOPROXY=https://proxy.golang.org,direct
 COPY . .
-RUN --mount=type=bind,source=go-cache,dst=/go/pkg/mod/,rw=true go mod download
+RUN go mod download
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o app ./cmd/verification/main.go
-RUN ls /go/pkg/mod/
-RUN pwd
 RUN printenv
 
 FROM gitea.pena/penadevops/container-images/alpine:main
 COPY --from=build app/app .
-COPY --from=build app/staging.env .
 COPY --from=build app/assets ./assets
 RUN apk add --no-cache ca-certificates
 CMD ["/app"]
diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml
index e7934b8..60ee9c0 100644
--- a/deployments/staging/docker-compose.yaml
+++ b/deployments/staging/docker-compose.yaml
@@ -28,11 +28,11 @@ services:
       MONGO_URL: mongodb://verification:54143ffdd9304865586e5cf1@10.7.0.6:27017/?authSource=verification
       MONGO_DB_NAME: verification 
       JWT_SECRET: >
-        -----BEGIN PUBLIC KEY-----
-        MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE
-        r7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM
-        ZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w
-        KKFD0I2Dr59BFVSGJwIDAQAB
-        -----END PUBLIC KEY-----
+        -----BEGIN PUBLIC KEY-----\n
+        MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE\n
+        r7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM\n
+        ZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w\n
+        KKFD0I2Dr59BFVSGJwIDAQAB\n
+        -----END PUBLIC KEY-----\n
 
     tty: true
diff --git a/internal/app/app_verification.go b/internal/app/app_verification.go
index f5ba121..84bb963 100644
--- a/internal/app/app_verification.go
+++ b/internal/app/app_verification.go
@@ -19,6 +19,7 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"time"
+	"os"
 )
 
 type Build struct {
@@ -37,7 +38,7 @@ func Run(cfg *config.Config, build Build) {
 		panic(err)
 	}
 
-	logger.Info("RUN", zap.Any("ENV", cfg))
+	logger.Info("RUN", zap.Any("ENV", cfg), zap.String("JWT_SECRET", os.Getenv("JWT_SECRET")))
 
 	ctx := context.Background()
 
diff --git a/internal/config/config.go b/internal/config/config.go
index 70efb20..50770ad 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -3,7 +3,6 @@ package config
 import (
 	"gitea.pena/PenaSide/common/mongo"
 	"github.com/caarlos0/env/v8"
-	"github.com/joho/godotenv"
 )
 
 type Config struct {
@@ -28,10 +27,6 @@ type External struct {
 }
 
 func NewConfig(file ...string) (*Config, error) {
-	if err := godotenv.Load(file...); err != nil {
-		return nil, err
-	}
-
 	var cfg Config
 	if err := env.Parse(&cfg); err != nil {
 		return nil, err