Merge branch 'main' of github.com:enowars/enowars8-service-replme

enowars · Jul 20, 2024 · 31bc63c · 31bc63c
2 parents bb7c124 + 2877f0d
commit 31bc63c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/service/backend/service/docker.go b/service/backend/service/docker.go
@@ -103,12 +103,19 @@ func (docker *DockerService) BuildImage() {
 		log.Fatal(err, " :unable to create tar")
 	}
 
+	httpProxy := "http://proxy.prod.bambi.ovh:3128"
+	buildArgs := make(map[string]*string)
+	buildArgs["http_proxy"] = &httpProxy
+	buildArgs["https_proxy"] = &httpProxy
+	buildArgs["HTTP_PROXY"] = &httpProxy
+	buildArgs["HTTPS_PROXY"] = &httpProxy
 	opts := dockerTypes.ImageBuildOptions{
 		Dockerfile: "Dockerfile",
 		Tags:       []string{docker.ImgTag},
 		Remove:     true,
 		// ForceRemove: true,
 		// NoCache:     true,
+		BuildArgs: buildArgs,
 	}
 
 	res, err := docker.Client.ImageBuild(docker.Context, tar, opts)

diff --git a/service/docker-compose.override.yml b/service/docker-compose.override.yml
@@ -0,0 +1,22 @@
+services:
+  frontend:
+    build:
+      args:
+        http_proxy: http://proxy.prod.bambi.ovh:3128
+        https_proxy: http://proxy.prod.bambi.ovh:3128
+        HTTP_PROXY: http://proxy.prod.bambi.ovh:3128
+        HTTPS_PROXY: http://proxy.prod.bambi.ovh:3128
+  backend:
+    build:
+      args:
+        http_proxy: http://proxy.prod.bambi.ovh:3128
+        https_proxy: http://proxy.prod.bambi.ovh:3128
+        HTTP_PROXY: http://proxy.prod.bambi.ovh:3128
+        HTTPS_PROXY: http://proxy.prod.bambi.ovh:3128
+  postgres:
+    build:
+      args:
+        http_proxy: http://proxy.prod.bambi.ovh:3128
+        https_proxy: http://proxy.prod.bambi.ovh:3128
+        HTTP_PROXY: http://proxy.prod.bambi.ovh:3128
+        HTTPS_PROXY: http://proxy.prod.bambi.ovh:3128