Merge branch 'launch' of https://github.com/frikky/shuffle into launch

2020-10-14 17:18:52 +02:00
parent 14582d16b3 8fa39b5a42
commit daaf8b1429
15 changed files with 179 additions and 24 deletions
@@ -61,6 +61,9 @@ services:
      - HTTPS_PROXY=${SHUFFLE_HTTPS_PROXY}
      - SHUFFLE_PASS_WORKER_PROXY=${SHUFFLE_PASS_WORKER_PROXY}
      - SHUFFLE_ORBORUS_EXECUTION_TIMEOUT=600
+      - SHUFFLE_BASE_IMAGE_NAME=${SHUFFLE_BASE_IMAGE_NAME}
+      - SHUFFLE_BASE_IMAGE_REGISTRY=${SHUFFLE_BASE_IMAGE_REGISTRY}
+      - SHUFFLE_BASE_IMAGE_TAG_SUFFIX=${SHUFFLE_BASE_IMAGE_TAG_SUFFIX}
    restart: unless-stopped
  database:
    #build: ./backend/database