Merge branch 'master' into launch

2020-10-14 12:36:56 +02:00
parent b4976e32b3 d38ee59aa5
commit 8fa39b5a42
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