Merge branch 'master' into launch
This commit is contained in:
@@ -8,7 +8,7 @@ SHUFFLE_DOWNLOAD_WORKFLOW_USERNAME=
|
||||
SHUFFLE_DOWNLOAD_WORKFLOW_PASSWORD=
|
||||
SHUFFLE_DOWNLOAD_WORKFLOW_BRANCH=
|
||||
|
||||
SHUFFLE_APP_DOWNLOAD_LOCATION=https://github.com/frikky/shuffle-apps
|
||||
SHUFFLE_APP_DOWNLOAD_LOCATION=https://github.com/frikky/shuffle-apps
|
||||
SHUFFLE_DOWNLOAD_AUTH_USERNAME=
|
||||
SHUFFLE_DOWNLOAD_AUTH_PASSWORD=
|
||||
SHUFFLE_DOWNLOAD_AUTH_BRANCH=
|
||||
@@ -40,7 +40,6 @@ OUTER_HOSTNAME=shuffle-backend
|
||||
DB_LOCATION=./shuffle-database
|
||||
DOCKER_API_VERSION=1.40
|
||||
|
||||
|
||||
# Proxy configurations. SHUFFLE_PASS_WORKER_PROXY must be FALSE to not pass the proxy information to sub-apps.
|
||||
# PS: It will skip proxy for
|
||||
HTTP_PROXY=
|
||||
|
||||
Reference in New Issue
Block a user