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

Fix some gubbins

Browse source
This commit is contained in:
Greyscale 2019-11-09 04:00:40 +01:00
parent 48581e5256
commit adfc023fae
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/build-php-apache.yml vendored
View file

@ -8,6 +8,7 @@ on:
- 'marshall/**' - 'marshall/**'
- 'Dockerfile' - 'Dockerfile'
- '.dockerignore' - '.dockerignore'
- '.github/workflows/build-php-apache.yml'
jobs: jobs:
PHP_56: PHP_56:

1
.github/workflows/build-php-cli.yml vendored
View file

@ -8,6 +8,7 @@ on:
- 'marshall/**' - 'marshall/**'
- 'Dockerfile' - 'Dockerfile'
- '.dockerignore' - '.dockerignore'
- '.github/workflows/build-php-cli.yml'
jobs: jobs:
PHP_56: PHP_56:

1
.github/workflows/build-php-nginx.yml vendored
View file

@ -8,6 +8,7 @@ on:
- 'marshall/**' - 'marshall/**'
- 'Dockerfile' - 'Dockerfile'
- '.dockerignore' - '.dockerignore'
- '.github/workflows/build-php-nginx.yml'
jobs: jobs:
PHP_56: PHP_56:

16
Dockerfile
View file

@ -114,19 +114,25 @@ RUN apt-get -qq update && \
mkdir /run/php && \ mkdir /run/php && \
rm -fr /var/www/html && \ rm -fr /var/www/html && \
ln -s /app /var/www/html && \ ln -s /app /var/www/html && \
# Move nginx configuration into place
mv /conf/NginxDefault /etc/nginx/sites-enabled/default && \ mv /conf/NginxDefault /etc/nginx/sites-enabled/default && \
mkdir /etc/service/nginx && \ # Create runit service directories
mkdir /etc/service/php-fpm && \ mkdir /etc/service/nginx \
mkdir /etc/service/logs-nginx-access && \ /etc/service/php-fpm \
mkdir /etc/service/logs-nginx-error && \ /etc/service/logs-nginx-access \
mkdir /etc/service/logs-phpfpm-error && \ /etc/service/logs-nginx-error \
/etc/service/logs-phpfpm-error && \
# Copy our new service runits into location
mv /conf/nginx.runit /etc/service/nginx/run && \ mv /conf/nginx.runit /etc/service/nginx/run && \
mv /conf/php-fpm.runit /etc/service/php-fpm/run && \ mv /conf/php-fpm.runit /etc/service/php-fpm/run && \
mv /conf/logs-nginx-access.runit /etc/service/logs-nginx-access/run && \ mv /conf/logs-nginx-access.runit /etc/service/logs-nginx-access/run && \
mv /conf/logs-nginx-error.runit /etc/service/logs-nginx-error/run && \ mv /conf/logs-nginx-error.runit /etc/service/logs-nginx-error/run && \
mv /conf/logs-phpfpm-error.runit /etc/service/logs-phpfpm-error/run && \ mv /conf/logs-phpfpm-error.runit /etc/service/logs-phpfpm-error/run && \
# Make sure all our new services are executable
chmod +x /etc/service/*/run && \ chmod +x /etc/service/*/run && \
# Cleanup the /conf dir
rm -R /conf && \ rm -R /conf && \
# Write the PHP version into some template locations
sed -i "s/{{PHP}}/$PHP_VERSION/g" /etc/nginx/sites-enabled/default && \ sed -i "s/{{PHP}}/$PHP_VERSION/g" /etc/nginx/sites-enabled/default && \
sed -i "s/{{PHP}}/$PHP_VERSION/g" /etc/service/php-fpm/run && \ sed -i "s/{{PHP}}/$PHP_VERSION/g" /etc/service/php-fpm/run && \
# Enable PHP-FPM status & PHP-FPM ping # Enable PHP-FPM status & PHP-FPM ping