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

root/usr/libexec/apps/discourse/discourse.sh

@@ -4,24 +4,20 @@ ACTION=${1}
 shift 1
 
 get_image() {
-  IMAGE_NAME="docker.io/bitnami/discourse:2"
+  IMAGE_NAME=$(uci get discourse.@discourse[0].image_name 2>/dev/null)
 }
 
 do_install_detail() {
-  local config=`uci get discourse.@discourse[0].config_path 2>/dev/null`
+  local config=$(uci get discourse.@discourse[0].config_path 2>/dev/null)
-  local port=`uci get discourse.@discourse[0].port 2>/dev/null`
+  local port=$(uci get discourse.@discourse[0].port 2>/dev/null)
-  local IMAGE_NAME=`uci get discourse.@discourse[0].image_name 2>/dev/null`
+  local IMAGE_NAME=$(uci get discourse.@discourse[0].image_name 2>/dev/null)
-  local username=`uci get discourse.@discourse[0].username 2>/dev/null`
+  local username=$(uci get discourse.@discourse[0].username 2>/dev/null)
-  local password=`uci get discourse.@discourse[0].password 2>/dev/null`
+  local password=$(uci get discourse.@discourse[0].password 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_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)
-  # Strip trailing network mask
   LAN_IP="${LAN_IP%/*}"
 
   if [ -z "$config" ]; then
@@ -29,14 +25,14 @@ do_install_detail() {
     exit 1
   fi
 
-  [ -z "$port" ] && port=""
+  [ -z "$port" ] && port=3000
-  [ -z "$IMAGE_NAME" ] && IMAGE_NAME=docker.io/bitnami/discourse:2
+  [ -z "$IMAGE_NAME" ] && IMAGE_NAME="docker.io/bitnami/discourse:2"
 
+  rm -R /opt/docker2/compose/discourse-app
+  mkdir /opt/docker2/compose/discourse-app
 
-  # Create Docker Compose file with custom variables
+  touch /opt/docker2/compose/discourse-app/docker-compose.yml
-touch docker-compose.yml
+  cat > /opt/docker2/compose/discourse-app/docker-compose.yml <<EOF
-  # Create Docker Compose file with custom variables
-cat > docker-compose.yml <<EOF
 version: '2'
 services:
   postgresql:
@@ -44,7 +40,6 @@ services:
     volumes:
       - 'postgresql_data:/bitnami/postgresql'
     environment:
-      # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - ALLOW_EMPTY_PASSWORD=no
       - POSTGRESQL_USERNAME=bn_discourse
       - POSTGRESQL_DATABASE=bitnami_discourse
@@ -52,12 +47,11 @@ services:
   redis:
     image: docker.io/bitnami/redis:7.0
     environment:
-      # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - 'redis_data:/bitnami/redis'
   discourse:
-    image: docker.io/bitnami/discourse:2
+    image: $IMAGE_NAME
     ports:
       - '$port:3000'
     volumes:
@@ -66,7 +60,6 @@ services:
       - postgresql
       - redis
     environment:
-      # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - ALLOW_EMPTY_PASSWORD=no
       - DISCOURSE_HOST=$LAN_IP:$port
       - DISCOURSE_DATABASE_HOST=postgresql
@@ -76,25 +69,20 @@ services:
       - DISCOURSE_DATABASE_NAME=bitnami_discourse
       - DISCOURSE_REDIS_HOST=redis
       - DISCOURSE_REDIS_PORT_NUMBER=6379
-      - POSTGRESQL_CLIENT_POSTGRES_USER=bn_discourse
-      - POSTGRESQL_CLIENT_CREATE_DATABASE_NAME=bitnami_discourse
-      - POSTGRESQL_CLIENT_POSTGRES_PASSWORD=$GEN_PASS
-      - POSTGRESQL_CLIENT_CREATE_DATABASE_EXTENSIONS=hstore,pg_trgm
   sidekiq:
-    image: docker.io/bitnami/discourse:2
+    image: $IMAGE_NAME
     depends_on:
       - discourse
     volumes:
       - 'sidekiq_data:/bitnami/discourse'
     command: /opt/bitnami/scripts/discourse-sidekiq/run.sh
     environment:
-      # ALLOW_EMPTY_PASSWORD is recommended only for development.
       - ALLOW_EMPTY_PASSWORD=no
-      - DISCOURSE_HOST=${LAN_IP}:$port
+      - DISCOURSE_HOST=$LAN_IP:$port
       - DISCOURSE_DATABASE_HOST=postgresql
       - DISCOURSE_DATABASE_PORT_NUMBER=5432
       - DISCOURSE_DATABASE_USER=bn_discourse
-      - DISCOURSE_DATABASE_PASSWORD=${GEN_PASS}
+      - DISCOURSE_DATABASE_PASSWORD=$GEN_PASS
       - DISCOURSE_DATABASE_NAME=bitnami_discourse
       - DISCOURSE_REDIS_HOST=redis
       - DISCOURSE_REDIS_PORT_NUMBER=6379
@@ -109,15 +97,14 @@ volumes:
     driver: local
 EOF
 
-  docker-compose up -d
 
-  # Add a new list option to the "shortcutmenu" configuration file
+  docker-compose -f /opt/docker2/compose/discourse-app/docker-compose.yml up -d
+
   uci add shortcutmenu lists
   uci set shortcutmenu.@lists[-1].webname="$IMAGE_NAME"
   uci set shortcutmenu.@lists[-1].weburl="$LAN_IP:$port"
   uci set shortcutmenu.@lists[-1].webpath="/"
   uci commit shortcutmenu
-
 }
 
 usage() {
@@ -131,28 +118,40 @@ usage() {
 }
 
 case ${ACTION} in
-  "install")
+  "install"|"upgrade")
-    get_image
-    do_install_detail
-  ;;
-  "upgrade")
     get_image
     do_install_detail
   ;;
   "rm")
-    docker rm -f discourse
+    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} discourse
+    get_image
+    CONTAINER_IDS=$(docker ps -a --filter "ancestor=${IMAGE_NAME}" --format '{{.ID}}')
+    for ID in $CONTAINER_IDS; do
+      docker ${ACTION} ${ID}
+    done
   ;;
   "status")
-    docker ps --all -f 'name=discourse' --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")
-    docker ps --all -f 'name=discourse' --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
     exit 1
   ;;
 esac
+