fix workdir path.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
This commit is contained in:
parent
e7baf3cfc3
commit
b6c7746a0d
|
@ -6,11 +6,11 @@ ARG PHP_SOCKET=php-fpm:9000
|
||||||
|
|
||||||
ENV WEB_PHP_SOCKET=$PHP_SOCKET
|
ENV WEB_PHP_SOCKET=$PHP_SOCKET
|
||||||
|
|
||||||
ENV WEB_DOCUMENT_ROOT=/var/www/laravel/public
|
ENV WEB_DOCUMENT_ROOT=/var/www/public
|
||||||
|
|
||||||
EXPOSE 80 443
|
EXPOSE 80 443
|
||||||
|
|
||||||
WORKDIR /var/www/laravel/public
|
WORKDIR /var/www/public
|
||||||
|
|
||||||
ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"]
|
ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"]
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Docs: https://caddyserver.com/docs/caddyfile
|
# Docs: https://caddyserver.com/docs/caddyfile
|
||||||
0.0.0.0:80
|
0.0.0.0:80
|
||||||
root /var/www/laravel/public
|
root /var/www/public
|
||||||
fastcgi / php-fpm:9000 php {
|
fastcgi / php-fpm:9000 php {
|
||||||
index index.php
|
index index.php
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,6 +19,6 @@ RUN curl --silent --show-error --fail --location \
|
||||||
|
|
||||||
EXPOSE 80 443 2015
|
EXPOSE 80 443 2015
|
||||||
|
|
||||||
WORKDIR /var/www/laravel/public
|
WORKDIR /var/www/public
|
||||||
|
|
||||||
CMD ["/usr/bin/caddy", "-conf", "/etc/Caddyfile"]
|
CMD ["/usr/bin/caddy", "-conf", "/etc/Caddyfile"]
|
||||||
|
|
|
@ -10,13 +10,13 @@ RUN apt-get update -y \
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
RUN mkdir -p /var/www/laravel
|
RUN mkdir -p /var/www
|
||||||
|
|
||||||
ADD server.ini /etc/hhvm/server.ini
|
ADD server.ini /etc/hhvm/server.ini
|
||||||
|
|
||||||
RUN usermod -u 1000 www-data
|
RUN usermod -u 1000 www-data
|
||||||
|
|
||||||
WORKDIR /var/www/laravel
|
WORKDIR /var/www
|
||||||
|
|
||||||
CMD ["/usr/bin/hhvm", "-m", "server", "-c", "/etc/hhvm/server.ini"]
|
CMD ["/usr/bin/hhvm", "-m", "server", "-c", "/etc/hhvm/server.ini"]
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ hhvm.log.level = Error
|
||||||
hhvm.log.header = true
|
hhvm.log.header = true
|
||||||
hhvm.log.access[default][file] = /var/log/hhvm/access.log
|
hhvm.log.access[default][file] = /var/log/hhvm/access.log
|
||||||
hhvm.log.access[default][format] = "%h %l %u %t \"%r\" %>s %b"
|
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
|
hhvm.repo.central.path = /var/run/hhvm/hhvm.hhbc
|
||||||
|
|
||||||
; Uncomment to log to files instead of STDOUT
|
; Uncomment to log to files instead of STDOUT
|
||||||
|
|
|
@ -45,12 +45,12 @@ services:
|
||||||
links:
|
links:
|
||||||
- workspace
|
- workspace
|
||||||
|
|
||||||
### Laravel Application Code Container ######################
|
### Application Code Container ######################
|
||||||
|
|
||||||
volumes_source:
|
volumes_source:
|
||||||
image: tianon/true
|
image: tianon/true
|
||||||
volumes:
|
volumes:
|
||||||
- ../:/var/www/laravel
|
- ../:/var/www
|
||||||
|
|
||||||
### Databases Data Container ################################
|
### Databases Data Container ################################
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
* * * * * php /var/www/laravel/artisan schedule:run >> /dev/null 2>&1
|
* * * * * php /var/www/artisan schedule:run >> /dev/null 2>&1
|
||||||
|
|
Loading…
Reference in New Issue