Merge pull request #359 from J0WI/alpine-3.18

tianon · web-flow · commit 6e8cdde42b4b · 2023-05-10T22:14:57.000Z
Alpine 3.18
diff --git a/6.0/alpine/Dockerfile b/6.0/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18
 
 # 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.17
+FROM alpine:3.18
 
 # 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/7.0/alpine/Dockerfile b/7.0/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18
 
 # 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/7.2-rc/alpine/Dockerfile b/7.2-rc/alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17
+FROM alpine:3.18
 
 # 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.17
+FROM alpine:3.18
 
 # 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.17`
	`1`	`+FROM alpine:3.18`
`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`