From c917814d32f734dbefcda96db12f7cb2f2b21c8f Mon Sep 17 00:00:00 2001 From: Dorian Date: Sat, 11 Apr 2026 09:33:10 -0400 Subject: [PATCH] refactor: migrate container registry from 80.71.235.15:3000 to git.tx1138.com/lfg2025 All hardcoded references to the old IP-based registry replaced across Rust backend, Vue frontend, shell scripts, Dockerfiles, CI, and docs. Co-Authored-By: Claude Opus 4.6 (1M context) --- .gitea/workflows/build-iso-dev.yml | 2 +- .../archipelago/src/api/rpc/package/config.rs | 4 +-- .../src/api/rpc/package/install.rs | 2 +- .../archipelago/src/api/rpc/package/stacks.rs | 34 +++++++++---------- .../src/container/image_versions.rs | 16 ++++----- docker/bitcoin-ui/Dockerfile | 2 +- docker/electrs-ui/Dockerfile | 2 +- docker/fips-ui/Dockerfile | 2 +- docker/lnd-ui/Dockerfile | 2 +- docker/nostr-vpn-ui/Dockerfile | 2 +- docs/container-architecture.html | 4 +-- image-recipe/build-auto-installer-iso.sh | 12 +++---- image-recipe/scripts/install-podman.sh | 4 +-- neode-ui/src/stores/container.ts | 2 +- neode-ui/src/views/MarketplaceAppDetails.vue | 2 +- neode-ui/src/views/discover/curatedApps.ts | 2 +- .../src/views/marketplace/marketplaceData.ts | 2 +- scripts/bootstrap-switchover.sh | 4 +-- scripts/deploy-bitcoin-knots.sh | 2 +- scripts/dev-container-test.sh | 2 +- scripts/first-boot-containers.sh | 2 +- scripts/image-versions.sh | 6 ++-- scripts/validate-app-manifest.sh | 2 +- 23 files changed, 57 insertions(+), 57 deletions(-) diff --git a/.gitea/workflows/build-iso-dev.yml b/.gitea/workflows/build-iso-dev.yml index 037d189c..5ffa8324 100644 --- a/.gitea/workflows/build-iso-dev.yml +++ b/.gitea/workflows/build-iso-dev.yml @@ -86,7 +86,7 @@ jobs: run: | sudo mkdir -p /etc/containers/registries.conf.d echo '[[registry]] - location = "80.71.235.15:3000" + location = "git.tx1138.com" insecure = true' | sudo tee /etc/containers/registries.conf.d/archipelago.conf - name: Build unbundled ISO diff --git a/core/archipelago/src/api/rpc/package/config.rs b/core/archipelago/src/api/rpc/package/config.rs index 8cc5c0f8..571a3cdc 100644 --- a/core/archipelago/src/api/rpc/package/config.rs +++ b/core/archipelago/src/api/rpc/package/config.rs @@ -4,7 +4,7 @@ use anyhow::{Context, Result}; /// Trusted Docker registries. Only images from these sources are allowed. #[allow(dead_code)] -pub(super) const TRUSTED_REGISTRIES: &[&str] = &["docker.io/", "ghcr.io/", "localhost/", "80.71.235.15:3000/"]; +pub(super) const TRUSTED_REGISTRIES: &[&str] = &["docker.io/", "ghcr.io/", "localhost/", "git.tx1138.com/"]; /// Validate Docker image against trusted registry allowlist. pub(super) fn is_valid_docker_image(image: &str) -> bool { @@ -21,7 +21,7 @@ pub(super) fn is_valid_docker_image(image: &str) -> bool { Some(r) => r, None => return false, }; - matches!(registry, "docker.io" | "ghcr.io" | "localhost" | "80.71.235.15:3000") + matches!(registry, "docker.io" | "ghcr.io" | "localhost" | "git.tx1138.com") } /// Per-app Linux capabilities needed beyond the default cap-drop=ALL. diff --git a/core/archipelago/src/api/rpc/package/install.rs b/core/archipelago/src/api/rpc/package/install.rs index 24e56700..61ea6c25 100644 --- a/core/archipelago/src/api/rpc/package/install.rs +++ b/core/archipelago/src/api/rpc/package/install.rs @@ -987,7 +987,7 @@ autopilot.active=false\n", .find(|d| std::path::Path::new(d).join("Dockerfile").exists()) .unwrap_or_else(|| ui_dir.to_string()); let image_base = image_base.to_string(); - let registry = "80.71.235.15:3000/archipelago"; + let registry = "git.tx1138.com/lfg2025"; let registry_image = format!("{}/{}:latest", registry, image_base); let local_image = format!("localhost/{}:latest", image_base); tokio::spawn(async move { diff --git a/core/archipelago/src/api/rpc/package/stacks.rs b/core/archipelago/src/api/rpc/package/stacks.rs index 07fb72aa..58fe1961 100644 --- a/core/archipelago/src/api/rpc/package/stacks.rs +++ b/core/archipelago/src/api/rpc/package/stacks.rs @@ -49,7 +49,7 @@ async fn adopt_stack_if_exists( }))) } -const REGISTRY: &str = "80.71.235.15:3000/archipelago"; +const REGISTRY: &str = "git.tx1138.com/lfg2025"; /// Pull an image with retry and exponential backoff (3 attempts). async fn pull_image_with_retry(image: &str) -> Result<()> { @@ -116,9 +116,9 @@ impl RpcHandler { } let images = [ - "80.71.235.15:3000/archipelago/immich-postgres:14-vectorchord0.4.3-pgvectors0.2.0", - "80.71.235.15:3000/archipelago/valkey:7-alpine", - "80.71.235.15:3000/archipelago/immich-server:release", + "git.tx1138.com/lfg2025/immich-postgres:14-vectorchord0.4.3-pgvectors0.2.0", + "git.tx1138.com/lfg2025/valkey:7-alpine", + "git.tx1138.com/lfg2025/immich-server:release", ]; for img in &images { pull_image_with_retry(img).await?; @@ -156,7 +156,7 @@ impl RpcHandler { "POSTGRES_USER=postgres", "-e", "POSTGRES_DB=immich", - "80.71.235.15:3000/archipelago/immich-postgres:14-vectorchord0.4.3-pgvectors0.2.0", + "git.tx1138.com/lfg2025/immich-postgres:14-vectorchord0.4.3-pgvectors0.2.0", ]) .output() .await; @@ -172,7 +172,7 @@ impl RpcHandler { "unless-stopped", "--network", "immich-net", - "80.71.235.15:3000/archipelago/valkey:7-alpine", + "git.tx1138.com/lfg2025/valkey:7-alpine", ]) .output() .await; @@ -204,7 +204,7 @@ impl RpcHandler { "REDIS_HOSTNAME=immich_redis", "-e", "UPLOAD_LOCATION=/usr/src/app/upload", - "80.71.235.15:3000/archipelago/immich-server:release", + "git.tx1138.com/lfg2025/immich-server:release", ]) .output() .await @@ -237,11 +237,11 @@ impl RpcHandler { } let images = [ - "80.71.235.15:3000/archipelago/postgres:15", - "80.71.235.15:3000/archipelago/valkey:8.1", - "80.71.235.15:3000/archipelago/penpot-backend:2.4", - "80.71.235.15:3000/archipelago/penpot-exporter:2.4", - "80.71.235.15:3000/archipelago/penpot-frontend:2.4", + "git.tx1138.com/lfg2025/postgres:15", + "git.tx1138.com/lfg2025/valkey:8.1", + "git.tx1138.com/lfg2025/penpot-backend:2.4", + "git.tx1138.com/lfg2025/penpot-exporter:2.4", + "git.tx1138.com/lfg2025/penpot-frontend:2.4", ]; for img in &images { pull_image_with_retry(img).await?; @@ -284,7 +284,7 @@ impl RpcHandler { "POSTGRES_USER=penpot", "-e", "POSTGRES_PASSWORD=penpot", - "80.71.235.15:3000/archipelago/postgres:15", + "git.tx1138.com/lfg2025/postgres:15", ]) .output() .await; @@ -302,7 +302,7 @@ impl RpcHandler { "penpot-net", "-e", "VALKEY_EXTRA_FLAGS=--maxmemory 128mb --maxmemory-policy volatile-lfu", - "80.71.235.15:3000/archipelago/valkey:8.1", + "git.tx1138.com/lfg2025/valkey:8.1", ]) .output() .await; @@ -338,7 +338,7 @@ impl RpcHandler { "PENPOT_OBJECTS_STORAGE_FS_DIRECTORY=/opt/data/assets", "-e", "PENPOT_FLAGS=disable-email-verification enable-smtp enable-prepl-server disable-secure-session-cookies", - "80.71.235.15:3000/archipelago/penpot-backend:2.4", + "git.tx1138.com/lfg2025/penpot-backend:2.4", ]) .output() .await; @@ -360,7 +360,7 @@ impl RpcHandler { "PENPOT_PUBLIC_URI=http://penpot-frontend:8080", "-e", "PENPOT_REDIS_URI=redis://penpot-valkey/0", - "80.71.235.15:3000/archipelago/penpot-exporter:2.4", + "git.tx1138.com/lfg2025/penpot-exporter:2.4", ]) .output() .await; @@ -384,7 +384,7 @@ impl RpcHandler { &format!("PENPOT_PUBLIC_URI=http://{}:9001", host_ip), "-e", "PENPOT_FLAGS=disable-email-verification enable-smtp enable-prepl-server disable-secure-session-cookies", - "80.71.235.15:3000/archipelago/penpot-frontend:2.4", + "git.tx1138.com/lfg2025/penpot-frontend:2.4", ]) .output() .await diff --git a/core/archipelago/src/container/image_versions.rs b/core/archipelago/src/container/image_versions.rs index b8a466f5..45d1b68d 100644 --- a/core/archipelago/src/container/image_versions.rs +++ b/core/archipelago/src/container/image_versions.rs @@ -194,11 +194,11 @@ pub fn pinned_image_for_app(app_id: &str) -> Option { } /// Extract version tag from a full image reference. -/// e.g. "80.71.235.15:3000/archipelago/lnd:v0.18.4-beta" → "v0.18.4-beta" +/// e.g. "git.tx1138.com/lfg2025/lnd:v0.18.4-beta" → "v0.18.4-beta" /// Returns "latest" if no tag or tag is empty. pub fn extract_version_from_image(image: &str) -> String { // Split off the tag after the last colon, but only if it comes after the last slash - // (to avoid splitting on registry port like "80.71.235.15:3000") + // (to avoid splitting on registry port like "registry.example.com:3000") if let Some(slash_pos) = image.rfind('/') { let after_slash = &image[slash_pos..]; if let Some(colon_pos) = after_slash.rfind(':') { @@ -259,11 +259,11 @@ mod tests { #[test] fn test_extract_version() { assert_eq!( - extract_version_from_image("80.71.235.15:3000/archipelago/lnd:v0.18.4-beta"), + extract_version_from_image("git.tx1138.com/lfg2025/lnd:v0.18.4-beta"), "v0.18.4-beta" ); assert_eq!( - extract_version_from_image("80.71.235.15:3000/archipelago/grafana:10.2.0"), + extract_version_from_image("git.tx1138.com/lfg2025/grafana:10.2.0"), "10.2.0" ); assert_eq!( @@ -271,7 +271,7 @@ mod tests { "latest" ); assert_eq!( - extract_version_from_image("80.71.235.15:3000/archipelago/bitcoin-knots:latest"), + extract_version_from_image("git.tx1138.com/lfg2025/bitcoin-knots:latest"), "latest" ); } @@ -279,7 +279,7 @@ mod tests { #[test] fn test_parse_image_versions() { let content = r#" -ARCHY_REGISTRY="80.71.235.15:3000/archipelago" +ARCHY_REGISTRY="git.tx1138.com/lfg2025" LND_IMAGE="$ARCHY_REGISTRY/lnd:v0.18.4-beta" GRAFANA_IMAGE="$ARCHY_REGISTRY/grafana:10.2.0" # comment @@ -288,11 +288,11 @@ NOT_AN_IMAGE="something" let parsed = parse_image_versions(content); assert_eq!( parsed.get("LND_IMAGE"), - Some(&"80.71.235.15:3000/archipelago/lnd:v0.18.4-beta".to_string()) + Some(&"git.tx1138.com/lfg2025/lnd:v0.18.4-beta".to_string()) ); assert_eq!( parsed.get("GRAFANA_IMAGE"), - Some(&"80.71.235.15:3000/archipelago/grafana:10.2.0".to_string()) + Some(&"git.tx1138.com/lfg2025/grafana:10.2.0".to_string()) ); assert!(!parsed.contains_key("NOT_AN_IMAGE")); assert!(!parsed.contains_key("ARCHY_REGISTRY")); diff --git a/docker/bitcoin-ui/Dockerfile b/docker/bitcoin-ui/Dockerfile index 71bb91c7..7e1fae50 100644 --- a/docker/bitcoin-ui/Dockerfile +++ b/docker/bitcoin-ui/Dockerfile @@ -1,4 +1,4 @@ -FROM 80.71.235.15:3000/archipelago/nginx:1.27.4-alpine +FROM git.tx1138.com/lfg2025/nginx:1.27.4-alpine COPY index.html /usr/share/nginx/html/ COPY 50x.html /usr/share/nginx/html/ COPY nginx.conf /etc/nginx/conf.d/default.conf diff --git a/docker/electrs-ui/Dockerfile b/docker/electrs-ui/Dockerfile index b3fad404..fdfe0e5e 100644 --- a/docker/electrs-ui/Dockerfile +++ b/docker/electrs-ui/Dockerfile @@ -1,4 +1,4 @@ -FROM 80.71.235.15:3000/archipelago/nginx:1.27.4-alpine +FROM git.tx1138.com/lfg2025/nginx:1.27.4-alpine COPY index.html /usr/share/nginx/html/ COPY 50x.html /usr/share/nginx/html/ COPY qrcode.js /usr/share/nginx/html/ diff --git a/docker/fips-ui/Dockerfile b/docker/fips-ui/Dockerfile index 933ab7d8..18de606a 100644 --- a/docker/fips-ui/Dockerfile +++ b/docker/fips-ui/Dockerfile @@ -1,4 +1,4 @@ -FROM 80.71.235.15:3000/archipelago/nginx:1.27.4-alpine +FROM git.tx1138.com/lfg2025/nginx:1.27.4-alpine COPY index.html /usr/share/nginx/html/ COPY nginx.conf /etc/nginx/conf.d/default.conf RUN sed -i 's/^user nginx;/user root;/' /etc/nginx/nginx.conf && \ diff --git a/docker/lnd-ui/Dockerfile b/docker/lnd-ui/Dockerfile index babc6f48..da31def2 100644 --- a/docker/lnd-ui/Dockerfile +++ b/docker/lnd-ui/Dockerfile @@ -1,4 +1,4 @@ -FROM 80.71.235.15:3000/archipelago/nginx:1.27.4-alpine +FROM git.tx1138.com/lfg2025/nginx:1.27.4-alpine # Copy the HTML file COPY index.html /usr/share/nginx/html/ diff --git a/docker/nostr-vpn-ui/Dockerfile b/docker/nostr-vpn-ui/Dockerfile index 37252c9f..3101f7b9 100644 --- a/docker/nostr-vpn-ui/Dockerfile +++ b/docker/nostr-vpn-ui/Dockerfile @@ -1,4 +1,4 @@ -FROM 80.71.235.15:3000/archipelago/nginx:1.27.4-alpine +FROM git.tx1138.com/lfg2025/nginx:1.27.4-alpine COPY index.html /usr/share/nginx/html/ COPY nginx.conf /etc/nginx/conf.d/default.conf RUN sed -i 's/^user nginx;/user root;/' /etc/nginx/nginx.conf && \ diff --git a/docs/container-architecture.html b/docs/container-architecture.html index 3a9df9a1..2ff7363e 100644 --- a/docs/container-architecture.html +++ b/docs/container-architecture.html @@ -842,8 +842,8 @@

