client/Containerfile

@@ -5,7 +5,7 @@ ARG AMANDA_VERSION=tag-community-3.5.4
 RUN apt-get -qy update && apt-get -qy upgrade
 RUN apt-get -qy install git libssl-dev make autoconf autoconf-archive automake bash bison \ 
                         flex perl libperl-dev libglib2.0-dev swig \
-                        libtirpc-dev libreadline-dev libxslt1-dev libxml-simple-perl procps
+                        libtirpc-dev libreadline-dev libxslt1-dev libxml-simple-perl
 WORKDIR /src
 
 RUN git clone https://github.com/zmanda/amanda.git && cd amanda && git checkout ${AMANDA_VERSION} && git submodule update --init --recursive
@@ -21,7 +21,7 @@ FROM debian:stable-slim
 
 RUN apt-get -qy update && apt-get -qy upgrade
 RUN apt-get -qy install git libssl3 bash perl libglib2.0 swig libtirpc3 libreadline8 \ 
-                        libxslt1.1 libxml-simple-perl libjson-perl openbsd-inetd procps
+                        libxslt1.1 libxml-simple-perl libjson-perl openbsd-inetd
 
 RUN apt-get -qy install tini
 
@@ -41,7 +41,7 @@ RUN cp /usr/local/etc/amanda/amanda-security.conf /usr/local/etc/
 RUN chown root:root /usr/local/etc/amanda-security.conf
 
 RUN mkdir -p /usr/local/var/amanda/gnutar-lists
-RUN touch /usr/local/var/amanda/amandates
+RUN mkdir -p /usr/local/var/amanda/amandates
 RUN chown -R backup:backup /usr/local/var/amanda
 
 USER backup

scripts/entryPoint.sh

@@ -1,114 +0,0 @@
-#!/bin/bash
-
-write_config_file()
-{
-    FILE=$1
-    ENGINE=$2
-    DATABASE=$3
-    USER=$4
-    PASS=$5
-    HOST=$6
-
-    if [ -n $HOST ]; then
-        HOST=";host=${HOST}"
-    fi
-
-    echo '%dbconfig= (' >> $FILE;
-    echo "      connection => \"${ENGINE}:dbname=${DATABASE}${HOST}\"," >> $FILE
-    echo "      user => \"$USER\"," >> $FILE
-    echo "      password => \"$PASS\"" >> $FILE
-    echo ');' >> $FILE
-
-}
-
-CONFIGDBFILE=/opt/fhem/configDB.conf
-LOGDBFILE=/opt/fhem/db.conf
-
-
-if [ -z ${CONFIG_DATABASE_ENGINE} ]; then
-    CONFIG_DATABASE_ENGINE=sqlite
-
-    if [ -z ${CONFIG_DATABASE} ]; then
-        CONFIG_DATABASE="/opt/fhem/configDB.db"
-    fi
-
-fi
-
-if [ -z ${CONFIG_DATABASE} ]; then
-    echo "please provide CONFIG_DATABASE name"
-    exit 255
-fi
-
-if [ "${CONFIG_DATABASE_ENGINE}" == "sqlite" ]; then
-    
-    write_config_file "${CONFIGDBFILE}" "SQLite" "${CONFIG_DATABASE}" "" "";
-
-elif [ "${CONFIG_DATABASE_ENGINE}" == "mysql" ]; then
-
-    if [ -z ${CONFIG_DATABASE_HOST} ]; then
-        CONFIG_DATABASE_HOST="localhost"
-    fi
-
-    if [ -z ${CONFIG_DATABASE_USER} ]; then
-        echo "please provide CONFIG_DATABASE_USER "
-        exit 255
-    fi
-
-    if [ -z ${CONFIG_DATABASE_PASS} ]; then
-        echo "please provide CONFIG_DATABASE_PASS"
-        exit 255
-    fi
-
-    write_config_file "${CONFIGDBFILE}" "mysql" "${CONFIG_DATABASE}" "${CONFIG_DATABASE_USER}" "${CONFIG_DATABASE_PASS}" "${CONFIG_DATABASE_HOST}"
-
-else
-    echo "unknown database engine provided in CONFIG_DATABASE_ENGINE"
-    exit 255
-fi
-
-if [ -z ${LOG_DATABASE_ENGINE} ]; then
-    LOG_DATABASE_ENGINE=sqlite
-
-    if [ -z ${LOG_DATABASE} ]; then
-        LOG_DATABASE="/opt/fhem/logdb.db"
-    fi
-
-fi
-
-if [ -z ${LOG_DATABASE} ]; then
-    echo "please provide LOG_DATABASE name"
-    exit 255
-fi
-
-
-if [ "${LOG_DATABASE_ENGINE}" == "sqlite" ]; then
-
-    write_config_file "${LOGDBFILE}" "SQLite" "${LOG_DATABASE}" "" ""
-
-elif [ "${LOG_DATABASE_ENGINE}" == "mysql" ]; then
-    
-    if [ -z ${LOG_DATABASE_HOST} ]; then
-        CONFIG_DATABASE_HOST="localhost"
-    fi
-
-    if [ -z ${LOG_DATABASE_USER} ]; then
-        echo "please provide LOG_DATABASE_USER "
-        exit 255
-    fi
-
-    if [ -z ${LOG_DATABASE_PASS} ]; then
-        echo "please provide LOG_DATABASE_PASS "
-        exit 255
-    fi
-
-    write_config_file "${LOGDBFILE}" "mysql" "${LOG_DATABASE}" "${LOG_DATABASE_USER}" "${LOG_DATABASE_PASS}" "${LOG_DATABASE_HOST}"
-
-else
-    echo "unknown database engine provided in LOG_DATABASE_ENGINE"
-    exit 255
-fi
-
-
-export FHEM_GLOBALATTR="nofork=1 updateInBackground=1 logfile=/dev/stdout"
-cd /opt/fhem || exit 255
-./fhem.pl configDB

