diff --git a/docker-compose-with-transit.yaml b/docker-compose-with-transit.yaml index 50242bf4a..b582f68ae 100644 --- a/docker-compose-with-transit.yaml +++ b/docker-compose-with-transit.yaml @@ -47,8 +47,8 @@ services: condition: service_completed_successfully networks: - otp_backend - ports: - - "9001:8000" + # ports: + # - "9001:8000" travelmux: image: ghcr.io/headwaymaps/travelmux:latest restart: always @@ -79,8 +79,6 @@ services: env_file: .env networks: - valhalla_backend - # deprecated - can delete this eventually since valhalla is only accessed via travelmux - - valhalla_frontend volumes: - "valhalla_data:/data/:ro" ulimits: @@ -90,8 +88,8 @@ services: depends_on: valhalla-init: condition: service_completed_successfully - ports: - - "9002:8002" + # ports: + # - "9002:8002" frontend-init: image: ghcr.io/headwaymaps/headway-init:latest env_file: .env @@ -106,15 +104,13 @@ services: HEADWAY_RESOLVER: 127.0.0.11 HEADWAY_PELIAS_URL: http://pelias-api:4000 HEADWAY_TILESERVER_URL: http://tileserver:8000 - HEADWAY_TRANSITMUX_URL: http://travelmux:8000 + HEADWAY_TRAVELMUX_URL: http://travelmux:8000 ports: - "8080:8080" networks: - pelias_frontend - tileserver_frontend - travel_frontend - # deprecated - can delete this eventually since valhalla is only accessed via travelmux - - valhalla_frontend volumes: - "frontend_data:/data/:ro" depends_on: @@ -215,8 +211,6 @@ networks: pelias_backend: travel_frontend: valhalla_backend: - # deprecated - can delete this eventually since valhalla is only accessed via travelmux - valhalla_frontend: otp_backend: volumes: pelias_config_data: diff --git a/docker-compose.yaml b/docker-compose.yaml index a5fc65f07..6eabfb37e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -32,6 +32,9 @@ services: image: ghcr.io/headwaymaps/travelmux:latest restart: always env_file: .env + depends_on: + opentripplanner: + condition: service_healthy networks: - travel_frontend - valhalla_backend @@ -54,8 +57,6 @@ services: env_file: .env networks: - valhalla_backend - # deprecated - can delete this eventually since valhalla is only accessed via travelmux - - valhalla_frontend volumes: - "valhalla_data:/data/:ro" ulimits: @@ -65,6 +66,8 @@ services: depends_on: valhalla-init: condition: service_completed_successfully + # ports: + # - "9002:8002" frontend-init: image: ghcr.io/headwaymaps/headway-init:latest env_file: .env @@ -79,15 +82,13 @@ services: HEADWAY_RESOLVER: 127.0.0.11 HEADWAY_PELIAS_URL: http://pelias-api:4000 HEADWAY_TILESERVER_URL: http://tileserver:8000 - HEADWAY_TRANSITMUX_URL: http://travelmux:8000 + HEADWAY_TRAVELMUX_URL: http://travelmux:8000 ports: - "8080:8080" networks: - pelias_frontend - tileserver_frontend - travel_frontend - # deprecated - can delete this eventually since valhalla is only accessed via travelmux - - valhalla_frontend volumes: - "frontend_data:/data/:ro" depends_on: @@ -188,8 +189,6 @@ networks: pelias_backend: travel_frontend: valhalla_backend: - # deprecated - can delete this eventually since valhalla is only accessed via travelmux - valhalla_frontend: volumes: pelias_config_data: pelias_placeholder_data: diff --git a/services/frontend/www-app/quasar.config.js b/services/frontend/www-app/quasar.config.js index c23c7c649..ee210e5d4 100644 --- a/services/frontend/www-app/quasar.config.js +++ b/services/frontend/www-app/quasar.config.js @@ -55,7 +55,9 @@ module.exports = configure(function (/* ctx */) { node: 'node16', }, - vueRouterMode: 'hash', // available values: 'hash', 'history' + vueRouterMode: 'history', // available values: 'hash', 'history' + // Use this for dev where we don't have mod_rewrite, otherwise refreshing page 404's + // vueRouterMode: 'hash', // vueRouterBase, // vueDevtools, // vueOptionsAPI: false, @@ -117,9 +119,9 @@ module.exports = configure(function (/* ctx */) { }, '/travelmux': { changeOrigin: true, - // target: HEADWAY_HOST, - target: 'http://0.0.0.0:8000', - rewrite: (path) => path.replace(/^\/travelmux/, ''), + target: HEADWAY_HOST, + // target: 'http://0.0.0.0:8000', + // rewrite: (path) => path.replace(/^\/travelmux/, ''), }, }, },