Skip to content

Commit

Permalink
Install Magerun98 in docker container, install PHP 7.2 support patch …
Browse files Browse the repository at this point in the history
…to fix session issues
  • Loading branch information
portchris committed Jan 14, 2019
1 parent 3e9a1d2 commit 0fb7790
Show file tree
Hide file tree
Showing 56 changed files with 67,349 additions and 6,916 deletions.
13 changes: 9 additions & 4 deletions env/php72/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ RUN apt-get install -y --no-install-recommends \
php7.2-intl \
php7.2-soap \
php7.2-sqlite3 \
php7.2-mcrypt \
php-redis

# Fix issue with php sessions
Expand All @@ -86,6 +87,13 @@ ADD ./config/ssmtp /etc/ssmtp
ADD ./config/cron /etc/cron.d
RUN chmod 0644 -R /etc/cron.d/

# Install n98-magerun
RUN curl -sS -o n98-magerun.phar https://files.magerun.net/n98-magerun.phar && \
curl -sS -o n98-magerun.phar.sha256 https://files.magerun.net/sha256.php?file=n98-magerun.phar && \
shasum -a 256 -c n98-magerun.phar.sha256 && \
chmod +x n98-magerun.phar && \
mv n98-magerun.phar /usr/local/bin/n98-magerun.phar

EXPOSE 9000

# Install Ioncube
Expand All @@ -94,8 +102,5 @@ EXPOSE 9000
# Install Composer
CMD ["/bin/bash", "/scripts/install-composer.sh"]

# Install Magerun
CMD ["/bin/bash", "/scripts/install-magerun.sh"]

# Run supervisor to start all services
# CMD ["/bin/bash", "/scripts/start-php-fpm.sh"]
CMD ["/bin/bash", "/scripts/start.sh"]
5 changes: 0 additions & 5 deletions env/php72/scripts/install-magerun.sh

This file was deleted.

2 changes: 1 addition & 1 deletion magento.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env bash

docker-compose exec --user www nr_php72 n98-magerun --root-dir=/home/www/naturalremedy/src $@
docker-compose exec --user www nr_php72 n98-magerun.phar --root-dir=/home/www/naturalremedy/src $@
2 changes: 1 addition & 1 deletion php.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/env bash

docker-compose exec -u root nr_php bash -c 'cd /home/www/naturalremedy/; exec "${SHELL:-sh}"'
docker-compose exec -u root nr_php72 bash -c 'cd /home/www/naturalremedy/; exec "${SHELL:-sh}"'
Loading

0 comments on commit 0fb7790

Please sign in to comment.