Merge remote-tracking branch 'origin/dc4eu-rome'

.github/workflows/docker-build-push.yml

@@ -29,7 +29,7 @@ jobs:
          password: ${{secrets.GITHUB_TOKEN}}
 
     - name: Set up .npmrc to access GitHub NPM registry
-      uses: wwwallet/wallet-ecosystem/.github/actions/setup-npmrc@master
+      uses: gunet/wallet-ecosystem/.github/actions/setup-npmrc@dc4eu-rome
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/docker-image-wallet-enterprise-acme-verifier.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches-ignore:
       - master
+      - dc4eu-rome
   pull_request:
 
 jobs:
@@ -14,6 +15,6 @@ jobs:
     uses: ./.github/workflows/docker-build-push.yml
     secrets: inherit
     with:
-      image-tag: ghcr.io/wwwallet/wallet-enterprise-acme-verifier:latest
+      image-tag: ghcr.io/gunet/wallet-enterprise-acme-verifier:latest
       docker-push: false
       dockerfile-path: ./wallet-enterprise-configurations/acme-verifier/Dockerfile

.github/workflows/docker-image-wallet-enterprise-ehic-issuer.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches-ignore:
       - master
+      - dc4eu-rome
   pull_request:
 
 jobs:
@@ -14,6 +15,6 @@ jobs:
     uses: ./.github/workflows/docker-build-push.yml
     secrets: inherit
     with:
-      image-tag: ghcr.io/wwwallet/wallet-enterprise-ehic-issuer:latest
+      image-tag: ghcr.io/gunet/wallet-enterprise-ehic-issuer:latest
       docker-push: false
       dockerfile-path: ./wallet-enterprise-configurations/ehic-issuer/Dockerfile

.github/workflows/docker-image-wallet-enterprise-diploma-issuer.yml → .github/workflows/docker-image-wallet-enterprise-pda1-issuer.yml

@@ -3,17 +3,18 @@ on:
   push:
     branches-ignore:
       - master
+      - dc4eu-rome
   pull_request:
 
 jobs:
-  build-diploma:
+  build-pda1:
     permissions:
       contents: read
       packages: read
 
     uses: ./.github/workflows/docker-build-push.yml
     secrets: inherit
     with:
-      image-tag: ghcr.io/wwwallet/wallet-enterprise-diploma-issuer:latest
+      image-tag: ghcr.io/gunet/wallet-enterprise-pda1-issuer:latest
       docker-push: false
-      dockerfile-path: ./wallet-enterprise-configurations/diploma-issuer/Dockerfile
+      dockerfile-path: ./wallet-enterprise-configurations/pda1-issuer/Dockerfile

.github/workflows/docker-image-wallet-enterprise-vid-issuer.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches-ignore:
       - master
+      - dc4eu-rome
   pull_request:
 
 jobs:
@@ -14,6 +15,6 @@ jobs:
     uses: ./.github/workflows/docker-build-push.yml
     secrets: inherit
     with:
-      image-tag: ghcr.io/wwwallet/wallet-enterprise-vid-issuer:latest
+      image-tag: ghcr.io/gunet/wallet-enterprise-vid-issuer:latest
       docker-push: false
       dockerfile-path: ./wallet-enterprise-configurations/vid-issuer/Dockerfile

.github/workflows/docker-push-wallet-enterprise-acme-verifier-latest.yml

@@ -0,0 +1,18 @@
+name: Push Docker image
+on:
+  push:
+    branches:
+      - dc4eu-rome
+
+jobs:
+  push-acme:
+    permissions:
+      contents: read
+      packages: write
+
+    uses: ./.github/workflows/docker-build-push.yml
+    secrets: inherit
+    with:
+      image-tag: ghcr.io/gunet/wallet-enterprise-acme-verifier:latest
+      docker-push: true
+      dockerfile-path: ./wallet-enterprise-configurations/acme-verifier/Dockerfile

.github/workflows/docker-push-wallet-enterprise-acme-verifier.yml

@@ -15,6 +15,6 @@ jobs:
     uses: ./.github/workflows/docker-build-push.yml
     secrets: inherit
     with:
