Permalink
Browse files

Fix docker review feedback

  • Loading branch information...
jessedobbelaere committed Aug 4, 2017
1 parent f075e45 commit cf252f52c823b34fda9b5d9a3f42ce97f5cc0752
@@ -24,12 +24,11 @@ build/
composer.phar
docker-compose.override.yml
docker-compose.yml
docker/db/data/
var/
var/docker/db/data/
vendor/
.idea
app/cache/*
app/logs/*
var/cache/*
var/logs/*
app/config/parameters.yml
src/Backend/Cache/*/*
src/Frontend/Cache/*/*
@@ -23,5 +23,5 @@
/js/*.js

# Docker
/data/*
var/docker/db/data/*
docker-compose.override.yml
@@ -66,7 +66,7 @@ deny from env=stayout
RewriteRule src/Frontend/Cache/CompiledTemplates - [F]
RewriteRule src/Frontend/Cache/Search - [F]
RewriteRule src/Backend/Cache/CompiledTemplates - [F]
RewriteRule docker/.* - [F]
RewriteRule var/docker/.* - [F]
RewriteRule Dockerfile - [F]
RewriteRule \.dockerignore - [F]
RewriteRule docker-compose\.yml - [F]
@@ -30,11 +30,11 @@ RUN apt-get update && apt-get install -y \
docker-php-ext-install intl

# Custom php.ini settings
COPY docker/php/php.ini ${PHP_INI_DIR}/php.ini
COPY var/docker/php/php.ini ${PHP_INI_DIR}/php.ini

# Install and configure XDebug
RUN pecl install xdebug && docker-php-ext-enable xdebug
COPY docker/php/xdebug.ini ${PHP_INI_DIR}/conf.d/xdebug.init
COPY var/docker/php/xdebug.ini ${PHP_INI_DIR}/conf.d/xdebug.init
RUN echo 'xdebug.remote_host="${DOCKER_HOST_IP}"' >> ${PHP_INI_DIR}/conf.d/xdebug.ini

# Install composer
@@ -34,9 +34,9 @@ services:
# Uncomment the next line if you want to keep mysql in a data container
# - db-data:/var/lib/mysql:rw
# By default, use a bind-mounted host directory instead. It's harder to accidentally lose all your db data!
- ./docker/db/data:/var/lib/mysql:rw
- ./var/docker/db/data:/var/lib/mysql:rw
- ./tests/data/test_db.sql:/test_db.sql:ro
- ./docker/db/scripts:/docker-entrypoint-initdb.d:ro
- ./var/docker/db/scripts:/docker-entrypoint-initdb.d:ro

volumes:
db-data: {}
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit cf252f5

Please sign in to comment.