From 6c944ab9a0e6611b8410c91ef013bab12bd754c1 Mon Sep 17 00:00:00 2001 From: icex2 Date: Sun, 17 Jan 2021 00:39:48 +0100 Subject: [PATCH] Rename dockerfile to allow using multiple dockerfiles --- Dockerfile => Dockerfile.build | 0 Makefile | 2 +- doc/hook/hook.md | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename Dockerfile => Dockerfile.build (100%) diff --git a/Dockerfile b/Dockerfile.build similarity index 100% rename from Dockerfile rename to Dockerfile.build diff --git a/Makefile b/Makefile index 623df41..dad798e 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ test: build build-docker: $(V)rm -rf $(BUILDDIR)/docker $(V)mkdir -p $(BUILDDIR)/docker - $(V)docker build -t pumptools:build . + $(V)docker build -f Dockerfile.build -t pumptools:build . $(V)docker create --name pumptools-build pumptools:build $(V)docker cp pumptools-build:/pumptools/build $(BUILDDIR)/docker $(V)mv $(BUILDDIR)/docker/build/* $(BUILDDIR)/docker diff --git a/doc/hook/hook.md b/doc/hook/hook.md index 845aab1..83f1e9a 100644 --- a/doc/hook/hook.md +++ b/doc/hook/hook.md @@ -28,7 +28,7 @@ features to work correctly: * Hook libraries, e.g. `nx2hook` that support network features, e.g. usb profiles with pumpnet * IO API implementations that support real devices, e.g. real PIUIO, which use libusb-1.0 -Taken from [the Dockerfile for building pumptools](../../Dockerfile), the following commands install +Taken from [the Dockerfile for building pumptools](../../Dockerfile.build), the following commands install the dependencies that you need on an Ubuntu-based system: ```bash