Skip to content

Commit

Permalink
closes #277 and closes #279
Browse files Browse the repository at this point in the history
  • Loading branch information
richarvey committed Mar 1, 2023
1 parent 9353b9c commit c00afd6
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,10 @@ RUN echo @testing https://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk
libzip-dev \
bzip2-dev \
icu-dev \
gcc && \
apk add --no-cache --virtual .sys-deps \
tzdata \
gcc

RUN apk add --no-cache --virtual .sys-deps \
musl-dev \
linux-headers \
augeas-dev \
Expand Down
9 changes: 4 additions & 5 deletions docs/versioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@ The latest tag will always follow the master branch in git. the other versions w
| 3.0.1 | 8.2.3 |1.22.1 | 3.17 | 0.3.16 | no cache typo fixed |
| 3.0.0 | 8.2.3 |1.22.1 | 3.17 | 0.3.16 | upgraded php to 8.2.3 switched to packaged nginx |

These tags will be created on GitHub and as tags in docker hub.

### Unmaintained tags:

#### PHP 8.1.x

| Docker Tag | PHP Version | Nginx Version | Alpine Version | Container Scripts | Notes |
|-----|-------|-----|--------|--------|----------|
| 2.2.1 | 8.1.12 |1.22.1 | 3.16 | 0.3.16 | nginx upgraded to 1.22.1 php to 8.1.12 |
| 2.1.4 | 8.1.9 |1.21.6 | 3.16 | 0.3.16 | nginx upgraded to 1.22.0 |
| 2.1.3 | 8.1.6 |1.22.0 | 3.15 | 0.3.16 | nginx upgraded to 1.22.0 |
| 2.1.2 | 8.1.6 |1.21.6 | 3.15 | 0.3.16 | mod lua upgraded to 0.10.17 |
Expand All @@ -39,10 +42,6 @@ The latest tag will always follow the master branch in git. the other versions w
| 2.0.1 | 8.1.3 |1.21.6 | 3.15 | 0.3.14 | upgrade to PHP 8.1.3 |
| 2.0.0 | 8.1.2 |1.21.6 | 3.15 | 0.3.14 | upgrade to PHP 8 |

These tags will be created on GitHub and as tags in docker hub.

### Unmaintained tags:

#### PHP 7.4

| Docker Tag | PHP Version | Nginx Version | Alpine Version | Container Scripts | Notes |
Expand Down
2 changes: 1 addition & 1 deletion scripts/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ if [ -f /etc/nginx/sites-available/default-ssl.conf ]; then
fi

# Set the desired timezone
echo date.timezone=$(cat /etc/TZ) > /usr/local/etc/php/conf.d/timezone.ini
echo date.timezone=Europe/London > /usr/local/etc/php/conf.d/timezone.ini

# Display errors in docker logs
if [ ! -z "$PHP_ERRORS_STDERR" ]; then
Expand Down

0 comments on commit c00afd6

Please sign in to comment.