summaryrefslogtreecommitdiffstats
path: root/dockerfiles
diff options
context:
space:
mode:
Diffstat (limited to 'dockerfiles')
-rw-r--r--dockerfiles/images/mysql/Dockerfile2
-rw-r--r--dockerfiles/images/postgres/Dockerfile2
2 files changed, 3 insertions, 1 deletions
diff --git a/dockerfiles/images/mysql/Dockerfile b/dockerfiles/images/mysql/Dockerfile
index 9b163e32bf..8fff5a194c 100644
--- a/dockerfiles/images/mysql/Dockerfile
+++ b/dockerfiles/images/mysql/Dockerfile
@@ -10,7 +10,7 @@ RUN add-apt-repository -y "deb http://archive.ubuntu.com/ubuntu $(lsb_release -s
RUN apt-get --yes --force-yes update
RUN apt-get --yes --force-yes upgrade
-ENV MYSQL_PASSWORD THE_MYSQL_PASSWORD
+ENV MYSQL_PASSWORD THE_DB_PASSWORD
RUN echo "mysql-server mysql-server/root_password password $MYSQL_PASSWORD" | debconf-set-selections
RUN echo "mysql-server mysql-server/root_password_again password $MYSQL_PASSWORD" | debconf-set-selections
diff --git a/dockerfiles/images/postgres/Dockerfile b/dockerfiles/images/postgres/Dockerfile
index 9f026600c6..44e82b7d88 100644
--- a/dockerfiles/images/postgres/Dockerfile
+++ b/dockerfiles/images/postgres/Dockerfile
@@ -1,6 +1,8 @@
FROM ubuntu
MAINTAINER SvenDowideit@docker.com
+ENV DEBIAN_FRONTEND noninteractive
+
# Add the PostgreSQL PGP key to verify their Debian packages.
# It should be the same key as https://www.postgresql.org/media/keys/ACCC4CF8.asc
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8