better log output remove apk cache add tag to build script
This commit is contained in:
@@ -14,6 +14,7 @@ COPY entrypoint.sh /
|
|||||||
RUN apk update ; apk upgrade
|
RUN apk update ; apk upgrade
|
||||||
RUN apk add --no-cache sudo bash tzdata openssh-server openrc \
|
RUN apk add --no-cache sudo bash tzdata openssh-server openrc \
|
||||||
borgbackup
|
borgbackup
|
||||||
|
RUN rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
# Setup SSH-Server
|
# Setup SSH-Server
|
||||||
RUN sed -ie 's/#Port 22/Port 22/g' /etc/ssh/sshd_config
|
RUN sed -ie 's/#Port 22/Port 22/g' /etc/ssh/sshd_config
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
DOCKER_IMAGE_NAME="borgbackup-ssh"
|
DOCKER_IMAGE_NAME="daniel156161/borgbackup-ssh"
|
||||||
DOCKER_CONTAINER_NAME="borgbackup"
|
DOCKER_CONTAINER_NAME="borgbackup"
|
||||||
|
|
||||||
run_docker_container() {
|
run_docker_container() {
|
||||||
@@ -14,9 +14,13 @@ run_docker_container() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
build_docker_image() {
|
build_docker_image() {
|
||||||
|
TAG="$1"
|
||||||
|
|
||||||
echo "Building..."
|
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
|
run_docker_container
|
||||||
|
|
||||||
|
#build_docker_image "1.1.17"
|
||||||
+27
-8
@@ -1,4 +1,16 @@
|
|||||||
#!/bin/sh
|
#!/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
|
# Make authorized_keys file
|
||||||
touch "/.ssh/authorized_keys"
|
touch "/.ssh/authorized_keys"
|
||||||
@@ -6,28 +18,33 @@ touch "/.ssh/authorized_keys"
|
|||||||
# Add User
|
# Add User
|
||||||
sh -c "echo '$USER ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
|
sh -c "echo '$USER ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
|
||||||
|
|
||||||
echo "ADD USER: $USER WITH UID: $UID"
|
|
||||||
adduser \
|
adduser \
|
||||||
--disabled-password \
|
--disabled-password \
|
||||||
--gecos "" \
|
--gecos "" \
|
||||||
--home "/" \
|
--home "/" \
|
||||||
--uid "$UID" \
|
--uid "$UID" \
|
||||||
"$USER"
|
"$USER"
|
||||||
echo "$USER:*" | chpasswd
|
echo "$USER:*" | chpasswd
|
||||||
echo "ADD GROUP: $USER WITH GID: $GID"
|
|
||||||
addgroup -g "$GID" "$USER"
|
addgroup -g "$GID" "$USER"
|
||||||
|
sepurator
|
||||||
|
echo "* USER: $USER ID: $UID"
|
||||||
|
echo "* GROUP: $USER GID: $GID"
|
||||||
|
sepurator
|
||||||
|
|
||||||
mkdir -p /sshkeys/clients
|
mkdir -p /sshkeys/clients
|
||||||
mkdir -p /sshkeys/host
|
mkdir -p /sshkeys/host
|
||||||
chown -R "$USER":"$USER" "/sshkeys"
|
chown -R "$USER":"$USER" "/sshkeys"
|
||||||
|
|
||||||
|
echo "* IMPORT SSH KEYS"
|
||||||
|
echo ""
|
||||||
# Add SSH Keys to authorized_keys
|
# Add SSH Keys to authorized_keys
|
||||||
FILES=$(ls -1 /sshkeys/clients)
|
FILES=$(ls -1 /sshkeys/clients)
|
||||||
for key in $FILES; do
|
for key in $FILES; do
|
||||||
echo "Adding SSH-Key $key"
|
echo "- Adding SSH-Key $key"
|
||||||
cat "/sshkeys/clients/$key" >> "/.ssh/authorized_keys"
|
cat "/sshkeys/clients/$key" >> "/.ssh/authorized_keys"
|
||||||
done
|
done
|
||||||
echo "" >> "/.ssh/authorized_keys"
|
echo "" >> "/.ssh/authorized_keys"
|
||||||
|
sepurator
|
||||||
|
|
||||||
# Change Ownership of SSH-Keys
|
# Change Ownership of SSH-Keys
|
||||||
chown -R "$USER":"$USER" "/.ssh"
|
chown -R "$USER":"$USER" "/.ssh"
|
||||||
@@ -47,4 +64,6 @@ fi
|
|||||||
|
|
||||||
chown -R "$USER":"$USER" "/sshkeys/host"
|
chown -R "$USER":"$USER" "/sshkeys/host"
|
||||||
|
|
||||||
|
echo "* Init done! - Starting SSH-Daemon..."
|
||||||
|
sepurator
|
||||||
exec /usr/sbin/sshd -D -e "$@"
|
exec /usr/sbin/sshd -D -e "$@"
|
||||||
|
|||||||
Reference in New Issue
Block a user