Refactor (#6418)

ct/neo4j.sh

@@ -28,16 +28,7 @@ function update_script() {
     exit
   fi
   if ! dpkg -l | grep -q temurin-21-jre; then
-    msg_info "Installing Adoptium JDK"
-    $STD apt-get install -y \
-      gnupg2 \
-      lsb-release
-    mkdir -p /etc/apt/keyrings
-    curl -fsSL https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor >/etc/apt/trusted.gpg.d/adoptium.gpg
-    echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" >/etc/apt/sources.list.d/adoptium.list
-    $STD apt-get update
-    $STD apt-get install -y temurin-21-jre
-    msg_ok "Adoptium JDK installed"
+    JAVA_VERSION="21" setup_java
   fi
   msg_info "Updating ${APP}"
   $STD apt-get update

frontend/public/json/neo4j.json

@@ -6,10 +6,10 @@
   ],
   "date_created": "2024-10-20",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 7474,
-  "documentation": null,
+  "documentation": "https://neo4j.com/docs/",
   "website": "https://neo4j.com/product/neo4j-graph-database/",
   "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/neo4j.webp",
   "config_path": "/etc/neo4j/neo4j.conf",

install/neo4j-install.sh

@@ -14,22 +14,12 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Dependencies"
-$STD apt-get install -y \
-  lsb-release
-msg_ok "Installed Dependencies"
-
-msg_info "Setting up Adoptium Repository"
-mkdir -p /etc/apt/keyrings
-curl -fsSL "https://packages.adoptium.net/artifactory/api/gpg/key/public" | gpg --dearmor >/etc/apt/trusted.gpg.d/adoptium.gpg
-echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" >/etc/apt/sources.list.d/adoptium.list
-msg_ok "Set up Adoptium Repository"
+JAVA_VERSION="21" setup_java
 
 msg_info "Installing Neo4j (patience)"
 curl -fsSL "https://debian.neo4j.com/neotechnology.gpg.key" | gpg --dearmor -o /etc/apt/keyrings/neotechnology.gpg
 echo 'deb [signed-by=/etc/apt/keyrings/neotechnology.gpg] https://debian.neo4j.com stable latest' >/etc/apt/sources.list.d/neo4j.list
 $STD apt-get update
-$STD apt-get install -y temurin-21-jre
 $STD apt-get install -y neo4j
 sed -i '/server.default_listen_address/s/^#//' /etc/neo4j/neo4j.conf
 systemctl enable -q --now neo4j