From 5e000d5ff2840890204c915ed75ca45ea9c92d79 Mon Sep 17 00:00:00 2001
From: Daniel Dolezal <d.dolezal97@protonmail.com>
Date: Thu, 30 Dec 2021 05:29:36 +0100
Subject: [PATCH] better log output remove apk cache add tag to build script

---
 Dockerfile    |  1 +
 build.sh      | 10 +++++++---
 entrypoint.sh | 35 +++++++++++++++++++++++++++--------
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0d257fb..b7cf2ef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,7 @@ COPY entrypoint.sh /
 RUN apk update ; apk upgrade
 RUN apk add --no-cache sudo bash tzdata openssh-server openrc \
     borgbackup
+RUN rm -rf /var/cache/apk/*
 
 # Setup SSH-Server
 RUN sed -ie 's/#Port 22/Port 22/g' /etc/ssh/sshd_config
diff --git a/build.sh b/build.sh
index 640e3db..5542781 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DOCKER_IMAGE_NAME="borgbackup-ssh"
+DOCKER_IMAGE_NAME="daniel156161/borgbackup-ssh"
 DOCKER_CONTAINER_NAME="borgbackup"
 
 run_docker_container() {
@@ -14,9 +14,13 @@ run_docker_container() {
 }
 
 build_docker_image() {
+  TAG="$1"
+
   echo "Building..."
-  docker build -t "$DOCKER_IMAGE_NAME" .
+  docker build -t "$DOCKER_IMAGE_NAME:$TAG" .
 }
 
-build_docker_image
+build_docker_image "latest"
 run_docker_container
+
+#build_docker_image "1.1.17"
\ No newline at end of file
diff --git a/entrypoint.sh b/entrypoint.sh
index fb63612..bfdb4a2 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,4 +1,16 @@
 #!/bin/sh
+DOCKER_IMAGE_VERSION="1.0.3"
+
+sepurator() {
+  echo "==============================================================================="
+}
+
+sepurator
+BORG_VERSION=$(borg -V)
+echo "* BorgServer powered by $BORG_VERSION"
+echo "* Image Hostname: $HOSTNAME"
+echo "* Image Version: $DOCKER_IMAGE_VERSION"
+sepurator
 
 # Make authorized_keys file
 touch "/.ssh/authorized_keys"
@@ -6,28 +18,33 @@ touch "/.ssh/authorized_keys"
 # Add User
 sh -c "echo '$USER ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
 
-echo "ADD USER: $USER WITH UID: $UID"
 adduser \
-    --disabled-password \
-    --gecos "" \
-    --home "/" \
-    --uid "$UID" \
-    "$USER"
+  --disabled-password \
+  --gecos "" \
+  --home "/" \
+  --uid "$UID" \
+  "$USER"
 echo "$USER:*" | chpasswd
-echo "ADD GROUP: $USER WITH GID: $GID"
 addgroup -g "$GID" "$USER"
+sepurator
+echo "* USER: $USER ID: $UID"
+echo "* GROUP: $USER GID: $GID"
+sepurator
 
 mkdir -p /sshkeys/clients
 mkdir -p /sshkeys/host
 chown -R "$USER":"$USER" "/sshkeys"
 
+echo "* IMPORT SSH KEYS"
+echo ""
 # Add SSH Keys to authorized_keys
 FILES=$(ls -1 /sshkeys/clients)
 for key in $FILES; do
-  echo "Adding SSH-Key $key"
+  echo "-  Adding SSH-Key $key"
   cat "/sshkeys/clients/$key" >> "/.ssh/authorized_keys"
 done
 echo "" >> "/.ssh/authorized_keys"
+sepurator
 
 # Change Ownership of SSH-Keys
 chown -R "$USER":"$USER" "/.ssh"
@@ -47,4 +64,6 @@ fi
 
 chown -R "$USER":"$USER" "/sshkeys/host"
 
+echo "* Init done! - Starting SSH-Daemon..."
+sepurator
 exec /usr/sbin/sshd -D -e "$@"