Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
laradock
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kerwin
laradock
Commits
03bba8d2
Commit
03bba8d2
authored
Nov 01, 2016
by
Mahmoud Zalt
Committed by
GitHub
Nov 01, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #400 from LaraDock/appleboy-patch-1
fix phpunit path for multiple project.
parents
f6309701
b6c7746a
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
11 deletions
+11
-11
Dockerfile
apache2/Dockerfile
+2
-2
Caddyfile
caddy/Caddyfile
+1
-1
Dockerfile
caddy/Dockerfile
+1
-1
Dockerfile
hhvm/Dockerfile
+2
-2
server.ini
hhvm/server.ini
+1
-1
production-docker-compose.yml
production-docker-compose.yml
+2
-2
Dockerfile
workspace/Dockerfile
+1
-1
root
workspace/crontab/root
+1
-1
No files found.
apache2/Dockerfile
View file @
03bba8d2
...
...
@@ -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"]
...
...
caddy/Caddyfile
View file @
03bba8d2
# 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
}
...
...
caddy/Dockerfile
View file @
03bba8d2
...
...
@@ -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"]
hhvm/Dockerfile
View file @
03bba8d2
...
...
@@ -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"]
...
...
hhvm/server.ini
View file @
03bba8d2
...
...
@@ -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
...
...
production-docker-compose.yml
View file @
03bba8d2
...
...
@@ -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 ################################
...
...
workspace/Dockerfile
View file @
03bba8d2
...
...
@@ -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
...
...
workspace/crontab/root
View file @
03bba8d2
* * * * * 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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment