Merge pull request #57 from HBPMedical/fix/datacatalogue_version

Fix/datacatalogue version

.versions_env

@@ -2,4 +2,5 @@ EXAREME=22.2.2
 PORTALBACKEND=6.1.3
 FRONTEND=6.3.1
 GALAXY=1.3.1
+DATACATALOGUE=2.1
 MIP=6.1.0

Federation/docker-compose.yml

@@ -62,7 +62,7 @@ services:
       GALAXY_API_KEY: d14a4cc5eebf805eb2ff261374ed08a2
       GALAXY_USERNAME: admin
       GALAXY_PASSWORD: password
-      CLIENT_ID: vanilla
+      CLIENT_ID: default
       CLIENT_SECRET: SaNJbC2YFHPhPM-tGiJ1b7tmAA
       AUTH_URI: 'https://iam.humanbrainproject.eu/auth/realms/MIPTEST/protocol/openid-connect/auth'
       USER_INFO_URI: 'https://iam.humanbrainproject.eu/auth/realms/MIPTEST/protocol/openid-connect/userinfo'
@@ -91,7 +91,7 @@ services:
       PORTAL_BACKEND_SERVER: portalbackend:8080
       PORTAL_BACKEND_CONTEXT: services
       INSTANCE_NAME: 'MIP ${MIP}'
-      VERSION: 'Frontend: ${FRONTEND}, Backend: ${PORTALBACKEND}, Exareme: ${EXAREME}, Galaxy: ${GALAXY}'
+      VERSION: 'Frontend: ${FRONTEND}, Backend: ${PORTALBACKEND}, Exareme: ${EXAREME}, Galaxy: ${GALAXY}, DataCatalogue: ${DATACATALOGUE}'
       TRACKER_ID: UA-80660232-5
       GALAXY_URL: http://galaxy/nativeGalaxy
       DATACATALOGUE_SERVER: datacataloguefrontend:4200
@@ -100,7 +100,7 @@ services:
     restart: on-failure
 
   datacatalogue_backend:
-    image: hbpmip/datacatalogue_spring_boot_backend:latest
+    image: hbpmip/datacatalogue_spring_boot_backend:${DATACATALOGUE}
     ports:
       - 8086
     depends_on:
@@ -111,16 +111,16 @@ services:
       - spring.datasource.url=jdbc:postgresql://datacatalogue_postgres:5432/datacatalog
       - spring.datasource.username=andy
       - spring.datasource.password=password
-      - keycloak.client.clientId=Mipqa
-      - keycloak.client.clientSecret=a67c7ae8-e8f2-444b-a0a4-bd0b783adb47
+      - keycloak.client.clientId=default
+      - keycloak.client.clientSecret=SaNJbC2YFHPhPM-tGiJ1b7tmAA
       - keycloak.client.accessTokenUri=https://iam.humanbrainproject.eu/auth/realms/MIPTEST/protocol/openid-connect/token
       - keycloak.resource.userInfoUri=https://iam.humanbrainproject.eu/auth/realms/MIPTEST/protocol/openid-connect/userinfo
       - keycloak.client.userAuthorizationUri=https://iam.humanbrainproject.eu/auth/realms/MIPTEST/protocol/openid-connect/auth
       - keycloak.client.redirect_uri=http://localhost:4200/pathologies
-
+    restart: on-failure
 
   datacataloguefrontend:
-    image: hbpmip/datacatalogue_angular_frontend:latest
+    image: hbpmip/datacatalogue_angular_frontend:${DATACATALOGUE}
     ports:
       - 4200:4200
     depends_on: