Merge branch 'update-stack' into 'master'

feat: various update stack version, scripts

See merge request !4

cozystack/Dockerfile

 FROM ubuntu:20.10 AS installer
 
-ARG COZY_VERSION=1.4.24
+ARG COZY_VERSION=1.4.36
 ARG NODE_VERSION=12.13.0
 
 WORKDIR /tmp

create-instance.sh

@@ -25,11 +25,11 @@ echo "Creating instance ${INSTANCE_ID}.${COZY_TLD} ..."
 docker-compose exec cozy ./cozy instances add $OIDC_CONTEXT --host 0.0.0.0 --apps drive,collect,settings,home "${INSTANCE_ID}.${COZY_TLD}" | tee "${TMPFILE}"
 
 # Install grand lyon apps
-docker-compose exec cozy ./cozy konnectors install enedisgrandlyon --domain "${INSTANCE_ID}.${COZY_TLD}" git://forge.grandlyon.com/web-et-numerique/llle_project/enedis-konnector.git#build
-docker-compose exec cozy ./cozy konnectors install grdfgrandlyon --domain "${INSTANCE_ID}.${COZY_TLD}" git://forge.grandlyon.com/web-et-numerique/llle_project/grdf-konnector.git#build
-docker-compose exec cozy ./cozy konnectors install eglgrandlyon --domain "${INSTANCE_ID}.${COZY_TLD}" git://forge.grandlyon.com/web-et-numerique/llle_project/egl-konnector.git#build
-docker-compose exec cozy ./cozy apps install ecolyo --domain "${INSTANCE_ID}.${COZY_TLD}" git://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo.git#build
-docker-compose exec cozy ./cozy apps install pilote --domain "${INSTANCE_ID}.${COZY_TLD}" git://forge.grandlyon.com/solidarite/monparcourssocial/mps-usager.git#build
+docker-compose exec cozy ./cozy konnectors install enedisgrandlyon --domain "${INSTANCE_ID}.${COZY_TLD}" git://forge.grandlyon.com/web-et-numerique/llle_project/enedis-konnector.git#build-dev
+docker-compose exec cozy ./cozy konnectors install grdfgrandlyon --domain "${INSTANCE_ID}.${COZY_TLD}" git://forge.grandlyon.com/web-et-numerique/llle_project/grdf-konnector.git#build-dev
+docker-compose exec cozy ./cozy konnectors install eglgrandlyon --domain "${INSTANCE_ID}.${COZY_TLD}" git://forge.grandlyon.com/web-et-numerique/llle_project/egl-konnector.git#build-dev
+docker-compose exec cozy ./cozy apps install ecolyo --domain "${INSTANCE_ID}.${COZY_TLD}" git://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo.git#build-dev
+docker-compose exec cozy ./cozy apps install pilote --domain "${INSTANCE_ID}.${COZY_TLD}" git://forge.grandlyon.com/solidarite/monparcourssocial/mps-usager.git#build-dev
 
 ## To replace by registry://store/something after next cozy-stack release
 docker-compose exec cozy ./cozy apps install --domain "${INSTANCE_ID}.${COZY_TLD}" store registry://store/stable | tee -a "${TMPFILE}"

db-init.sh

@@ -8,4 +8,6 @@ source .env
 
 docker-compose exec db curl -X PUT -d "{\"_id\":\"eglgrandlyon\",\"grant_mode\":\"secret\",\"slug\":\"eglgrandlyon\",\"secret\":{\"eglBaseURL\":\"${EGL_BASE_URL}\",\"eglAPIAuthKey\":\"${EGL_API_AUTH_KEY}\"}}" http://127.0.0.1:5984/secrets%2Fio-cozy-account_types/eglgrandlyon
 docker-compose exec db curl -X PUT -d "{\"_id\":\"enedisgrandlyon\",\"grant_mode\":\"authorization_code\",\"client_id\":\"${ENEDIS_CLIENT_ID}\",\"client_secret\":\"${ENEDIS_CLIENT_SECRET}\",\"auth_endpoint\":\"${ENEDIS_AUTH_ENDPOINT}\",\"token_endpoint\": \"${ENEDIS_TOKEN_ENDPOINT}\",\"token_mode\":\"get\"}" http://127.0.0.1:5984/secrets%2Fio-cozy-account_types/enedisgrandlyon
-docker-compose exec db curl -X PUT -d "{\"_id\":\"grdfgrandlyon\",\"grant_mode\":\"authorization_code\",\"client_id\":\"${GRDF_CLIENT_ID}\",\"client_secret\":\"${GRDF_CLIENT_SECRET}\",\"auth_endpoint\":\"${GRDF_AUTH_ENDPOINT}\",\"token_endpoint\": \"${GRDF_TOKEN_ENDPOINT}\",\"token_mode\":\"get\"}" http://127.0.0.1:5984/secrets%2Fio-cozy-account_types/grdfgrandlyon
\ No newline at end of file
+docker-compose exec db curl -X PUT -d "{\"_id\":\"grdfgrandlyon\",\"grant_mode\":\"authorization_code\",\"client_id\":\"${GRDF_CLIENT_ID}\",\"client_secret\":\"${GRDF_CLIENT_SECRET}\",\"auth_endpoint\":\"${GRDF_AUTH_ENDPOINT}\",\"token_endpoint\": \"${GRDF_TOKEN_ENDPOINT}\",\"token_mode\":\"get\"}" http://127.0.0.1:5984/secrets%2Fio-cozy-account_types/grdfgrandlyon
+docker-compose exec db curl -X PUT -d "{\"_id\":\"cc.cozycloud.dacc.dev\",\"token\":\"${DACC_DEV_TOKEN}\"}" http://127.0.0.1:5984/secrets%2Fio-cozy-remote-secrets/cc.cozycloud.dacc.dev
+docker-compose exec db curl -X PUT -d "{\"_id\":\"org.ecolyo.dju\",\"token\":\"${API_DATAGRANDLYON_TOKEN}\"}" http://127.0.0.1:5984/secrets%2Fio-cozy-remote-secrets/org.ecolyo.dju

docker-compose.yml

@@ -11,13 +11,14 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     logging:
-      driver: "json-file"
+      driver: loki
       options:
-        max-size: "1M"
-        max-file: "10"
+        loki-url: http://localhost:3100/loki/api/v1/push
     restart: unless-stopped
     ports:
-     - 5984:5984
+     - 5984:5984    
+    networks:
+      - cozy-network
 
   cozy:
     image: npernoud/easy-cozy:latest-amd64
@@ -37,12 +38,13 @@ services:
     depends_on:
       - db
     logging:
-      driver: "json-file"
+      driver: loki
       options:
-        max-size: "1M"
-        max-file: "10"
+        loki-url: http://localhost:3100/loki/api/v1/push
     restart: unless-stopped
-
+    networks:
+      - cozy-network
+      
   keycloak:
     image: jboss/keycloak:latest
     volumes:
@@ -55,3 +57,8 @@ services:
       - KEYCLOAK_USER=admin
       - KEYCLOAK_PASSWORD=admin
       - KEYCLOAK_IMPORT=/tmp/kc/realm.json
+    networks:
+      - cozy-network
+      
+networks:
+  cozy-network:

update_apps.sh

@@ -3,4 +3,5 @@
 
 echo "Updating Apps ..."
 
-docker-compose exec cozy ./cozy apps update ecolyo --all-domains git://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo.git#build
+docker-compose exec cozy ./cozy apps update ecolyo --all-domains git://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo.git#build-dev
+# docker-compose exec cozy ./cozy apps install pilote --all-domains git://forge.grandlyon.com/solidarite/monparcourssocial/mps-usager.git#build

update_konnectors.sh

@@ -3,6 +3,6 @@
 
 echo "Updating Konnectors ..."
 
-docker-compose exec cozy ./cozy konnectors update enedisgrandlyon --all-domains git://forge.grandlyon.com/web-et-numerique/llle_project/enedis-konnector.git#build
-docker-compose exec cozy ./cozy konnectors update grdfgrandlyon --all-domains git://forge.grandlyon.com/web-et-numerique/llle_project/grdf-konnector.git#build
-docker-compose exec cozy ./cozy konnectors update eglgrandlyon --all-domains git://forge.grandlyon.com/web-et-numerique/llle_project/egl-konnector.git#build
+docker-compose exec cozy ./cozy konnectors update enedisgrandlyon --all-domains git://forge.grandlyon.com/web-et-numerique/llle_project/enedis-konnector.git#build-dev
+docker-compose exec cozy ./cozy konnectors update grdfgrandlyon --all-domains git://forge.grandlyon.com/web-et-numerique/llle_project/grdf-konnector.git#build-dev
+docker-compose exec cozy ./cozy konnectors update eglgrandlyon --all-domains git://forge.grandlyon.com/web-et-numerique/llle_project/egl-konnector.git#build-dev