diff --git a/docker/Dockerfile.server b/docker/Dockerfile.server index 06df6301..3e820b8e 100644 --- a/docker/Dockerfile.server +++ b/docker/Dockerfile.server @@ -149,6 +149,8 @@ VOLUME ["/var/lib/containerd", "/opt/memoh/data"] EXPOSE 8080 HEALTHCHECK --interval=30s --timeout=3s --start-period=30s --retries=3 \ - CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:8080/health || exit 1 + CMD wget --no-verbose --tries=1 --spider http://127.0.0.1:8080/health \ + || wget --no-verbose --tries=1 --spider http://server:8080/health \ + || exit 1 ENTRYPOINT ["/entrypoint.sh"] diff --git a/scripts/install.sh b/scripts/install.sh index b773348c..52b3b343 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -106,7 +106,7 @@ if [ "$SILENT" = false ]; then esac fi - printf " Data directory (bind mount for containerd/memoh data) [%s]: " "$WORKSPACE/data" > /dev/tty + printf " Data directory (bind mount for server container data) [%s]: " "$WORKSPACE/data" > /dev/tty read -r input < /dev/tty || true if [ -n "$input" ]; then case "$input" in @@ -169,8 +169,8 @@ export MEMOH_DATA_DIR mkdir -p "$MEMOH_DATA_DIR" echo "" -echo "${GREEN}Starting services (first build may take a few minutes)...${NC}" -$DOCKER compose up -d --build +echo "${GREEN}Starting services (first startup may take a few minutes)...${NC}" +$DOCKER compose up -d echo "" echo "${GREEN}========================================${NC}"