Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Alpine 3.19 & PHP 8.2 #11

Merged
merged 2 commits into from
Dec 11, 2023
Merged

Alpine 3.19 & PHP 8.2 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf21b0b
Alpine 3.19 & PHP 8.2
mhzawadi Dec 10, 2023
2261b08
Merge branch 'main' into dev
mhzawadi Dec 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions docker/Dockerfile-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM alpine:3.18
FROM alpine:3.19
MAINTAINER Matthew Horwood <[email protected]>

# Install required deb packages
RUN apk update && apk upgrade && \
apk add nginx php81-fpm php81-pdo_mysql php81-sockets php81-gd php81-ldap \
php81-gettext php81-pcntl php81-mysqlnd php81-session php81-gmp php81-json \
php81-mbstring php81-iconv php81-ctype php81-curl php81-pear php81-simplexml \
php81-dom php81-xmlwriter php81-tokenizer php81 php81-phar php81-sqlite3 curl git \
apk add nginx php82-fpm php82-pdo_mysql php82-sockets php82-gd php82-ldap \
php82-gettext php82-pcntl php82-mysqlnd php82-session php82-gmp php82-json \
php82-mbstring php82-iconv php82-ctype php82-curl php82-pear php82-simplexml \
php82-dom php82-xmlwriter php82-tokenizer php82 php82-phar php82-sqlite3 curl git \
&& mkdir -p /var/www/html/ \
&& mkdir -p /run/nginx \
&& rm -f /var/cache/apk/*; \
Expand All @@ -17,8 +17,8 @@ RUN apk update && apk upgrade && \

COPY docker/config /config

RUN cp /config/php.ini /etc/php81/php.ini && \
cp /config/php_fpm_site.conf /etc/php81/php-fpm.d/www.conf && \
RUN cp /config/php.ini /etc/php82/php.ini && \
cp /config/php_fpm_site.conf /etc/php82/php-fpm.d/www.conf && \
cp /config/nginx_site.conf /etc/nginx/http.d/default.conf;

WORKDIR /var/www/html
Expand Down
2 changes: 1 addition & 1 deletion docker/config/php.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ max_file_uploads = 20
allow_url_fopen = On
allow_url_include = Off
default_socket_timeout = 60
include_path = ".:/usr/share/php7"
include_path = ".:/usr/share/php82"

[Date]
date.timezone = "Europe/London"
Expand Down
4 changes: 2 additions & 2 deletions docker/config/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ ln -s /dev/stdout /var/log/nginx/access.log

if [ "$TZ" != "" ]
then
sed -i "s!Europe/London!$TZ!" /etc/php81/php.ini
sed -i "s!Europe/London!$TZ!" /etc/php82/php.ini
fi

php-fpm81 -R
php-fpm82 -R

exec "$@"
Loading