Merge pull request #4076 from mboersma/debian-noninteractive

mboersma · mboersma · commit 0bd256829cc3 · 2015-07-22T10:36:25.000-06:00
fix(Dockerfiles): silence apt-get TTY warnings
diff --git a/controller/Dockerfile b/controller/Dockerfile
@@ -1,7 +1,5 @@
 FROM alpine:3.1
 
-ENV DEBIAN_FRONTEND noninteractive
-
 # install common packages
 RUN apk add --update-cache curl bash sudo && rm -rf /var/cache/apk/*
 
diff --git a/database/Dockerfile b/database/Dockerfile
@@ -1,7 +1,5 @@
 FROM alpine:3.1
 
-ENV DEBIAN_FRONTEND noninteractive
-
 # install common packages
 RUN apk add --update-cache curl bash sudo && rm -rf /var/cache/apk/*
 
diff --git a/mesos/build-marathon b/mesos/build-marathon
@@ -1,5 +1,6 @@
 FROM deis/mesos-template:#VERSION#
 
+ENV DEBIAN_FRONTEND noninteractive
 ENV MARATHON_VERSION=#MARATHON_VERSION#
 
 COPY build-marathon-jar.sh /tmp/build.sh
diff --git a/mesos/template b/mesos/template
@@ -1,5 +1,7 @@
 FROM ubuntu-debootstrap:14.04
 
+ENV DEBIAN_FRONTEND noninteractive
+
 COPY build-mesos.sh /tmp/build.sh
 
 RUN DOCKER_BUILD=true MESOS="#VERSION#" /tmp/build.sh
diff --git a/router/image/Dockerfile b/router/image/Dockerfile
@@ -1,7 +1,5 @@
 FROM alpine:3.1
 
-ENV DEBIAN_FRONTEND noninteractive
-
 # install common packages
 RUN apk add --update-cache curl bash sudo && rm -rf /var/cache/apk/*
 
