From 3977e379aeafc472ffcb001afaef91520cb0203b Mon Sep 17 00:00:00 2001 From: Ivan Mikushin Date: Fri, 14 Aug 2015 16:48:24 +0500 Subject: [PATCH] cleanup to host rancher/os (os-installer) Dockerfile --- Dockerfile => Dockerfile.build | 0 Dockerfile.base => Dockerfile.build-base | 0 Makefile | 4 ++-- scripts/ci | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename Dockerfile => Dockerfile.build (100%) rename Dockerfile.base => Dockerfile.build-base (100%) diff --git a/Dockerfile b/Dockerfile.build similarity index 100% rename from Dockerfile rename to Dockerfile.build diff --git a/Dockerfile.base b/Dockerfile.build-base similarity index 100% rename from Dockerfile.base rename to Dockerfile.build-base diff --git a/Makefile b/Makefile index 47ea8cdc..40d6a15d 100644 --- a/Makefile +++ b/Makefile @@ -8,11 +8,11 @@ all: clean ros-build-base build-all ros-build-base: - docker build -t ros-build-base -f Dockerfile.base . + docker build -t ros-build-base -f Dockerfile.build-base . ros-build-image: - docker build -t ros-build . + docker build -t ros-build -f Dockerfile.build . bin/rancheros: ros-build-image diff --git a/scripts/ci b/scripts/ci index b8188b50..fb50b2cb 100755 --- a/scripts/ci +++ b/scripts/ci @@ -7,6 +7,6 @@ if [ -x "$(which wrapdocker)" ] && ! docker info >/dev/null 2>&1; then wrapdocker fi -docker build -t ros-build-base -f Dockerfile.base . -docker build -t ros-build . +docker build -t ros-build-base -f Dockerfile.build-base . +docker build -t ros-build -f Dockerfile.build . ./scripts/docker-run.sh make -f Makefile.docker build-all