Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
Administrator
Platform
Commits
8c2025c5
Unverified
Commit
8c2025c5
authored
Sep 20, 2017
by
Nicolas Widart
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updating docker setup with dockerize-me upstream. Install blackfire
parent
dfec61bb
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
4 deletions
+24
-4
dcp
dcp
+8
-0
docker-compose.yml
docker-compose.yml
+7
-0
Dockerfile
docker/app/Dockerfile
+8
-2
Dockerfile
docker/mysql/Dockerfile
+0
-1
Dockerfile
docker/node/Dockerfile
+1
-1
No files found.
dcp
View file @
8c2025c5
...
...
@@ -11,6 +11,14 @@ if [ $# -gt 0 ]; then
shift
1
EXEC_CMD
=
"cd /var/www/html && php artisan
$@
"
$COMPOSE
exec
app bash
-c
"
$EXEC_CMD
"
elif
[
"
$1
"
==
"bin/console"
]
;
then
shift
1
EXEC_CMD
=
"cd /var/www/html && php bin/console
$@
"
$COMPOSE
exec
app bash
-c
"
$EXEC_CMD
"
elif
[
"
$1
"
==
"app/console"
]
;
then
shift
1
EXEC_CMD
=
"cd /var/www/html && php app/console
$@
"
$COMPOSE
exec
app bash
-c
"
$EXEC_CMD
"
elif
[
"
$1
"
==
"test"
]
;
then
shift
1
$COMPOSE
run
--rm
-w
/var/www/html app ./vendor/bin/phpunit
$@
...
...
docker-compose.yml
View file @
8c2025c5
...
...
@@ -43,6 +43,13 @@ services:
volumes
:
-
.:/var/www/html
blackfire
:
image
:
blackfire/blackfire
environment
:
BLACKFIRE_SERVER_ID
:
BLACKFIRE_SERVER_TOKEN
:
networks
:
-
asgard_net
volumes
:
redisdata
:
...
...
docker/app/Dockerfile
View file @
8c2025c5
...
...
@@ -32,6 +32,12 @@ RUN add-apt-repository ppa:nginx/stable \
curl
\
&&
mkdir
/run/php
\
&&
curl
-sS
https://getcomposer.org/installer | php
--
--install-dir
=
/usr/local/bin
--filename
=
composer
\
&&
version
=
$(
php
-r
"echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;"
)
\
&&
curl
-A
"Docker"
-o
/tmp/blackfire-probe.tar.gz
-D
-
-L
-s
https://blackfire.io/api/v1/releases/probe/php/linux/amd64/
$version
\
&&
tar
zxpf /tmp/blackfire-probe.tar.gz
-C
/tmp
\
&&
mv
/tmp/blackfire-
*
.so
$(
php
-r
"echo ini_get('extension_dir');"
)
/blackfire.so
\
&&
printf
"extension=blackfire.so
\n
blackfire.agent_socket=tcp://blackfire:8707
\n
"
>
/etc/php/7.0/mods-available/blackfire.ini
\
&&
phpenmod blackfire
\
&&
apt-get remove
-y
--purge
software-properties-common curl
\
&&
apt-get clean
\
&&
apt-get autoremove
-y
\
...
...
@@ -54,9 +60,9 @@ RUN openssl genrsa -des3 -passout pass:x -out server.pass.key 2048 \
&&
cp
server.key /etc/ssl/private/
\
&&
rm
-rf
/tmp/certgen
EXPOSE
80
EXPOSE
443
WORKDIR
/var/www/html
CMD
["supervisord"]
docker/mysql/Dockerfile
View file @
8c2025c5
FROM
mysql:5.7
MAINTAINER
Julien Tant <julien@craftyx.fr>
docker/node/Dockerfile
View file @
8c2025c5
...
...
@@ -2,4 +2,4 @@ FROM node:alpine
MAINTAINER
Julien Tant <julien@craftyx.fr>
RUN
npm update
-g
\ No newline at end of file
RUN
npm update
-g
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