From e7baf3cfc3487afca7665a3d817150b6b62cb328 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 1 Nov 2016 09:00:19 +0800 Subject: [PATCH 1/2] fix phpunit path --- workspace/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index d0315ee..1bbb606 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -91,7 +91,7 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \ apt-get update && \ apt-get install -y --force-yes php7.0-xdebug && \ sed -i 's/^/;/g' /etc/php/7.0/cli/conf.d/20-xdebug.ini && \ - echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/laravel/vendor/bin/phpunit'" >> ~/.bashrc \ + echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/vendor/bin/phpunit'" >> ~/.bashrc \ ;fi # ADD for REMOTE debugging COPY ./xdebug.ini /etc/php/7.0/cli/conf.d/xdebug.ini From b6c7746a0d47fb22f73af17d6ca2617da80fcdc2 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Tue, 1 Nov 2016 09:23:40 +0800 Subject: [PATCH 2/2] fix workdir path. Signed-off-by: Bo-Yi Wu --- apache2/Dockerfile | 4 ++-- caddy/Caddyfile | 2 +- caddy/Dockerfile | 2 +- hhvm/Dockerfile | 4 ++-- hhvm/server.ini | 2 +- production-docker-compose.yml | 4 ++-- workspace/crontab/root | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apache2/Dockerfile b/apache2/Dockerfile index dd1a9d1..569ba9f 100644 --- a/apache2/Dockerfile +++ b/apache2/Dockerfile @@ -6,11 +6,11 @@ ARG PHP_SOCKET=php-fpm:9000 ENV WEB_PHP_SOCKET=$PHP_SOCKET -ENV WEB_DOCUMENT_ROOT=/var/www/laravel/public +ENV WEB_DOCUMENT_ROOT=/var/www/public EXPOSE 80 443 -WORKDIR /var/www/laravel/public +WORKDIR /var/www/public ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"] diff --git a/caddy/Caddyfile b/caddy/Caddyfile index f3c5434..4f0212a 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -1,6 +1,6 @@ # Docs: https://caddyserver.com/docs/caddyfile 0.0.0.0:80 -root /var/www/laravel/public +root /var/www/public fastcgi / php-fpm:9000 php { index index.php } diff --git a/caddy/Dockerfile b/caddy/Dockerfile index c689b2c..9579d15 100644 --- a/caddy/Dockerfile +++ b/caddy/Dockerfile @@ -19,6 +19,6 @@ RUN curl --silent --show-error --fail --location \ EXPOSE 80 443 2015 -WORKDIR /var/www/laravel/public +WORKDIR /var/www/public CMD ["/usr/bin/caddy", "-conf", "/etc/Caddyfile"] diff --git a/hhvm/Dockerfile b/hhvm/Dockerfile index 9fa4452..cca2c55 100644 --- a/hhvm/Dockerfile +++ b/hhvm/Dockerfile @@ -10,13 +10,13 @@ RUN apt-get update -y \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -RUN mkdir -p /var/www/laravel +RUN mkdir -p /var/www ADD server.ini /etc/hhvm/server.ini RUN usermod -u 1000 www-data -WORKDIR /var/www/laravel +WORKDIR /var/www CMD ["/usr/bin/hhvm", "-m", "server", "-c", "/etc/hhvm/server.ini"] diff --git a/hhvm/server.ini b/hhvm/server.ini index 47d2017..8cd5569 100644 --- a/hhvm/server.ini +++ b/hhvm/server.ini @@ -12,7 +12,7 @@ hhvm.log.level = Error hhvm.log.header = true hhvm.log.access[default][file] = /var/log/hhvm/access.log hhvm.log.access[default][format] = "%h %l %u %t \"%r\" %>s %b" -hhvm.server.source_root=/var/www/laravel/public +hhvm.server.source_root=/var/www/public hhvm.repo.central.path = /var/run/hhvm/hhvm.hhbc ; Uncomment to log to files instead of STDOUT diff --git a/production-docker-compose.yml b/production-docker-compose.yml index 7bf4ae8..e8c0dd4 100644 --- a/production-docker-compose.yml +++ b/production-docker-compose.yml @@ -45,12 +45,12 @@ services: links: - workspace -### Laravel Application Code Container ###################### +### Application Code Container ###################### volumes_source: image: tianon/true volumes: - - ../:/var/www/laravel + - ../:/var/www ### Databases Data Container ################################ diff --git a/workspace/crontab/root b/workspace/crontab/root index c09ea2a..db972b1 100644 --- a/workspace/crontab/root +++ b/workspace/crontab/root @@ -1 +1 @@ -* * * * * php /var/www/laravel/artisan schedule:run >> /dev/null 2>&1 \ No newline at end of file +* * * * * php /var/www/artisan schedule:run >> /dev/null 2>&1