Merge branch 'master' into update/login-creds

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

@@ -11,6 +11,10 @@ on:
         type: boolean
         required: true
 
+      dockerfile-path:
+        type: string
+        required: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -32,7 +36,7 @@ jobs:
     - uses: docker/build-push-action@v3
       with:
         context: .
-        file: ./Dockerfile
+        file: ${{ inputs.dockerfile-path }}
         push: ${{ inputs.docker-push }}
         tags: ${{ inputs.image-tag }}
         secret-files: |

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

@@ -0,0 +1,19 @@
+name: Build Docker image
+on:
+  push:
+    branches-ignore:
+      - master
+  pull_request:
+
+jobs:
+  build-acme:
+    permissions:
+      contents: read
+      packages: read
+
+    uses: ./.github/workflows/docker-build-push.yml
+    secrets: inherit
+    with:
+      image-tag: ghcr.io/wwwallet/wallet-enterprise-acme-verifier:latest
+      docker-push: false
+      dockerfile-path: ./wallet-enterprise-configurations/acme-verifier/Dockerfile

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

@@ -0,0 +1,19 @@
+name: Build Docker image
+on:
+  push:
+    branches-ignore:
+      - master
+  pull_request:
+
+jobs:
+  build-diploma:
+    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
+      docker-push: false
+      dockerfile-path: ./wallet-enterprise-configurations/diploma-issuer/Dockerfile

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

@@ -0,0 +1,19 @@
+name: Build Docker image
+on:
+  push:
+    branches-ignore:
+      - master
+  pull_request:
+
+jobs:
+  build-ehic:
+    permissions:
+      contents: read
+      packages: read
+
+    uses: ./.github/workflows/docker-build-push.yml
+    secrets: inherit
+    with:
+      image-tag: ghcr.io/wwwallet/wallet-enterprise-ehic-issuer:latest
+      docker-push: false
+      dockerfile-path: ./wallet-enterprise-configurations/ehic-issuer/Dockerfile

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

@@ -0,0 +1,19 @@
+name: Build Docker image
+on:
+  push:
+    branches-ignore:
+      - master
+  pull_request:
+
+jobs:
+  build-vid:
+    permissions:
+      contents: read
+      packages: read
+
+    uses: ./.github/workflows/docker-build-push.yml
+    secrets: inherit
+    with:
+      image-tag: ghcr.io/wwwallet/wallet-enterprise-vid-issuer:latest
+      docker-push: false
+      dockerfile-path: ./wallet-enterprise-configurations/vid-issuer/Dockerfile

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

@@ -0,0 +1,20 @@
+name: Push Docker image
+on:
+  push:
+    tags:
+      - v0.*
+      - v1.*
+      - v2.*
+
+jobs:
+  push-acme:
+    permissions:
+      contents: read
+      packages: write
+
+    uses: ./.github/workflows/docker-build-push.yml
+    secrets: inherit
+    with:
+      image-tag: ghcr.io/wwwallet/wallet-enterprise-acme-verifier:${{ github.ref_name }}
+      docker-push: true
+      dockerfile-path: ./wallet-enterprise-configurations/acme-verifier/Dockerfile

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

@@ -0,0 +1,20 @@
+name: Push Docker image
+on:
+  push:
+    tags:
+      - v0.*
+      - v1.*
+      - v2.*
+
+jobs:
+  push-diploma:
+    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 }}
+      docker-push: true
+      dockerfile-path: ./wallet-enterprise-configurations/diploma-issuer/Dockerfile

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

@@ -0,0 +1,20 @@
+name: Push Docker image
+on:
+  push:
+    tags:
+      - v0.*
+      - v1.*
+      - v2.*
+
+jobs:
+  push-ehic:
+    permissions:
+      contents: read
+      packages: write
+
+    uses: ./.github/workflows/docker-build-push.yml
+    secrets: inherit
+    with:
+      image-tag: ghcr.io/wwwallet/wallet-enterprise-ehic-issuer:${{ github.ref_name }}
+      docker-push: true
+      dockerfile-path: ./wallet-enterprise-configurations/ehic-issuer/Dockerfile

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

@@ -0,0 +1,20 @@
+name: Push Docker image
+on:
+  push:
+    tags:
+      - v0.*
+      - v1.*
+      - v2.*
+
+jobs:
+  push-vid:
+    permissions:
+      contents: read
+      packages: write
+
+    uses: ./.github/workflows/docker-build-push.yml
+    secrets: inherit
+    with:
+      image-tag: ghcr.io/wwwallet/wallet-enterprise-vid-issuer:${{ github.ref_name }}
+      docker-push: true
+      dockerfile-path: ./wallet-enterprise-configurations/vid-issuer/Dockerfile

wallet-enterprise-configurations/acme-verifier/Dockerfile

