Browse code
Only set DOCKER_CROSSPLATFORMS from env if it's set
This allows for the default to come from the image/`Dockerfile` rather
than being unconditionally overwritten by the environment.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Tianon Gravi authored on 2017/05/04 23:13:09Showing 1 changed files
| ... | ... |
@@ -17,13 +17,13 @@ export DOCKER_GITCOMMIT |
| 17 | 17 |
# to allow things like `make KEEPBUNDLE=1 binary` easily |
| 18 | 18 |
# `project/PACKAGERS.md` have some limited documentation of some of these |
| 19 | 19 |
DOCKER_ENVS := \ |
| 20 |
+ $(if $(DOCKER_CROSSPLATFORMS), -e DOCKER_CROSSPLATFORMS) \ |
|
| 20 | 21 |
-e BUILD_APT_MIRROR \ |
| 21 | 22 |
-e BUILDFLAGS \ |
| 22 | 23 |
-e KEEPBUNDLE \ |
| 23 | 24 |
-e DOCKER_BUILD_ARGS \ |
| 24 | 25 |
-e DOCKER_BUILD_GOGC \ |
| 25 | 26 |
-e DOCKER_BUILD_PKGS \ |
| 26 |
- -e DOCKER_CROSSPLATFORMS \ |
|
| 27 | 27 |
-e DOCKER_DEBUG \ |
| 28 | 28 |
-e DOCKER_EXPERIMENTAL \ |
| 29 | 29 |
-e DOCKER_GITCOMMIT \ |