Browse Source

chore(docker): update base images, fixes #57

As a consequence, also adjust some package dependencies. Also, since
MariaDB 10.2.4, SQL_MODE by default includes STRICT_TRANS_TABLES,
necessitating a change in the dbmaster init scripts.

For some reason, pool.sks-keyservers.net is unreliable, so we switched
to keys.gnupg.net.
Peter Thomassen 7 years ago
parent
commit
035e375ed1

+ 1 - 1
api/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.5
+FROM python:3.6
 
 RUN apt-get update && apt-get install -y \
 		gcc \

+ 1 - 1
dbapi/Dockerfile

@@ -1,4 +1,4 @@
-FROM mariadb:10.1
+FROM mariadb:10.2
 
 # Use random throw-away root password. Our init scripts switch authentication to socket logins only
 ENV MYSQL_RANDOM_ROOT_PASSWORD=yes

+ 1 - 1
dblord/Dockerfile

@@ -1,4 +1,4 @@
-FROM mariadb:10.1
+FROM mariadb:10.2
 
 # Use random throw-away root password. Our init scripts switch authentication to socket logins only
 ENV MYSQL_RANDOM_ROOT_PASSWORD=yes

+ 1 - 1
dbmaster/Dockerfile

@@ -1,4 +1,4 @@
-FROM mariadb:10.1
+FROM mariadb:10.2
 
 # Use random throw-away root password. Our init scripts switch authentication to socket logins only
 ENV MYSQL_RANDOM_ROOT_PASSWORD=yes

+ 1 - 1
dbmaster/initdb.d/11-pdns-master-supermasters.sql.var

@@ -1,3 +1,3 @@
 USE pdns;
 
-INSERT INTO supermasters SET ip="${DESECSTACK_IPV4_REAR_PREFIX16}.1.11", nameserver="ns1.desec.io";
+INSERT INTO supermasters SET ip="${DESECSTACK_IPV4_REAR_PREFIX16}.1.11", nameserver="ns1.desec.io", account="";

+ 4 - 3
nslord/Dockerfile

@@ -1,11 +1,12 @@
-FROM debian:jessie
+FROM debian:stretch
 
 RUN apt-get update && apt-get install -y \
 		dnsutils \
 		net-tools \
+		dirmngr gnupg \
 	--no-install-recommends && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN echo 'deb http://repo.powerdns.com/debian jessie-auth-40 main' \
+RUN echo 'deb http://repo.powerdns.com/debian stretch-auth-40 main' \
       >> /etc/apt/sources.list \
  && echo 'Package: pdns-*' \
       > /etc/apt/preferences.d/pdns \
@@ -15,7 +16,7 @@ RUN echo 'deb http://repo.powerdns.com/debian jessie-auth-40 main' \
       >> /etc/apt/preferences.d/pdns
 
 RUN set -ex \
-	&& apt-key adv --keyserver hkp://pool.sks-keyservers.net --recv 0x1B0C6205FD380FBB \
+	&& apt-key adv --keyserver hkp://keys.gnupg.net --recv 0x1B0C6205FD380FBB \
 	&& apt-get update \
 	&& apt-get install -y pdns-server pdns-backend-mysql \
 	# credentials management via envsubst

+ 4 - 3
nsmaster/Dockerfile

@@ -1,11 +1,12 @@
-FROM debian:jessie
+FROM debian:stretch
 
 RUN apt-get update && apt-get install -y \
 		dnsutils \
 		net-tools \
+		dirmngr gnupg \
 	--no-install-recommends && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN echo 'deb http://repo.powerdns.com/debian jessie-auth-40 main' \
+RUN echo 'deb http://repo.powerdns.com/debian stretch-auth-40 main' \
       >> /etc/apt/sources.list \
  && echo 'Package: pdns-*' \
       > /etc/apt/preferences.d/pdns \
@@ -15,7 +16,7 @@ RUN echo 'deb http://repo.powerdns.com/debian jessie-auth-40 main' \
       >> /etc/apt/preferences.d/pdns
 
 RUN set -ex \
-	&& apt-key adv --keyserver hkp://pool.sks-keyservers.net --recv 0x1B0C6205FD380FBB \
+	&& apt-key adv --keyserver hkp://keys.gnupg.net --recv 0x1B0C6205FD380FBB \
 	&& apt-get update \
 	&& apt-get install -y pdns-server pdns-backend-mysql \
 	# credentials management via envsubst

+ 1 - 1
www/Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.11-alpine
+FROM nginx:1.12-alpine
 
 # Add dependencies for our scripts
 RUN apk add --no-cache bash openssl