summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTilo Spannagel <development@tilosp.de>2020-06-30 01:11:41 +0200
committerGitHub <noreply@github.com>2020-06-30 01:11:41 +0200
commit1e702241082208e0af748370786d2ec18df39246 (patch)
treef1893c9146c346dd594e50e14267d519fd2be6ad
parentf9ef31431dc0be4b4e2227e90f6a336492da661c (diff)
parent84b26184c52d6d796df9b041a5383669b8b432a9 (diff)
Merge pull request #1161 from J0WI/alpine-3.12
Upgrade Alpine to 3.12
-rw-r--r--17.0/fpm-alpine/Dockerfile2
-rw-r--r--18.0/fpm-alpine/Dockerfile2
-rw-r--r--19.0/fpm-alpine/Dockerfile2
-rw-r--r--Dockerfile-alpine.template2
4 files changed, 4 insertions, 4 deletions
diff --git a/17.0/fpm-alpine/Dockerfile b/17.0/fpm-alpine/Dockerfile
index c2645fc1..3abe0393 100644
--- a/17.0/fpm-alpine/Dockerfile
+++ b/17.0/fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.3-fpm-alpine3.11
+FROM php:7.3-fpm-alpine3.12
# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
diff --git a/18.0/fpm-alpine/Dockerfile b/18.0/fpm-alpine/Dockerfile
index 18de6afa..ad2491ff 100644
--- a/18.0/fpm-alpine/Dockerfile
+++ b/18.0/fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.3-fpm-alpine3.11
+FROM php:7.3-fpm-alpine3.12
# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
diff --git a/19.0/fpm-alpine/Dockerfile b/19.0/fpm-alpine/Dockerfile
index 9d5dac6d..8860a2d9 100644
--- a/19.0/fpm-alpine/Dockerfile
+++ b/19.0/fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:7.4-fpm-alpine3.11
+FROM php:7.4-fpm-alpine3.12
# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 28bec67f..1beeae26 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -1,4 +1,4 @@
-FROM php:%%PHP_VERSION%%-%%VARIANT%%3.11
+FROM php:%%PHP_VERSION%%-%%VARIANT%%3.12
# entrypoint.sh and cron.sh dependencies
RUN set -ex; \