Merge pull request #371 from J0WI/alpine11

jsternberg · web-flow · commit 5fd2f68ea8bb · 2020-08-31T17:29:54.000-05:00
Upgrading all instances of alpine:3.9 to 3.12
diff --git a/chronograf/1.6/alpine/Dockerfile b/chronograf/1.6/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.12
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache ca-certificates && \
diff --git a/chronograf/1.7/alpine/Dockerfile b/chronograf/1.7/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.12
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache ca-certificates && \
diff --git a/chronograf/1.8/alpine/Dockerfile b/chronograf/1.8/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.12
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache ca-certificates && \
diff --git a/influxdb/1.7/alpine/Dockerfile b/influxdb/1.7/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.12
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache tzdata bash ca-certificates && \
diff --git a/influxdb/1.7/data/alpine/Dockerfile b/influxdb/1.7/data/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.12
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache tzdata bash ca-certificates && \
diff --git a/influxdb/1.7/meta/alpine/Dockerfile b/influxdb/1.7/meta/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.12
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache tzdata bash ca-certificates && \
diff --git a/influxdb/1.8/alpine/Dockerfile b/influxdb/1.8/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.12
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache tzdata bash ca-certificates && \
diff --git a/influxdb/1.8/data/alpine/Dockerfile b/influxdb/1.8/data/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.12
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache tzdata bash ca-certificates && \
diff --git a/influxdb/1.8/meta/alpine/Dockerfile b/influxdb/1.8/meta/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.12
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache tzdata bash ca-certificates && \
diff --git a/influxdb/nightly/alpine/Dockerfile b/influxdb/nightly/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.12
 
 RUN apk add --no-cache bash
 
diff --git a/kapacitor/1.4/alpine/Dockerfile b/kapacitor/1.4/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.12
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache ca-certificates && \
diff --git a/kapacitor/1.5/alpine/Dockerfile b/kapacitor/1.5/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.12
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache ca-certificates && \
diff --git a/telegraf/1.13/alpine/Dockerfile b/telegraf/1.13/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.12
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata && \
diff --git a/telegraf/1.14/alpine/Dockerfile b/telegraf/1.14/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.12
 
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors tzdata && \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM alpine:3.9`
	`1`	`+FROM alpine:3.12`
`2`	`2`
`3`	`3`	`RUN echo 'hosts: files dns' >> /etc/nsswitch.conf`
`4`	`4`	`RUN apk add --no-cache ca-certificates && \`