diff --git a/docker/cozy-app-dev-with-app.sh b/docker/cozy-app-dev-with-app.sh index 044d32111088f8d9ab255eb0e9ec6c24f37399ee..2f59d0eae0ccd4f6254d83859958e6f7a5bb59e6 100644 --- a/docker/cozy-app-dev-with-app.sh +++ b/docker/cozy-app-dev-with-app.sh @@ -4,7 +4,7 @@ set -e set -m -[ -z "${COZY_STACK_HOST}" ] && COZY_STACK_HOST="cozy.localhost" +[ -z "${COZY_STACK_HOST}" ] && COZY_STACK_HOST="cozy.tools" [ -z "${COZY_STACK_PORT}" ] && COZY_STACK_PORT="8080" [ -z "${COZY_STACK_PASS}" ] && COZY_STACK_PASS="cozy" [ -z "${COZY_STACK_ADMIN_PORT}" ] && COZY_STACK_ADMIN_PORT="6060" @@ -117,9 +117,9 @@ do_start() { wait_for "localhost:${COZY_STACK_PORT}/version/" "cozy-stack" if [ "${COZY_STACK_PORT}" = "80" ]; then - cozy_dev_addr="${COZY_STACK_HOST}" + cozy_dev_addr="cozy.tools" else - cozy_dev_addr="${COZY_STACK_HOST}:${COZY_STACK_PORT}" + cozy_dev_addr="cozy.tools:${COZY_STACK_PORT}" fi echo "" @@ -216,9 +216,9 @@ do_install_app() { echo "Removing konnector eglgrandlyon..." cozy-stack konnectors uninstall eglgrandlyon fi - cozy-stack konnectors install --domain cozy.localhost:8080 enedisgrandlyon git://forge.grandlyon.com/web-et-numerique/llle_project/enedis-konnector.git#build - cozy-stack konnectors install --domain cozy.localhost:8080 grdfgrandlyon git://forge.grandlyon.com/web-et-numerique/llle_project/grdf-konnector.git#build - cozy-stack konnectors install --domain cozy.localhost:8080 eglgrandlyon git://forge.grandlyon.com/web-et-numerique/llle_project/egl-konnector.git#build + cozy-stack konnectors install --domain cozy.tools:8080 enedisgrandlyon git://forge.grandlyon.com/web-et-numerique/llle_project/enedis-konnector.git#build + cozy-stack konnectors install --domain cozy.tools:8080 grdfgrandlyon git://forge.grandlyon.com/web-et-numerique/llle_project/grdf-konnector.git#build + cozy-stack konnectors install --domain cozy.tools:8080 eglgrandlyon git://forge.grandlyon.com/web-et-numerique/llle_project/egl-konnector.git#build } wait_for() { diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 7f3f4ad19b9dd4c7b5eec16146c93a18c83c9af8..c1c3f8220b903d37e8453f856fa9ac9bf4f9125e 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -26,7 +26,7 @@ else fi fi -COZY_KONNECTORS_CMD="/usr/bin/konnector-node-run.sh" /usr/bin/cozy-app-dev.sh \ +/usr/bin/cozy-app-dev.sh \ -d "${appdir}" \ -f /data/cozy-storage