diff --git a/dokuwiki/Dockerfile b/dokuwiki/Dockerfile index 451f4d7..10e72fc 100644 --- a/dokuwiki/Dockerfile +++ b/dokuwiki/Dockerfile @@ -11,13 +11,14 @@ RUN set -xe \ && apk add -U ca-certificates \ gzip \ nginx \ - php-fpm \ - php-openssl \ - php-pdo_sqlite \ - php-sqlite3 \ - php-xml \ - php-zlib \ + php5-fpm \ + php5-openssl \ + php5-pdo_sqlite \ + php5-sqlite3 \ + php5-xml \ + php5-zlib \ tar \ + && touch /etc/php5/fpm.d/empty.conf \ && wget -O- http://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz | tar xz --strip 1 \ && chown -R nobody:nobody . \ && rm -rf /var/cache/apk/* @@ -35,4 +36,4 @@ VOLUME /var/www/html/conf \ EXPOSE 80 -CMD php-fpm && nginx -g 'daemon off;' +CMD mkdir -p /run/nginx && php-fpm && nginx -g 'daemon off;' diff --git a/dokuwiki/arm/Dockerfile b/dokuwiki/arm/Dockerfile index 71e54a4..629de29 100644 --- a/dokuwiki/arm/Dockerfile +++ b/dokuwiki/arm/Dockerfile @@ -11,12 +11,12 @@ RUN set -xe \ && apk add -U ca-certificates \ gzip \ nginx \ - php-fpm \ - php-openssl \ - php-pdo_sqlite \ - php-sqlite3 \ - php-xml \ - php-zlib \ + php5-fpm \ + php5-openssl \ + php5-pdo_sqlite \ + php5-sqlite3 \ + php5-xml \ + php5-zlib \ tar \ && wget -O- http://download.dokuwiki.org/src/dokuwiki/dokuwiki-stable.tgz | tar xz --strip 1 \ && chown -R nobody:nobody . \ @@ -35,4 +35,4 @@ VOLUME /var/www/html/conf \ EXPOSE 80 -CMD php-fpm && nginx -g 'daemon off;' +CMD mkdir -p /run/nginx && php-fpm && nginx -g 'daemon off;' diff --git a/phpvirtualbox/arm/Dockerfile b/phpvirtualbox/arm/Dockerfile index b6b7afe..ea3335a 100644 --- a/phpvirtualbox/arm/Dockerfile +++ b/phpvirtualbox/arm/Dockerfile @@ -8,6 +8,7 @@ MAINTAINER kev RUN set -xe \ && apk add --no-cache bash nginx php5-fpm php5-cli php5-json php5-soap \ && apk add --no-cache --virtual build-dependencies wget unzip \ + && touch /etc/php5/fpm.d/empty.conf \ && wget --no-check-certificate https://sourceforge.net/projects/phpvirtualbox/files/latest/download -O phpvirtualbox.zip \ && unzip phpvirtualbox.zip -d phpvirtualbox \ && mkdir -p /var/www \ @@ -29,4 +30,4 @@ COPY servers-from-env.php /servers-from-env.php EXPOSE 80 # write linked instances to config, then monitor all services -CMD php /servers-from-env.php && php-fpm && nginx +CMD mkdir -p /run/nginx && php /servers-from-env.php && php-fpm && nginx