-      image-tag: ghcr.io/wwwallet/wallet-enterprise-acme-verifier:${{ github.ref_name }}
+      image-tag: ghcr.io/gunet/wallet-enterprise-acme-verifier:${{ github.ref_name }}
       docker-push: true
       dockerfile-path: ./wallet-enterprise-configurations/acme-verifier/Dockerfile

.github/workflows/docker-push-wallet-enterprise-ehic-issuer-latest.yml

@@ -0,0 +1,18 @@
+name: Push Docker image
+on:
+  push:
+    branches:
+      - dc4eu-rome
+
+jobs:
+  push-ehic:
+    permissions:
+      contents: read
+      packages: write
+
+    uses: ./.github/workflows/docker-build-push.yml
+    secrets: inherit
+    with:
+      image-tag: ghcr.io/gunet/wallet-enterprise-ehic-issuer:latest
+      docker-push: true
+      dockerfile-path: ./wallet-enterprise-configurations/ehic-issuer/Dockerfile

.github/workflows/docker-push-wallet-enterprise-ehic-issuer.yml

@@ -15,6 +15,6 @@ jobs:
     uses: ./.github/workflows/docker-build-push.yml
     secrets: inherit
     with:
-      image-tag: ghcr.io/wwwallet/wallet-enterprise-ehic-issuer:${{ github.ref_name }}
+      image-tag: ghcr.io/gunet/wallet-enterprise-ehic-issuer:${{ github.ref_name }}
       docker-push: true
       dockerfile-path: ./wallet-enterprise-configurations/ehic-issuer/Dockerfile

.github/workflows/docker-push-wallet-enterprise-pda1-issuer-latest.yml

@@ -0,0 +1,18 @@
+name: Push Docker image
+on:
+  push:
+    branches:
+      - dc4eu-rome
+
+jobs:
+  push-pda1:
+    permissions:
+      contents: read
+      packages: write
+
+    uses: ./.github/workflows/docker-build-push.yml
+    secrets: inherit
+    with:
+      image-tag: ghcr.io/gunet/wallet-enterprise-pda1-issuer:latest
+      docker-push: true
+      dockerfile-path: ./wallet-enterprise-configurations/pda1-issuer/Dockerfile

.github/workflows/docker-push-wallet-enterprise-diploma-issuer.yml → .github/workflows/docker-push-wallet-enterprise-pda1-issuer.yml

@@ -7,14 +7,14 @@ on:
       - v2.*
 
 jobs:
-  push-diploma:
+  push-pda1:
     permissions:
       contents: read
       packages: write
 
     uses: ./.github/workflows/docker-build-push.yml
     secrets: inherit
     with:
-      image-tag: ghcr.io/wwwallet/wallet-enterprise-diploma-issuer:${{ github.ref_name }}
+      image-tag: ghcr.io/gunet/wallet-enterprise-pda1-issuer:${{ github.ref_name }}
       docker-push: true
-      dockerfile-path: ./wallet-enterprise-configurations/diploma-issuer/Dockerfile
+      dockerfile-path: ./wallet-enterprise-configurations/pda1-issuer/Dockerfile

.github/workflows/docker-push-wallet-enterprise-vid-issuer-latest.yml

@@ -0,0 +1,18 @@
+name: Push Docker image
+on:
+  push:
+    branches:
+      - dc4eu-rome
+
+jobs:
+  push-vid:
+    permissions:
+      contents: read
+      packages: write
+
+    uses: ./.github/workflows/docker-build-push.yml
+    secrets: inherit
+    with:
+      image-tag: ghcr.io/gunet/wallet-enterprise-vid-issuer:latest
+      docker-push: true
+      dockerfile-path: ./wallet-enterprise-configurations/vid-issuer/Dockerfile

.github/workflows/docker-push-wallet-enterprise-vid-issuer.yml

@@ -15,6 +15,6 @@ jobs:
     uses: ./.github/workflows/docker-build-push.yml
     secrets: inherit
     with:
-      image-tag: ghcr.io/wwwallet/wallet-enterprise-vid-issuer:${{ github.ref_name }}
+      image-tag: ghcr.io/gunet/wallet-enterprise-vid-issuer:${{ github.ref_name }}
       docker-push: true
       dockerfile-path: ./wallet-enterprise-configurations/vid-issuer/Dockerfile

