Merge pull request 'Nextcloud, Hyperling.com, LibreTranslate, and backup.sh Enhancements' (#11) from dev into main

Reviewed-on: #11

Config/Hyperling.com/Dockerfile

@@ -6,7 +6,7 @@
 FROM node:lts-slim
 
 # Cache System Dependencies
-RUN apt-get update && apt-get install -y git php-cli sudo curl
+RUN apt-get update && apt-get install -y git php-cli sudo curl procps
 
 # Cache Node Dependencies
 RUN mkdir -p /var/www/api
@@ -16,10 +16,18 @@ RUN npm install
 
 # Install + Run Website
 CMD cd /var/www/api && \
-    rm -rfv pages main.js run.sh && \
+    echo "Dockerfile: Ensure symlink is properly deleted if it exists..." && \
-    git clone https://git.hyperling.com/me/nodejs-website website && \
+    ls -l website/files; rm -v website/files; sleep 0 && \
-    rm -rfv website/files && \
+    echo "Dockerfile: Clone the website's Git repo..." && \
-    mv -v website/* ./ && \
     rm -rfv website && \
-    echo "Starting Website's Run Script" && \
+    git clone https://git.hyperling.com/me/nodejs-website $BRANCH website && \
+    echo "Dockerfile: Remove dummy files and replace with symlink..." && \
+    rm -rfv website/files && \
+    cd website && \
+    echo -n "Dockerfile: Using branch " && \
+    git branch && \
+    ln -sv ../files ./files && \
+    echo "Dockerfile: Allow files under files/ to be ignored by Git..." && \
+    find ./files -exec git update-index --assume-unchanged {} \; && \
+    echo "Dockerfile: Start website!" && \
     ./run.sh

Config/Hyperling.com/docker-compose.main.yml

@@ -10,11 +10,15 @@ services:
     restart: always
     ports:
       - 8317:8080
+    environment:
+      - BRANCH=$BRANCH
+      - CPU=$CPU
+      - MEM=$MEM
     volumes:
       - ./files:/var/www/api/files
     deploy:
       mode: global
       resources:
         limits:
-          cpus: '0.25'
+          cpus: $CPU
-          memory: 256M
+          memory: $MEM

Config/Hyperling.com/docker-compose.micro.yml

@@ -1,21 +0,0 @@
-# 2022-10-29
-# Hyperling.com configuration.
-# 2023-01-24 container needs 128M to get started fully then settles to 25M.
-
-services:
-  app:
-    container_name: www-app
-    build:
-      context: ./
-      network: host
-    restart: always
-    ports:
-      - 8317:8080
-    volumes:
-      - ./files:/var/www/api/files
-    deploy:
-      mode: global
-      resources:
-        limits:
-          cpus: '0.10'
-          memory: 128M

Config/Hyperling.com/env.example

@@ -7,3 +7,18 @@
 # Subsequent builds consistently take less than 2 seconds.
 # Testing was done on the micro server, not a workstation.
 COMPOSE_BAKE=true
+
+## Branch ##
+# Allow choosing the branch. By leaving it blank, the main branch will be used.
+# Should be in the full "--branch my-branch" syntax.
+BRANCH=
+#BRANCH="--branch dev"
+
+## Performance ##
+# Standard Server
+CPU=0.25
+MEM=0.25G
+# Micro Server
+# 2023-01-24 container needs 128M to get started fully then settles to 25M.
+#CPU=0.10
+#MEM=128M

Config/LibreTranslate/env.example

@@ -47,3 +47,7 @@ MODELS_DIR=../../Volumes/LibreTranslate/models
 ## them from backup type locations such as Volumes/LibreTranslate/ and /var/.
 ## Please see the README for the CRON command related to this setting.
 # MODELS_DIR=/tmp/LibreTranslate/models
+
+## Can also place them under /opt/ which may be recommended by FHS standards.
+## This keeps them from taking up precious RAM / swap if using tmpfs or similar.
+# MODELS_DIR=/opt/LibreTranslate/models

bin/backup.sh

@@ -11,15 +11,24 @@ source $DIR/../source.env
 
 TAG="Docker"
 DATE="`date "+%Y%m%d-%H%M%S"`"
-BASENAME="/tmp/Backup"
+BACKUP_DIR="/srv/backup"
-file="$BASENAME.$DATE.$HOSTNAME.$TAG.zip"
+BASENAME="Backup"
+file="$BACKUP_DIR/$BASENAME.$DATE.$HOSTNAME.$TAG.zip"
 time="`which time`"
 
 ## Main ##
 
+# Ensure backup directory exists with correct permissions.
+mkdir -pv "$BACKUP_DIR"
+mkdir -pv "$BACKUP_DIR/TRASH"
+chmod -Rv 775 "$BACKUP_DIR"
+chown -Rv root:root "$BACKUP_DIR"
+
 # Remove the last backup.
 echo "`date` - Removing existing files."
-rm -fv "$BASENAME"*"$TAG"*
+cd "$BACKUP_DIR"
+mv -v "$BASENAME"*"$TAG"* TRASH/
+rm -v TRASH/*
 
 echo -e "\n`date` - Take down services for a cold backup."
 manage.sh -d