From 72ce577ad3bbe988c8e4b8540ea33984004129e1 Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Thu, 29 Jul 2021 16:05:38 +0200
Subject: [PATCH] fix(docker): revert to cozy.tools because upgrade had side
effects on scripts
---
docker/cozy-app-dev-with-app.sh | 12 ++++++------
docker/docker-entrypoint.sh | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docker/cozy-app-dev-with-app.sh b/docker/cozy-app-dev-with-app.sh
index 044d32111..2f59d0eae 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 7f3f4ad19..c1c3f8220 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
--
GitLab