.gitignore

@@ -7,3 +7,4 @@ docker-compose.yml
 *.production*
 *.tar
 .npmrc
+dataset.json

.gitmodules

@@ -1,9 +1,15 @@
+[submodule "wallet-enterprise"]
+	path = wallet-enterprise
+	url = [email protected]:gunet/wallet-enterprise.git
 [submodule "wallet-backend-server"]
 	path = wallet-backend-server
-	url = [email protected]:wwwallet/wallet-backend-server.git
+	url = [email protected]:gunet/wallet-backend-server.git
 [submodule "wallet-frontend"]
 	path = wallet-frontend
-	url = [email protected]:wwwallet/wallet-frontend.git
-[submodule "wallet-enterprise"]
-	path = wallet-enterprise
-	url = [email protected]:wwwallet/wallet-enterprise.git
+	url = [email protected]:gunet/wallet-frontend.git
+[submodule "resources-vault"]
+	path = resources-vault
+	url = [email protected]:gunet/resources-vault.git
+[submodule "credential-status-list"]
+	path = credential-status-list
+	url = [email protected]:gunet/credential-status-list.git

db-setup/scripts/init.sql

@@ -3,3 +3,6 @@ CREATE DATABASE issuer;
 CREATE DATABASE vidissuer;
 CREATE DATABASE ehicissuer;
 CREATE DATABASE verifier;
+CREATE DATABASE pda1issuer;
+CREATE DATABASE resources_vault;
+CREATE DATABASE credential_status_list;

docker-compose.template.yml

@@ -20,6 +20,7 @@ services:
         condition: service_healthy
     volumes:
       - ./wallet-enterprise:/app:rw
+      - ./wallet-enterprise-configurations/vid-issuer/datasets/:/datasets/:rw
       - ./wallet-enterprise-configurations/vid-issuer/config/config.development.ts:/app/config/config.development.ts:rw
       - ./wallet-enterprise-configurations/vid-issuer/keys:/app/keys:rw
       - ./wallet-enterprise-configurations/vid-issuer/src/configuration:/app/src/configuration:rw
@@ -54,10 +55,13 @@ services:
         condition: service_healthy
     volumes:
       - ./wallet-enterprise:/app:rw
+      - ./wallet-enterprise-configurations/ehic-issuer/datasets/:/datasets/:rw
       - ./wallet-enterprise-configurations/ehic-issuer/config/config.development.ts:/app/config/config.development.ts:rw
       - ./wallet-enterprise-configurations/ehic-issuer/keys:/app/keys:rw
+      - ./wallet-enterprise-configurations/ehic-issuer/public/styles/styles.css:/app/public/styles/styles.css:rw
       - ./wallet-enterprise-configurations/ehic-issuer/src/configuration:/app/src/configuration:rw
       - ./wallet-enterprise-configurations/ehic-issuer/views/header.pug:/app/views/header.pug:rw
+      - ./wallet-enterprise-configurations/ehic-issuer/views/index.pug:/app/views/index.pug:rw
       - ./.vscode/:/app/.vscode:rw
       - type: tmpfs
         target: /app/dist  # Not /dist here because of relative imports that assume dist/ and keys/, views/ etc. are sibling dirs
@@ -68,40 +72,41 @@ services:
           limits:
             memory: 1G
 
-  wallet-enterprise-diploma-issuer:
-    container_name: wallet-enterprise-diploma-issuer
-    hostname: wallet-enterprise-diploma-issuer
+  wallet-enterprise-pda1-issuer:
+    container_name: wallet-enterprise-pda1-issuer
+    hostname: wallet-enterprise-pda1-issuer
     build:
       context: $PWD/wallet-enterprise
       dockerfile: development.Dockerfile
       secrets:
         - npmrc
-    image: wallet-enterprise:dev-diploma
-    restart: on-failure
+    image: wallet-enterprise:dev-pda1
+    restart: always
     ports:
-      - 8000:8000
+      - 8006:8006
     depends_on:
       wallet-db:
         condition: service_healthy
     volumes:
       - ./wallet-enterprise:/app:rw
