diff --git a/docker-compose.yml b/docker-compose.yml index 710e0c3..3ee8332 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,6 @@ services: 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" @@ -20,54 +19,52 @@ services: - "8050:8050" - "3050:3050" links: - # - import - importapi - # - libraryqueue depends_on: - db - redis - nats - traefik - importapi - # - import - # - imagetransformation + - import + - imagetransformation networks: - proxy - # comicvineapi: - # build: - # context: https://github.com/rishighan/comicvine-service.git - # image: frishi/comicvine-service - # container_name: comicvine-api - # ports: - # - "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" - # env_file: ./docker-env/comicvine-service.env - # volumes: - # - ./userdata:/comicvine-service/userdata - # depends_on: - # - nats - # networks: - # - proxy + comicvineapi: + build: + context: https://github.com/rishighan/comicvine-service.git + image: frishi/comicvine-service + container_name: comicvine-api + ports: + - "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" + env_file: ./docker-env/comicvine-service.env + volumes: + - ./userdata:/comicvine-service/userdata + depends_on: + - nats + networks: + - proxy - # comicvine: - # build: - # context: https://github.com/rishighan/comicvine-service.git - # image: frishi/comicvine-service - # container_name: comicvine-service - # environment: - # SERVICES: comicvine - # volumes: - # - ./userdata:/comicvine-service/userdata - # env_file: ./docker-env/comicvine-service.env - # networks: - # - proxy + comicvine: + build: + context: https://github.com/rishighan/comicvine-service.git + image: frishi/comicvine-service + container_name: comicvine-service + environment: + SERVICES: comicvine + volumes: + - ./userdata:/comicvine-service/userdata + env_file: ./docker-env/comicvine-service.env + networks: + - proxy importapi: build: @@ -77,8 +74,6 @@ services: ports: - "3000:3000" - "3001:3001" - expose: - - "3001" environment: SERVICES: api labels: @@ -97,58 +92,56 @@ services: networks: - proxy - # import: - # build: - # context: https://github.com/rishighan/threetwo-import-service.git - # image: frishi/threetwo-import-service - # container_name: import - # ports: - # - "3001:3001" - # depends_on: - # - db - # - nats - # environment: - # SERVICES: import - # volumes: - # - ./userdata:/threetwo-import-service/userdata - # - ./comics:/threetwo-import-service/comics - # env_file: ./docker-env/threetwo-import-service.env - # networks: - # - proxy + import: + build: + context: https://github.com/rishighan/threetwo-import-service.git + image: frishi/threetwo-import-service + container_name: import + depends_on: + - db + - nats + environment: + SERVICES: import + volumes: + - ./userdata:/threetwo-import-service/userdata + - ./comics:/threetwo-import-service/comics + env_file: ./docker-env/threetwo-import-service.env + networks: + - proxy - # imagetransformation: - # build: - # context: https://github.com/rishighan/threetwo-import-service.git - # image: frishi/threetwo-import-service - # container_name: image-transformation - # volumes: - # - ./userdata:/threetwo-import-service/userdata - # - ./comics:/threetwo-import-service/comics - # depends_on: - # - db - # - nats - # environment: - # SERVICES: imagetransformation - # env_file: ./docker-env/threetwo-import-service.env - # networks: - # - proxy + imagetransformation: + build: + context: https://github.com/rishighan/threetwo-import-service.git + image: frishi/threetwo-import-service + container_name: image-transformation + volumes: + - ./userdata:/threetwo-import-service/userdata + - ./comics:/threetwo-import-service/comics + depends_on: + - db + - nats + environment: + SERVICES: imagetransformation + env_file: ./docker-env/threetwo-import-service.env + networks: + - proxy - # libraryqueue: - # build: - # context: https://github.com/rishighan/threetwo-import-service.git - # image: frishi/threetwo-import-service - # container_name: library-queue - # volumes: - # - ./userdata:/threetwo-import-service/userdata - # - ./comics:/threetwo-import-service/comics - # depends_on: - # - db - # - nats - # environment: - # SERVICES: libraryqueue - # env_file: ./docker-env/threetwo-import-service.env - # networks: - # - proxy + libraryqueue: + build: + context: https://github.com/rishighan/threetwo-import-service.git + image: frishi/threetwo-import-service + container_name: library-queue + volumes: + - ./userdata:/threetwo-import-service/userdata + - ./comics:/threetwo-import-service/comics + depends_on: + - db + - nats + environment: + SERVICES: libraryqueue + env_file: ./docker-env/threetwo-import-service.env + networks: + - proxy db: image: 'bitnami/mongodb:latest' diff --git a/src/client/store/index.ts b/src/client/store/index.ts index a696653..aa15326 100644 --- a/src/client/store/index.ts +++ b/src/client/store/index.ts @@ -6,7 +6,7 @@ import createRootReducer from "../reducers"; import socketIO from "socket.io-client"; import socketIoMiddleware from "redux-socket.io-middleware"; // import { SOCKET_BASE_URI } from "../constants/endpoints"; -const io = socketIO(`ws://importapi:3001`); +const io = socketIO(`http://localhost:3001`); export const history = createBrowserHistory(); const configureStore = (initialState) => { const store = createStore(