Skip to content

Commit 3858027

Browse files
author
José Fernando Cordova
committed
xdebug and dev dependencies
1 parent 1f389d3 commit 3858027

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

.docker/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ COPY .docker/vhost.conf /etc/apache2/sites-available/000-default.conf
3737
COPY ./composer.json ./composer.json
3838
COPY ./composer.lock ./composer.lock
3939

40+
RUN composer install --no-dev --no-interaction --no-scripts
41+
4042
# entrypoint
4143
COPY .docker/docker-php-entrypoint /usr/local/bin/
4244

@@ -48,3 +50,7 @@ RUN chmod 777 -R storage
4850

4951
# mode-root:
5052
USER root
53+
54+
HEALTHCHECK --interval=50s \
55+
--timeout=600s \
56+
CMD curl -f http://localhost/api/hello || exit 1

.docker/docker-php-entrypoint

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44

55
cp /docker-laravel-api-dev/.env.example /docker-laravel-api-dev/.env
66

7-
# Xdebug
7+
# Xdebug ----------------------------------------------------
88

99
if [ "${XDEBUG_MODE}" == 1 ] ; then
10+
echo 'Installs require-dev dependencies'
11+
composer install --no-scripts
1012
echo 'Installing XDebug...'
1113
pecl install xdebug && docker-php-ext-enable xdebug
1214
echo 'XDebug installed!'
@@ -26,11 +28,10 @@
2628

2729
echo 'Running Migrations...'
2830
cd /docker-laravel-api-dev
29-
composer install
31+
php artisan key:generate
3032
php artisan migrate
3133
echo 'Migrations done!'
3234

33-
3435
# APACHE -----------------------------------
3536

3637
# first arg is `-f` or `--some-option`

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
"laravel/framework": "5.5.*",
1010
"tymon/jwt-auth": "dev-develop",
1111
"dingo/api": "2.0.0-alpha1",
12-
"barryvdh/laravel-cors": "^0.9.3",
13-
"tiendanube/php-sdk": ">=1.0"
12+
"barryvdh/laravel-cors": "^0.9.3"
1413
},
1514
"require-dev": {
1615
"fzaninotto/faker": "~1.4",

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
APP_NAME: docker-laravel-api-dev
77
APP_ENV: local
88
APP_DEBUG: "true"
9-
APP_KEY: base64:B4svAvz1VlCE6iiaKUy/qlmiV2E5JTj7+kCfS5nJpZI=
9+
APP_KEY:
1010
APP_LOG_LEVEL: debug
1111
APP_URL: "http://localhost"
1212
DB_CONNECTION: mysql

0 commit comments

Comments
 (0)