From 238c7c9bf8d7f3ae3d42e6bb743f09890da28bb8 Mon Sep 17 00:00:00 2001
From: Jordan Walster <me@jrdn.dev>
Date: Thu, 20 Feb 2025 14:17:53 +0000
Subject: [PATCH]  chore: consolidate commands into Dockerfile

---
 Dockerfile         |  2 ++
 docker-compose.yml |  4 ----
 entrypoint.sh      | 15 ---------------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 930d9a8..05a308d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,8 @@ RUN apk add borgbackup
 # Create host keys to allow SSHD to start
 RUN ssh-keygen -A
 
+RUN adduser -D -h /opt/borg borg
+
 COPY ./entrypoint.sh /entrypoint.sh
 
 CMD ["/entrypoint.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
index f7a3089..a73c8ae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,10 +5,6 @@ services:
       - 22:22
     volumes:
       - ./borg:/opt/borg
-      - ssh-keys:/home/borg/.ssh
     environment:
       - SSH_PASSWORD=value
     restart: always
-
-volumes:
-  ssh-keys:
diff --git a/entrypoint.sh b/entrypoint.sh
index 515ec94..be183b9 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,23 +1,8 @@
 #!/bin/sh
 
-# Create backup user
-echo "Creating borg backup user"
-adduser -D borg 
-
 # Set ssh password
 echo "Updating password..."
 echo "borg:$SSH_PASSWORD" | chpasswd
 
-# Change borg folder ownership to be owned by borg
-echo "Setting file ownership"
-chown -R borg:borg /opt/borg 
-
-# Create ssh directory and ensure permissions
-mkdir /home/borg/.ssh
-chown borg:borg /home/borg/.ssh
-
-# Set default login path to /opt/borg
-echo 'cd /opt/borg' >> /home/borg/.profile
-
 # Start SSHD
 /usr/sbin/sshd -D