Merge pull request #24 from OS2web/develop

BKDK-399, BKDK-438, BKDK-446, BKDK-452, BKDK-449

Author: andriyun

.docker/.gitignore

@@ -0,0 +1,9 @@
+logs/*
+!logs/.gitkeep
+ssh/*
+!ssh/.gitkeep
+php/logs/*.log
+mariadb/data/*
+!mariadb/data/.gitkeep
+solr_data/*
+!solr_data/.gitkeep

.docker/os2web/Dockerfile

@@ -49,9 +49,11 @@ RUN echo '<?php $settings["project_env"] = PROD_ENV; ' > /opt/drupal/web/sites/d
 	mkdir -p private; \
 	# Adding sync directory.
 	mkdir -p config/sync; \
+	# Adding translations directory.
+	mkdir -p translations; \
 	# Adjusting ownership
-	chown -R www-data:www-data /opt/drupal/private /opt/drupal/files /opt/drupal/config/sync /opt/drupal/tmp /opt/drupal/logs; \
-	chmod g+s -R /opt/drupal/private /opt/drupal/files /opt/drupal/config/sync
+	chown -R www-data:www-data /opt/drupal/private /opt/drupal/files /opt/drupal/config/sync /opt/drupal/tmp /opt/drupal/logs /opt/drupal/translations; \
+	chmod g+s -R /opt/drupal/private /opt/drupal/files /opt/drupal/translations /opt/drupal/config/sync
 
 # Adding custom apache configuration with PHP value and log settings.
 COPY apache/000-default.conf /etc/apache2/sites-enabled/000-default.conf

.docker/ssh/.gitkeep

@@ -30,16 +30,17 @@
 ## Theme that is going to be used on installation process.
 # OS2WEB_THEME=
 
-
-## Variable used only in docker-compose.yaml
-# OS2WEB_TAG=
-
 ## Migrate DB mysql variables.
 # MIGRATE_MYSQL_DATABASE=
 # MIGRATE_MYSQL_HOSTNAME=
 # MIGRATE_MYSQL_PASSWORD=
 # MIGRATE_MYSQL_PORT=
 # MIGRATE_MYSQL_USER=
 
+## Variable used only in docker-compose.yaml
+# OS2WEB_TAG=
+# Meeting folder mounting credentials
+# OS2WEB_MEETINGS_MNT_HOST=
+# OS2WEB_MEETINGS_MNT_SHARES=
 ## Port that is used on host machine for reaching out application
 # WEB_SERVER_PORT=8098

.env.example

@@ -51,11 +51,3 @@ tmp/*
 !tmp/.gitkeep
 sessions/*
 !sessions/.gitkeep
-
-.docker/logs/*
-!.docker/logs/.gitkeep
-.docker/php/logs/*.log
-.docker/mariadb/data/*
-!.docker/mariadb/data/.gitkeep
-.docker/solr_data/*
-!.docker/solr_data/.gitkeep

.gitignore

@@ -151,6 +151,9 @@
             "drupal/core": {
                 "Notice: Undefined index: value in Drupal\\views\\Plugin\\views\\filter\\NumericFilter->acceptExposedInput()" : "https://www.drupal.org/files/issues/2020-06-04/2825860-exposed-filter-notice-38.patch",
                  "Allow edit Media items from Media Library modal dialog in CKEditor" : "https://www.drupal.org/files/issues/2021-04-21/3168868-13_0.patch"
+            },
+            "drupal/printable": {
+                "3214729 PDF filename is generated with it's location" : "https://git.drupalcode.org/issue/printable-3214729/-/commit/cbc98dbe864f82b4cc1da110d88097d0c4740bb9.patch"
             }
         }
     }

composer.json

@@ -11,7 +11,6 @@ volumes:
     driver: local
   os2web:
     driver: local
-
 services:
 
   # General application container.
@@ -93,13 +92,25 @@ services:
       - /bin/bash
       - -c
       - "drush status --root=/opt/drupal"
-    environment:
-      ## Environment sensitive settings. See .env file.
-      - MYSQL_HOSTNAME=${MYSQL_HOSTNAME}
-      - MYSQL_ROOT_PASSWORD=root
-      - MYSQL_DATABASE=${MYSQL_DATABASE}
-      - MYSQL_USER=${MYSQL_USER}
-      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-      - MYSQL_PORT=${MYSQL_PORT}
-      - DRUPAL_HASH_SALT=${DRUPAL_HASH_SALT}
-      - OS2WEB_THEME=${OS2WEB_THEME}
+    env_file:
+      - .env
+
+  agenda_import:
+    # Check agenda file container.
+    image: dkbellcom/os2web8:${OS2WEB_TAG}
+    container_name: agenda_import
+    volumes:
+      - ./files:/opt/drupal/files
+      - ./:/opt/drupal
+      - ./private:/opt/drupal/private
+    env_file:
+      - .env
+    networks:
+      - backend
+    entrypoint:
+      - /bin/bash
+      - -c
+    command:
+      - "mkdir -p mnt/Testshares; \
+      cat /opt/drupal/private/mntCred; \
+      php /opt/drupal/scripts/dagsorden/check_shares.php -h=${OS2WEB_MEETINGS_MNT_HOST} -s=${OS2WEB_MEETINGS_MNT_SHARES} -m=/opt/drupal/mnt -c=/opt/drupal/private/mntCred -d"