Benzine/Docker-PHP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Run php-cli as www-data on nginx container for compatability.

Browse source
This commit is contained in:
Greyscale 2022-05-17 20:34:41 +02:00
parent 01675bf4e8
commit 8c7f3f6471
No known key found for this signature in database
GPG key ID: EF017054C3E9CD59
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
php/Dockerfile.Flavours
View file

@ -29,6 +29,7 @@ COPY self-signed-certificates /certs
RUN apt-get -qq update && \ RUN apt-get -qq update && \
# Install pre-dependencies to use apt-key. # Install pre-dependencies to use apt-key.
apt-get -yqq install --no-install-recommends \ apt-get -yqq install --no-install-recommends \
sudo \
lsb-core \ lsb-core \
gnupg \ gnupg \
&& \ && \
@ -107,6 +108,9 @@ RUN apt-get -qq update && \
dos2unix -q /etc/service/*/run && \ dos2unix -q /etc/service/*/run && \
# Make sure all our new services are executable # Make sure all our new services are executable
chmod +x /etc/service/*/run && \ chmod +x /etc/service/*/run && \
# Insert shim for php-cli still running in this nginx container to run as www-data.
mv /conf/php-cli-user-shim.sh /usr/local/sbin/php && \
chmod +x /usr/local/sbin/php && \
# Cleanup the /conf dir # Cleanup the /conf dir
rm -R /conf && \ rm -R /conf && \
# Write the PHP version into some template locations # Write the PHP version into some template locations

1
php/Makefile
View file

@ -33,5 +33,6 @@ bake:
$(MAKE) docker-php-core bake-flavours PHP_VERSION=7.3 $(MAKE) docker-php-core bake-flavours PHP_VERSION=7.3
$(MAKE) docker-php-core bake-flavours PHP_VERSION=7.4 $(MAKE) docker-php-core bake-flavours PHP_VERSION=7.4
$(MAKE) docker-php-core bake-flavours PHP_VERSION=8.0 $(MAKE) docker-php-core bake-flavours PHP_VERSION=8.0
$(MAKE) docker-php-core bake-flavours PHP_VERSION=8.1
all: bake all: bake

3
php/nginx/php-cli-user-shim.sh Normal file
View file

@ -0,0 +1,3 @@
#!/bin/sh
sudo -u www-data /usr/bin/php "$*"
return $?