github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-02 07:26:13 +00:00
Code Issues Projects Releases Wiki Activity

Makefile: Fix bug where network was not disabled

Browse Source 
This commit moves the include statement to the bottom of the file to
ensure that all variables are set before conditionals are evaluated.

I also changed the ifndef NETWORK to ifdef NETWORK as the former was
incorrect. We want `NET_OPTS="--network=none"` in cases where NETWORK is
not defined.

Fixes: #2134

Signed-off-by: Dave Tucker <dt@docker.com>
This commit is contained in:
Dave Tucker
2017-06-30 11:55:08 +01:00
parent 736713dc8f
commit 5a225b9dc5
26 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/mkimage/Makefile
View File

@@ -1,4 +1,4 @@
include ../package.mk
IMAGE=mkimage
DEPS=mkimage.sh
include ../package.mk