Upgrade to 6.0.x

Dockerfile

@@ -1,6 +1,6 @@
 FROM php:7.4-apache
 LABEL maintainer="Niels Lippke<nlippke@gmx.de>"
-ENV VER 5.1.24
+ENV VER 6.0.21
 ENV SEEDDMS_BASE=/var/www/seeddms \
     SEEDDMS_HOME=/var/www/seeddms/seeddms
 ENV PUBLIC_CERT=${SEEDDMS_BASE}/conf/cacert.pem \
@@ -19,7 +19,7 @@ RUN docker-php-ext-install gd mysqli pdo pdo_mysql zip && \
 
 # Get seeddms
 RUN curl -fsSL https://downloads.sourceforge.net/project/seeddms/seeddms-${VER}/seeddms-quickstart-${VER}.tar.gz | tar -xzC /var/www
-RUN mv /var/www/seeddms51x /var/www/seeddms && mkdir /var/www/seeddms/backup && mkdir -p /var/www/seeddms/import/admin && \
+RUN mv /var/www/seeddms60x /var/www/seeddms && mkdir /var/www/seeddms/backup && mkdir -p /var/www/seeddms/import/admin && \
     mv /var/www/seeddms/conf /var/www/seeddms/data/conf && ln -s /var/www/seeddms/data/conf /var/www/seeddms/conf && \
     mkdir $SEEDDMS_HOME/ext && touch /var/www/seeddms/conf/ENABLE_INSTALL_TOOL
 

README.md

@@ -7,21 +7,22 @@ Cron is also included to handle jobs internally (backup, index, ...).
 
 ## How to run
 
