marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#210: Fixed hostmode docker builds

Browse Source
This commit is contained in:
frikky
2020-12-06 05:28:26 +01:00
parent f1e135f8e3
commit 0ef55b2f03
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/go-app/docker.go
+8 -8
View File
@@ -181,11 +181,11 @@ func buildImageMemory(fs billy.Filesystem, tags []string, dockerfileFolder strin
// Dockerfile is inside the TAR itself. Not local context // Dockerfile is inside the TAR itself. Not local context
// docker build --build-arg http_proxy=http://my.proxy.url // docker build --build-arg http_proxy=http://my.proxy.url
buildOptions := types.ImageBuildOptions{ buildOptions := types.ImageBuildOptions{
Remove: true, Remove: true,
Tags: tags, Tags: tags,
BuildArgs: map[string]*string{}, BuildArgs: map[string]*string{},
NetworkMode: "host",
} }
// NetworkMode: "host",
httpProxy := os.Getenv("HTTP_PROXY") httpProxy := os.Getenv("HTTP_PROXY")
if len(httpProxy) > 0 { if len(httpProxy) > 0 {
@@ -244,11 +244,11 @@ func buildImage(tags []string, dockerfileFolder string) error {
dockerFileTarReader := bytes.NewReader(buf.Bytes()) dockerFileTarReader := bytes.NewReader(buf.Bytes())
buildOptions := types.ImageBuildOptions{ buildOptions := types.ImageBuildOptions{
Remove: true, Remove: true,
Tags: tags, Tags: tags,
BuildArgs: map[string]*string{}, BuildArgs: map[string]*string{},
NetworkMode: "host",
} }
//NetworkMode: "host",
httpProxy := os.Getenv("HTTP_PROXY") httpProxy := os.Getenv("HTTP_PROXY")
if len(httpProxy) > 0 { if len(httpProxy) > 0 {