🔧 WIP fixing the socket errors in docker-compose on portainer

This commit is contained in:
2021-11-01 00:08:47 -07:00
parent 124a88cb2c
commit 08811e5128
2 changed files with 26 additions and 21 deletions

View File

@@ -10,11 +10,11 @@ services:
environment: environment:
DOCKER_HOST: $HOSTNAME DOCKER_HOST: $HOSTNAME
restart: unless-stopped restart: unless-stopped
labels: # labels:
- "traefik.enable=true" # - "traefik.enable=true"
- "traefik.http.routers.threetwo-ui.rule=Host(`localhost`)" # - "traefik.http.routers.threetwo-ui.rule=Host(`localhost`)"
- "traefik.http.services.threetwo-ui.loadbalancer.server.port=8050" # - "traefik.http.services.threetwo-ui.loadbalancer.server.port=8050"
- "traefik.docker.network=proxy" # - "traefik.docker.network=proxy"
ports: ports:
- "8050:8050" - "8050:8050"
- "3050:3050" - "3050:3050"
@@ -40,11 +40,11 @@ services:
- "3080:3080" - "3080:3080"
environment: environment:
SERVICES: api SERVICES: api
labels: # labels:
- "traefik.enable=true" # - "traefik.enable=true"
- "traefik.http.routers.comicvine-service.rule=Host(`localhost`)" # - "traefik.http.routers.comicvine-service.rule=Host(`localhost`)"
- "traefik.http.services.comicvine-service.loadbalancer.server.port=3080" # - "traefik.http.services.comicvine-service.loadbalancer.server.port=3080"
- "traefik.docker.network=proxy" # - "traefik.docker.network=proxy"
env_file: ./docker-env/comicvine-service.env env_file: ./docker-env/comicvine-service.env
volumes: volumes:
- ./userdata:/comicvine-service/userdata - ./userdata:/comicvine-service/userdata
@@ -76,12 +76,12 @@ services:
- "3001:3001" - "3001:3001"
environment: environment:
SERVICES: api SERVICES: api
labels: # labels:
- "traefik.enable=true" # - "traefik.enable=true"
- "traefik.wss.protocol=http" # - "traefik.wss.protocol=http"
- "traefik.http.routers.importapi.rule=Host(`localhost`)" # - "traefik.http.routers.importapi.rule=Host(`localhost`)"
- "traefik.http.services.importapi.loadbalancer.server.port=3000" # - "traefik.http.services.importapi.loadbalancer.server.port=3000"
- "traefik.docker.network=proxy" # - "traefik.docker.network=proxy"
env_file: ./docker-env/threetwo-import-service.env env_file: ./docker-env/threetwo-import-service.env
volumes: volumes:
- ./userdata:/threetwo-import-service/userdata - ./userdata:/threetwo-import-service/userdata

View File

@@ -11,34 +11,39 @@ export const hostURIBuilder = (options: Record<string, string>): string => {
export const COMICBOOKINFO_SERVICE_URI = hostURIBuilder({ export const COMICBOOKINFO_SERVICE_URI = hostURIBuilder({
protocol: "http", protocol: "http",
host: process.env.DOCKER_HOST || "localhost", // host: process.env.DOCKER_HOST || "localhost",
host: "localhost",
port: "3080", port: "3080",
apiPath: "/api/comicvine", apiPath: "/api/comicvine",
}); });
export const API_BASE_URI = hostURIBuilder({ export const API_BASE_URI = hostURIBuilder({
protocol: "http", protocol: "http",
host: process.env.DOCKER_HOST || "localhost", host: "localhost",
// host: process.env.DOCKER_HOST || "localhost",
port: "8050", port: "8050",
apiPath: "/api", apiPath: "/api",
}); });
export const IMPORT_SERVICE_HOST = hostURIBuilder({ export const IMPORT_SERVICE_HOST = hostURIBuilder({
protocol: "http", protocol: "http",
host: process.env.DOCKER_HOST || "localhost", // host: process.env.DOCKER_HOST || "localhost",
host: "localhost",
port: "3000", port: "3000",
apiPath: ``, apiPath: ``,
}); });
export const IMPORT_SERVICE_BASE_URI = hostURIBuilder({ export const IMPORT_SERVICE_BASE_URI = hostURIBuilder({
protocol: "http", protocol: "http",
host: process.env.DOCKER_HOST || "localhost", // host: process.env.DOCKER_HOST || "localhost",
host: "localhost",
port: "3000", port: "3000",
apiPath: "/api/import", apiPath: "/api/import",
}); });
export const SOCKET_BASE_URI = hostURIBuilder({ export const SOCKET_BASE_URI = hostURIBuilder({
protocol: "http", protocol: "http",
host: process.env.LIBRARY_SOCKET_HOST || "localhost", // host: process.env.LIBRARY_SOCKET_HOST || "localhost",
host: "localhost",
port: "3001", port: "3001",
apiPath: `/`, apiPath: `/`,
}); });