-      - ./wallet-enterprise-configurations/diploma-issuer/config/config.development.ts:/app/config/config.development.ts:rw
-      - ./wallet-enterprise-configurations/diploma-issuer/keys:/app/keys:rw
-      - ./wallet-enterprise-configurations/diploma-issuer/src/configuration:/app/src/configuration:rw
-      - ./wallet-enterprise-configurations/diploma-issuer/views/header.pug:/app/views/header.pug:rw
-      - ./wallet-enterprise-configurations/diploma-issuer/views/index.pug:/app/views/index.pug:rw
-      - ./wallet-enterprise-configurations/diploma-issuer/public/styles/styles.css:/app/public/styles/styles.css:rw
-      - ./wallet-enterprise-configurations/diploma-issuer/public/images:/app/public/images:rw
+      - ./wallet-enterprise-configurations/pda1-issuer/datasets/:/datasets/:rw
+      - ./wallet-enterprise-configurations/pda1-issuer/config/config.development.ts:/app/config/config.development.ts:rw
+      - ./wallet-enterprise-configurations/pda1-issuer/keys:/app/keys:rw
+      - ./wallet-enterprise-configurations/pda1-issuer/src/configuration:/app/src/configuration:rw
+      - ./wallet-enterprise-configurations/pda1-issuer/views/header.pug:/app/views/header.pug:rw
+      - ./wallet-enterprise-configurations/pda1-issuer/public/styles/styles.css:/app/public/styles/styles.css:rw
+      - ./wallet-enterprise-configurations/pda1-issuer/views/index.pug:/app/views/index.pug:rw
       - ./.vscode/:/app/.vscode:rw
       - type: tmpfs
-        target: /app/dist
+        target: /app/dist  # Not /dist here because of relative imports that assume dist/ and keys/, views/ etc. are sibling dirs
         tmpfs:
           mode: 01777
     deploy:
       resources:
           limits:
             memory: 1G
 
+
   wallet-enterprise-acme-verifier:
     container_name: wallet-enterprise-acme-verifier
     hostname: wallet-enterprise-acme-verifier
@@ -129,6 +134,7 @@ services:
       - ./wallet-enterprise-configurations/acme-verifier/views/verifier/QR.pug:/app/views/verifier/QR.pug:rw
       - ./wallet-enterprise-configurations/acme-verifier/views/verifier/success.pug:/app/views/verifier/success.pug:rw
       - ./wallet-enterprise-configurations/acme-verifier/public/images:/app/public/images:rw
+      - ./wallet-enterprise-configurations/acme-verifier/public/site.webmanifest:/app/public/site.webmanifest:rw
       - ./.vscode/:/app/.vscode:rw
       - type: tmpfs
         target: /app/dist
@@ -204,6 +210,32 @@ services:
           limits:
             memory: 1G
 
+  credential-status-list:
+    container_name: credential-status-list
+    build:
+      context: $PWD/credential-status-list
+      dockerfile: development.Dockerfile
+      secrets:
+        - npmrc
+    image: credential-status-list:dev
+    restart: on-failure
+    ports:
+      - 9001:9001
+    depends_on:
+      wallet-db:
+        condition: service_healthy
+    volumes:
+      - ./credential-status-list:/usr/src/app:rw
+      - ./.vscode/:/usr/src/app/.vscode:rw
+      - type: tmpfs
+        target: /dist
+        tmpfs:
+          mode: 01777
+    deploy:
+      resources:
+          limits:
+            memory: 1G
+
   wallet-frontend:
     build:
       context: $PWD/wallet-frontend
@@ -225,6 +257,22 @@ services:
         tmpfs:
           mode: 01777
 
+  resources-vault:
+    build:
+      context: $PWD/resources-vault
+      dockerfile: Dockerfile
+    image: resources-vault:dev
+    container_name: resources-vault
+    hostname: resources-vault
+    volumes:
+      - ./resources-vault/src/config/config.js:/app/src/config/config.js
+      - ./resources-vault/keys/:/app/keys/
+    depends_on:
+      wallet-db:
+        condition: service_healthy
+    ports:
+      - 6555:6555
+
 volumes:
   datadir:
   cache: