Skip to content
Snippets Groups Projects
Commit 72ce577a authored by Hugo SUBTIL's avatar Hugo SUBTIL
Browse files

fix(docker): revert to cozy.tools because upgrade had side effects on scripts

parent 51f8ec9c
Branches
No related tags found
No related merge requests found
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
set -e set -e
set -m 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_PORT}" ] && COZY_STACK_PORT="8080"
[ -z "${COZY_STACK_PASS}" ] && COZY_STACK_PASS="cozy" [ -z "${COZY_STACK_PASS}" ] && COZY_STACK_PASS="cozy"
[ -z "${COZY_STACK_ADMIN_PORT}" ] && COZY_STACK_ADMIN_PORT="6060" [ -z "${COZY_STACK_ADMIN_PORT}" ] && COZY_STACK_ADMIN_PORT="6060"
...@@ -117,9 +117,9 @@ do_start() { ...@@ -117,9 +117,9 @@ do_start() {
wait_for "localhost:${COZY_STACK_PORT}/version/" "cozy-stack" wait_for "localhost:${COZY_STACK_PORT}/version/" "cozy-stack"
if [ "${COZY_STACK_PORT}" = "80" ]; then if [ "${COZY_STACK_PORT}" = "80" ]; then
cozy_dev_addr="${COZY_STACK_HOST}" cozy_dev_addr="cozy.tools"
else else
cozy_dev_addr="${COZY_STACK_HOST}:${COZY_STACK_PORT}" cozy_dev_addr="cozy.tools:${COZY_STACK_PORT}"
fi fi
echo "" echo ""
...@@ -216,9 +216,9 @@ do_install_app() { ...@@ -216,9 +216,9 @@ do_install_app() {
echo "Removing konnector eglgrandlyon..." echo "Removing konnector eglgrandlyon..."
cozy-stack konnectors uninstall eglgrandlyon cozy-stack konnectors uninstall eglgrandlyon
fi 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.tools: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.tools: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 eglgrandlyon git://forge.grandlyon.com/web-et-numerique/llle_project/egl-konnector.git#build
} }
wait_for() { wait_for() {
......
...@@ -26,7 +26,7 @@ else ...@@ -26,7 +26,7 @@ else
fi fi
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}" \ -d "${appdir}" \
-f /data/cozy-storage -f /data/cozy-storage
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment