Skip to content

Commit

Permalink
feat(drupal): update project to 1.1.1 version
Browse files Browse the repository at this point in the history
  • Loading branch information
acattaneoacn committed Oct 24, 2022
1 parent f507a75 commit f3c50a7
Show file tree
Hide file tree
Showing 187 changed files with 9,478 additions and 2,642 deletions.
13 changes: 10 additions & 3 deletions drupal/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ RUN apt-get install libpng-dev -y
RUN apt-get install zip -y
RUN apt-get install npm -y
RUN apt-get install mysql\* -y
RUN apt-get install cron -y

RUN npm install -g n
RUN n lts
Expand All @@ -43,13 +44,19 @@ RUN a2enmod rewrite
COPY ./deploy/000-default.conf /etc/apache2/sites-available/000-default.conf
COPY ./deploy/ports.conf /etc/apache2/ports.conf

COPY ./deploy/updatedatabase.sh /updatedatabase.sh
RUN chmod 777 /updatedatabase.sh

RUN rm -rf /var/www/html/
ADD ./ /var/www/html
RUN chown -R www-data:www-data /var/www

RUN chsh -s /bin/bash www-data

RUN mkdir /var/log/cron/
RUN chown -R www-data:www-data /var/log/cron/

USER ${APACHE_RUN_USER}:

RUN (cd /var/www/html/ && composer install -v)

RUN (crontab -u $(whoami) -l; echo "* * * * * /usr/local/bin/php /var/www/html/vendor/bin/drush cron > /var/log/cron/drupal.log" ) | crontab -u $(whoami) -

USER root:
12 changes: 10 additions & 2 deletions drupal/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@
"drupal/openapi_rest": "^2.0@RC",
"drupal/openapi_ui_swagger": "^1.0@RC",
"drupal/restui": "^1.21",
"drupal/s3fs": "^3.0@RC",
"drupal/search_api": "^1.25",
"drupal/ultimate_cron": "^2.0@alpha",
"drupal/simple_cron": "^1.0",
"drupal/views_field_view": "^1.0@beta",
"drupal/whoops": "^1.0@beta",
"drush/drush": "^11.1",
Expand Down Expand Up @@ -60,7 +61,14 @@
"enable_patches": true,
"patches": {
"drupal/notificationswidget": {
"Add relationship and fix explode": "patches/notificationwidget_relationship_explode.patch"
"Add relationship and fix explode": "patches/notificationswidget_relationship_explode.patch",
"Notification action in views": "patches/notificationswidget_action_in_view.patch"
},
"drupal/flag": {
"Fix Deprecated function: str_replace() warning": "patches/flag_string_replace_deprecated.patch"
},
"drupal/simple_cron": {
"Remove warning when a job is not executed": "patches/simple_cron_no_warning.patch"
}
},
"drupal-scaffold": {
Expand Down
Loading

0 comments on commit f3c50a7

Please sign in to comment.