Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improviments with Sync, CRON, XDebug, Redis #41

Merged
merged 6 commits into from
Feb 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .docker/bin/install-magento2
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ chmod u+w -R ./var ./vendor ./pub/static ./pub/media ./app/etc \
--backend-frontname=admin \
--use-sample-data \
&& mv ./app/etc/env.php ./app/etc/env.original.php;
cp -rv /var/www/env.sample.php ./app/etc/env.php \
&& php -f ./bin/magento indexer:set-mode schedule;
cp -rv /var/www/env.sample.php ./app/etc/env.php;
n98 cron:install;
php -f ./bin/magento indexer:set-mode schedule;
cp ~/.composer/auth.json var/composer_home/auth.json \
&& php -f ./bin/magento sampledata:deploy \
&& php -f ./bin/magento setup:upgrade \
Expand Down
3 changes: 3 additions & 0 deletions .docker/bin/redis-flush
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash
redis-cli -h redis-session flushall
redis-cli -h redis flushall
9 changes: 0 additions & 9 deletions .docker/bin/setup-cron

This file was deleted.

2 changes: 1 addition & 1 deletion .docker/config/custom-xdebug.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ xdebug.remote_enable=1
xdebug.remote_handler=dbgp
xdebug.profiler_enable=0
xdebug.profiler_output_dir="/var/www/html"
xdebug.remote_connect_back=0
xdebug.remote_connect_back=1
xdebug.cli_color=1
xdebug.var_display_max_depth=10
8 changes: 4 additions & 4 deletions .docker/config/magento.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
# ServerName dev.local
# ServerAlias www.dev.local
<Directory /var/www/html/>
Options FollowSymLinks
AllowOverride All
Order allow,deny
allow from all
Options FollowSymLinks
AllowOverride All
Order allow,deny
allow from all
</Directory>
ErrorLog /var/log/apache2/magento2-error_log
CustomLog /var/log/apache2/magento2-access_log common
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ RUN apt-get update \
libedit2 \
libxslt1-dev \
apt-utils \
mysql-client \
redis-tools \
mysql-client \
git \
vim \
wget \
Expand Down