Renamed image, specialized for scanners, added file watcher to move files

The samba server doesn't work stable enough directly on the mounted folder

Author: jan-di

Dockerfile

@@ -1,15 +1,23 @@
 FROM dperson/samba:amd64
 
-RUN apk add --no-cache --update \
-    cifs-utils 
+RUN apk add --no-cache --update --upgrade \
+    cifs-utils \
+    coreutils \
+    python3 \
+    supervisor
 
-RUN mkdir /share
+RUN mkdir /share /remote
+COPY ./supervisord.conf /etc/supervisord.conf
 
+COPY ./watcher.py /watcher.py
+
+# Docker Healthcheck
 COPY ./docker-healthcheck.sh /docker-healthcheck.sh
 RUN chmod +x /docker-healthcheck.sh
 HEALTHCHECK --interval=30s --timeout=15s --start-period=5s --retries=3 \
     CMD ["/docker-healthcheck.sh"]
 
-COPY ./docker-cmd.sh /docker-cmd.sh
-RUN chmod +x /docker-cmd.sh
-ENTRYPOINT ["/docker-cmd.sh"]
+# Docker Entrypoint
+COPY ./docker-entrypoint.sh /docker-entrypoint.sh
+RUN chmod +x /docker-entrypoint.sh
+ENTRYPOINT ["/docker-entrypoint.sh"]

README.md

@@ -1,17 +1,17 @@
-# SMB1-Proxy #
+# Scan-to-SMB1 #
 
 [
-  ![](https://img.shields.io/docker/v/jandi/smb1-proxy)
-  ![](https://img.shields.io/docker/pulls/jandi/smb1-proxy)
-  ![](https://img.shields.io/docker/stars/jandi/smb1-proxy)
-  ![](https://img.shields.io/docker/image-size/jandi/smb1-proxy)
-  ![](https://img.shields.io/docker/cloud/build/jandi/smb1-proxy)
-](https://hub.docker.com/repository/docker/jandi/smb1-proxy)
+  ![](https://img.shields.io/docker/v/jandi/scan-to-smb1)
+  ![](https://img.shields.io/docker/pulls/jandi/scan-to-smb1)
+  ![](https://img.shields.io/docker/stars/jandi/scan-to-smb1)
+  ![](https://img.shields.io/docker/image-size/jandi/scan-to-smb1)
+  ![](https://img.shields.io/docker/cloud/build/jandi/scan-to-smb1)
+](https://hub.docker.com/repository/docker/jandi/scan-to-smb1)
 
-This container is used to proxy an existing secure smb share (version 2+) to allow devices, that only support cifs/smb v1 the access to a specific share or folder on the secure share - without downgrading the complete server to smb v1.
+This container is used to proxy an existing secure smb share (version 2+) to allow legacy scanning devices, that only support cifs/smb v1 the access to a specific share or folder on the secure share - without downgrading the complete server to smb v1. Its designed to forward all files to the secure share, without overwriting files on the destination
 
-* GitHub: [jan-di/smb1-proxy](https://github.com/jan-di/smb1-proxy)
-* Docker Hub: [jandi/smb1-proxy](https://hub.docker.com/repository/docker/jandi/smb1-proxy)
+* GitHub: [jan-di/scan-to-smb1](https://github.com/jan-di/scan-to-smb1)
+* Docker Hub: [jandi/scan-to-smb1](https://hub.docker.com/repository/docker/jandi/scan-to-smb1)
 
 ## Usage ##
 
@@ -22,7 +22,7 @@ version: '3.7'
 
 services:
   smb1proxy:
-    image: jandi/smb1-proxy
+    image: jandi/scan-to-smb1
     environment:
       TZ: 'Europe/Berlin'
       USERID: 1000

docker-entrypoint.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+chown -R $USERID:$GROUPID /share /remote
+
+echo "Mounting $SERVER_SHARE with user $SERVER_DOMAIN\\$SERVER_USERNAME.."
+mount -t cifs -o username=$SERVER_USERNAME,password=$SERVER_PASSWORD,domain=$SERVER_DOMAIN,vers=3.0,uid=$USERID,gid=$GROUPID \
+    $SERVER_SHARE /remote
+
+echo "Starting samba.."
+export USER="$PROXY_USERNAME;$PROXY_PASSWORD"
+export SHARE="$PROXY_SHARE;/share;yes;no;no;$PROXY_USERNAME"
+export RECYCLE=x # disable recycle bin
+export SMB=x # disable SMB2 minimum version
+
+/usr/bin/supervisord -c /etc/supervisord.conf

docker-healthcheck.sh

@@ -4,8 +4,8 @@ set -e
 
 # check cifs mount
 UUID=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
-touch /share/.smb1-proxy.$UUID.healthcheck
-rm /share/.smb1-proxy.$UUID.healthcheck
+touch /share/.scan-to-smb1-proxy.$UUID.healthcheck
+rm /share/.scan-to-smb1-proxy.$UUID.healthcheck
 
 # see dockerfile from dperson/samba
 smbclient -L \\localhost -U % -m SMB3

supervisord.conf

@@ -0,0 +1,15 @@
+[supervisord]
+nodaemon=true
+user=root
+
+[program:samba]
+command=/usr/bin/samba.sh
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
+redirect_stderr=true
+
+[program:watcher]
+command=python3 -u /watcher.py
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
+redirect_stderr=true 

watcher.py

@@ -0,0 +1,36 @@
+#!/usr/bin/env python3
+
+import time
+import glob
+import os
+import shutil
+
+print('File watcher started')
+
+while True:
+  files = glob.glob('/share/*.pdf')
+  for file in files:
+    currentTime = time.time()
+    modifiedTime = os.path.getmtime(file)
+    fileAge = currentTime - modifiedTime
+    if fileAge < 15:
+      continue
+
+    _, filename = os.path.split(file)
+    name, ext = os.path.splitext(filename) 
+
+    i = 0
+    while True:
+      i = i + 1
+      remotePath = "/remote/" + name + "_" + str(i) + ext
+      if not os.path.exists(remotePath):
+        break
+    
+    try:
+      print("Move Scan: '" + file + "' -> '" + remotePath + "'")
+      shutil.copyfile(file, remotePath)
+      os.remove(file)
+    except (FileNotFoundError, OSError) as err:
+      print("↳ " + str(err))
+      
+  time.sleep(5)