Sonia Zorba · Sonia Zorba · Sonia Zorba · Sonia Zorba · 3c0681e1 · 3c0681e1
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,10 +3,18 @@ stages:
  - test
  - deploy

-build_gms_client:
-  stage: build
+.gms_client:
  tags:
    - docker
+  rules:
+    - if: '$CI_COMMIT_BRANCH != "master"'
+      when: never
+    - changes:
+        - gms-client/gms-client/*
+
+build_gms_client:
+  extends: .gms_client
+  stage: build
  script:
    - cd gms-client/gms-client
    - mvn clean package -DskipTests -DfinalName=gms-client
@@ -15,28 +23,66 @@ build_gms_client:
      - gms-client/gms-client/target/gms-client.jar
      - gms-client/gms-client/pom.xml
    expire_in: 7 days
-  only:
-    - master

 test_gms_client:
+  extends: .gms_client
+  stage: test
+  script:
+    - cd gms-client/gms-client
+    - mvn clean test
+
+test_gms:
  stage: test
  tags:
    - docker
+  image: git.ia2.inaf.it:5050/ia2/ia2-devops/maven-otj-pg-embedded
  script:
-    - cd gms-client/gms-client
+    - cd gms
    - mvn clean test
-  only:
-    - master
+    - awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print "coverage=" 100*covered/instructions }' target/site/jacoco/jacoco.csv
+  coverage: '/coverage=\d+\.\d+/'
+  rules:
+    - if: '$CI_COMMIT_BRANCH != "master"'
+      when: never
+    - changes:
+        - gms/*

 deploy_gms_client:
+  extends: .gms_client
  stage: deploy
-  tags:
-    - docker
  script:
    - mvn deploy:deploy-file
        -Dfile=gms-client/gms-client/target/gms-client.jar
        -DrepositoryId=ia2.snapshots
        -DpomFile=gms-client/gms-client/pom.xml
        -Durl=${IA2_MVN_REPO_SNAPSHOTS}
-  only:
-    - master
+
+dockerize_db:
+  stage: deploy
+  tags:
+    - shell
+  script:
+    - docker login -u "${CI_REGISTRY_USER}" -p "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}"
+    - docker build -t "${CI_REGISTRY_IMAGE}/database" -f database/Dockerfile .
+    - docker push "${CI_REGISTRY_IMAGE}/database"
+  rules:
+    - if: '$CI_COMMIT_BRANCH != "master"'
+      when: never
+    - changes:
+        - database/*
+        - gms/src/main/resources/sql/*
+
+dockerize_gms:
+  stage: deploy
+  tags:
+    - shell
+  script:
+    - docker login -u "${CI_REGISTRY_USER}" -p "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}"
+    - docker build -t "${CI_REGISTRY_IMAGE}" -f gms/Dockerfile .
+    - docker push "${CI_REGISTRY_IMAGE}"
+  rules:
+    - if: '$CI_COMMIT_BRANCH != "master"'
+      when: never
+    - changes:
+        - gms/*
+        - gms-ui/*
--- a/LICENSE
+++ b/LICENSE
--- a/README.md
+++ b/README.md
 # IA2 GMS

-## Database Docker image
+## Docker images

-To build the image run **from current directory**:
+Docker images are available on [container registry page](https://www.ict.inaf.it/gitlab/ia2/ia2-gms/container_registry).

-    docker build -f database/Dockerfile --tag gms-db .
-
-To start the image and use the database:
-
-    docker run -d -p 5432:5432 -i -t gms-db:latest
-
-## GMS Docker image
-
-To build the image:
-
-    mvn clean package dockerfile:build -DskipTests
-
-To run:
-
-    docker run --env-file docker-env -d -p 8081:8081 -i -t gms:latest
+A working demo using Docker Compose is available on [RAP repository](https://www.ict.inaf.it/gitlab/ia2/rap-ia2).

 ## Create the first super-admin


--- a/docker-env
+++ b/docker-env
-SPRING_DATASOURCE_URL=jdbc:postgresql://140.105.79.115:5432/postgres
-SECURITY_OAUTH2_CLIENT_ACCESS-TOKEN-URI=http://140.105.79.115/rap-ia2/auth/oauth2/token
-SECURITY_OAUTH2_CLIENT_USER-AUTHORIZATION-URI=http://localhost/rap-ia2/auth/oauth2/authorize
-SECURITY_OAUTH2_RESOURCE_TOKEN-INFO-URI=http://140.105.79.115/rap-ia2/auth/oauth2/check_token
-SECURITY_OAUTH2_RESOURCE_JWK_KEY-SET-URI=http://140.105.79.115/rap-ia2/auth/oidc/jwks
-RAP_WS-URL=http://140.105.79.115/rap-ia2/ws
-SPRING_PROFILES_ACTIVE=prod
--- a/gms-client/gms-cli/src/main/java/it/inaf/ia2/gms/cli/CLI.java
+++ b/gms-client/gms-cli/src/main/java/it/inaf/ia2/gms/cli/CLI.java
+/*
+ * Copyright (C) 2021 Istituto Nazionale di Astrofisica
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package it.inaf.ia2.gms.cli;

 import it.inaf.ia2.client.ClientException;

--- a/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/GmsClient.java
+++ b/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/GmsClient.java
+/*
+ * This file is part of gms-client
+ * Copyright (C) 2021 Istituto Nazionale di Astrofisica
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package it.inaf.ia2.gms.client;

 import com.fasterxml.jackson.databind.ObjectMapper;

--- a/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/AddInvitedRegistrationCall.java
+++ b/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/AddInvitedRegistrationCall.java
+/*
+ * This file is part of gms-client
+ * Copyright (C) 2021 Istituto Nazionale di Astrofisica
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package it.inaf.ia2.gms.client.call;

 import it.inaf.ia2.client.BaseCall;

--- a/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/AddMemberCall.java
+++ b/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/AddMemberCall.java
+/*
+ * This file is part of gms-client
+ * Copyright (C) 2021 Istituto Nazionale di Astrofisica
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package it.inaf.ia2.gms.client.call;

 import it.inaf.ia2.client.BaseCall;

--- a/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/AddPermissionCall.java
+++ b/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/AddPermissionCall.java
+/*
+ * This file is part of gms-client
+ * Copyright (C) 2021 Istituto Nazionale di Astrofisica
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package it.inaf.ia2.gms.client.call;

 import it.inaf.ia2.client.BaseCall;

--- a/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/CreateGroupCall.java
+++ b/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/CreateGroupCall.java
+/*
+ * This file is part of gms-client
+ * Copyright (C) 2021 Istituto Nazionale di Astrofisica
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package it.inaf.ia2.gms.client.call;

 import it.inaf.ia2.client.BaseCall;

--- a/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/DeleteGroupCall.java
+++ b/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/DeleteGroupCall.java
+/*
+ * This file is part of gms-client
+ * Copyright (C) 2021 Istituto Nazionale di Astrofisica
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package it.inaf.ia2.gms.client.call;

 import it.inaf.ia2.client.BaseCall;

--- a/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/GetGroupPermissionsCall.java
+++ b/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/GetGroupPermissionsCall.java
+/*
+ * This file is part of gms-client
+ * Copyright (C) 2021 Istituto Nazionale di Astrofisica
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package it.inaf.ia2.gms.client.call;

 import it.inaf.ia2.client.BaseCall;

--- a/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/GetGroupStatusCall.java
+++ b/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/GetGroupStatusCall.java
+/*
+ * This file is part of gms-client
+ * Copyright (C) 2021 Istituto Nazionale di Astrofisica
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package it.inaf.ia2.gms.client.call;

 import it.inaf.ia2.client.BaseCall;

--- a/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/GetMemberEmailAddresses.java
+++ b/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/GetMemberEmailAddresses.java
+/*
+ * This file is part of gms-client
+ * Copyright (C) 2021 Istituto Nazionale di Astrofisica
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package it.inaf.ia2.gms.client.call;

 import it.inaf.ia2.client.BaseCall;

--- a/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/GetUserGroupsCall.java
+++ b/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/GetUserGroupsCall.java
+/*
+ * This file is part of gms-client
+ * Copyright (C) 2021 Istituto Nazionale di Astrofisica
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package it.inaf.ia2.gms.client.call;

 import it.inaf.ia2.client.BaseCall;

--- a/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/GetUserPermissionsCall.java
+++ b/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/GetUserPermissionsCall.java
+/*
+ * This file is part of gms-client
+ * Copyright (C) 2021 Istituto Nazionale di Astrofisica
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package it.inaf.ia2.gms.client.call;

 import it.inaf.ia2.client.BaseCall;

--- a/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/ListGroupsCall.java
+++ b/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/ListGroupsCall.java
+/*
+ * This file is part of gms-client
+ * Copyright (C) 2021 Istituto Nazionale di Astrofisica
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package it.inaf.ia2.gms.client.call;

 import it.inaf.ia2.client.BaseCall;

--- a/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/RemoveMemberCall.java
+++ b/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/RemoveMemberCall.java
+/*
+ * This file is part of gms-client
+ * Copyright (C) 2021 Istituto Nazionale di Astrofisica
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package it.inaf.ia2.gms.client.call;

 import it.inaf.ia2.client.BaseCall;

--- a/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/RemovePermissionCall.java
+++ b/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/RemovePermissionCall.java
+/*
+ * This file is part of gms-client
+ * Copyright (C) 2021 Istituto Nazionale di Astrofisica
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package it.inaf.ia2.gms.client.call;

 import it.inaf.ia2.client.BaseCall;

--- a/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/SetPermissionCall.java
+++ b/gms-client/gms-client/src/main/java/it/inaf/ia2/gms/client/call/SetPermissionCall.java
+/*
+ * This file is part of gms-client
+ * Copyright (C) 2021 Istituto Nazionale di Astrofisica
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 package it.inaf.ia2.gms.client.call;

 import it.inaf.ia2.client.BaseCall;