server/Containerfile

@@ -5,13 +5,14 @@ ARG AMANDA_VERSION=tag-community-3.5.4
 RUN apt-get -qy update && apt-get -qy upgrade
 RUN apt-get -qy install git libssl-dev make autoconf autoconf-archive automake bash bison \ 
                         flex perl libperl-dev libglib2.0-dev swig \
-                        libtirpc-dev libreadline-dev libxslt1-dev libxml-simple-perl procps
+                        libtirpc-dev libreadline-dev libxslt1-dev libxml-simple-perl
 
 
 WORKDIR /src
 
 RUN git clone https://github.com/zmanda/amanda.git && cd amanda && git checkout ${AMANDA_VERSION} && git submodule update --init --recursive
 
+
 RUN cd amanda && ./autogen
 RUN cd amanda && ./configure --without-client --without-bsd-security --with-ssl-security --with-ssh-security --with-readline --with-ipv6 --with-user=backup --with-group=backup
 RUN cd amanda && make
@@ -21,20 +22,10 @@ FROM debian:stable-slim
 
 RUN apt-get -qy update && apt-get -qy upgrade
 RUN apt-get -qy install git libssl3 bash perl libglib2.0 swig libtirpc3 libreadline8 \ 
-                        libxslt1.1 libxml-simple-perl libjson-perl procps
-RUN apt-get -qy install tini
+                        libxslt1.1 libxml-simple-perl libjson-perl
 
 COPY --from=builder /usr/local/ /usr/local/
 
-RUN mkdir /usr/local/etc/amanda/ssl
-RUN mkdir /usr/local/etc/amanda/Backup/
-COPY conf/amanda.conf /usr/local/etc/amanda/Backup
-RUN chown backup:backup /usr/local/etc/amanda
-
 ENV LD_LIBRARY_PATH /usr/local/share/perl5/site_perl/auto/Amanda/Debug/
-ADD scripts/entryPoint.sh /entryPoint.sh
-RUN chmod +x /entryPoint.sh
 
 USER backup
-
-ENTRYPOINT ["/usr/bin/tini", "--", "/entryPoint.sh"]