distributor-node: converge on single config file

and configure correct env var for volumes in docker-compose.yml

.env

@@ -54,4 +54,4 @@ DISTRIBUTOR_2_WORKER_ID=1
 DISTRIBUTOR_2_ACCOUNT_URI=//testing//worker//Distribution//${DISTRIBUTOR_2_WORKER_ID}
 
 # joystream/node docker image tag
-JOYSTREAM_NODE_TAG=latest
+JOYSTREAM_NODE_TAG=latest

distributor-node.Dockerfile

@@ -22,7 +22,5 @@ RUN \
   yarn --frozen-lockfile --production &&\
   yarn cache clean
 
-ENV CONFIG_PATH ./distributor-node/config/docker/config.docker.yml
-
 ENTRYPOINT ["yarn", "joystream-distributor"]
 CMD ["start"]

distributor-node/config/docker/config.docker.yml

@@ -1,26 +0,0 @@
-id: distributor-node-docker
-endpoints:
-  queryNode: http://graphql-server:4001/graphql
-  joystreamNodeWs: ws://joystream-node:9944
-  # elasticSearch: http://elasticsearch:9200
-directories:
-  assets: /data
-  cacheState: /cache
-  logs: /logs
-log:
-  console: info
-  # elastic: info
-limits:
-  storage: 100G
-  maxConcurrentStorageNodeDownloads: 100
-  maxConcurrentOutboundConnections: 300
-  outboundRequestsTimeout: 5000
-intervals:
-  saveCacheState: 60
-  checkStorageNodeResponseTimes: 60
-  cacheCleanup: 60
-port: 3334
-keys:
-  - suri: //Alice
-buckets: 'all'
-workerId: 0

docker-compose.yml

@@ -70,10 +70,10 @@ services:
       JOYSTREAM_DISTRIBUTOR__WORKER_ID: ${DISTRIBUTOR_1_WORKER_ID}
       JOYSTREAM_DISTRIBUTOR__PORT: 3334
       JOYSTREAM_DISTRIBUTOR__ENDPOINTS__JOYSTREAM_NODE_WS: ${JOYSTREAM_NODE_WS}
+      JOYSTREAM_DISTRIBUTOR__DIRECTORIES__ASSETS: /data
+      JOYSTREAM_DISTRIBUTOR__DIRECTORIES__CACHE_STATE: /cache
+      JOYSTREAM_DISTRIBUTOR__DIRECTORIES__LOGS: /logs
     #   JOYSTREAM_DISTRIBUTOR__ENDPOINTS__ELASTIC_SEARCH: es-endpoint
-    #   JOYSTREAM_DISTRIBUTOR__DIRECTORIES__ASSETS: assets-dir
-    #   JOYSTREAM_DISTRIBUTOR__DIRECTORIES__CACHE_STATE: cache-state-dir
-    #   JOYSTREAM_DISTRIBUTOR__DIRECTORIES__LOGS: logs-dir
     #   JOYSTREAM_DISTRIBUTOR__LOG__CONSOLE: "off"
     #   JOYSTREAM_DISTRIBUTOR__LOG__FILE: "off"
     #   JOYSTREAM_DISTRIBUTOR__LOG__ELASTIC: "off"
@@ -133,10 +133,10 @@ services:
       JOYSTREAM_DISTRIBUTOR__WORKER_ID: ${DISTRIBUTOR_2_WORKER_ID}
       JOYSTREAM_DISTRIBUTOR__PORT: 3334
       JOYSTREAM_DISTRIBUTOR__ENDPOINTS__JOYSTREAM_NODE_WS: ${JOYSTREAM_NODE_WS}
+      JOYSTREAM_DISTRIBUTOR__DIRECTORIES__ASSETS: /data
+      JOYSTREAM_DISTRIBUTOR__DIRECTORIES__CACHE_STATE: /cache
+      JOYSTREAM_DISTRIBUTOR__DIRECTORIES__LOGS: /logs
     #   JOYSTREAM_DISTRIBUTOR__ENDPOINTS__ELASTIC_SEARCH: es-endpoint
-    #   JOYSTREAM_DISTRIBUTOR__DIRECTORIES__ASSETS: assets-dir
-    #   JOYSTREAM_DISTRIBUTOR__DIRECTORIES__CACHE_STATE: cache-state-dir
-    #   JOYSTREAM_DISTRIBUTOR__DIRECTORIES__LOGS: logs-dir
     #   JOYSTREAM_DISTRIBUTOR__LOG__CONSOLE: "off"
     #   JOYSTREAM_DISTRIBUTOR__LOG__FILE: "off"
     #   JOYSTREAM_DISTRIBUTOR__LOG__ELASTIC: "off"