From d3ab48669e6ec0db14e372e9afce6507c9e22621 Mon Sep 17 00:00:00 2001 From: Cyril Tovena Date: Mon, 8 Jul 2019 13:58:51 -0400 Subject: [PATCH] move Dockerfile multi-arch to build and ignore that folder (#723) * move Dockerfile multi-arch to build and ignore that folder * docker-driver fix --- Makefile | 2 +- Dockerfile => build/Dockerfile | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename Dockerfile => build/Dockerfile (100%) diff --git a/Makefile b/Makefile index ff74cc07b6a22..9fa45ebb43ab5 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD) # We don't want find to scan inside a bunch of directories, to accelerate the # 'make: Entering directory '/go/src/github.com/grafana/loki' phase. -DONT_FIND := -name tools -prune -o -name vendor -prune -o -name .git -prune -o -name .cache -prune -o -name .pkg -prune -o +DONT_FIND := -name build -prune -o -name tools -prune -o -name vendor -prune -o -name .git -prune -o -name .cache -prune -o -name .pkg -prune -o # Get a list of directories containing Dockerfiles DOCKERFILES := $(shell find . -name docker-driver -prune -o $(DONT_FIND) -type f -name 'Dockerfile' -print) diff --git a/Dockerfile b/build/Dockerfile similarity index 100% rename from Dockerfile rename to build/Dockerfile