Registry

    -
  • Private registry at 80.71.235.15:3000/archipelago/
    • -
  • HTTP only (insecure, self-hosted Gitea)
    • +
  • Private registry at git.tx1138.com/lfg2025/
    • +
  • HTTPS (self-hosted Gitea)
  • All images pre-pulled into registry; nodes pull on first boot
diff --git a/image-recipe/build-auto-installer-iso.sh b/image-recipe/build-auto-installer-iso.sh index b667c6c1..19dff038 100755 --- a/image-recipe/build-auto-installer-iso.sh +++ b/image-recipe/build-auto-installer-iso.sh @@ -216,7 +216,7 @@ check_tools() { mkdir -p /etc/containers/registries.conf.d cat > /etc/containers/registries.conf.d/archipelago.conf <<'REGCONF' [[registry]] -location = "80.71.235.15:3000" +location = "git.tx1138.com" insecure = true REGCONF fi @@ -986,7 +986,7 @@ fi # If built against a newer GLIBC, the binary will fail at runtime. # Rebuild with: FROM debian:13 AS builder echo " Extracting NostrVPN binary..." -_NVPN_IMG="${NOSTR_VPN_IMAGE:-80.71.235.15:3000/archipelago/nostr-vpn:v0.3.7}" +_NVPN_IMG="${NOSTR_VPN_IMAGE:-git.tx1138.com/lfg2025/nostr-vpn:v0.3.7}" NVPN_IMAGE_ID="$($CONTAINER_CMD images -q "$_NVPN_IMG" 2>/dev/null)" if [ -z "$NVPN_IMAGE_ID" ]; then $CONTAINER_CMD pull "$_NVPN_IMG" 2>/dev/null || true @@ -1017,11 +1017,11 @@ fi # Extract nostr-rs-relay binary from container image (native system service for VPN signaling) echo " Extracting nostr-rs-relay binary..." -RELAY_IMAGE="$($CONTAINER_CMD images -q 80.71.235.15:3000/archipelago/nostr-rs-relay:0.9.0 2>/dev/null)" +RELAY_IMAGE="$($CONTAINER_CMD images -q git.tx1138.com/lfg2025/nostr-rs-relay:0.9.0 2>/dev/null)" if [ -z "$RELAY_IMAGE" ]; then - $CONTAINER_CMD pull 80.71.235.15:3000/archipelago/nostr-rs-relay:0.9.0 2>/dev/null || true + $CONTAINER_CMD pull git.tx1138.com/lfg2025/nostr-rs-relay:0.9.0 2>/dev/null || true fi -RELAY_CONTAINER=$($CONTAINER_CMD create 80.71.235.15:3000/archipelago/nostr-rs-relay:0.9.0 2>/dev/null) || true +RELAY_CONTAINER=$($CONTAINER_CMD create git.tx1138.com/lfg2025/nostr-rs-relay:0.9.0 2>/dev/null) || true if [ -n "$RELAY_CONTAINER" ]; then $CONTAINER_CMD cp "$RELAY_CONTAINER:/usr/local/bin/nostr-rs-relay" "$ARCH_DIR/bin/nostr-rs-relay" 2>/dev/null && \ chmod +x "$ARCH_DIR/bin/nostr-rs-relay" && \ @@ -2112,7 +2112,7 @@ ln -sf /var/lib/archipelago/containers/storage /mnt/target/home/archipelago/.loc # Configure Archipelago app registry (HTTP, insecure) cat > /mnt/target/home/archipelago/.config/containers/registries.conf <<'REGCONF' [[registry]] -location = "80.71.235.15:3000" +location = "git.tx1138.com" insecure = true REGCONF chown -R 1000:1000 /mnt/target/home/archipelago/.config diff --git a/image-recipe/scripts/install-podman.sh b/image-recipe/scripts/install-podman.sh index 47b70a76..418ad29c 100755 --- a/image-recipe/scripts/install-podman.sh +++ b/image-recipe/scripts/install-podman.sh @@ -28,10 +28,10 @@ EOF mkdir -p /home/archipelago/.config/containers/registries.conf.d cat > /home/archipelago/.config/containers/registries.conf.d/000-shortnames.conf < { }) /** App dependency definitions */ -const R = '80.71.235.15:3000/archipelago' +const R = 'git.tx1138.com/lfg2025' const APP_DEPENDENCIES: Record = { 'electrumx': [{ id: 'bitcoin-knots', title: 'Bitcoin Knots', dockerImage: `${R}/bitcoin-knots:latest` }], 'lnd': [{ id: 'bitcoin-knots', title: 'Bitcoin Knots', dockerImage: `${R}/bitcoin-knots:latest` }], diff --git a/neode-ui/src/views/discover/curatedApps.ts b/neode-ui/src/views/discover/curatedApps.ts index fa7883ab..4a4a8a37 100644 --- a/neode-ui/src/views/discover/curatedApps.ts +++ b/neode-ui/src/views/discover/curatedApps.ts @@ -1,6 +1,6 @@ import type { MarketplaceApp } from './types' -const R = '80.71.235.15:3000/archipelago' +const R = 'git.tx1138.com/lfg2025' export function getCuratedAppList(): MarketplaceApp[] { return [ diff --git a/neode-ui/src/views/marketplace/marketplaceData.ts b/neode-ui/src/views/marketplace/marketplaceData.ts index 5e6f225d..ee12ac31 100644 --- a/neode-ui/src/views/marketplace/marketplaceData.ts +++ b/neode-ui/src/views/marketplace/marketplaceData.ts @@ -33,7 +33,7 @@ export interface InstallProgress { } /** Archipelago app registry — all app images are mirrored here */ -const REGISTRY = '80.71.235.15:3000/archipelago' +const REGISTRY = 'git.tx1138.com/lfg2025' /** Marketplace app ID -> backend package keys (for "Already Installed" when first-boot/deploy created them) */ export const INSTALLED_ALIASES: Record = { diff --git a/scripts/bootstrap-switchover.sh b/scripts/bootstrap-switchover.sh index 171ace6b..0018fb89 100755 --- a/scripts/bootstrap-switchover.sh +++ b/scripts/bootstrap-switchover.sh @@ -78,7 +78,7 @@ if $DOCKER ps -a --format '{{.Names}}' 2>/dev/null | grep -q '^electrumx$'; then -e "DAEMON_URL=http://${RPC_USER}:${RPC_PASS}@bitcoin-knots:8332/" \ -e COIN=Bitcoin -e DB_DIRECTORY=/data \ -e "SERVICES=tcp://:50001,rpc://0.0.0.0:8000" \ - "${ELECTRUMX_IMAGE:-80.71.235.15:3000/archipelago/electrumx:v1.18.0}" + "${ELECTRUMX_IMAGE:-git.tx1138.com/lfg2025/electrumx:v1.18.0}" fi # Mempool API @@ -98,7 +98,7 @@ if $DOCKER ps -a --format '{{.Names}}' 2>/dev/null | grep -q '^mempool-api$'; th -e "DATABASE_ENABLED=true" -e "DATABASE_HOST=archy-mempool-db" \ -e "DATABASE_DATABASE=mempool" -e "DATABASE_USERNAME=mempool" \ -e "DATABASE_PASSWORD=$(cat "$SECRETS_DIR/mempool-db-password" 2>/dev/null || echo mempoolpass)" \ - "${MEMPOOL_API_IMAGE:-80.71.235.15:3000/archipelago/mempool-api:v3.2.0}" + "${MEMPOOL_API_IMAGE:-git.tx1138.com/lfg2025/mempool-api:v3.2.0}" fi # Stop Tor tunnel if it was active diff --git a/scripts/deploy-bitcoin-knots.sh b/scripts/deploy-bitcoin-knots.sh index 0d1f1b27..df651c1b 100644 --- a/scripts/deploy-bitcoin-knots.sh +++ b/scripts/deploy-bitcoin-knots.sh @@ -74,7 +74,7 @@ mkdir -p "$BUILD_DIR" # Create Dockerfile cat > "$BUILD_DIR/Dockerfile" << 'EOF' -FROM ${NGINX_ALPINE_IMAGE:-80.71.235.15:3000/archipelago/nginx:1.29.6-alpine} +FROM ${NGINX_ALPINE_IMAGE:-git.tx1138.com/lfg2025/nginx:1.29.6-alpine} # Copy the static UI COPY index.html /usr/share/nginx/html/ diff --git a/scripts/dev-container-test.sh b/scripts/dev-container-test.sh index 7ad3fcbc..a1e4f512 100755 --- a/scripts/dev-container-test.sh +++ b/scripts/dev-container-test.sh @@ -146,7 +146,7 @@ run_smoke_tests() { # Test 3: Install a lightweight container (filebrowser — small, fast, no deps) TESTS=$((TESTS + 1)) - local install_img="80.71.235.15:3000/archipelago/filebrowser:v2.27.0" + local install_img="git.tx1138.com/lfg2025/filebrowser:v2.27.0" # Check if already installed local fb_state fb_state=$(ssh $SSH_OPTS "$SSH_HOST" "podman inspect filebrowser --format '{{.State.Status}}' 2>/dev/null || echo 'none'") diff --git a/scripts/first-boot-containers.sh b/scripts/first-boot-containers.sh index 81ce4913..9b07573b 100644 --- a/scripts/first-boot-containers.sh +++ b/scripts/first-boot-containers.sh @@ -9,7 +9,7 @@ # # Image versions: sourced from /opt/archipelago/image-versions.sh (single source of truth). # All container image references use the $*_IMAGE variables defined there. -# Images pull from the Archipelago app registry (80.71.235.15:3000/archipelago/). +# Images pull from the Archipelago app registry (git.tx1138.com/lfg2025/). # # --- PLANNED REFACTOR (post-beta) --- # This script is ~995 lines and should be split into a modular library. diff --git a/scripts/image-versions.sh b/scripts/image-versions.sh index d861d4fb..41d1ca92 100644 --- a/scripts/image-versions.sh +++ b/scripts/image-versions.sh @@ -5,12 +5,12 @@ # Usage: source /opt/archipelago/image-versions.sh 2>/dev/null || true # source "$(dirname "$0")/image-versions.sh" 2>/dev/null || true # -# Tags MUST match what's actually in the registry at 80.71.235.15:3000/archipelago/ -# Run: podman images --format '{{.Repository}}:{{.Tag}}' | grep '80.71' | sort +# Tags MUST match what's actually in the registry at git.tx1138.com/lfg2025/ +# Run: podman images --format '{{.Repository}}:{{.Tag}}' | grep 'git.tx1138' | sort # to verify against the registry. # Archipelago app registry -ARCHY_REGISTRY="80.71.235.15:3000/archipelago" +ARCHY_REGISTRY="git.tx1138.com/lfg2025" # Bitcoin stack BITCOIN_KNOTS_IMAGE="$ARCHY_REGISTRY/bitcoin-knots:latest" diff --git a/scripts/validate-app-manifest.sh b/scripts/validate-app-manifest.sh index ee7d9f82..bc66de5b 100755 --- a/scripts/validate-app-manifest.sh +++ b/scripts/validate-app-manifest.sh @@ -86,7 +86,7 @@ else # Check trusted registry TRUSTED=false - for reg in "docker.io" "ghcr.io" "quay.io" "registry.hub.docker.com" "80.71.235.15:3000"; do + for reg in "docker.io" "ghcr.io" "quay.io" "registry.hub.docker.com" "git.tx1138.com"; do if echo "$IMAGE" | grep -q "$reg"; then TRUSTED=true break