chore(packaging): avoid running containers from Dockerfile

grafana · Aug 12, 2019 · 4eddcc1 · 4eddcc1
1 parent e4b99f2
commit 4eddcc1
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/cmd/docker-driver/Dockerfile b/cmd/docker-driver/Dockerfile
@@ -7,7 +7,7 @@ ARG BUILD_IMAGE=grafana/loki-build-image:latest
 FROM $BUILD_IMAGE as build
 COPY . /go/src/github.com/grafana/loki
 WORKDIR /go/src/github.com/grafana/loki
-RUN make clean && make cmd/docker-driver/docker-driver
+RUN make clean && make BUILD_IN_CONTAINER=false cmd/docker-driver/docker-driver
 
 FROM alpine:3.9
 RUN apk add --update --no-cache ca-certificates

diff --git a/cmd/loki-canary/Dockerfile b/cmd/loki-canary/Dockerfile
@@ -10,7 +10,7 @@ FROM --platform=linux/amd64 $BUILD_IMAGE as build
 COPY --from=goenv /goarch /goarm /
 COPY . /go/src/github.com/grafana/loki
 WORKDIR /go/src/github.com/grafana/loki
-RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make loki-canary
+RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false loki-canary
 
 FROM alpine:3.9
 RUN apk add --update --no-cache ca-certificates

diff --git a/cmd/loki/Dockerfile b/cmd/loki/Dockerfile
@@ -10,7 +10,7 @@ FROM --platform=linux/amd64 $BUILD_IMAGE as build
 COPY --from=goenv /goarch /goarm /
 COPY . /go/src/github.com/grafana/loki
 WORKDIR /go/src/github.com/grafana/loki
-RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make loki
+RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false loki
 
 FROM alpine:3.9
 RUN apk add --update --no-cache ca-certificates

diff --git a/cmd/loki/Dockerfile.debug b/cmd/loki/Dockerfile.debug
@@ -6,7 +6,7 @@ FROM grafana/loki-build-image as build
 ARG GOARCH="amd64"
 COPY . /go/src/github.com/grafana/loki
 WORKDIR /go/src/github.com/grafana/loki
-RUN make clean && make loki-debug
+RUN make clean && make BUILD_IN_CONTAINER=false loki-debug
 
 FROM       alpine:3.9
 RUN        apk add --update --no-cache ca-certificates

diff --git a/cmd/promtail/Dockerfile b/cmd/promtail/Dockerfile
@@ -10,7 +10,7 @@ FROM --platform=linux/amd64 $BUILD_IMAGE as build
 COPY --from=goenv /goarch /goarm /
 COPY . /go/src/github.com/grafana/loki
 WORKDIR /go/src/github.com/grafana/loki
-RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make promtail
+RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false promtail
 
 # Promtail requires debian as the base image to support systemd journal reading
 FROM debian:stretch-slim

diff --git a/cmd/promtail/Dockerfile.debug b/cmd/promtail/Dockerfile.debug
@@ -6,7 +6,7 @@ FROM grafana/loki-build-image as build
 ARG GOARCH="amd64"
 COPY . /go/src/github.com/grafana/loki
 WORKDIR /go/src/github.com/grafana/loki
-RUN make clean && make promtail-debug
+RUN make clean && make BUILD_IN_CONTAINER=false promtail-debug
 
 
 FROM       alpine:3.9