From 8788cb36bcb25aa16e3ef2985ac384d33dea4be1 Mon Sep 17 00:00:00 2001 From: PEDROLI Benjamin Date: Wed, 13 Jan 2021 15:22:43 +0100 Subject: [PATCH] add mofidication for cozy_version 1.4.22 / Add pilote by default as ecolyo --- cozystack/Dockerfile | 2 +- cozystack/install.sh | 6 +++--- create-instance.sh | 5 +++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/cozystack/Dockerfile b/cozystack/Dockerfile index 095c6c2..758ef4d 100644 --- a/cozystack/Dockerfile +++ b/cozystack/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:20.10 AS installer -ARG COZY_VERSION=1.4.18 +ARG COZY_VERSION=1.4.24 ARG NODE_VERSION=12.13.0 WORKDIR /tmp diff --git a/cozystack/install.sh b/cozystack/install.sh index 99a4ca4..d195087 100755 --- a/cozystack/install.sh +++ b/cozystack/install.sh @@ -17,10 +17,10 @@ fi echo "Install cozy-stack..." -wget -O /tmp/cozy-stack-linux-${COZY_ARCH}-${COZY_VERSION} https://github.com/cozy/cozy-stack/releases/download/${COZY_VERSION}/cozy-stack-linux-${COZY_ARCH} -wget -O /tmp/cozy.sha256 https://github.com/cozy/cozy-stack/releases/download/${COZY_VERSION}/cozy-stack.sha256 +wget -O /tmp/cozy-stack-linux-${COZY_ARCH}-${COZY_VERSION} https://github.com/cozy/cozy-stack/releases/download/${COZY_VERSION}/cozy-stack-linux-${COZY_ARCH}-${COZY_VERSION} +wget -O /tmp/cozy.sha256 https://github.com/cozy/cozy-stack/releases/download/${COZY_VERSION}/cozy-stack-linux-${COZY_ARCH}-${COZY_VERSION}.sha256 -grep linux-${COZY_ARCH} /tmp/cozy.sha256 > /tmp/SHA256 +awk '/cozy-stack-linux-'${COZY_ARCH}'-'${COZY_VERSION}'/{print $NF " cozy-stack-linux-'${COZY_ARCH}'-'${COZY_VERSION}'"}' /tmp/cozy.sha256 > /tmp/SHA256 echo "Expected checkum : $(cat /tmp/SHA256)" echo "Checksum of the downloaded file : $(sha256sum --tag /tmp/cozy-stack-linux-${COZY_ARCH}-${COZY_VERSION})" diff --git a/create-instance.sh b/create-instance.sh index 0e9e453..a8bec18 100755 --- a/create-instance.sh +++ b/create-instance.sh @@ -10,6 +10,10 @@ INSTANCE_ID=$1 if [ "$2" = "oidc" ]; then OIDC_CONTEXT="--context-name open-id-connect" +else + #Use for service Pilote app / No impact for other instance + OIDC_CONTEXT="--context-name pilotedemo" + echo "Context pilotedemo added" fi source .env @@ -25,6 +29,7 @@ docker-compose exec cozy ./cozy konnectors install enedisgrandlyon --domain "${I 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 ## 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}" -- GitLab