-`docker run --name seeddms -d -v dms-data:/var/www/seeddms/data -p 8080:80 nlippke/seeddms:5.1.24`
+`docker run --name seeddms -d -v dms-data:/var/www/seeddms/data -p 8080:80 nlippke/seeddms:6.0.21`
 
 or as compose file
 
 ```yaml
-version: '2'
+version: '3'
 
 services:
   dms:
-    image: nlippke/seeddms:5.1.24
+    image: nlippke/seeddms:6.0.21
     ports:
       - "8080:80"
       - "8443:443"
     environment:
       - TZ=Europe/Berlin
+      - 'CRON_SCHEDULER=5 * * * *'
       - 'CRON_INDEX=0 0 * * *'
       - 'CRON_BACKUP=0 23 * * *'
       - SSL_PORT=8443
@@ -69,9 +70,17 @@ Backup is done by syncing the `data` folder (partially) to the backup folder. Us
 
 ## Full text search
 
-Indexing documents can take some time (especially on low powered NAS). Therefore indexing is done asynchronously by a job. Use `CRON_INDEX` for scheduling this job. 
+Indexing documents can take some time (especially on low powered NAS). Therefore indexing is done asynchronously by a job. Use `CRON_INDEX` for scheduling this job.
+
+## Scheduler
+
+seeddms comes with an internal scheduler. This scheduler itself is triggered using cron. Default configuration is to check every 5 minutes whether to fire a job.
+This schedule can be changed using `CRON_SCHEDULER`. Also make sure that a seeddms-user `cli_scheduler` exists.
+
+## Migrating from 5.1
+
+If migrating from an existing 5.1 installation you need to update database first using [migration.sql](migration.sql).
 
 ## Additional information
 
 The image is base on https://github.com/ludwigprager/docker-seeddms.
-

migration.sql

@@ -0,0 +1,209 @@
+PRAGMA foreign_keys=off;
+
+BEGIN TRANSACTION;
+
+ALTER TABLE `tblDocumentContent` ADD COLUMN `revisiondate` TEXT default NULL;
+
+ALTER TABLE `tblUsers` ADD COLUMN `secret` varchar(50) default NULL;
+
+ALTER TABLE `tblWorkflows` ADD COLUMN `layoutdata` text default NULL;
+
+CREATE TABLE `new_tblWorkflowDocumentContent` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `parent` INTEGER DEFAULT NULL REFERENCES `tblWorkflowDocumentContent` (`id`) ON DELETE CASCADE,
+  `workflow` INTEGER DEFAULT NULL REFERENCES `tblWorkflows` (`id`) ON DELETE CASCADE,
+  `document` INTEGER DEFAULT NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  `version` INTEGER DEFAULT NULL,
+  `state` INTEGER DEFAULT NULL REFERENCES `tblWorkflowStates` (`id`) ON DELETE CASCADE,
+  `date` datetime NOT NULL
+) ;
+
+INSERT INTO `new_tblWorkflowDocumentContent` (`parent`, `workflow`, `document`, `version`,     `state`, `date`) SELECT NULL as `parent`, `workflow`, `document`, `version`, `state`, `date` FROM `tblWorkflowDocumentContent`;
+
+INSERT INTO `new_tblWorkflowDocumentContent` (`parent`, `workflow`, `document`, `version`, `state`, `date`) SELECT NULL, `a`.`workflow`, `a`.`document`, `a`.`version`, NULL AS `state`, max(`a`.`date`) FROM `tblWorkflowLog` `a` LEFT JOIN `tblWorkflowDocumentContent` `b` ON `a`.`document`=`b`.`document` AND `a`.`version`=`b`.`version` AND `a`.`workflow`=`b`.`workflow` WHERE `b`.`document` IS NULL GROUP BY `a`.`document`, `a`.`version`, `a`.`workflow`;
+
+CREATE TABLE `new_tblWorkflowLog` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+	`workflowdocumentcontent` INTEGER DEFAULT NULL REFERENCES `tblWorkflowDocumentContent` (`id`) ON DELETE CASCADE,
+  `userid` INTEGER default NULL REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+  `transition` INTEGER default NULL REFERENCES `tblWorkflowTransitions` (`id`) ON DELETE CASCADE,
+  `date` datetime NOT NULL,
+  `comment` text
+) ;
+
+INSERT INTO `new_tblWorkflowLog` (`id`, `workflowdocumentcontent`, `userid`, `transition`, `date`, `comment`) SELECT `a`.`id`, `b`.`id`, `a`.`userid`, `a`.`transition`, `a`.`date`, `a`.`comment` FROM `tblWorkflowLog` `a` LEFT JOIN `new_tblWorkflowDocumentContent` `b` ON `a`.`document`=`b`.`document` AND `a`.`version`=`b`.`version` AND `a`.`workflow`=`b`.`workflow` WHERE `b`.`document` IS NOT NULL;
+
+DROP TABLE `tblWorkflowLog`;
+
+ALTER TABLE `new_tblWorkflowLog` RENAME TO `tblWorkflowLog`;
+
+DROP TABLE `tblWorkflowDocumentContent`;
+
+ALTER TABLE `new_tblWorkflowDocumentContent` RENAME TO `tblWorkflowDocumentContent`;
+
+CREATE TABLE `tblUserSubstitutes` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `user` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+  `substitute` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+  UNIQUE (`user`, `substitute`)
+);
+
+CREATE TABLE `tblDocumentCheckOuts` (
+  `document` INTEGER REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  `version` INTEGER unsigned NOT NULL default '0',
+  `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`),
+  `date` TEXT NOT NULL,
+  `filename` varchar(255) NOT NULL default '',
+  UNIQUE (`document`)
+) ;
+
+CREATE TABLE `tblDocumentRecipients` (
+  `receiptID` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `documentID` INTEGER NOT NULL default '0' REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  `version` INTEGER unsigned NOT NULL default '0',
+  `type` INTEGER NOT NULL default '0',
+  `required` INTEGER NOT NULL default '0',
+  UNIQUE (`documentID`,`version`,`type`,`required`)
+) ;
+CREATE INDEX `indDocumentRecipientsRequired` ON `tblDocumentRecipients` (`required`);
+
+CREATE TABLE `tblDocumentReceiptLog` (
+  `receiptLogID` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `receiptID` INTEGER NOT NULL default 0 REFERENCES `tblDocumentRecipients` (`receiptID`) ON DELETE CASCADE,
+  `status` INTEGER NOT NULL default 0,
+  `comment` TEXT NOT NULL,
+  `date` TEXT NOT NULL,
+  `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
+) ;
+CREATE INDEX `indDocumentReceiptLogReceiptID` ON `tblDocumentReceiptLog` (`receiptID`);
+
+CREATE TABLE `tblDocumentRevisors` (
+  `revisionID` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `documentID` INTEGER NOT NULL default '0' REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  `version` INTEGER unsigned NOT NULL default '0',
+  `type` INTEGER NOT NULL default '0',
+  `required` INTEGER NOT NULL default '0',
+  `startdate` TEXT default NULL,
+  UNIQUE (`documentID`,`version`,`type`,`required`)
+) ;
+CREATE INDEX `indDocumentRevisorsRequired` ON `tblDocumentRevisors` (`required`);
+
+CREATE TABLE `tblDocumentRevisionLog` (
+  `revisionLogID` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `revisionID` INTEGER NOT NULL default 0 REFERENCES `tblDocumentRevisors` (`revisionID`) ON DELETE CASCADE,
+  `status` INTEGER NOT NULL default 0,
+  `comment` TEXT NOT NULL,
+  `date` TEXT NOT NULL,
+  `userID` INTEGER NOT NULL default 0 REFERENCES `tblUsers` (`id`) ON DELETE CASCADE
+) ;
+CREATE INDEX `indDocumentRevisionLogRevisionID` ON `tblDocumentRevisionLog` (`revisionID`);
+
+CREATE TABLE `tblTransmittals` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` text NOT NULL,
+  `comment` text NOT NULL,
+  `userID` INTEGER NOT NULL default '0' REFERENCES `tblUsers` (`id`) ON DELETE CASCADE,
+  `date` TEXT default NULL,
+  `public` INTEGER NOT NULL default '0'
+);
+
+CREATE TABLE `tblTransmittalItems` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+	`transmittal` INTEGER NOT NULL DEFAULT '0' REFERENCES `tblTransmittals` (`id`) ON DELETE CASCADE,
+  `document` INTEGER default NULL REFERENCES `tblDocuments` (`id`) ON DELETE CASCADE,
+  `version` INTEGER unsigned NOT NULL default '0',
+  `date` TEXT default NULL,
+  UNIQUE (transmittal, document, version)
+);
+
+CREATE TABLE `tblRoles` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` varchar(50) default NULL,
+  `role` INTEGER NOT NULL default '0',
+  `noaccess` varchar(30) NOT NULL default '',
+  UNIQUE (`name`)
+);
+
+INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (1, 'Admin', 1);
+INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (2, 'Guest', 2);
+INSERT INTO `tblRoles` (`id`, `name`, `role`) VALUES (3, 'User', 0);
+
+UPDATE `tblUsers` SET role=3 WHERE role=0;
+
+CREATE TABLE `new_tblUsers` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `login` varchar(50) default NULL,
+  `pwd` varchar(50) default NULL,
+  `fullName` varchar(100) default NULL,
+  `email` varchar(70) default NULL,
+  `language` varchar(32) NOT NULL,
+  `theme` varchar(32) NOT NULL,
+  `comment` text NOT NULL,
+  `role` INTEGER NOT NULL REFERENCES `tblRoles` (`id`),
+  `hidden` INTEGER NOT NULL default '0',
+  `pwdExpiration` TEXT default NULL,
+  `loginfailures` INTEGER NOT NULL default '0',
+  `disabled` INTEGER NOT NULL default '0',
+  `quota` INTEGER,
+  `homefolder` INTEGER default NULL REFERENCES `tblFolders` (`id`),
+  `secret` varchar(50) default NULL,
+  UNIQUE (`login`)
+);
+
+INSERT INTO new_tblUsers SELECT * FROM tblUsers;
+
+DROP TABLE tblUsers;
+
+ALTER TABLE new_tblUsers RENAME TO tblUsers;
+
+CREATE TABLE `tblAros` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `parent` INTEGER,
+  `model` TEXT NOT NULL,
+  `foreignid` INTEGER NOT NULL DEFAULT '0',
+  `alias` TEXT
+) ;
+
+CREATE TABLE `tblAcos` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `parent` INTEGER,
+  `model` TEXT NOT NULL,
+  `foreignid` INTEGER NOT NULL DEFAULT '0',
+  `alias` TEXT
+) ;
+
+CREATE TABLE `tblArosAcos` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `aro` INTEGER NOT NULL DEFAULT '0' REFERENCES `tblAros` (`id`) ON DELETE CASCADE,
+  `aco` INTEGER NOT NULL DEFAULT '0' REFERENCES `tblAcos` (`id`) ON DELETE CASCADE,
+  `create` INTEGER NOT NULL DEFAULT '-1',
+  `read` INTEGER NOT NULL DEFAULT '-1',
+  `update` INTEGER NOT NULL DEFAULT '-1',
+  `delete` INTEGER NOT NULL DEFAULT '-1',
+  UNIQUE (aco, aro)
+) ;
+
+CREATE INDEX `indDocumentStatusLogStatusID` ON `tblDocumentStatusLog` (`StatusID`);
+CREATE INDEX `indDocumentApproversRequired` ON `tblDocumentApprovers` (`required`);
+CREATE INDEX `indDocumentApproveLogApproveID` ON `tblDocumentApproveLog` (`approveID`);
+CREATE INDEX `indDocumentReviewersRequired` ON `tblDocumentReviewers` (`required`);
+CREATE INDEX `indDocumentReviewLogReviewID` ON `tblDocumentReviewLog` (`reviewID`);
+
+CREATE TABLE `tblSchedulerTask` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `name` varchar(100) DEFAULT NULL,
+  `description` TEXT DEFAULT NULL,
+  `disabled` INTEGER NOT NULL DEFAULT '0',
+  `extension` varchar(100) DEFAULT NULL,
+  `task` varchar(100) DEFAULT NULL,
+  `frequency` varchar(100) DEFAULT NULL,
+  `params` TEXT DEFAULT NULL,
+  `nextrun` TEXT DEFAULT NULL,
+  `lastrun` TEXT DEFAULT NULL
+) ;
+
+UPDATE tblVersion set major=6, minor=0, subminor=0;
+
+COMMIT;
+
+PRAGMA foreign_keys=on;

sources/seeddms-entrypoint

@@ -4,10 +4,20 @@ rm -rf /tmp/seed
 
 if [ -n "$TZ" ]; then
   echo $TZ > /etc/timezone
+  if ! tail /usr/local/etc/php/php.ini | grep date.timezone > /dev/null; then
+    echo "" >> /usr/local/etc/php/php.ini
+    echo "\ndate.timezone = $TZ" >> /usr/local/etc/php/php.ini
+  fi
 fi
 
 rm -f /etc/cron.d/seeddms
 
+if [ -z "$CRON_SCHEDULER" ]; then
+  CRON_SCHEDULER="5 * * * *"
+fi
+
+echo "$CRON_SCHEDULER su -s /bin/bash -c '. /usr/local/bin/seeddms-settings.sh && /var/www/seeddms/seeddms/utils/seeddms-schedulercli --config /var/www/seeddms/conf/settings.xml --mode=run' www-data" >> /etc/cron.d/seeddms
+
 if [ -n "$CRON_INDEX" ]; then
    echo "$CRON_INDEX su -s /bin/bash -c /usr/local/bin/seeddms-generate-index.sh www-data" >> /etc/cron.d/seeddms
 fi