From a9ec744fd48245f3a1dcddeabfe9b606c210d6f6 Mon Sep 17 00:00:00 2001 From: Renaud Gaubert Date: Tue, 22 Oct 2019 17:51:09 -0700 Subject: [PATCH] Move Dockerfiles to docker directory Signed-off-by: Renaud Gaubert --- Makefile | 10 +++++----- Dockerfile.amzn => docker/Dockerfile.amzn | 0 Dockerfile.centos => docker/Dockerfile.centos | 0 Dockerfile.debian => docker/Dockerfile.debian | 0 .../Dockerfile.opensuse-leap | 0 Dockerfile.ubuntu => docker/Dockerfile.ubuntu | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename Dockerfile.amzn => docker/Dockerfile.amzn (100%) rename Dockerfile.centos => docker/Dockerfile.centos (100%) rename Dockerfile.debian => docker/Dockerfile.debian (100%) rename Dockerfile.opensuse-leap => docker/Dockerfile.opensuse-leap (100%) rename Dockerfile.ubuntu => docker/Dockerfile.ubuntu (100%) diff --git a/Makefile b/Makefile index b2486f2..771922c 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ ubuntu%: --build-arg PKG_REV="$(PKG_REV)" \ --build-arg TOOLKIT_VERSION="$(TOOLKIT_VERSION)" \ --build-arg BASE="$(BASE)" \ - -t "nvidia/runtime/ubuntu:$*" -f Dockerfile.ubuntu . + -t "nvidia/runtime/ubuntu:$*" -f docker/Dockerfile.ubuntu . $(MKDIR) -p "$(DIST_DIR)/ubuntu$*/$(ARCH)" $(DOCKER) run --cidfile $@.cid "nvidia/runtime/ubuntu:$*" $(DOCKER) cp $$(cat $@.cid):/dist/. "$(DIST_DIR)/ubuntu$*/$(ARCH)/" @@ -37,7 +37,7 @@ debian%: --build-arg PKG_REV="$(PKG_REV)" \ --build-arg TOOLKIT_VERSION="$(TOOLKIT_VERSION)" \ --build-arg BASE="$(BASE)" \ - -t "nvidia/runtime/debian:$*" -f Dockerfile.debian . + -t "nvidia/runtime/debian:$*" -f docker/Dockerfile.debian . $(MKDIR) -p "$(DIST_DIR)/debian$*/$(ARCH)" $(DOCKER) run --cidfile $@.cid "nvidia/runtime/debian:$*" $(DOCKER) cp $$(cat $@.cid):/dist/. "$(DIST_DIR)/debian$*/$(ARCH)/" @@ -50,7 +50,7 @@ centos%: --build-arg PKG_REV="$(PKG_REV)" \ --build-arg TOOLKIT_VERSION="$(TOOLKIT_VERSION)" \ --build-arg BASE="$(BASE)" \ - -t "nvidia/runtime/centos:$*" -f Dockerfile.centos . + -t "nvidia/runtime/centos:$*" -f docker/Dockerfile.centos . $(MKDIR) -p "$(DIST_DIR)/centos$*/$(ARCH)" $(DOCKER) run --cidfile $@.cid "nvidia/runtime/centos:$*" $(DOCKER) cp $$(cat $@.cid):/dist/. "$(DIST_DIR)/centos$*/$(ARCH)/" @@ -63,7 +63,7 @@ amzn%: --build-arg PKG_REV="$(PKG_REV)" \ --build-arg TOOLKIT_VERSION="$(TOOLKIT_VERSION)" \ --build-arg BASE="$(BASE)" \ - -t "nvidia/runtime/amzn:$*" -f Dockerfile.amzn . + -t "nvidia/runtime/amzn:$*" -f docker/Dockerfile.amzn . $(MKDIR) -p "$(DIST_DIR)/amzn$*/$(ARCH)" $(DOCKER) run --cidfile $@.cid "nvidia/runtime/amzn:$*" $(DOCKER) cp $$(cat $@.cid):/dist/. "$(DIST_DIR)/amzn$*/$(ARCH)/" @@ -76,7 +76,7 @@ opensuse-leap%: --build-arg PKG_REV="$(PKG_REV)" \ --build-arg TOOLKIT_VERSION="$(TOOLKIT_VERSION)" \ --build-arg BASE="$(BASE)" \ - -t "nvidia/runtime/opensuse-leap:$*" -f Dockerfile.opensuse-leap . + -t "nvidia/runtime/opensuse-leap:$*" -f docker/Dockerfile.opensuse-leap . $(MKDIR) -p $(DIST_DIR)/opensuse-leap$*/$(ARCH) $(DOCKER) run --cidfile $@.cid "nvidia/runtime/opensuse-leap:$*" $(DOCKER) cp $$(cat $@.cid):/dist/. $(DIST_DIR)/opensuse-leap$*/$(ARCH)/ diff --git a/Dockerfile.amzn b/docker/Dockerfile.amzn similarity index 100% rename from Dockerfile.amzn rename to docker/Dockerfile.amzn diff --git a/Dockerfile.centos b/docker/Dockerfile.centos similarity index 100% rename from Dockerfile.centos rename to docker/Dockerfile.centos diff --git a/Dockerfile.debian b/docker/Dockerfile.debian similarity index 100% rename from Dockerfile.debian rename to docker/Dockerfile.debian diff --git a/Dockerfile.opensuse-leap b/docker/Dockerfile.opensuse-leap similarity index 100% rename from Dockerfile.opensuse-leap rename to docker/Dockerfile.opensuse-leap diff --git a/Dockerfile.ubuntu b/docker/Dockerfile.ubuntu similarity index 100% rename from Dockerfile.ubuntu rename to docker/Dockerfile.ubuntu -- GitLab