Kleine wijzigingen, Docker best practises

Make WebGUI 7.10 master again as we do not want to go to 8

.dockerignore

@@ -1,15 +0,0 @@
-# https://medium.com/@bounouh.fedi/mastering-the-dockerignore-file-boosting-docker-build-efficiency-398719f4a0e1
-
-# Ignore version control (directories), not needed in container
-.git
-.git/
-.gitignore
-
-# If we're cacheing cpan modules, so they are not downloaded every time
-# ignore these caches in the container
-.cpanrc
-cpan-cache/
-
-# Ignore Docker-related files
-Dockerfile*
-.dockerignore

Dockerfile

@@ -1,14 +1,14 @@
-FROM debian:trixie
+FROM debian:latest
 
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt update && apt -y install perl cpanminus libaspell-dev make libdbd-mysql-perl libdigest-perl-md5-perl libxml-simple-perl \
    libmodule-install-perl gcc libperl-dev default-libmysqlclient-dev libpng-dev build-essential libgd-dev mariadb-client imagemagick \
    libpng-dev libjpeg-dev libtiff-dev libapache2-mod-perl2 libapache2-mod-perl2-dev libapache2-request-perl libimage-magick-perl vim \
-   apache2 apache2-utils mailutils
+   apache2 apache2-utils 
 
 
-RUN cpanm --notest --no-cache --force \
+RUN cpanm --notest --force \
    Algorithm::Permute \
    App::Cmd \
    Archive::Any \
@@ -79,7 +79,6 @@ RUN cpanm --notest --no-cache --force \
    List::MoreUtils \
    Locales \
    Log::Log4perl \
-   Mail::DeliveryStatus::BounceParser \
    MIME::Tools \
    Module::Find \
    Monkey::Patch \
@@ -141,9 +140,6 @@ RUN cpanm --notest --no-cache --force \
    common::sense \
    namespace::autoclean
 
-RUN apt -y remove libjson-xs-perl
-RUN apt-get clean
-RUN rm -rf /var/lib/apt/lists/* 
 
 #RUN cpanm --notest --force \
 #   DBD::mysql@4.051

distribution/docker-compose.yml

@@ -13,13 +13,10 @@ services:
      volumes:
      - ./share/create.sql:/docker-entrypoint-initdb.d/1.sql
      ports:
-       - 3306:3306
+      - 3306
       
    webgui:
-     image: webgui:latest
-     build:
-       context: ..
-       dockerfile: Dockerfile
+     image: webgui
      container_name: webgui
      depends_on:
       - db
@@ -41,4 +38,4 @@ services:
       #- "443:443"
       # TODO: serve staatic files directly from nginx
       #- ./www:/var/www/html:ro
-    
+    

distribution/webgui/entrypoint

@@ -29,16 +29,8 @@ for configfile in `perl -Ilib sbin/wgd for-each`;do
 
         ## perl -Ilib sbin/wgd db --config-file=www.example.com --webgui-root=/data/WebGUI  
 
-        #install newsletter module
-        perl -I /data/WebGUI/lib -I /data/WebGUI/custom/webgui_newsletter/lib /data/WebGUI/custom/webgui_newsletter/sbin/install_icons.pl --customRoot=/data/WebGUI/custom
-
-        cd /data/WebGUI/lib
-        perl -I /data/WebGUI/lib -I /data/WebGUI/custom/webgui_newsletter/lib /data/WebGUI/custom/webgui_newsletter/sbin/install_newsletter.pl --configFile=www.example.com.conf
     fi
 
-
-
-
 done
 
 perl -I/data/WebGUI/lib sbin/spectre.pl --daemon

distribution/webgui/www.example.com.conf

@@ -1,6 +1,6 @@
 <VirtualHost 0.0.0.0:80>
-ServerName localhost
-ServerAlias webgui www.example.com example.com unitedknowledge.vps2.unitedknowledge.net www.unitedknowledge.eu unitedknowledge.eu  www.united-knowledge.eu united-knowledge.eu www.unitedknowledge.net unitedknowledge.net
+ServerName www.example.com
+ServerAlias webgui localhost example.com unitedknowledge.vps2.unitedknowledge.net www.unitedknowledge.eu unitedknowledge.eu  www.united-knowledge.eu united-knowledge.eu www.unitedknowledge.net unitedknowledge.net
 DocumentRoot /data/WebGUI/www
     SetEnvIf SSLPROXY "1" \
 SSLPROXY

etc/log.conf

@@ -4,7 +4,7 @@
 # system is capable of. To unleash the full power read the config file manual
 # http://log4perl.sourceforge.net/releases/Log-Log4perl/docs/html/Log/Log4perl/Config.html
 
-log4perl.logger = WARN, mainlog 
+log4perl.logger = ERROR, mainlog 
 log4perl.appender.mainlog = Log::Log4perl::Appender::File
 log4perl.appender.mainlog.filename = /var/log/webgui.log 
 log4perl.appender.mainlog.layout = PatternLayout

lib/Spectre/Admin.pm

@@ -155,7 +155,6 @@ sub loadSiteData {
         	} 
 		else {
 			my $siteData = {};
-			print "Reading site configs. $url responded with: " . $response->content . "\n";
 			eval { $siteData = JSON::decode_json($response->content); };
 			if ($@) {
 				$self->error("Couldn't fetch Spectre configuration data for $key : $@");

lib/WebGUI/Asset/RichEdit.pm

@@ -19,7 +19,7 @@ use WebGUI::Asset;
 use WebGUI::Form;
 use WebGUI::Utility;
 use WebGUI::International;
-use JSON -convert_blessed_universally;
+use JSON;
 
 our @ISA = qw(WebGUI::Asset);
 
@@ -664,10 +664,9 @@ EOHTML1
     if ( $ask ) {
         $config->{mode} = "none";
     }
-    $self->session->log->debug("config: $config->{mode} ");
 
     $out    .= $self->getLoadPlugins;
-    $out    .= "\ttinyMCE.init(" . JSON->new->allow_blessed->pretty->encode( $config ) . " );\n";
+    $out    .= "\ttinyMCE.init(" . JSON->new->pretty->encode( $config ) . " );\n";
     $out    .= "</script>";
 }
 

lib/WebGUI/Crud.pm

@@ -233,7 +233,7 @@ sub crud_createTable {
 	my $tableName = $class->crud_getTableName($session);
 	$class->crud_dropTable($session);
 	$db->write('create table '.$dbh->quote_identifier($tableName).' (
-		'.$dbh->quote_identifier($class->crud_getTableKey($session)).' CHAR(22) binary not null default "" primary key,
+		'.$dbh->quote_identifier($class->crud_getTableKey($session)).' CHAR(22) binary not null primary key,
 		sequenceNumber int not null default 1,
 		dateCreated datetime,
 		lastUpdated datetime
@@ -468,7 +468,7 @@ sub crud_updateTable {
 		my $notNullClause = ($isKey || $defaultValue ne "") ? "not null" : "";
 		my $defaultClause = '';
         if ($fieldType !~ /(?:text|blob)$/i) {
-            $defaultClause = "default ".$dbh->quote($defaultValue);
+            $defaultClause = "default ".$dbh->quote($defaultValue) if ($defaultValue ne "");
         }
 		if (exists $tableFields{$property}) {
 			my $changed = 0;