centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-27 14:28:47 +07:00
Code Issues Packages Projects Releases Wiki Activity

Improve checking dummy kernel module

Browse Source 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
This commit is contained in:
Stefan Scherer
2016-03-11 07:55:07 +01:00
parent 9ad946eded
commit 53ba08c874
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@@ -84,16 +84,6 @@ binary: build
$(DOCKER_RUN_DOCKER) hack/make.sh binary
build: bundles
ifeq ($(DOCKER_OSARCH), linux/arm)
# A few libnetwork integration tests require that the kernel be
# configured with "dummy" network interface and has the module
# loaded. However, the dummy module is not available by default
# on arm images. This ensures that it's built and loaded.
echo "Syncing kernel modules"
oc-sync-kernel-modules
depmod
modprobe dummy
endif
docker build ${DOCKER_BUILD_ARGS} -t "$(DOCKER_IMAGE)" -f "$(DOCKERFILE)" .
bundles:
@@ -101,8 +91,8 @@ bundles:
cross: build
$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary binary cross
win: build
$(DOCKER_RUN_DOCKER) hack/make.sh win