Fixed missing proxy builds in Docker
This commit is contained in:
@@ -178,9 +178,20 @@ func buildImageMemory(fs billy.Filesystem, tags []string, dockerfileFolder strin
|
|||||||
dockerFileTarReader := bytes.NewReader(buf.Bytes())
|
dockerFileTarReader := bytes.NewReader(buf.Bytes())
|
||||||
|
|
||||||
// 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
|
||||||
buildOptions := types.ImageBuildOptions{
|
buildOptions := types.ImageBuildOptions{
|
||||||
Remove: true,
|
Remove: true,
|
||||||
Tags: tags,
|
Tags: tags,
|
||||||
|
BuildArgs: map[string]*string{},
|
||||||
|
}
|
||||||
|
|
||||||
|
httpProxy := os.Getenv("HTTP_PROXY")
|
||||||
|
if len(httpProxy) > 0 {
|
||||||
|
buildOptions.BuildArgs["http_proxy"] = &httpProxy
|
||||||
|
}
|
||||||
|
httpsProxy := os.Getenv("HTTPS_PROXY")
|
||||||
|
if len(httpProxy) > 0 {
|
||||||
|
buildOptions.BuildArgs["https_proxy"] = &httpsProxy
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build the actual image
|
// Build the actual image
|
||||||
@@ -231,8 +242,18 @@ 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{},
|
||||||
|
}
|
||||||
|
|
||||||
|
httpProxy := os.Getenv("HTTP_PROXY")
|
||||||
|
if len(httpProxy) > 0 {
|
||||||
|
buildOptions.BuildArgs["http_proxy"] = &httpProxy
|
||||||
|
}
|
||||||
|
httpsProxy := os.Getenv("HTTPS_PROXY")
|
||||||
|
if len(httpProxy) > 0 {
|
||||||
|
buildOptions.BuildArgs["https_proxy"] = &httpsProxy
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build the actual image
|
// Build the actual image
|
||||||
|
|||||||
@@ -1,14 +1,6 @@
|
|||||||
# Installation guide
|
# Installation guide
|
||||||
Installation of Shuffle is currently only available in docker. Looking for how to update Shuffle? Check the [updating guide](https://shuffler.io/docs/configuration#updating_shuffle)
|
Installation of Shuffle is currently only available in docker. Looking for how to update Shuffle? Check the [updating guide](https://shuffler.io/docs/configuration#updating_shuffle)
|
||||||
|
|
||||||
There are four parts to the infrastructure:
|
|
||||||
* Frontend - GUI, React
|
|
||||||
* Backend - Go
|
|
||||||
* Database - Google Datastore
|
|
||||||
* Orborus - Go, controls the workers to deploy. Can be used to connect to others' setup
|
|
||||||
* Worker - Controls each workflow execution
|
|
||||||
* App_sdk - Used
|
|
||||||
|
|
||||||
## Docker
|
## Docker
|
||||||
The Docker setup is done with docker-compose and is a single command to get set up.
|
The Docker setup is done with docker-compose and is a single command to get set up.
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user