Merge pull request #280 from J0WI/alpine-3.14

yosifkit · web-flow · commit f5386d5a84dd · 2021-06-16T10:11:07.000-07:00
Alpine 3.14
diff --git a/5/alpine/Dockerfile b/5/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3.14
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN addgroup -S -g 1000 redis && adduser -S -G redis -u 999 redis
diff --git a/6.0/alpine/Dockerfile b/6.0/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3.14
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN addgroup -S -g 1000 redis && adduser -S -G redis -u 999 redis
diff --git a/6.2/alpine/Dockerfile b/6.2/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3.14
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN addgroup -S -g 1000 redis && adduser -S -G redis -u 999 redis
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -1,4 +1,4 @@
-FROM alpine:3.13
+FROM alpine:3.14
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN addgroup -S -g 1000 redis && adduser -S -G redis -u 999 redis

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM alpine:3.13`
	`1`	`+FROM alpine:3.14`
`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 -g 1000 redis && adduser -S -G redis -u 999 redis`