From 783ec72d56f419ff93c327a07092acc0a4f75960 Mon Sep 17 00:00:00 2001 From: Stanislav Bogatyrev Date: Mon, 3 Aug 2020 21:44:42 +0300 Subject: [PATCH] build: Simplify Docker image build Signed-off-by: Stanislav Bogatyrev --- Dockerfile => Dockerfile.storage | 0 Makefile | 18 ++++-------------- 2 files changed, 4 insertions(+), 14 deletions(-) rename Dockerfile => Dockerfile.storage (100%) diff --git a/Dockerfile b/Dockerfile.storage similarity index 100% rename from Dockerfile rename to Dockerfile.storage diff --git a/Makefile b/Makefile index bc986eb8c..b191e99d6 100644 --- a/Makefile +++ b/Makefile @@ -66,24 +66,14 @@ protoc: rm -rf vendor # Build NeoFS Storage Node docker image -image-storage: - @echo "⇒ Build NeoFS Storage Node docker image " +image-%: + @echo "⇒ Build NeoFS $* docker image " @docker build \ --build-arg REPO=$(REPO) \ --build-arg VERSION=$(VERSION) \ --rm \ - -f Dockerfile \ - -t $(HUB_IMAGE)-storage:$(HUB_TAG) . - -# Build NeoFS Storage Node docker image -image-ir: - @echo "⇒ Build NeoFS Inner Ring docker image " - @docker build \ - --build-arg REPO=$(REPO) \ - --build-arg VERSION=$(VERSION) \ - --rm \ - -f Dockerfile.ir \ - -t $(HUB_IMAGE)-ir:$(HUB_TAG) . + -f Dockerfile.$* \ + -t $(HUB_IMAGE)-$*:$(HUB_TAG) . # Build all Docker images images: image-storage image-ir