From 08811e51283bada38252bdc24f75adea3d03e1b6 Mon Sep 17 00:00:00 2001 From: Rishi Ghan Date: Mon, 1 Nov 2021 00:08:47 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20WIP=20fixing=20the=20socket=20er?= =?UTF-8?q?rors=20in=20docker-compose=20on=20portainer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 32 +++++++++++++++---------------- src/client/constants/endpoints.ts | 15 ++++++++++----- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9735d82..80abb7c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,11 +10,11 @@ services: environment: DOCKER_HOST: $HOSTNAME restart: unless-stopped - labels: - - "traefik.enable=true" - - "traefik.http.routers.threetwo-ui.rule=Host(`localhost`)" - - "traefik.http.services.threetwo-ui.loadbalancer.server.port=8050" - - "traefik.docker.network=proxy" + # labels: + # - "traefik.enable=true" + # - "traefik.http.routers.threetwo-ui.rule=Host(`localhost`)" + # - "traefik.http.services.threetwo-ui.loadbalancer.server.port=8050" + # - "traefik.docker.network=proxy" ports: - "8050:8050" - "3050:3050" @@ -40,11 +40,11 @@ services: - "3080:3080" environment: SERVICES: api - labels: - - "traefik.enable=true" - - "traefik.http.routers.comicvine-service.rule=Host(`localhost`)" - - "traefik.http.services.comicvine-service.loadbalancer.server.port=3080" - - "traefik.docker.network=proxy" + # labels: + # - "traefik.enable=true" + # - "traefik.http.routers.comicvine-service.rule=Host(`localhost`)" + # - "traefik.http.services.comicvine-service.loadbalancer.server.port=3080" + # - "traefik.docker.network=proxy" env_file: ./docker-env/comicvine-service.env volumes: - ./userdata:/comicvine-service/userdata @@ -76,12 +76,12 @@ services: - "3001:3001" environment: SERVICES: api - labels: - - "traefik.enable=true" - - "traefik.wss.protocol=http" - - "traefik.http.routers.importapi.rule=Host(`localhost`)" - - "traefik.http.services.importapi.loadbalancer.server.port=3000" - - "traefik.docker.network=proxy" + # labels: + # - "traefik.enable=true" + # - "traefik.wss.protocol=http" + # - "traefik.http.routers.importapi.rule=Host(`localhost`)" + # - "traefik.http.services.importapi.loadbalancer.server.port=3000" + # - "traefik.docker.network=proxy" env_file: ./docker-env/threetwo-import-service.env volumes: - ./userdata:/threetwo-import-service/userdata diff --git a/src/client/constants/endpoints.ts b/src/client/constants/endpoints.ts index c021c6e..03e406b 100644 --- a/src/client/constants/endpoints.ts +++ b/src/client/constants/endpoints.ts @@ -11,34 +11,39 @@ export const hostURIBuilder = (options: Record): string => { export const COMICBOOKINFO_SERVICE_URI = hostURIBuilder({ protocol: "http", - host: process.env.DOCKER_HOST || "localhost", + // host: process.env.DOCKER_HOST || "localhost", + host: "localhost", port: "3080", apiPath: "/api/comicvine", }); export const API_BASE_URI = hostURIBuilder({ protocol: "http", - host: process.env.DOCKER_HOST || "localhost", + host: "localhost", + // host: process.env.DOCKER_HOST || "localhost", port: "8050", apiPath: "/api", }); export const IMPORT_SERVICE_HOST = hostURIBuilder({ protocol: "http", - host: process.env.DOCKER_HOST || "localhost", + // host: process.env.DOCKER_HOST || "localhost", + host: "localhost", port: "3000", apiPath: ``, }); export const IMPORT_SERVICE_BASE_URI = hostURIBuilder({ protocol: "http", - host: process.env.DOCKER_HOST || "localhost", + // host: process.env.DOCKER_HOST || "localhost", + host: "localhost", port: "3000", apiPath: "/api/import", }); export const SOCKET_BASE_URI = hostURIBuilder({ protocol: "http", - host: process.env.LIBRARY_SOCKET_HOST || "localhost", + // host: process.env.LIBRARY_SOCKET_HOST || "localhost", + host: "localhost", port: "3001", apiPath: `/`, });