Skip to content

Commit 1d8cadb

Browse files
authored
v3.0.0 (#86)
Major updates * Moving document root from /www to /www/htdocs * Using Alpine-specific base images * Re-adding PHP 7.4, 8.0 and 8.2 Minor updates * Using latest base images * Downrating PHP 8.1 build
1 parent b22ace5 commit 1d8cadb

30 files changed

Lines changed: 171 additions & 21 deletions

.github/workflows/dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
php: [ "5.6", "8.1" ]
20+
php: [ "5.6", "7.4", "8.0", "8.1", "8.2" ]
2121
runs-on: ubuntu-latest
2222
steps:
2323
-

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
php: [ "5.6", "8.1" ]
13+
php: [ "5.6", "7.4", "8.0", "8.1", "8.2" ]
1414
runs-on: ubuntu-latest
1515
steps:
1616
-

5.6/APACHE_BASE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
apache2.4.4x
1+
apache2.4.43-alpine3.8

5.6/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM bfren/apache:apache2.4.4x-2.2.31
1+
FROM bfren/apache:apache2.4.43-alpine3.8-3.0.0
22

33
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
44

5.6/overlay/etc/apk/repositories

Lines changed: 0 additions & 6 deletions
This file was deleted.

7.4/APACHE_BASE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
apache2.4.56-alpine3.15

7.4/Dockerfile

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
FROM bfren/apache:apache2.4.56-alpine3.15-3.0.0
2+
3+
LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php"
4+
5+
ARG BF_IMAGE
6+
ARG BF_VERSION
7+
8+
ENV \
9+
# PHP config directory
10+
PHP_DIR=/etc/php7 \
11+
# www.conf override: log_level
12+
PHP_FPM_LOG_LEVEL="notice" \
13+
# php.ini template to use, or 'custom' if you want to bind your own custom php.ini -
14+
# which will cause the other PHP_INI_* environment variables to be ignored
15+
PHP_INI="production" \
16+
# php.ini override: display_errors
17+
PHP_INI_DISPLAY_ERRORS= \
18+
# php.ini override: display_startup_errors
19+
PHP_INI_DISPLAY_STARTUP_ERRORS= \
20+
# php.ini override: error_log
21+
PHP_INI_ERROR_LOG="/var/log/php7/error.log" \
22+
# php.ini override: err-r_reporting
23+
PHP_INI_ERROR_REPORTING= \
24+
# php.ini override: memory_limit
25+
PHP_INI_MEMORY_LIMIT="256M" \
26+
# php.ini override: max_post
27+
PHP_INI_MAX_POST="64M" \
28+
# php.ini override: max_upload
29+
PHP_INI_MAX_UPLOAD="64M" \
30+
# php.ini override: session_max_lifetime
31+
PHP_SESSION_MAX_LIFETIME=86400
32+
33+
COPY ./overlay /
34+
COPY ./7.4/overlay /
35+
36+
RUN bf-install

7.4/overlay/tmp/PHP_BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7.4.33-r1

7.4/overlay/tmp/PHP_REVISION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7.4.33

7.4/overlay/tmp/install-php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/sh
2+
3+
set -euo pipefail
4+
5+
6+
#======================================================================================================================
7+
# Install PHP8.
8+
#======================================================================================================================
9+
10+
apk add --no-cache \
11+
php7=${1} \
12+
php7-apache2=${1} \
13+
php7-common=${1} \
14+
php7-session=${1}

0 commit comments

Comments
 (0)