From 762f18e9138ea466ceb6d9f48b353505350d3903 Mon Sep 17 00:00:00 2001 From: andryyy Date: Thu, 14 Sep 2017 23:13:24 +0200 Subject: [PATCH 1/2] [Clamd] Use Dockerds own init system --- data/Dockerfiles/clamd/bootstrap.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/Dockerfiles/clamd/bootstrap.sh b/data/Dockerfiles/clamd/bootstrap.sh index 6b4acb4d..21b09788 100755 --- a/data/Dockerfiles/clamd/bootstrap.sh +++ b/data/Dockerfiles/clamd/bootstrap.sh @@ -1,6 +1,4 @@ #!/bin/bash -trap "kill 0" SIGINT - touch /var/log/clamav/clamd.log /var/log/clamav/freshclam.log chown -R clamav:clamav /var/log/clamav/ From c63fb8b11abe11dfbb672b1d5e49d41a38d1409b Mon Sep 17 00:00:00 2001 From: andryyy Date: Fri, 15 Sep 2017 07:55:23 +0200 Subject: [PATCH 2/2] [Web] Init db fix for c_location --- data/web/inc/init_db.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/web/inc/init_db.inc.php b/data/web/inc/init_db.inc.php index 84df030f..32418534 100644 --- a/data/web/inc/init_db.inc.php +++ b/data/web/inc/init_db.inc.php @@ -3,7 +3,7 @@ function init_db_schema() { try { global $pdo; - $db_version = "14092017_2244"; + $db_version = "15092017_0754"; $stmt = $pdo->query("SHOW TABLES LIKE 'versions'"); $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC)); @@ -376,7 +376,7 @@ function init_db_schema() { "c_path3" => "VARCHAR(255) DEFAULT NULL", "c_path4" => "VARCHAR(255) DEFAULT NULL", "c_foldername" => "VARCHAR(255) NOT NULL", - "c_location" => "INT NULL", + "c_location" => "VARCHAR(2048) DEFAULT NULL", "c_quick_location" => "VARCHAR(2048) DEFAULT NULL", "c_acl_location" => "VARCHAR(2048) DEFAULT NULL", "c_folder_type" => "VARCHAR(255) NOT NULL"