Merge branch 'dev' into 'master'

Dev

See merge request mumie/docker-services!30

Author: mumie

README.md

@@ -1,2 +1,2 @@
 Container Services most of them based on alpine image to be lightweight.
-Alle Services are build for a gracefull shutdown/restart.
+Alle Services are build for a graceful shutdown/restart.

jdownloader/Dockerfile

@@ -2,22 +2,19 @@ FROM alpine:latest
 
 ENV USER_UID="1002" \
     USER_NAME="jdownloader" \
-    JDOWNLOADER_LINK="http://installer.jdownloader.org/JDownloader.jar"
+    JDOWNLOADER_LINK="http://installer.jdownloader.org/JDownloader.jar" \
+    JDPATH="/jdownloader" \
+    LANG='C.UTF-8' \
+    LANGUAGE='C.UTF-8'
 
-ENV JAVA_VERSION=8 \
-    JAVA_VERSION_MINOR=202 \
-    JAVA_VERSION_BUILD=08 \
-    JAVA_PACKAGE=server-jre \
-    JAVA_MAGIC=1961070e4c9b4e26a04e7f5a083f551e \
-    JAVA_HOME=/opt/jdk \
+ENV JAVA_HOME=/opt/jdk \
     PATH=${PATH}:/opt/jdk/bin \
-    GLIBC_VERSION=2.29-r0 \
-    LANG=C.UTF-8
+    GLIBC_VERSION=2.30-r0
 
 # alpine - openjdk8-jre-base java-jna openjdk8-jre-lib libstdc++  glibc-bin glibc-i18n
 # libstdc++ and glibc-i18n needed for jdownloader building 7zip Package
 RUN set -ex \
-    && apk add --no-cache --update wget bash ca-certificates su-exec curl libstdc++ tar \
+    && apk add --no-cache --update wget bash ca-certificates su-exec curl libstdc++ tar openjdk8-jre-base \
     && wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub \
     && wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk \
     && wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-bin-${GLIBC_VERSION}.apk \
@@ -26,29 +23,23 @@ RUN set -ex \
 #    && ( /usr/glibc-compat/bin/localedef --force --inputfile POSIX --charmap UTF-8 C.UTF-8 || true ) \
 #    && echo "export $LANG" > /etc/profile.d/locale.sh \
 #    && /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib \
-    # Downloading Oracle Java Server-Jre
     && mkdir -p /opt \
-    && curl -jksSLH "Cookie: oraclelicense=accept-securebackup-cookie" -o /tmp/java.tar.gz \
-    https://download.oracle.com/otn-pub/java/jdk/${JAVA_VERSION}u${JAVA_VERSION_MINOR}-b${JAVA_VERSION_BUILD}/${JAVA_MAGIC}/${JAVA_PACKAGE}-${JAVA_VERSION}u${JAVA_VERSION_MINOR}-linux-x64.tar.gz \
-    && tar -C /opt -zxvf /tmp/java.tar.gz \
-    && ln -s /opt/jdk1.${JAVA_VERSION}.0_${JAVA_VERSION_MINOR} /opt/jdk \
-    && find /opt/jdk/ -maxdepth 1 -mindepth 1 | grep -v jre | xargs rm -rf \
-    && cd /opt/jdk/ \
-    && ln -s ./jre/bin ./bin \
+    && mkdir -p ${JDPATH} \
     && echo "adding $USER_NAME as Group and User" \
     && addgroup -g ${USER_UID} ${USER_NAME} \
     && adduser -D -u ${USER_UID} -G ${USER_NAME} -s /bin/sh -h /${USER_NAME} ${USER_NAME} \
