diff --git a/install.sh b/install.sh index 14b6367..e508ce2 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -### version: 1.10.0 +### version: 1.10.1 # ~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.~.# # Nightscout Mikr.us setup script # @@ -54,7 +54,7 @@ DISK_LOW_MAIL=5184000 # == 60 days in seconds DISK_CRITICAL_WARNING=104857600 # == 100 MiB DISK_CRITICAL_MAIL=604800 # == 7 days in seconds DOCKER_DOWN_MAIL=604800 # == 7 days in seconds -SCRIPT_VERSION="1.10.0" #auto-update +SCRIPT_VERSION="1.10.1" #auto-update SCRIPT_BUILD_TIME="2026.01.04" #auto-update #======================================= @@ -756,19 +756,18 @@ patch_docker_compose() { containers_running=1 fi - # Check if mongodb image needs patching (bitnami/mongodb or incorrect format) - if grep -qE "image:\s*(bitnami/)?mongo(db)?" "$DOCKER_COMPOSE_FILE"; then + # Check if mongodb image needs patching (bitnami/mongodb) + if grep -q "bitnami/mongodb" "$DOCKER_COMPOSE_FILE"; then ohai "Patching docker-compose.yml MongoDB image..." - # Replace any bitnami/mongodb or incorrect mongo image with proper format - sed -i -E 's|image:\s*"?bitnami/mongodb:.*"?|image: "mongo:${NS_MONGODB_TAG}"|g' "$DOCKER_COMPOSE_FILE" - sed -i -E 's|image:\s*"?mongo:[^"]+"?|image: "mongo:${NS_MONGODB_TAG}"|g' "$DOCKER_COMPOSE_FILE" - sed -i -E 's|image:\s*"?mongodb:[^"]+"?|image: "mongo:${NS_MONGODB_TAG}"|g' "$DOCKER_COMPOSE_FILE" + # Replace bitnami/mongodb with official mongo image + sed -i -E 's|image:\s*"*(bitnami/)?mongodb:.*"|image: "mongo:${NS_MONGODB_TAG}"|g' "$DOCKER_COMPOSE_FILE" patched=1 fi # Check if volume path needs patching (bitnami/mongodb -> data/db) - if grep -q ":/bitnami/mongodb\"" "$DOCKER_COMPOSE_FILE"; then + if grep -q "/bitnami/mongodb" "$DOCKER_COMPOSE_FILE"; then ohai "Patching docker-compose.yml MongoDB volume path..." - sed -i -E 's|:/bitnami/mongodb"?|:/data/db"|g' "$DOCKER_COMPOSE_FILE" + # Replace both host path and container path for mongodb volume + sed -i -E 's|(\$\{NS_DATA_DIR\}/mongodb):/bitnami/mongodb"|\1/data/db:/data/db"|g' "$DOCKER_COMPOSE_FILE" patched=1 fi diff --git a/package.json b/package.json index 1239e7b..1e30480 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dlvoy/ns-installer-mikrus", - "version": "1.10.0", + "version": "1.10.1", "description": "Nightscout installer for mikr.us VPS", "main": "index.js", "scripts": { diff --git a/src/lib.sh b/src/lib.sh index 34f5c02..fe1d1ed 100644 --- a/src/lib.sh +++ b/src/lib.sh @@ -740,19 +740,18 @@ patch_docker_compose() { containers_running=1 fi - # Check if mongodb image needs patching (bitnami/mongodb or incorrect format) - if grep -qE "image:\s*(bitnami/)?mongo(db)?" "$DOCKER_COMPOSE_FILE"; then + # Check if mongodb image needs patching (bitnami/mongodb) + if grep -q "bitnami/mongodb" "$DOCKER_COMPOSE_FILE"; then ohai "Patching docker-compose.yml MongoDB image..." - # Replace any bitnami/mongodb or incorrect mongo image with proper format - sed -i -E 's|image:\s*"?bitnami/mongodb:.*"?|image: "mongo:${NS_MONGODB_TAG}"|g' "$DOCKER_COMPOSE_FILE" - sed -i -E 's|image:\s*"?mongo:[^"]+"?|image: "mongo:${NS_MONGODB_TAG}"|g' "$DOCKER_COMPOSE_FILE" - sed -i -E 's|image:\s*"?mongodb:[^"]+"?|image: "mongo:${NS_MONGODB_TAG}"|g' "$DOCKER_COMPOSE_FILE" + # Replace bitnami/mongodb with official mongo image + sed -i -E 's|image:\s*"*(bitnami/)?mongodb:.*"|image: "mongo:${NS_MONGODB_TAG}"|g' "$DOCKER_COMPOSE_FILE" patched=1 fi # Check if volume path needs patching (bitnami/mongodb -> data/db) - if grep -q ":/bitnami/mongodb\"" "$DOCKER_COMPOSE_FILE"; then + if grep -q "/bitnami/mongodb" "$DOCKER_COMPOSE_FILE"; then ohai "Patching docker-compose.yml MongoDB volume path..." - sed -i -E 's|:/bitnami/mongodb"?|:/data/db"|g' "$DOCKER_COMPOSE_FILE" + # Replace both host path and container path for mongodb volume + sed -i -E 's|(\$\{NS_DATA_DIR\}/mongodb):/bitnami/mongodb"|\1/data/db:/data/db"|g' "$DOCKER_COMPOSE_FILE" patched=1 fi diff --git a/templates/docker-compose.yml b/templates/docker-compose.yml index e30cd78..e4e0a6b 100644 --- a/templates/docker-compose.yml +++ b/templates/docker-compose.yml @@ -16,7 +16,7 @@ services: environment: - MONGODB_EXTRA_FLAGS=--wiredTigerCacheSizeGB=0.4 volumes: - - "${NS_DATA_DIR}/mongodb:/data/db" + - "${NS_DATA_DIR}/mongodb/data/db:/data/db" ports: - ${INTERNAL_MONGO_PORT}:27017 networks: diff --git a/updated b/updated index ae11af5..ef7fec0 100644 --- a/updated +++ b/updated @@ -1 +1 @@ -2026-01-04T22:01:38.168Z \ No newline at end of file +2026-01-04T22:28:46.096Z \ No newline at end of file