From f84539f6b7c6fc5842ee957cb089aaa348a22496 Mon Sep 17 00:00:00 2001
From: pedro <git2021@cas.cat>
Date: Tue, 10 Oct 2023 11:08:32 +0200
Subject: [PATCH] add idhub repo (TODO docker part)

---
 .gitignore    |  1 +
 Makefile      | 25 ++++++++++++++++---------
 pull-repos.sh |  4 +++-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index b30d8d3..c961dff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 
 django-orchestra
 django-musician
+IdHub
diff --git a/Makefile b/Makefile
index 70027a0..29fcf0a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,26 +3,33 @@ project := dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral
 # docker images
 # docker images
 
-orchestra_branch := `git -C django-orchestra branch --show-current`
-orchestra_commit := `git -C django-orchestra log -1 --format=%h`
-orchestra_tag := ${orchestra_branch}__${orchestra_commit}
-orchestra_image := ${project}/orchestra:${orchestra_tag}
-
-musician_branch := `git -C django-musician branch --show-current`
-musician_commit := `git -C django-musician log -1 --format=%h`
-musician_tag := ${orchestra_branch}__${musician_commit}
-musician_image := ${project}/musician:${musician_tag}
+####
+# orchestra image tag
+####
 
 orchestra_branch := `git -C django-orchestra branch --show-current`
 orchestra_commit := `git -C django-orchestra log -1 --format=%h`
 orchestra_tag := ${orchestra_branch}__${orchestra_commit}
 orchestra_image := ${project}/orchestra:${orchestra_tag}
 
+####
+# musician image tag
+####
+
 musician_branch := `git -C django-musician branch --show-current`
 musician_commit := `git -C django-musician log -1 --format=%h`
 musician_tag := ${orchestra_branch}__${musician_commit}
 musician_image := ${project}/musician:${musician_tag}
 
+####
+# idhub image tag
+####
+
+idhub_branch := `git -C django-idhub branch --show-current`
+idhub_commit := `git -C django-idhub log -1 --format=%h`
+idhub_tag := ${orchestra_branch}__${idhub_commit}
+idhub_image := ${project}/idhub:${idhub_tag}
+
 docker_build:
 	docker build -f docker/orchestra.Dockerfile -t ${orchestra_image} .
 	docker build -f docker/musician.Dockerfile -t ${musician_image} .
diff --git a/pull-repos.sh b/pull-repos.sh
index ba03b72..cbf7b95 100755
--- a/pull-repos.sh
+++ b/pull-repos.sh
@@ -8,7 +8,8 @@ set -x
 # clone or pull git repo
 _pull() {
         myurl="${1}"
-        mydir="$(basename "${myurl}")"
+        mydir_raw="$(basename "${myurl}")"
+        mydir="${mydir_raw%.git}"
         mybranch="${2}"
 
         if [ -d "${mydir}" ]; then
@@ -25,6 +26,7 @@ _pull() {
 main() {
         _pull 'https://gitea.pangea.org/pangea/django-orchestra' 'sso'
         _pull 'https://gitea.pangea.org/pangea/django-musician' 'sso'
+        _pull 'git@gitea.pangea.org:trustchain-oc1-orchestral/IdHub.git' 'main'
 }
 
 main "${@}"