Fixed merge issues

This commit is contained in:
frikky
2022-01-26 16:26:40 +00:00
committed by GitHub
parent 2f324e6862
commit b4209903d0
5 changed files with 40 additions and 5 deletions
+2 -2
View File
@@ -47,10 +47,10 @@ services:
volumes:
- /var/run/docker.sock:/var/run/docker.sock
environment:
- SHUFFLE_WORKER_VERSION=nightly
- SHUFFLE_WORKER_VERSION=0.9.52
- ORG_ID=${ORG_ID}
- ENVIRONMENT_NAME=${ENVIRONMENT_NAME}
- BASE_URL=http://${OUTER_HOSTNAME}:${BACKEND_PORT}
- BASE_URL=https://frikky-shuffle-5gvr4xx62w64-5001.githubpreview.dev
- DOCKER_API_VERSION=1.40
- SHUFFLE_BASE_IMAGE_NAME=${SHUFFLE_BASE_IMAGE_NAME}
- SHUFFLE_BASE_IMAGE_REGISTRY=${SHUFFLE_BASE_IMAGE_REGISTRY}