v2.2.0 (#43)

bfren · web-flow · commit b41ad47372c6 · 2022-05-28T11:21:41.000+01:00
Major updates
* Using Alpin 3.16 for PHP 8
* Removing unnecessary create PHP 8 symlink
* Using latest base images

Minor updates
* Updating to PHP 8.0.19
* Using Alpine 3.15 repos to install PHP 7.4

Documentation updates
* Using new bfren shields
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/apache:apache2.4.4x-2.1.14
+FROM bfren/apache:apache2.4.4x-2.2.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
 
diff --git a/7.4/Dockerfile b/7.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/apache:apache2.4.5x-2.1.14
+FROM bfren/apache:apache2.4.5x-2.2.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
 
diff --git a/7.4/overlay/etc/apk/repositories b/7.4/overlay/etc/apk/repositories
@@ -0,0 +1,4 @@
+https://dl-cdn.alpinelinux.org/alpine/v3.15/main
+https://dl-cdn.alpinelinux.org/alpine/v3.15/community
+@edgemain https://dl-cdn.alpinelinux.org/alpine/edge/main
+@edgecomm https://dl-cdn.alpinelinux.org/alpine/edge/community
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/apache:apache2.4.5x-2.1.14
+FROM bfren/apache:apache2.4.5x-2.2.0
 
 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
 
diff --git a/8.0/overlay/tmp/PHP_BUILD b/8.0/overlay/tmp/PHP_BUILD
@@ -1 +1 @@
-8.0.18-r0
+8.0.19-r1
diff --git a/8.0/overlay/tmp/PHP_REVISION b/8.0/overlay/tmp/PHP_REVISION
@@ -1 +1 @@
-8.0.18
+8.0.19
diff --git a/8.0/overlay/tmp/install-php b/8.0/overlay/tmp/install-php
@@ -12,10 +12,3 @@ apk add --no-cache \
     php8-apache2=${1} \
     php8-common=${1} \
     php8-session=${1}
-
-
-#======================================================================================================================
-# Create symlinks so PHP can be called on the commandline using php.
-#======================================================================================================================
-
-ln -s /usr/bin/php8 /usr/bin/php
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Docker Apache PHP
 
-![GitHub release (latest by date)](https://img.shields.io/github/v/release/bfren/docker-apache-php) ![Docker Pulls](https://img.shields.io/docker/pulls/bfren/apache-php?label=pulls) ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/bfren/apache-php/latest?label=size)<br/>
+![GitHub release (latest by date)](https://img.shields.io/github/v/release/bfren/docker-apache-php) ![Docker Pulls](https://img.shields.io/endpoint?url=https%3A%2F%2Fbfren.dev%2Fdocker%2Fpulls%2Fapache-php) ![Docker Image Size](https://img.shields.io/endpoint?url=https%3A%2F%2Fbfren.dev%2Fdocker%2Fsize%2Fapache-php)<br/>
 ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/bfren/docker-apache-php/dev-5_6?label=PHP+5.6)
 
 [Docker Repository](https://hub.docker.com/r/bfren/apache-php) - [bfren ecosystem](https://github.com/bfren/docker)
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.1.16
+2.2.0
diff --git a/VERSION_MINOR b/VERSION_MINOR
@@ -1 +1 @@
-2.1
+2.2
diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 
 docker pull bfren/alpine
 
-BASE_REVISION="2.1.14"
+BASE_REVISION="2.2.0"
 echo "Base: ${BASE_REVISION}"
 
 PHP_VERSIONS="5.6 7.4 8.0"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM bfren/apache:apache2.4.4x-2.1.14`
	`1`	`+FROM bfren/apache:apache2.4.4x-2.2.0`
`2`	`2`
`3`	`3`	`LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM bfren/apache:apache2.4.5x-2.1.14`
	`1`	`+FROM bfren/apache:apache2.4.5x-2.2.0`
`2`	`2`
`3`	`3`	`LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"`
`4`	`4`