-    && echo "Downloading jDownloader jar File" \
-    && wget -O /${USER_NAME}/JDownloader.jar --progress=bar:force ${JDOWNLOADER_LINK} \
-    && apk del wget ca-certificates curl tar \
+#    && echo "Downloading jDownloader jar File" \
+#    && wget -O ${JDPATH}/JDownloader.jar --progress=bar:force ${JDOWNLOADER_LINK} \
+    && apk del wget curl tar \
     && rm -rf /tmp/* /var/cache/apk/* /var/lib/apk/lists/*
 
 ADD start.sh /start.sh
+ADD JDownloader.jar ${JDPATH}/JDownloader.jar
 RUN chmod +x /start.sh
 
 #USER $USER_NAME
-VOLUME /${USER_NAME}/cfg
-WORKDIR /${USER_NAME}
+VOLUME ${JDPATH}/cfg
+WORKDIR ${JDPATH}
 CMD ["/start.sh"]
 
 # Run Commands

jdownloader/JDownloader.jar

@@ -1,7 +1,16 @@
 Lightweight alpine container with jdownloader (126MB image size) with graceful shutdown/restart (java runs on PID 1 with USER_UID specified). All is working correctly especially extracting ( glibc is added for extraction to work ).
 
-Use it with:
-docker run -d -m 2g --restart=unless-stopped --name jdownloader -v /home/USER/data/jdownloader:/jdownloader/cfg -v /YOUR/download/path:/jdownloader/Downloads -e USER_UID=1002 mumiehub/jdownloader
+# Usage Example:
+
+    docker run -d -m 2g --name jdownloader \
+        --restart=unless-stopped \
+        --cap-add SYS_ADMIN \
+        --device /dev/fuse \
+        --security-opt apparmor:unconfined \
+        -e USER_UID=1002 \
+        -v /home/<USER>/jdownloader:/jdownloader/cfg \
+        -v /host/download/path:/jdownloader/Downloads \
+        mumiehub/jdownloader
 
 -m 2g is used because jdownloader will eat up your memory when downloading something (caching).
 

jdownloader/README.md

@@ -1,7 +1,54 @@
 #!/bin/sh
 set -e
 
-# Display settings on standard out.
+#ENV
+OS=""
+
+#Functions
+DectectOS(){
+  if [ -e /etc/alpine-release ]; then
+    OS="alpine"
+  elif [ -e /etc/os-release ]; then
+    if /bin/grep -q "NAME=\"Ubuntu\"" /etc/os-release ; then 
+      OS="ubuntu"
+    fi
+  fi
+}
+
+AutoUpgrade(){
+    if [ "${OS}" == "alpine" ]; then
+        /sbin/apk --no-cache upgrade
+        /bin/rm -rf /var/cache/apk/*
+    elif [ "${OS}" == "ubuntu" ]; then
+        export DEBIAN_FRONTEND=noninteractive
+        /usr/bin/apt-get update
+        /usr/bin/apt-get -y --no-install-recommends dist-upgrade
+        /usr/bin/apt-get -y autoclean
+        /usr/bin/apt-get -y clean 
+        /usr/bin/apt-get -y autoremove
+        /bin/rm -rf /var/lib/apt/lists/*
+    fi
+}
+
+AddCredentials(){
+    if [ ! -f $JDPATH/cfg/org.jdownloader.api.myjdownloader.MyJDownloaderSettings.json ]; then
+      cat << EOF > $JDPATH/cfg/org.jdownloader.api.myjdownloader.MyJDownloaderSettings.json
+{
+  "autoconnectenabledv2" : true,
+  "email" : "${DOCKJDMAIL}",
+  "password" : "${DOCKJDPASSWD}"
+}
+EOF
+      /bin/chown -R "${MYUSER}":"${MYUSER}" $JDPATH/cfg/org.jdownloader.api.myjdownloader.MyJDownloaderSettings.json
+      /bin/chmod 0664 $JDPATH/cfg/org.jdownloader.api.myjdownloader.MyJDownloaderSettings.json
+    fi
+}
+
+SetDownloadFolder(){
+  if [ -f $JDPATH/cfg/org.jdownloader.settings.GeneralSettings.json ]; then
+    sed -i "s|\s*\"defaultdownloadfolder\"\s*:\s*\"\"|\ \ \ \ \ \ \ \ \"defaultdownloadfolder\":\ \"/downloads\"|g" $JDPATH/cfg/org.jdownloader.settings.GeneralSettings.json
+  fi
+}
 
 #USER_NAME="jdownloader"
 echo "===================="
@@ -26,6 +73,12 @@ chown -R ${USER_NAME}: /jdownloader
 chown ${USER_NAME}: /media
 echo "[DONE]"
 
+#run functions##############################
+DectectOS
+AutoUpgrade
+#AddCredentials
+#SetDownloadFolder
+
 # Finally, start JDownloader.
 echo "Starting JDownloader..."
-exec su -pc "exec java -Djava.awt.headless=true -jar JDownloader.jar 2>&1 >/dev/null" $USER_NAME
+exec su -pc "exec java -Djava.awt.headless=true -jar ${JDPATH}/JDownloader.jar 2>&1 >/dev/null" $USER_NAME

jdownloader/start.sh

@@ -1,6 +1,10 @@
-FROM alpine
+FROM alpine:latest
 
-ENV GOPATH="/go" \
+ARG OVERLAY_VERSION="v1.22.1.0"
+ARG OVERLAY_ARCH="amd64"
+
+ENV DEBUG="false" \
+    GOPATH="/go" \
     AccessFolder="/mnt" \
     RemotePath="mediaefs:" \
     MountPoint="/mnt/mediaefs" \
@@ -10,19 +14,29 @@ ENV GOPATH="/go" \
     UnmountCommands="-u -z"
 
 ## Alpine with Go Git
-RUN apk add --no-cache --update alpine-sdk ca-certificates go git fuse fuse-dev \
+RUN apk --no-cache upgrade \
+    && apk add --no-cache --update alpine-sdk ca-certificates go git fuse fuse-dev gnupg \
+    && echo "Installing S6 Overlay" \
+    && curl -o /tmp/s6-overlay.tar.gz -L \
+    "https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}.tar.gz" \
+    && curl -o /tmp/s6-overlay.tar.gz.sig -L \
+    "https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}.tar.gz.sig" \
+    && curl https://keybase.io/justcontainers/key.asc | gpg --import \
+    && gpg --verify /tmp/s6-overlay.tar.gz.sig /tmp/s6-overlay.tar.gz \
+    && tar xfz /tmp/s6-overlay.tar.gz -C / \
+    && echo "Download and compile rclone" \
     && go get -u -v github.com/rclone/rclone \
     && cp /go/bin/rclone /usr/sbin/ \
     && rm -rf /go \
-    && apk del alpine-sdk go git \
+    && apk del alpine-sdk go git gnupg \
     && rm -rf /tmp/* /var/cache/apk/* /var/lib/apk/lists/*
 
-ADD start.sh /start.sh
-RUN chmod +x /start.sh 
+COPY rootfs/ /
 
 VOLUME ["/mnt"]
 
-CMD ["/start.sh"]
+ENTRYPOINT ["/init"]
+#CMD ["/start.sh"]
 
 # Use this docker Options in run
 # --cap-add SYS_ADMIN --device /dev/fuse --security-opt apparmor:unconfined

rclone-mount/Dockerfile

@@ -5,10 +5,10 @@
 Rclone Mount Container
 ---
 
-Lightweight and simple Container Image (`alpine:latest - 44MB`) with compiled rclone (https://github.com/ncw/rclone master). Mount your cloudstorage like amazon cloud drive inside a container and make it available to other containers like your Plex Media Server or on your hostsystem (mountpoint on host is shared). You need a working rclone.conf (from another host or create it inside the container). all rclone remotes can be used.
+Lightweight and simple Container Image (`alpine:latest - 160MB`) with compiled rclone (https://github.com/ncw/rclone master). Mount your cloudstorage like amazon cloud drive inside a container and make it available to other containers like your Plex Media Server or on your hostsystem (mountpoint on host is shared). You need a working rclone.conf (from another host or create it inside the container with entrypoint /bin/sh). all rclone remotes can be used.
 
 
-The Container uses a tiny trap function, to handle docker stop/restart ( fusermount -uz $MountPoint is applied on SIGTERM signal or app crashes also) on PID 1.
+The Container uses S6 Overlay, to handle docker stop/restart ( fusermount -uz $MountPoint is applied on app crashes also) and also preparing the mountpoint.
 
 
 # Usage Example:

rclone-mount/README.md

@@ -0,0 +1,21 @@
+#!/usr/bin/env sh
+
+Color_Off='\033[0m'       # Text Reset
+# Regular Colors
+Black='\033[0;30m'        # Black
+Red='\033[0;31m'          # Red
+Green='\033[0;32m'        # Green
+Yellow='\033[0;33m'       # Yellow
+Blue='\033[0;34m'         # Blue
+Purple='\033[0;35m'       # Purple
+Cyan='\033[0;36m'         # Cyan
+White='\033[0;37m'        # White
+# Bold
+BBlack='\033[1;30m'       # Black
+BRed='\033[1;31m'         # Red
+BGreen='\033[1;32m'       # Green
+BYellow='\033[1;33m'      # Yellow
+BBlue='\033[1;34m'        # Blue
+BPurple='\033[1;35m'      # Purple
+BCyan='\033[1;36m'        # Cyan
+BWhite='\033[1;37m'       # White

rclone-mount/rootfs/etc/colors.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/with-contenv sh
+
+source /etc/colors.sh
+
+PREFFIX="[cont-finish.d] $(s6-basename ${0}):"
+
+#s6-svc -d /var/run/s6/services/rclone-mount
+#s6-svc -wD /var/run/s6/services/rclone-mount
+
+echo -e "${PREFFIX} ${Yellow}waiting for shutdown of all services${Color_Off}"
+#wait for all services to be down
+s6-svwait -D /var/run/s6/services/*
+
+#awk '/efsgoogle:/ && /\'$ENVIRON["MountPoint"]'/ {print; exit 1}' /proc/mounts
+
+#check if rclone gracefully unmounted
+if grep -Eq ''$RemotePath'.*'$MountPoint'|'$MountPoint'.*'$RemotePath'' /proc/mounts; then
+    echo -e "${PREFFIX} ${Red}force unmounting with fusermount $UnmountCommands at: $(date +%Y.%m.%d-%T)${Color_Off}"
+    fusermount $UnmountCommands $MountPoint
+    wait ${!}
+    exit 1
+else
+    #cleanup of mount namespace
+    umount $MountPoint
+    echo -e "${PREFFIX} ${Green}successful unmounted${Color_Off}"
+    exit 0
+fi

rclone-mount/rootfs/etc/cont-finish.d/20-unmount

@@ -0,0 +1,50 @@
+#!/usr/bin/with-contenv sh
+
+source /etc/colors.sh
+
+PREFFIX="[cont-init.d] $(s6-basename ${0}):"
+
+#ENV
+OS=""
+ConfigPath=""
+
+#Functions
+DetectOS(){
+  if [ -e /etc/alpine-release ]; then
+    OS="alpine"
+  elif [ -e /etc/os-release ]; then
+    if /bin/grep -q "NAME=\"Ubuntu\"" /etc/os-release ; then 
+      OS="ubuntu"
+    fi
+  fi
+}
+
+AutoUpgrade(){
+  if [ "${OS}" == "alpine" ]; then
+      /sbin/apk --no-cache upgrade
+      /bin/rm -rf /var/cache/apk/*
+  elif [ "${OS}" == "ubuntu" ]; then
+      export DEBIAN_FRONTEND=noninteractive
+      /usr/bin/apt-get update
+      /usr/bin/apt-get -y --no-install-recommends dist-upgrade
+      /usr/bin/apt-get -y autoclean
+      /usr/bin/apt-get -y clean 
+      /usr/bin/apt-get -y autoremove
+      /bin/rm -rf /var/lib/apt/lists/*
+  fi
+}
+
+#fix Mountpoint Syntax
+#remove / at the end #todo
+
+#create folders
+mkdir -p \
+  $MountPoint \
+  $ConfigDir
+
+#export ConfigPath="$ConfigDir/$ConfigName env"
+printf "$ConfigDir/$ConfigName" > /var/run/s6/container_environment/ConfigPath
+
+echo -e "${PREFFIX} ${Blue}installing system updates${Color_Off}"
+DetectOS
+AutoUpgrade

rclone-mount/rootfs/etc/cont-init.d/20-init

@@ -0,0 +1,24 @@
+#!/usr/bin/with-contenv sh
+
+source /etc/colors.sh
+
+PREFFIX="[cont-init.d] $(s6-basename ${0}):"
+
+#check if the MountPoint is empty
+if [ "$(ls -A ${MountPoint})" ]; then
+    echo -e "${PREFFIX} ${Red}MountPoint folder not empty[ERROR]${Color_Off}"
+    #todo
+fi
+
+#check for other fsmounts, stop mounting if other MountPoint exists
+#mount | grep -c $MountPoint
+
+if grep -Eq ''$RemotePath'.*'$MountPoint'|'$MountPoint'.*'$RemotePath'' /proc/mounts; then
+    #exit container here
+    echo -e "${PREFFIX} ${Red}found other MountPoint in /proc/mounts${Color_Off}"
+    #cleanup mountpoint
+    exit 1
+else
+    echo -e "${PREFFIX} ${Green}MountPoint $MountPoint is ready${Color_Off}"
+    exit 0
+fi