Merge pull request #268 from michael-k/alpine-3.8

tianon · web-flow · commit 81f98fc2db54 · 2018-07-10T13:58:57.000-06:00
Bump alpine to 3.8
diff --git a/3.6-rc/alpine/Dockerfile b/3.6-rc/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.6
+FROM alpine:3.8
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN addgroup -S rabbitmq && adduser -S -h /var/lib/rabbitmq -G rabbitmq rabbitmq
diff --git a/3.6/alpine/Dockerfile b/3.6/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.6
+FROM alpine:3.8
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN addgroup -S rabbitmq && adduser -S -h /var/lib/rabbitmq -G rabbitmq rabbitmq
diff --git a/3.7-rc/alpine/Dockerfile b/3.7-rc/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN addgroup -S rabbitmq && adduser -S -h /var/lib/rabbitmq -G rabbitmq rabbitmq
diff --git a/3.7/alpine/Dockerfile b/3.7/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN addgroup -S rabbitmq && adduser -S -h /var/lib/rabbitmq -G rabbitmq rabbitmq

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM alpine:3.6`
	`1`	`+FROM alpine:3.8`
`2`	`2`
`3`	`3`	`# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added`
`4`	`4`	`RUN addgroup -S rabbitmq && adduser -S -h /var/lib/rabbitmq -G rabbitmq rabbitmq`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM alpine:3.7`
	`1`	`+FROM alpine:3.8`
`2`	`2`
`3`	`3`	`# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added`
`4`	`4`	`RUN addgroup -S rabbitmq && adduser -S -h /var/lib/rabbitmq -G rabbitmq rabbitmq`