diff --git a/1.0/Dockerfile b/1.0/Dockerfile deleted file mode 100644 index 3111e39..0000000 --- a/1.0/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -FROM drupal:8.4 -MAINTAINER devel@goalgorilla.com - -# Install packages. -RUN apt-get update && apt-get install -y \ - zlib1g-dev \ - mysql-client \ - git \ - ssmtp \ - nano \ - vim && \ - apt-get clean - -ADD mailcatcher-ssmtp.conf /etc/ssmtp/ssmtp.conf - -RUN echo "hostname=goalgorilla.com" >> /etc/ssmtp/ssmtp.conf -RUN echo 'sendmail_path = "/usr/sbin/ssmtp -t"' > /usr/local/etc/php/conf.d/mail.ini - -ADD php.ini /usr/local/etc/php/php.ini - -# Install extensions -RUN docker-php-ext-install zip -RUN docker-php-ext-install bcmath -RUN docker-php-ext-install exif - -# Install Composer. -RUN curl -sS https://getcomposer.org/installer | php -RUN mv composer.phar /usr/local/bin/composer - -# Install Open Social via composer. -RUN rm -f /var/www/composer.lock -RUN rm -rf /root/.composer - -ADD composer.json /var/www/composer.json -WORKDIR /var/www/ -RUN composer install --prefer-dist --no-interaction --no-dev - -WORKDIR /var/www/html/ -RUN chown -R www-data:www-data * - -# Unfortunately, adding the composer vendor dir to the PATH doesn't seem to work. So: -RUN ln -s /var/www/vendor/bin/drush /usr/local/bin/drush - -RUN php -r 'opcache_reset();' - -# Fix shell. -RUN echo "export TERM=xterm" >> ~/.bashrc diff --git a/1.0/composer.json b/1.0/composer.json deleted file mode 100644 index 060b144..0000000 --- a/1.0/composer.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "name": "goalgorilla/social_docker", - "description": "Social docker template for composer based Open Social projects.", - "type": "project", - "license": "GPL-2.0+", - "minimum-stability": "dev", - "prefer-stable": true, - "require": { - "composer/installers": "^1.0", - "drupal-composer/drupal-scaffold": "^2.0.0", - "cweagans/composer-patches": "1.5.0", - "drush/drush": "8.*@stable", - "goalgorilla/open_social": "^1.0", - "goalgorilla/open_social_scripts": "dev-master" - }, - "require-dev": { - "jcalderonzumba/gastonjs": "~1.0.2", - "jcalderonzumba/mink-phantomjs-driver": "~0.3.1", - "mikey179/vfsStream": "~1.2", - "symfony/css-selector": "~2.8", - "behat/behat": "3.*@stable", - "behat/mink": "1.*@stable", - "behat/mink-extension": "*", - "behat/mink-goutte-driver": "*", - "behat/mink-selenium2-driver": "*", - "drupal/drupal-extension": "*", - "squizlabs/php_codesniffer": "2.7.0", - "drupal/coder": "8.*@stable", - "phpmd/phpmd": "@stable", - "pdepend/pdepend": "2.1.0", - "sebastian/phpcpd": "*", - "phpunit/phpunit": "4.8" - }, - "repositories": [ - { - "type": "composer", - "url": "https://packages.drupal.org/8" - } - ], - "scripts": { - "post-install-cmd": [ - "DrupalComposer\\DrupalScaffold\\Plugin::scaffold" - ], - "post-update-cmd": [ - "DrupalComposer\\DrupalScaffold\\Plugin::scaffold" - ] - }, - "extra": { - "installer-paths": { - "html/core": [ - "drupal/core" - ], - "html/modules/contrib/{$name}": [ - "type:drupal-module" - ], - "html/profiles/contrib/social": [ - "goalgorilla/open_social" - ], - "html/profiles/contrib/{$name}": [ - "type:drupal-profile" - ], - "html/themes/contrib/{$name}": [ - "type:drupal-theme" - ], - "scripts/{$name}": [ - "goalgorilla/open_social_scripts" - ], - "drush/contrib/{$name}": [ - "type:drupal-drush" - ] - }, - "enable-patching": true - } -} diff --git a/1.0/mailcatcher-ssmtp.conf b/1.0/mailcatcher-ssmtp.conf deleted file mode 100644 index ea29e8d..0000000 --- a/1.0/mailcatcher-ssmtp.conf +++ /dev/null @@ -1,3 +0,0 @@ -root=postmaster -mailhub=mailcatcher:1025 -FromLineOverride=YES diff --git a/1.0/php.ini b/1.0/php.ini deleted file mode 100644 index 9c1e3b2..0000000 --- a/1.0/php.ini +++ /dev/null @@ -1,8 +0,0 @@ -[PHP] -; Prod settings -date.timezone = UTC -zend.assertions = 0 -upload_max_filesize = 24M -post_max_size = 32M -file_uploads = On -memory_limit = 128M diff --git a/1.0/ssmtp.conf b/1.0/ssmtp.conf deleted file mode 100644 index 91c0b9d..0000000 --- a/1.0/ssmtp.conf +++ /dev/null @@ -1,5 +0,0 @@ -root=postmaster -mailhub=mail -AuthUser=user -AuthPass=password -FromLineOverride=YES diff --git a/3.0/Dockerfile b/3.0/Dockerfile deleted file mode 100644 index 4076b95..0000000 --- a/3.0/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -FROM drupal:8.6 -MAINTAINER devel@goalgorilla.com - -# Install packages. -RUN apt-get update && apt-get install -y \ - zlib1g-dev \ - mysql-client \ - git \ - ssmtp \ - nano \ - vim && \ - apt-get clean - -ADD mailcatcher-ssmtp.conf /etc/ssmtp/ssmtp.conf - -RUN echo "hostname=goalgorilla.com" >> /etc/ssmtp/ssmtp.conf -RUN echo 'sendmail_path = "/usr/sbin/ssmtp -t"' > /usr/local/etc/php/conf.d/mail.ini - -ADD php.ini /usr/local/etc/php/php.ini - -# Install extensions -RUN docker-php-ext-install zip -RUN docker-php-ext-install bcmath -RUN docker-php-ext-install exif - -# Install Composer. -RUN curl -sS https://getcomposer.org/installer | php -RUN mv composer.phar /usr/local/bin/composer - -# Install Open Social via composer. -RUN rm -f /var/www/composer.lock -RUN rm -rf /root/.composer - -ADD composer.json /var/www/composer.json -WORKDIR /var/www/ -RUN composer install --prefer-dist --no-interaction --no-dev - -WORKDIR /var/www/html/ -RUN chown -R www-data:www-data * - -# Unfortunately, adding the composer vendor dir to the PATH doesn't seem to work. So: -RUN ln -s /var/www/vendor/bin/drush /usr/local/bin/drush - -RUN php -r 'opcache_reset();' - -# Fix shell. -RUN echo "export TERM=xterm" >> ~/.bashrc diff --git a/3.0/composer.json b/3.0/composer.json deleted file mode 100644 index 92ae11e..0000000 --- a/3.0/composer.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "name": "goalgorilla/social_docker", - "description": "Social docker template for composer based Open Social projects.", - "type": "project", - "license": "GPL-2.0-or-later", - "minimum-stability": "dev", - "prefer-stable": true, - "require": { - "composer/installers": "^1.0", - "drupal-composer/drupal-scaffold": "^2.0.0", - "cweagans/composer-patches": "^1.0", - "drush/drush": "8.*@stable", - "goalgorilla/open_social": "^3.0", - "goalgorilla/open_social_scripts": "dev-master" - }, - "require-dev": { - "jcalderonzumba/gastonjs": "~1.0.2", - "jcalderonzumba/mink-phantomjs-driver": "~0.3.1", - "mikey179/vfsStream": "~1.2", - "symfony/css-selector": "~2.8", - "behat/behat": "3.*@stable", - "behat/mink": "1.*@stable", - "behat/mink-extension": "*", - "behat/mink-goutte-driver": "*", - "behat/mink-selenium2-driver": "*", - "drupal/coder": "^8.3", - "drupal/drupal-extension": "^3.4", - "phpmd/phpmd": "@stable", - "sebastian/phpcpd": "@stable", - "phpunit/phpunit": "^6.5", - "phpunit/php-timer": "^1.0.9", - "drupal/console": "@stable", - "zaporylie/composer-drupal-optimizations": "^1.0", - "squizlabs/html_codesniffer": "*" - }, - "repositories": { - "0": { - "type": "composer", - "url": "https://packages.drupal.org/8" - }, - "1": { - "type": "composer", - "url": "https://asset-packagist.org" - }, - "3": { - "type": "package", - "package": { - "name": "squizlabs/html_codesniffer", - "version": "1.0.0", - "source": { - "url": "https://github.com/squizlabs/HTML_CodeSniffer.git", - "type": "git", - "reference": "master" - } - } - }, - "social": { - "type": "git", - "url": "https://github.com/goalgorilla/open_social.git" - } - }, - "scripts": { - "post-install-cmd": [ - "DrupalComposer\\DrupalScaffold\\Plugin::scaffold" - ], - "post-update-cmd": [ - "DrupalComposer\\DrupalScaffold\\Plugin::scaffold" - ] - }, - "extra": { - "installer-types": [ - "bower-asset", - "npm-asset" - ], - "installer-paths": { - "html/core": [ - "drupal/core" - ], - "html/modules/contrib/{$name}": [ - "type:drupal-module" - ], - "html/profiles/contrib/social": [ - "goalgorilla/open_social" - ], - "html/profiles/contrib/{$name}": [ - "type:drupal-profile" - ], - "html/themes/contrib/{$name}": [ - "type:drupal-theme" - ], - "html/libraries/{$name}": [ - "type:drupal-library", - "type:bower-asset", - "type:npm-asset" - ], - "scripts/{$name}": [ - "goalgorilla/open_social_scripts" - ], - "drush/contrib/{$name}": [ - "type:drupal-drush" - ] - }, - "enable-patching": true, - "patches": { - "squizlabs/html_codesniffer": { - "Translatings does not work": "patches/DS-5443-accessibility.patch" - } - } - } -} diff --git a/3.0/mailcatcher-ssmtp.conf b/3.0/mailcatcher-ssmtp.conf deleted file mode 100644 index ea29e8d..0000000 --- a/3.0/mailcatcher-ssmtp.conf +++ /dev/null @@ -1,3 +0,0 @@ -root=postmaster -mailhub=mailcatcher:1025 -FromLineOverride=YES diff --git a/3.0/php.ini b/3.0/php.ini deleted file mode 100644 index 9c1e3b2..0000000 --- a/3.0/php.ini +++ /dev/null @@ -1,8 +0,0 @@ -[PHP] -; Prod settings -date.timezone = UTC -zend.assertions = 0 -upload_max_filesize = 24M -post_max_size = 32M -file_uploads = On -memory_limit = 128M diff --git a/3.0/ssmtp.conf b/3.0/ssmtp.conf deleted file mode 100644 index 91c0b9d..0000000 --- a/3.0/ssmtp.conf +++ /dev/null @@ -1,5 +0,0 @@ -root=postmaster -mailhub=mail -AuthUser=user -AuthPass=password -FromLineOverride=YES diff --git a/4.0/Dockerfile b/4.0/Dockerfile deleted file mode 100644 index 53c47a8..0000000 --- a/4.0/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -FROM drupal:8.6 -MAINTAINER devel@goalgorilla.com - -# Install packages. -RUN apt-get update && apt-get install -y \ - zlib1g-dev \ - mysql-client \ - git \ - ssmtp \ - nano \ - vim && \ - apt-get clean - -ADD mailcatcher-ssmtp.conf /etc/ssmtp/ssmtp.conf - -RUN echo "hostname=goalgorilla.com" >> /etc/ssmtp/ssmtp.conf -RUN echo 'sendmail_path = "/usr/sbin/ssmtp -t"' > /usr/local/etc/php/conf.d/mail.ini - -ADD php.ini /usr/local/etc/php/php.ini - -# Install extensions -RUN docker-php-ext-install zip -RUN docker-php-ext-install bcmath -RUN docker-php-ext-install exif - -# Install Composer. -RUN curl -sS https://getcomposer.org/installer | php -RUN mv composer.phar /usr/local/bin/composer - -# Install Open Social via composer. -RUN rm -f /var/www/composer.lock -RUN rm -rf /root/.composer - -ADD composer.json /var/www/composer.json -WORKDIR /var/www/ -RUN COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-dist --no-interaction --no-dev - -WORKDIR /var/www/html/ -RUN chown -R www-data:www-data * - -# Unfortunately, adding the composer vendor dir to the PATH doesn't seem to work. So: -RUN ln -s /var/www/vendor/bin/drush /usr/local/bin/drush - -RUN php -r 'opcache_reset();' - -# Fix shell. -RUN echo "export TERM=xterm" >> ~/.bashrc diff --git a/4.0/composer.json b/4.0/composer.json deleted file mode 100644 index 8827d19..0000000 --- a/4.0/composer.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "name": "goalgorilla/social_docker", - "description": "Social docker template for composer based Open Social projects.", - "type": "project", - "license": "GPL-2.0-or-later", - "minimum-stability": "dev", - "prefer-stable": true, - "require": { - "composer/installers": "^1.0", - "drupal-composer/drupal-scaffold": "^2.0.0", - "cweagans/composer-patches": "^1.0", - "drush/drush": "8.*@stable", - "goalgorilla/open_social": "^4.0", - "goalgorilla/open_social_scripts": "dev-master" - }, - "require-dev": { - "jcalderonzumba/gastonjs": "~1.0.2", - "jcalderonzumba/mink-phantomjs-driver": "~0.3.1", - "mikey179/vfsStream": "~1.2", - "symfony/css-selector": "~2.8", - "behat/behat": "3.*@stable", - "behat/mink": "1.*@stable", - "behat/mink-extension": "*", - "behat/mink-goutte-driver": "*", - "behat/mink-selenium2-driver": "*", - "drupal/coder": "^8.3", - "drupal/drupal-extension": "^3.4", - "phpmd/phpmd": "@stable", - "sebastian/phpcpd": "@stable", - "phpunit/phpunit": "^6.5", - "phpunit/php-timer": "^1.0.9", - "drupal/console": "@stable", - "zaporylie/composer-drupal-optimizations": "^1.0", - "squizlabs/html_codesniffer": "*" - }, - "repositories": { - "0": { - "type": "composer", - "url": "https://packages.drupal.org/8" - }, - "1": { - "type": "composer", - "url": "https://asset-packagist.org" - }, - "3": { - "type": "package", - "package": { - "name": "squizlabs/html_codesniffer", - "version": "1.0.0", - "source": { - "url": "https://github.com/squizlabs/HTML_CodeSniffer.git", - "type": "git", - "reference": "master" - } - } - }, - "social": { - "type": "git", - "url": "https://github.com/goalgorilla/open_social.git" - } - }, - "scripts": { - "post-install-cmd": [ - "DrupalComposer\\DrupalScaffold\\Plugin::scaffold" - ], - "post-update-cmd": [ - "DrupalComposer\\DrupalScaffold\\Plugin::scaffold" - ] - }, - "extra": { - "installer-types": [ - "bower-asset", - "npm-asset" - ], - "installer-paths": { - "html/core": [ - "drupal/core" - ], - "html/modules/contrib/{$name}": [ - "type:drupal-module" - ], - "html/profiles/contrib/social": [ - "goalgorilla/open_social" - ], - "html/profiles/contrib/{$name}": [ - "type:drupal-profile" - ], - "html/themes/contrib/{$name}": [ - "type:drupal-theme" - ], - "html/libraries/{$name}": [ - "type:drupal-library", - "type:bower-asset", - "type:npm-asset" - ], - "scripts/{$name}": [ - "goalgorilla/open_social_scripts" - ], - "drush/contrib/{$name}": [ - "type:drupal-drush" - ] - }, - "enable-patching": true, - "patches": { - "squizlabs/html_codesniffer": { - "Translatings does not work": "patches/DS-5443-accessibility.patch" - } - } - } -} diff --git a/4.0/mailcatcher-ssmtp.conf b/4.0/mailcatcher-ssmtp.conf deleted file mode 100644 index ea29e8d..0000000 --- a/4.0/mailcatcher-ssmtp.conf +++ /dev/null @@ -1,3 +0,0 @@ -root=postmaster -mailhub=mailcatcher:1025 -FromLineOverride=YES diff --git a/4.0/php.ini b/4.0/php.ini deleted file mode 100644 index 9c1e3b2..0000000 --- a/4.0/php.ini +++ /dev/null @@ -1,8 +0,0 @@ -[PHP] -; Prod settings -date.timezone = UTC -zend.assertions = 0 -upload_max_filesize = 24M -post_max_size = 32M -file_uploads = On -memory_limit = 128M diff --git a/4.0/ssmtp.conf b/4.0/ssmtp.conf deleted file mode 100644 index 91c0b9d..0000000 --- a/4.0/ssmtp.conf +++ /dev/null @@ -1,5 +0,0 @@ -root=postmaster -mailhub=mail -AuthUser=user -AuthPass=password -FromLineOverride=YES diff --git a/Dockerfile b/Dockerfile index 728e9b9..2aef76f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM drupal:9.5-php8.0 MAINTAINER devel@goalgorilla.com # Install packages. -RUN apt-get update && apt-get install -y \ +RUN apt-get clean && apt-get update && apt-get install -y \ zlib1g-dev \ libssl-dev \ libxml2-dev \ @@ -34,15 +34,7 @@ RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && mv composer.phar /usr/local/bin/composer && \ php -r "unlink('composer-setup.php');" - -# Install Open Social via composer. -RUN rm -f /var/www/composer.lock -RUN rm -rf /root/.composer - -ADD composer.json /var/www/composer.json -WORKDIR /var/www/ ENV COMPOSER_ALLOW_SUPERUSER=1 -RUN COMPOSER_MEMORY_LIMIT=-1 composer install --prefer-dist --no-interaction --no-dev WORKDIR /var/www/html/ RUN chown -R www-data:www-data * @@ -52,7 +44,17 @@ RUN wget -O drush.phar https://github.com/drush-ops/drush-launcher/releases/down chmod +x drush.phar && \ mv drush.phar /usr/local/bin/drush -RUN php -r 'opcache_reset();' +# GMP library. +RUN apt-get install -y libgmp-dev +RUN ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/local/include/ +RUN docker-php-ext-configure gmp +RUN docker-php-ext-install gmp + +# Redis. +RUN pecl install redis \ + && docker-php-ext-enable redis # Fix shell. RUN echo "export TERM=xterm" >> ~/.bashrc + +RUN php -r 'opcache_reset();' diff --git a/ci/Dockerfile b/ci/Dockerfile index 317afc8..e53093d 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -1,26 +1,8 @@ -FROM goalgorilla/open_social_docker:latest +FROM goalgorilla/open_social_docker:latest-drupal95 MAINTAINER devel@goalgorilla.com -# Specify the work directory. -WORKDIR /var/www/ - -ADD php.ini /usr/local/etc/php/php.ini - ### CI SPECIFIC - START ### - -# GMP library. -RUN apt-get install -y libgmp-dev -RUN ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/local/include/ -RUN docker-php-ext-configure gmp -RUN docker-php-ext-install gmp - -# Install composer dependencies. -RUN composer install --prefer-dist --no-interaction - -# Unfortunately, adding the composer vendor dir to the PATH doesn't seem to work. So: -RUN ln -s /root/.composer/vendor/bin/behat /usr/local/bin/behat -RUN ln -s /root/.composer/vendor/bin/phpunit /usr/local/bin/phpunit - +ADD php.ini /usr/local/etc/php/php.ini ### CI SPECIFIC - END ### RUN php -r "opcache_reset();" diff --git a/composer.json b/composer.json deleted file mode 100644 index b711680..0000000 --- a/composer.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "name": "goalgorilla/social_docker", - "description": "Social docker template for composer based Open Social projects.", - "type": "project", - "license": "GPL-2.0-or-later", - "minimum-stability": "dev", - "prefer-stable": true, - "config": { - "optimize-autoloader": true, - "update-with-dependencies": true, - "sort-packages": true, - "allow-plugins": { - "composer/installers": true, - "drupal/core-composer-scaffold": true, - "cweagans/composer-patches": true, - "oomphinc/composer-installers-extender": true, - "phpstan/extension-installer": true, - "dealerdirect/phpcodesniffer-composer-installer": true, - "drupal/console-extend-plugin": true, - "zaporylie/composer-drupal-optimizations": true - } - }, - "require": { - "drupal/redis": "^1.5", - "goalgorilla/open_social": "dev-main" - }, - "require-dev": { - "composer/composer": "^2", - "goalgorilla/open_social_dev": "dev-main", - "palantirnet/drupal-rector": "^0.15", - "phpmd/phpmd": "^2.10", - "slevomat/coding-standard": "^7.0", - "squizlabs/html_codesniffer": "*", - "symplify/easy-coding-standard": "^9.4" - }, - "repositories": { - "0": { - "type": "composer", - "url": "https://packages.drupal.org/8", - "exclude": ["goalgorilla/open_social", "drupal/social"] - }, - "1": { - "type": "composer", - "url": "https://asset-packagist.org" - }, - "2": { - "type": "package", - "package": { - "name": "squizlabs/html_codesniffer", - "version": "2.8.1", - "source": { - "url": "https://github.com/squizlabs/HTML_CodeSniffer.git", - "type": "git", - "reference": "master" - } - } - }, - "3": { - "type": "git", - "url": "https://github.com/goalgorilla/open_social.git", - "only": ["goalgorilla/open_social", "drupal/social"] - } - }, - "extra": { - "installer-types": [ - "bower-asset", - "npm-asset" - ], - "installer-paths": { - "html/core": [ - "drupal/core" - ], - "html/modules/contrib/{$name}": [ - "type:drupal-module" - ], - "html/profiles/contrib/social": [ - "goalgorilla/open_social" - ], - "html/profiles/contrib/{$name}": [ - "type:drupal-profile" - ], - "html/themes/contrib/{$name}": [ - "type:drupal-theme" - ], - "html/libraries/{$name}": [ - "type:drupal-library", - "type:bower-asset", - "type:npm-asset" - ], - "scripts/{$name}": [ - "goalgorilla/open_social_scripts" - ], - "drush/contrib/{$name}": [ - "type:drupal-drush" - ] - }, - "enable-patching": true, - "patchLevel": { - "drupal/core": "-p2" - }, - "drupal-scaffold": { - "locations": { - "web-root": "html/" - } - } - } -} diff --git a/cron/Dockerfile b/cron/Dockerfile deleted file mode 100644 index 87ea799..0000000 --- a/cron/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM goalgorilla/open_social_docker:latest -MAINTAINER devel@goalgorilla.com - -# Install development related packages. -RUN apt-get update && apt-get install -y \ -cron - -# Install crontab -ADD cron.sh /root/dev-scripts/cron/cron.sh -ADD run_cron /root/dev-scripts/cron/run_cron -RUN chmod 777 /root/dev-scripts/cron/cron.sh -RUN chmod 777 /root/dev-scripts/cron/run_cron - -RUN echo '* * * * * . /root/dev-scripts/cron/cron.sh >> /var/log/cron.log 2>>/var/log/cron.log' | crontab - - -# Add output file -RUN touch /var/log/cron.log -# Start cron daemon -CMD cron && tail -f /var/log/cron.log diff --git a/cron/cron.sh b/cron/cron.sh deleted file mode 100644 index e1ee51f..0000000 --- a/cron/cron.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash -# -# Run the cron from this script -# This will be installed in your crontab during installation -# -# Expand path -PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin -# Some vars -CRON_ROOT=/root/dev-scripts/cron -DRUPAL_ROOT=/var/www/html -DRUSH=`which drush` -# Current implementation of the cron. Can be another (EG: elysia-cron) -CRON=core-cron -# drush must be installed. -if [ ! -f $DRUSH ] -then - echo `date`" - DRUSH NOT FOUND: SKIPPING CRON" - exit -fi - -# the run_cron file must be there. -if [ ! -f $CRON_ROOT/run_cron ] -then - echo `date`" - CRON TURNED OFF: SKIPPING CRON" - exit -fi - -# Run the cron. -echo `date`" - ALL GOOD: RUNNING CRON" - -$DRUSH --root=$DRUPAL_ROOT $CRON diff --git a/cron/run_cron b/cron/run_cron deleted file mode 100644 index 605bbbe..0000000 --- a/cron/run_cron +++ /dev/null @@ -1,2 +0,0 @@ -If this file is present, the drupal cron/queue will executed -renaming it will skip the cron/queue diff --git a/dev/Dockerfile b/dev/Dockerfile index f8d41a0..b5e4d3d 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -1,31 +1,10 @@ -FROM goalgorilla/open_social_docker:latest +FROM goalgorilla/open_social_docker:latest-drupal95 MAINTAINER devel@goalgorilla.com -### CI SPECIFIC - START ### -### - Making changes here? Also apply in ../ci/Dockerfile ### - -# Specify the work directory. -WORKDIR /var/www/ - -# Install composer dependencies. -RUN composer install --prefer-dist --no-interaction - -# Unfortunately, adding the composer vendor dir to the PATH doesn't seem to work. So: -RUN ln -s /root/.composer/vendor/bin/behat /usr/local/bin/behat -RUN ln -s /root/.composer/vendor/bin/phpunit /usr/local/bin/phpunit - -### CI SPECIFIC - END ### - ### DEV SPECIFIC - START ### ADD php.ini /usr/local/etc/php/php.ini -# GMP library. -RUN apt-get install -y libgmp-dev -RUN ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/local/include/ -RUN docker-php-ext-configure gmp -RUN docker-php-ext-install gmp - # Xdebug. RUN pecl install xdebug-3.1.1 && \ docker-php-ext-enable xdebug && \ @@ -35,28 +14,6 @@ RUN pecl install xdebug-3.1.1 && \ sed -i '1 a xdebug.client_host=host.docker.internal' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini && \ sed -i '1 a xdebug.idekey=PHPSTORMi' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini -# Blackfire -# @todo Fix PHP 8 based blackfire installation -#RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \ -# && architecture=$(uname -m) \ -# && curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/$architecture/$version \ -# && mkdir -p /tmp/blackfire \ -# && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \ -# && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \ -# && printf "extension=blackfire.so\nblackfire.agent_socket=tcp://blackfire:8307\n" > $PHP_INI_DIR/conf.d/blackfire.ini \ -# && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz - -RUN php -r "opcache_reset();" - -# @todo Remove these steps as it is not required for latest Docker desktop. -# Contains the Mac hack to get the permissions to work for development. -# Set user 1000 and group staff to www-data, enables write permission. -# https://github.com/boot2docker/boot2docker/issues/581#issuecomment-114804894 -#RUN usermod -u 1000 www-data -#RUN usermod -G staff www-data - ### DEV SPECIFIC - END ### -# Redis. -RUN pecl install redis \ - && docker-php-ext-enable redis +RUN php -r "opcache_reset();" diff --git a/mailcatcher-ssmtp.conf b/mailcatcher-ssmtp.conf deleted file mode 100644 index e2ce726..0000000 --- a/mailcatcher-ssmtp.conf +++ /dev/null @@ -1,4 +0,0 @@ -root=postmaster -mailhub=mailcatcher:1025 -FromLineOverride=YES -hostname=goalgorilla.com