@@ -0,0 +1,37 @@
+# Builder stage
+FROM ghcr.io/wwwallet/wallet-enterprise:base AS builder
+WORKDIR /app
+
+
+COPY wallet-enterprise/ .
+RUN rm -rf /app/src/configuration/
+COPY ./wallet-enterprise-configurations/acme-verifier/src/configuration/ /app/src/configuration/
+COPY ./wallet-enterprise-configurations/acme-verifier/views/index.pug /app/views/index.pug
+COPY ./wallet-enterprise-configurations/acme-verifier/views/header.pug /app/views/header.pug
+COPY ./wallet-enterprise-configurations/acme-verifier/views/verifier/public_definitions.pug /app/views/verifier/public_definitions.pug
+COPY ./wallet-enterprise-configurations/acme-verifier/views/verifier/QR.pug /app/views/verifier/QR.pug
+COPY ./wallet-enterprise-configurations/acme-verifier/views/verifier/success.pug /app/views/verifier/success.pug
+COPY ./wallet-enterprise-configurations/acme-verifier/public/styles/styles.css /app/public/styles/styles.css
+COPY ./wallet-enterprise-configurations/acme-verifier/public/images /app/public/images
+
+RUN --mount=type=secret,id=npmrc,required=true,target=./.npmrc,uid=1000 \
+    yarn cache clean && yarn install && yarn build
+
+# Production stage
+FROM node:16-bullseye-slim AS production
+WORKDIR /app
+
+COPY --from=builder /app/package.json .
+COPY --from=builder /app/dist ./dist
+COPY --from=builder /app/public ./public
+COPY --from=builder /app/views/ ./views/
+
+
+RUN --mount=type=secret,id=npmrc,required=true,target=./.npmrc,uid=1000 \
+    yarn cache clean && yarn install --production
+
+
+ENV NODE_ENV production
+EXPOSE 8003
+
+CMD ["node", "./dist/src/app.js"]

wallet-enterprise-configurations/diploma-issuer/Dockerfile

@@ -0,0 +1,32 @@
+# Builder stage
+FROM ghcr.io/wwwallet/wallet-enterprise:base AS builder
+WORKDIR /app
+
+COPY wallet-enterprise/ .
+RUN rm -rf src/configuration/
+COPY ./wallet-enterprise-configurations/diploma-issuer/src/configuration /app/src/configuration
+COPY ./wallet-enterprise-configurations/diploma-issuer/views/issuer/login.pug /app/views/issuer/login.pug
+COPY ./wallet-enterprise-configurations/diploma-issuer/public/styles/styles.css /app/public/styles/styles.css
+COPY ./wallet-enterprise-configurations/diploma-issuer/public/images /app/public/images
+COPY ./wallet-enterprise-configurations/diploma-issuer/views/header.pug /app/views/header.pug
+COPY ./wallet-enterprise-configurations/diploma-issuer/views/index.pug /app/views/index.pug
+
+RUN --mount=type=secret,id=npmrc,required=true,target=./.npmrc,uid=1000 \
+    yarn cache clean && yarn install && yarn build
+
+# Production stage
+FROM node:16-bullseye-slim AS production
+WORKDIR /app
+
+COPY --from=builder /app/package.json .
+COPY --from=builder /app/dist/ ./dist/
+COPY --from=builder /app/public/ ./public/
+COPY --from=builder /app/views/ ./views/
+
+RUN --mount=type=secret,id=npmrc,required=true,target=./.npmrc,uid=1000 \
+    yarn cache clean && yarn install --production
+
+ENV NODE_ENV production
+EXPOSE 8003
+
+CMD ["node", "./dist/src/app.js"]

wallet-enterprise-configurations/ehic-issuer/Dockerfile

@@ -0,0 +1,30 @@
+# Builder stage
+FROM ghcr.io/wwwallet/wallet-enterprise:base AS builder
+WORKDIR /app
+
+# COPY wallet-enterprise/ .
+RUN rm -rf src/configuration/
+COPY ./wallet-enterprise-configurations/ehic-issuer/src/configuration/ src/configuration/
+COPY ./wallet-enterprise-configurations/ehic-issuer/views/header.pug views/header.pug
+
+
+RUN --mount=type=secret,id=npmrc,required=true,target=./.npmrc,uid=1000 \
+    yarn cache clean && yarn install && yarn build
+
+# Production stage
+FROM node:16-bullseye-slim AS production
+WORKDIR /app
+
+COPY --from=builder /app/package.json .
+COPY --from=builder /app/dist/ ./dist/
+COPY --from=builder /app/public/ ./public/
+COPY --from=builder /app/views/ ./views/
+
+
+RUN --mount=type=secret,id=npmrc,required=true,target=./.npmrc,uid=1000 \
+    yarn cache clean && yarn install --production
+
+ENV NODE_ENV production
+EXPOSE 8003
+
+CMD ["node", "./dist/src/app.js"]

wallet-enterprise-configurations/vid-issuer/Dockerfile

@@ -0,0 +1,31 @@
+# Builder stage
+FROM ghcr.io/wwwallet/wallet-enterprise:base AS builder
+WORKDIR /app
+
+COPY wallet-enterprise/ .
+RUN rm -rf src/configuration/
+COPY ./wallet-enterprise-configurations/vid-issuer/src/configuration/ src/configuration/
+COPY ./wallet-enterprise-configurations/vid-issuer/public/styles/styles.css public/styles/styles.css
+COPY ./wallet-enterprise-configurations/vid-issuer/public/images/ public/images/
+COPY ./wallet-enterprise-configurations/vid-issuer/views/header.pug /app/views/header.pug
+COPY ./wallet-enterprise-configurations/vid-issuer/views/index.pug /app/views/index.pug
+
+RUN --mount=type=secret,id=npmrc,required=true,target=./.npmrc,uid=1000 \
+    yarn cache clean && yarn install && yarn build
+
+# Production stage
+FROM node:16-bullseye-slim AS production
+WORKDIR /app
+
+COPY --from=builder /app/package.json .
+COPY --from=builder /app/dist/ ./dist/
+COPY --from=builder /app/public/ ./public/
+COPY --from=builder /app/views/ ./views/
+
+RUN --mount=type=secret,id=npmrc,required=true,target=./.npmrc,uid=1000 \
+    yarn cache clean && yarn install --production
+
+ENV NODE_ENV production
+EXPOSE 8003
+
+CMD ["node", "./dist/src/app.js"]