Skip to content

Commit

Permalink
Improve checking dummy kernel module
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Scherer <[email protected]>
  • Loading branch information
StefanScherer committed Mar 14, 2016
1 parent 9ad946e commit 53ba08c
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 12 deletions.
14 changes: 2 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -84,25 +84,15 @@ 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:
mkdir bundles

cross: build
$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary binary cross


win: build
$(DOCKER_RUN_DOCKER) hack/make.sh win

Expand Down
15 changes: 15 additions & 0 deletions project/ARM.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,18 @@ So for example in order to build a Docker binary one has to
1. clone the Docker/Docker repository on an ARM device `git clone [email protected]:docker/docker.git`
2. change into the checked out repository with `cd docker`
3. execute `make binary` to create a Docker Engine binary for ARM

## Kernel modules
A few libnetwork integration tests require that the kernel be
configured with "dummy" network interface and has the module
loaded. However, the dummy module may be not loaded automatically.

To load the kernel module permanently, run these commands as `root`.

modprobe dummy
echo "dummy" >> /etc/modules

On some systems you also have to sync your kernel modules.

oc-sync-kernel-modules
depmod

0 comments on commit 53ba08c

Please sign in to comment.