Update 'root/usr/libexec/apps/joplin/joplin.sh'

main
ben 1 year ago
parent 6b1e491c93
commit b2f9888691

@ -4,109 +4,103 @@ ACTION=${1}
shift 1 shift 1
get_image() { get_image() {
IMAGE_NAME="florider89/joplin-server:latest" IMAGE_NAME=$(uci get joplin.@joplin[0].image_name 2>/dev/null)
} }
do_install_detail() { do_install_detail() {
local config=`uci get joplin.@joplin[0].config_path 2>/dev/null` local config=$(uci get joplin.@joplin[0].config_path 2>/dev/null)
local port=`uci get joplin.@joplin[0].port 2>/dev/null` local port=$(uci get joplin.@joplin[0].port 2>/dev/null)
local IMAGE_NAME=`uci get joplin.@joplin[0].image_name 2>/dev/null` local IMAGE_NAME=$(uci get joplin.@joplin[0].image_name 2>/dev/null)
#Generate the generic environment variables for the docker-compose
GEN_PASS=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo) GEN_PASS=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo)
GEN_PASS2=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo) GEN_PASS2=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo)
# Get our local LAN IP Address
LAN_IP=$(uci get network.lan.ipaddr) LAN_IP=$(uci get network.lan.ipaddr)
# Strip trailing network mask
LAN_IP="${LAN_IP%/*}" LAN_IP="${LAN_IP%/*}"
if [ -z "$config" ]; then if [ -z "$config" ]; then
echo "config path is empty!" echo "config path is empty!"
exit 1 exit 1
fi fi
[ -z "$port" ] && port=22300 [ -z "$port" ] && port=22300
[ -z "$IMAGE_NAME" ] && IMAGE_NAME=florider89/joplin-server:latest [ -z "$IMAGE_NAME" ] && IMAGE_NAME=florider89/joplin-server:latest
rm -R /opt/docker2/compose/joplin-app
# Create Docker Compose file with custom variables mkdir /opt/docker2/compose/joplin-app
# Create Docker Compose file with custom variables
touch docker-compose.yml
cat > docker-compose.yml <<EOF
version: '3'
services:
app:
environment:
- APP_BASE_URL=http://${LAN_IP}:${port}
- APP_PORT=${port}
- POSTGRES_PASSWORD=${GEN_PASS}
- POSTGRES_DATABASE=joplin
- POSTGRES_USER=joplin
- POSTGRES_PORT=5432
- POSTGRES_HOST=db
- DB_CLIENT=pg
restart: unless-stopped
image: florider89/joplin-server:latest
ports:
- ${port}:22300
db:
restart: unless-stopped
image: postgres:13.1
ports:
- 5432:5432
volumes:
- ./data:/var/lib/postgresql/data
environment:
- POSTGRES_PASSWORD=${GEN_PASS}
- POSTGRES_USER=joplin
- POSTGRES_DB=joplin
touch /opt/docker2/compose/joplin-app/docker-compose.yml
cat > /opt/docker2/compose/joplin-app/docker-compose.yml <<EOF
version: '3.7'
services:
app:
image: $IMAGE_NAME
restart: always
ports:
- ${LAN_IP}:${port}:22300
environment:
- POSTGRES_PASSWORD=${GEN_PASS}
labels:
plugsy.name: "Joplin"
plugsy.category: "Productivity"
plugsy.link: "http://${LAN_IP}:${port}"
db:
image: postgres:13.1
restart: always
environment:
- POSTGRES_PASSWORD=${GEN_PASS}
EOF EOF
docker-compose up -d docker-compose -f /opt/docker2/compose/joplin-app/docker-compose.yml up -d
# Add a new list option to the "shortcutmenu" configuration file
uci add shortcutmenu lists uci add shortcutmenu lists
uci set shortcutmenu.@lists[-1].webname="$IMAGE_NAME" uci set shortcutmenu.@lists[-1].webname="$IMAGE_NAME"
uci set shortcutmenu.@lists[-1].weburl="$LAN_IP:$port" uci set shortcutmenu.@lists[-1].weburl="$LAN_IP:$port"
uci set shortcutmenu.@lists[-1].webpath="/" uci set shortcutmenu.@lists[-1].webpath="/"
uci commit shortcutmenu uci commit shortcutmenu
} }
usage() { usage() {
echo "usage: $0 sub-command" echo "usage: $0 sub-command"
echo "where sub-command is one of:" echo "where sub-command is one of:"
echo " install Install joplin" echo " install Install Joplin"
echo " upgrade Upgrade joplin" echo " upgrade Upgrade Joplin"
echo " rm/start/stop/restart Remove/Start/Stop/Restart joplin" echo " rm/start/stop/restart Remove/Start/Stop/Restart Joplin"
echo " status joplin status" echo " status Joplin status"
echo " port joplin port" echo " port Joplin port"
} }
case ${ACTION} in case ${ACTION} in
"install") "install"|"upgrade")
get_image
do_install_detail
;;
"upgrade")
get_image get_image
do_install_detail do_install_detail
;; ;;
"rm") "rm")
docker rm -f joplin get_image
CONTAINER_IDS=$(docker ps -a --filter "ancestor=${IMAGE_NAME}" --format '{{.ID}}')
echo "Stopping and removing containers..."
for ID in $CONTAINER_IDS; do
docker stop $ID
docker rm $ID
done
docker rmi -f $IMAGE_NAME
;; ;;
"start" | "stop" | "restart") "start"|"stop"|"restart")
docker ${ACTION} joplin get_image
CONTAINER_IDS=$(docker ps -a --filter "ancestor=${IMAGE_NAME}" --format '{{.ID}}')
for ID in $CONTAINER_IDS; do
docker ${ACTION} ${ID}
done
;; ;;
"status") "status")
docker ps --all -f 'name=joplin' --format '{{.State}}' get_image
CONTAINER_NAMES=$(docker ps -a --filter "ancestor=${IMAGE_NAME}" --format '{{.Names}}')
docker ps --all -f "name=${CONTAINER_NAMES}" --format '{{.Status}}'
;; ;;
"port") "port")
docker ps --all -f 'name=joplin' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' get_image
CONTAINER_NAMES=$(docker ps -a --filter "ancestor=${IMAGE_NAME}" --format '{{.Names}}')
docker ps --all -f "name=${CONTAINER_NAMES}" --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
;; ;;
*) *)
usage usage

Loading…
Cancel
Save