diff --git a/comicvine-service.env b/comicvine-service.env index 323b991..f0b1f02 100644 --- a/comicvine-service.env +++ b/comicvine-service.env @@ -1,7 +1,7 @@ LOGGER=true LOGLEVEL=info SERVICEDIR=dist/services -PWD=./ TRANSPORTER=nats://nats:4222 CACHER=Memory +COMICVINE_API_KEY=a5fa0663683df8145a85d694b5da4b87e1c92c69 diff --git a/docker-compose.yml b/docker-compose.yml index 749f280..dd3e5b5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,8 +39,7 @@ services: - ${USERDATA_DIRECTORY}:/comicvine-service/userdata environment: SERVICES: api - COMICVINE_API_KEY: ${COMICVINE_API_KEY} - env_file: comicvine-service.env + env_file: services.env depends_on: - nats networks: @@ -56,7 +55,7 @@ services: volumes: - ${COMICS_DIRECTORY}:/comicvine-service/comics - ${USERDATA_DIRECTORY}:/comicvine-service/userdata - env_file: comicvine-service.env + env_file: services.env networks: - proxy @@ -70,8 +69,10 @@ services: - "3001:3001" environment: SERVICES: api - COMICVINE_API_KEY: ${COMICVINE_API_KEY} - env_file: threetwo-import-service.env + MONGO_URI: mongodb://db:27017/threetwo + REDIS_URI: redis://redis:6379 + CALIBRE_EBOOK_META_PATH: /opt/calibre/ebook-meta + env_file: services.env volumes: - ${USERDATA_DIRECTORY}:/threetwo-import-service/userdata - ${COMICS_DIRECTORY}:/threetwo-import-service/comics @@ -94,7 +95,7 @@ services: volumes: - ${USERDATA_DIRECTORY}:/threetwo-import-service/userdata - ${COMICS_DIRECTORY}:/threetwo-import-service/comics - env_file: threetwo-import-service.env + env_file: services.env networks: - proxy @@ -111,7 +112,7 @@ services: - nats environment: SERVICES: imagetransformation - env_file: threetwo-import-service.env + env_file: services.env networks: - proxy @@ -128,7 +129,7 @@ services: - nats environment: SERVICES: libraryqueue - env_file: threetwo-import-service.env + env_file: services.env networks: - proxy diff --git a/services.env b/services.env new file mode 100644 index 0000000..f141c1e --- /dev/null +++ b/services.env @@ -0,0 +1,7 @@ +LOGGER=true +LOGLEVEL=info +SERVICEDIR=dist/services +COMICVINE_API_KEY=a5fa0663683df8145a85d694b5da4b87e1c92c69 +TRANSPORTER=nats://nats:4222 +CACHER=Memory + diff --git a/threetwo-import-service.env b/threetwo-import-service.env deleted file mode 100644 index 544314b..0000000 --- a/threetwo-import-service.env +++ /dev/null @@ -1,9 +0,0 @@ -LOGGER=true -LOGLEVEL=info -SERVICEDIR=dist/services -MONGO_URI=mongodb://db:27017/threetwo -REDIS_URI=redis://redis:6379 -TRANSPORTER=nats://nats:4222 -CALIBRE_EBOOK_META_PATH=/opt/calibre/ebook-meta -CACHER=Memory -