diff --git a/docker-compose.yml b/docker-compose.yml index 495a329aa..104f44baa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -206,7 +206,7 @@ services: KNOT_LEGACY_ADMIN_SECRET_ENV: KNOT_LEGACY_ADMIN_SECRET KNOT_LEGACY_ADMIN_SECRET: super-strong-devonly-key KNOT_PLC_DIRECTORY: https://plc.tngl.boltless.dev - KNOT_APPVIEW_ENDPOINT: https://tngl.boltless.dev + KNOT_APPVIEW_ENDPOINT: https://web.tngl.boltless.dev KNOT_EXTRA_CA_FILE: /etc/ssl/certs/tngl.crt # cluster root KNOT_XRPC_TRUSTED_PROXY_HEADER: x-forwarded-for KNOT_XRPC_TRUSTED_PROXIES: 11.0.0.0/24 @@ -394,7 +394,7 @@ services: MIRROR_KNOT_USE_SSL: "true" MIRROR_KNOT_SSRF: "false" MIRROR_RESYNC_PARALLELISM: "4" - MIRROR_APPVIEW_URL: http://appview:3000 + MIRROR_APPVIEW_URL: https://web.tngl.boltless.dev MIRROR_SEARCH_ZOEKT_URL: https://zoekt.tngl.boltless.dev/indexserver MIRROR_V2_HOST: http://gitmirror:9001 MIRROR_DELIBERI_URL: http://deliberi:6565 @@ -466,66 +466,66 @@ services: command: ["zoekt-tngl-indexserver", "serve"] networks: [tngl] - tailwind: - build: - context: . - dockerfile: localinfra/tailwind.Dockerfile - restart: unless-stopped - working_dir: /build - init: true - volumes: - - .:/build:ro - - ./appview/pages/static:/build/appview/pages/static - command: - ["-i", "input.css", "-o", "appview/pages/static/tw.css", "--watch=always"] - network_mode: none - - appview: - dns: [11.0.0.254] - build: - context: . - dockerfile: localinfra/appview.Dockerfile - restart: unless-stopped - environment: - TANGLED_DEV: "true" - TANGLED_APPVIEW_HOST: 127.0.0.1:3000 - TANGLED_XRPC_ENABLED: "true" - TANGLED_DB_PATH: /var/lib/appview/appview.db - TANGLED_PLC_URL: https://plc.tngl.boltless.dev - TANGLED_JETSTREAM_ENDPOINT: wss://hydrant.tngl.boltless.dev/subscribe - TANGLED_REDIS_ADDR: redis:6379 - TANGLED_KNOTMIRROR_URL: https://mirror.tngl.boltless.dev - TANGLED_CODESEARCH_ZOEKT_URL: https://zoekt.tngl.boltless.dev - TANGLED_SSH_ENABLED: "true" - TANGLED_SSH_LISTEN_ADDR: "0.0.0.0:3333" - ports: - - "3000:3000" - - "3333:3333" - healthcheck: - test: ["CMD", "wget", "-qO-", "http://localhost:3000/"] - interval: 5s - timeout: 2s - retries: 15 - start_period: 10s - volumes: - - .:/src:cached - - go-cache:/go/cache - - go-mod-cache:/go/mod - - appview-data:/var/lib/appview - - init-state:/shared:ro - - ./localinfra/certs/root.crt:/usr/local/share/ca-certificates/caddy.crt:ro - depends_on: - dns: - condition: service_started - redis: - condition: service_started - pds: - condition: service_healthy - hydrant: - condition: service_healthy - init-data: - condition: service_completed_successfully - networks: [tngl] + # tailwind: + # build: + # context: . + # dockerfile: localinfra/tailwind.Dockerfile + # restart: unless-stopped + # working_dir: /build + # init: true + # volumes: + # - .:/build:ro + # - ./appview/pages/static:/build/appview/pages/static + # command: + # ["-i", "input.css", "-o", "appview/pages/static/tw.css", "--watch=always"] + # network_mode: none + # + # appview: + # dns: [11.0.0.254] + # build: + # context: . + # dockerfile: localinfra/appview.Dockerfile + # restart: unless-stopped + # environment: + # TANGLED_DEV: "true" + # TANGLED_APPVIEW_HOST: 127.0.0.1:3000 + # TANGLED_XRPC_ENABLED: "true" + # TANGLED_DB_PATH: /var/lib/appview/appview.db + # TANGLED_PLC_URL: https://plc.tngl.boltless.dev + # TANGLED_JETSTREAM_ENDPOINT: wss://hydrant.tngl.boltless.dev/subscribe + # TANGLED_REDIS_ADDR: redis:6379 + # TANGLED_KNOTMIRROR_URL: https://mirror.tngl.boltless.dev + # TANGLED_CODESEARCH_ZOEKT_URL: https://zoekt.tngl.boltless.dev + # TANGLED_SSH_ENABLED: "true" + # TANGLED_SSH_LISTEN_ADDR: "0.0.0.0:3333" + # ports: + # - "3000:3000" + # - "3333:3333" + # healthcheck: + # test: ["CMD", "wget", "-qO-", "http://localhost:3000/"] + # interval: 5s + # timeout: 2s + # retries: 15 + # start_period: 10s + # volumes: + # - .:/src:cached + # - go-cache:/go/cache + # - go-mod-cache:/go/mod + # - appview-data:/var/lib/appview + # - init-state:/shared:ro + # - ./localinfra/certs/root.crt:/usr/local/share/ca-certificates/caddy.crt:ro + # depends_on: + # dns: + # condition: service_started + # redis: + # condition: service_started + # pds: + # condition: service_healthy + # hydrant: + # condition: service_healthy + # init-data: + # condition: service_completed_successfully + # networks: [tngl] deliberi: dns: [11.0.0.254] @@ -597,8 +597,8 @@ services: HYDRANT_RELAY_HOSTS: pds::wss://pds.tngl.boltless.dev,pds::wss://knot2.tngl.boltless.dev,pds::wss://tranquil.tngl.boltless.dev HYDRANT_CRAWLER_URLS: list_repos::https://pds.tngl.boltless.dev HYDRANT_PLC_URL: https://plc.tngl.boltless.dev - HYDRANT_FILTER_COLLECTIONS: sh.tangled.*,org.tangled.* - HYDRANT_FILTER_SIGNALS: sh.tangled.actor.profile,sh.tangled.feed.comment,sh.tangled.feed.reaction,sh.tangled.feed.star,sh.tangled.git.refUpdate,sh.tangled.graph.follow,sh.tangled.graph.vouch,sh.tangled.knot,sh.tangled.knot.member,sh.tangled.knot.memberInvite,sh.tangled.label.definition,sh.tangled.label.op,sh.tangled.pipeline,sh.tangled.pipeline.status,sh.tangled.publicKey,sh.tangled.repo,sh.tangled.repo.artifact,sh.tangled.repo.collaborator,sh.tangled.repo.collaboratorAcceptance,sh.tangled.repo.collaboratorInvite,sh.tangled.repo.issue,sh.tangled.repo.issue.comment,sh.tangled.repo.issue.state,sh.tangled.repo.pull,sh.tangled.repo.pull.comment,sh.tangled.repo.pull.status,sh.tangled.spindle,sh.tangled.spindle.member,sh.tangled.string,org.tangled.feed.subscription,org.tangled.git.refs + HYDRANT_FILTER_COLLECTIONS: org.tangled.* + HYDRANT_FILTER_SIGNALS: org.tangled.actor.profile,org.tangled.repo.manifest HYDRANT_BACKFILL_STRATEGY: sparse-filter HYDRANT_VERIFY_SIGNATURES: none RUST_LOG: info @@ -636,12 +636,10 @@ services: BOBBIN_HYDRANT_URL: http://hydrant:3000 BOBBIN_SLINGSHOT_URL: http://hydrant:3000 BOBBIN_SERVICE_DID: did:web:bobbin.tngl.boltless.dev - BOBBIN_KNOT_ALLOW_PRIVATE: "true" BOBBIN_MIRROR_URL: http://knotmirror:7000 BOBBIN_POCKET_URL: http://pocket:3000 BOBBIN_CODESEARCH_ZOEKT_URL: https://zoekt.tngl.boltless.dev BOBBIN_LOG: info - BOBBIN_KNOT_REQUIRE_HTTPS: "true" BOBBIN_INGEST_IDLE_PROMOTE_MIN_EVENTS: "1" BOBBIN_OTLP_ENDPOINT: ${BOBBIN_OTLP_ENDPOINT:-} volumes: @@ -982,9 +980,9 @@ volumes: spindle-logs: ncps-data: init-state: - go-cache: - go-mod-cache: - appview-data: + # go-cache: + # go-mod-cache: + # appview-data: deliberi-data: prometheus-data: grafana-data: