github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 18:11:35 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/auditd/Makefile
View File

@ -1,3 +1,3 @@
include ../package.mk
IMAGE?=auditd
include ../package.mk

4
pkg/binfmt/Makefile
View File

@ -1,4 +1,4 @@
include ../package.mk
IMAGE=binfmt
DEPS=main.go $(wildcard etc/binmft.d/*)
include ../package.mk

4
pkg/ca-certificates/Makefile
View File

@ -1,3 +1,3 @@
include ../package.mk
IMAGE=ca-certificates
include ../package.mk

4
pkg/containerd/Makefile
View File

@ -1,4 +1,4 @@
include ../package.mk
IMAGE=containerd
NETWORK=1
include ../package.mk

4
pkg/dhcpcd/Makefile
View File

@ -1,4 +1,4 @@
include ../package.mk
IMAGE=dhcpcd
DEPS=dhcpcd.conf $(wildcard usr/lib/dhcpcd/dhcpcd-hooks/*)
include ../package.mk

4
pkg/docker-ce/Makefile
View File

@ -1,4 +1,4 @@
include ../package.mk
IMAGE=docker-ce
NETWORK=1
include ../package.mk

4
pkg/format/Makefile
View File

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

4
pkg/getty/Makefile
View File

@ -1,4 +1,4 @@
include ../package.mk
IMAGE=getty
DEPS=usr/bin/rungetty.sh $(wildcard etc/*) $(wildcard etc/init.d/*)
include ../package.mk

4
pkg/init/Makefile
View File

@ -1,4 +1,4 @@
include ../package.mk
IMAGE=init
DEPS=init usermode-helper.c $(wildcard etc/*) $(wildcard etc/init.d/*)
include ../package.mk

4
pkg/metadata/Makefile
View File

@ -1,4 +1,4 @@
include ../package.mk
IMAGE=metadata
DEPS=$(wildcard *.go)
include ../package.mk

4
pkg/mkimage/Makefile
View File

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

4
pkg/mount/Makefile
View File

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

4
pkg/node_exporter/Makefile
View File

@ -1,3 +1,3 @@
include ../package.mk
IMAGE=node_exporter
include ../package.mk

4
pkg/open-vm-tools/Makefile
View File

@ -1,3 +1,3 @@
include ../package.mk
IMAGE=open-vm-tools
include ../package.mk

4
pkg/openntpd/Makefile
View File

@ -1,4 +1,4 @@
include ../package.mk
IMAGE=openntpd
DEPS=etc/ntpd.conf
include ../package.mk

2
pkg/package.mk
View File

@ -21,7 +21,7 @@ endif
# Get a release tag, if present
RELEASE=$(shell git tag -l --points-at HEAD)
ifndef $(NETWORK)
ifdef NETWORK
NET_OPT=
else
NET_OPT=--network=none

4
pkg/qemu-ga/Makefile
View File

@ -1,3 +1,3 @@
include ../package.mk
IMAGE=qemu-ga
include ../package.mk

4
pkg/rngd/Makefile
View File

@ -1,3 +1,3 @@
include ../package.mk
IMAGE=rngd
include ../package.mk

4
pkg/runc/Makefile
View File

@ -1,4 +1,4 @@
include ../package.mk
IMAGE=runc
NETWORK=1
include ../package.mk

4
pkg/sshd/Makefile
View File

@ -1,4 +1,4 @@
include ../package.mk
IMAGE=sshd
DEPS=etc/motd etc/ssh/sshd_config usr/bin/ssh.sh
include ../package.mk

4
pkg/swap/Makefile
View File

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

4
pkg/sysctl/Makefile
View File

@ -1,4 +1,4 @@
include ../package.mk
IMAGE=sysctl
DEPS=main.go
include ../package.mk

4
pkg/sysfs/Makefile
View File

@ -1,4 +1,4 @@
include ../package.mk
IMAGE=sysfs
DEPS=main.go
include ../package.mk

4
pkg/trim-after-delete/Makefile
View File

@ -1,4 +1,4 @@
include ../package.mk
IMAGE=trim-after-delete
DEPS=$(wildcard *.go)
include ../package.mk

4
pkg/vpnkit-forwarder/Makefile
View File

@ -1,5 +1,5 @@
include ../package.mk
IMAGE=vpnkit-forwarder
DEPS=$(wildcard *.go)
NETWORK=1
include ../package.mk

4
pkg/vsudd/Makefile
View File

@ -1,5 +1,5 @@
include ../package.mk
IMAGE=vsudd
DEPS=$(wildcard *.go)
NETWORK=1
include ../package.mk