diff --git a/docker-compose.yml b/docker-compose.yml index c17918d11..f0e0b645d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -224,7 +224,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 @@ -497,7 +497,7 @@ services: environment: TANGLED_ZOEKT_INDEX_DIR: /data/index TANGLED_ZOEKT_PLC_URL: https://plc.tngl.boltless.dev - TANGLED_ZOEKT_APPVIEW_URL: http://appview:3000 + TANGLED_ZOEKT_APPVIEW_URL: https://web.tngl.boltless.dev TANGLED_ZOEKT_ALLOW_HTTP: "true" volumes: - zoekt-index:/data/index @@ -505,66 +505,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 + # 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-accounts: - condition: service_completed_successfully - networks: [tngl] + # 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-accounts: + # condition: service_completed_successfully + # networks: [tngl] deliberi: dns: [11.0.0.254] @@ -1003,9 +1003,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: