Merge remote-tracking branch 'origin/master' into MPMBRWP-25_advice_w…

…f_ui
IMIO · Jan 3, 2024 · 05c482c · 05c482c
2 parents d3228bb + 4a408b8
commit 05c482c
Show file tree

Hide file tree

Showing 11 changed files with 210 additions and 149 deletions.
diff --git a/.github/workflows/docker-hub-publish-base.yml b/.github/workflows/docker-hub-publish-base.yml
diff --git a/.github/workflows/docker-hub-publish.yml b/.github/workflows/docker-hub-publish.yml
diff --git a/.github/workflows/docker-publish-base.yml b/.github/workflows/docker-publish-base.yml
@@ -0,0 +1,22 @@
+name: Update base image
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 2 * * *' # Daily at 02:00
+
+jobs:
+  base:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Build and publish base image to harbor
+        uses: IMIO/buildout.pm/actions/harbor@master
+        with:
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          HARBOR_URL: ${{ secrets.HARBOR_URL }}
+          DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
+          DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
+          tags: |
+            imiobe/iadelib:base
+            "${{ secrets.HARBOR_URL }}/delib/iadelib:base"
+          dockerfile: ./docker/Dockerfile-base
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -0,0 +1,32 @@
+name: Update images
+on:
+  workflow_dispatch:
+  push:
+    branches: [ master ]
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Build latest
+        uses: IMIO/buildout.pm/actions/harbor@master
+        with:
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          HARBOR_URL: ${{ secrets.HARBOR_URL }}
+          DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
+          DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
+          tags: |
+            imiobe/iadelib:latest
+            "${{ secrets.HARBOR_URL }}/delib/iadelib:latest"
+          dockerfile: ./docker/Dockerfile-latest
+      - name: Build and publish dev image
+        uses: IMIO/buildout.pm/actions/harbor@master
+        with:
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          HARBOR_URL: ${{ secrets.HARBOR_URL }}
+          DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
+          DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
+          tags: imiobe/iadelib:dev
+          dockerfile: ./docker/Dockerfile-dev
+          profile: communes-dev
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,131 +8,160 @@ jobs:
   communes:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build and publish to dockerhub
-        uses: IMIO/buildout.pm/actions/dockerhub@master
+      - name: Build and publish communes image to harbor
+        uses: IMIO/buildout.pm/actions/harbor@master
         with:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-          tags: "imiobe/iadelib:${{ github.ref_name }},imiobe/iadelib:communes-${{ github.ref_name }}"
+          HARBOR_URL: ${{ secrets.HARBOR_URL }}
+          DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
+          DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
+          tags: | 
+            "imiobe/iadelib:${{ github.ref_name }}"
+            "imiobe/iadelib:communes-${{ github.ref_name }}"
+            "${{ secrets.HARBOR_URL }}/delib/iadelib:${{ github.ref_name }}"
+            "${{ secrets.HARBOR_URL }}/delib/iadelib:${{ github.ref_name }}"
+  
   bep:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build and publish to dockerhub
-        uses: IMIO/buildout.pm/actions/dockerhub@master
+      - name: Build and publish bep image to harbor
+        uses: IMIO/buildout.pm/actions/harbor@master
         with:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          HARBOR_URL: ${{ secrets.HARBOR_URL }}
+          DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
+          DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
           profile: bep
-          tags: "imiobe/iadelib:bep-${{ github.ref_name }}"
+          tags: |
+            "imiobe/iadelib:bep-${{ github.ref_name }}"
+            "${{ secrets.HARBOR_URL }}/delib/iadelib:bep-${{ github.ref_name }}"
+
   charleroi:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build and publish to dockerhub
-        uses: IMIO/buildout.pm/actions/dockerhub@master
+      - name: Build and publish charleroi image to harbor
+        uses: IMIO/buildout.pm/actions/harbor@master
         with:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          HARBOR_URL: ${{ secrets.HARBOR_URL }}
+          DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
+          DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
           profile: charleroi
-          tags: "imiobe/iadelib:charleroi-${{ github.ref_name }}"
+          tags: |
+            "imiobe/iadelib:charleroi-${{ github.ref_name }}"
+            "${{ secrets.HARBOR_URL }}/delib/iadelib:charleroi-${{ github.ref_name }}"
+
   hainaut-prov:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build and publish to dockerhub
-        uses: IMIO/buildout.pm/actions/dockerhub@master
+      - name: Build and publish hainaut-prov image to harbor
+        uses: IMIO/buildout.pm/actions/harbor@master
         with:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          HARBOR_URL: ${{ secrets.HARBOR_URL }}
+          DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
+          DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
           profile: hainaut-prov
-          tags: "imiobe/iadelib:hainaut-prov-${{ github.ref_name }}"
-#  idea:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v2
-#      - name: Build and publish to dockerhub
-#        uses: IMIO/buildout.pm/actions/dockerhub@master
-#        with:
-#          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-#          DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
-#          profile: idea
-#          tags: "imiobe/iadelib:idea-${{ github.ref_name }}"
+          tags: |
+            "imiobe/iadelib:hainaut-prov-${{ github.ref_name }}"
+            "${{ secrets.HARBOR_URL }}/delib/iadelib:hainaut-prov-${{ github.ref_name }}"
+  
   lalouviere:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build and publish to dockerhub
-        uses: IMIO/buildout.pm/actions/dockerhub@master
+      - name: Build and publish lalouviere image to harbor
+        uses: IMIO/buildout.pm/actions/harbor@master
         with:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          HARBOR_URL: ${{ secrets.HARBOR_URL }}
+          DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
+          DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
           profile: lalouviere
-          tags: "imiobe/iadelib:lalouviere-${{ github.ref_name }}"
+          tags: |
+            "imiobe/iadelib:lalouviere-${{ github.ref_name }}"
+            "${{ secrets.HARBOR_URL }}/delib/iadelib:lalouviere-${{ github.ref_name }}"
+  
   lalouviere-cpas:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build and publish to dockerhub
-        uses: IMIO/buildout.pm/actions/dockerhub@master
+      - name: Build and publish lalouviere-cpas image to harbor
+        uses: IMIO/buildout.pm/actions/harbor@master
         with:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          HARBOR_URL: ${{ secrets.HARBOR_URL }}
+          DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
+          DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
           profile: lalouviere-cpas
-          tags: "imiobe/iadelib:lalouviere-cpas-${{ github.ref_name }}"
+          tags: |
+            "imiobe/iadelib:lalouviere-cpas-${{ github.ref_name }}"
+            "${{ secrets.HARBOR_URL }}/delib/iadelib:lalouviere-cpas-${{ github.ref_name }}"
+  
   liege:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build and publish to dockerhub
-        uses: IMIO/buildout.pm/actions/dockerhub@master
+      - name: Build and publish liege image to harbor
+        uses: IMIO/buildout.pm/actions/harbor@master
         with:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          HARBOR_URL: ${{ secrets.HARBOR_URL }}
+          DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
+          DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
           profile: liege
-          tags: "imiobe/iadelib:liege-${{ github.ref_name }}"
+          tags: |
+            "imiobe/iadelib:liege-${{ github.ref_name }}"
+            "${{ secrets.HARBOR_URL }}/delib/iadelib:liege-${{ github.ref_name }}"
+
   mons:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build and publish to dockerhub
-        uses: IMIO/buildout.pm/actions/dockerhub@master
+      - name: Build and publish mons image to harbor
+        uses: IMIO/buildout.pm/actions/harbor@master
         with:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          HARBOR_URL: ${{ secrets.HARBOR_URL }}
+          DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
+          DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
           profile: mons
-          tags: "imiobe/iadelib:mons-${{ github.ref_name }}"
+          tags: |
+            "imiobe/iadelib:mons-${{ github.ref_name }}"
+            "${{ secrets.HARBOR_URL }}/delib/iadelib:mons-${{ github.ref_name }}"
+
   namur:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build and publish to dockerhub
-        uses: IMIO/buildout.pm/actions/dockerhub@master
+      - name: Build and publish namur image to harbor
+        uses: IMIO/buildout.pm/actions/harbor@master
         with:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          HARBOR_URL: ${{ secrets.HARBOR_URL }}
+          DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
+          DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
           profile: namur
-          tags: "imiobe/iadelib:namur-${{ github.ref_name }}"
+          tags: | 
+            "imiobe/iadelib:namur-${{ github.ref_name }}"
+            "${{ secrets.HARBOR_URL }}/delib/iadelib:namur-${{ github.ref_name }}"
+
   seraing:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build and publish to dockerhub
-        uses: IMIO/buildout.pm/actions/dockerhub@master
+      - name: Build and publish seraing image to harbor
+        uses: IMIO/buildout.pm/actions/harbor@master
         with:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
           DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+          HARBOR_URL: ${{ secrets.HARBOR_URL }}
+          DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
+          DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
           profile: seraing
-          tags: "imiobe/iadelib:seraing-${{ github.ref_name }}"
+          tags: |
+            "imiobe/iadelib:seraing-${{ github.ref_name }}"
+            "${{ secrets.HARBOR_URL }}/delib/iadelib:seraing-${{ github.ref_name }}"
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@ share
 config/core.properties
 local
 docker/data
+docker/extensions
 .plone.versioncheck.cache/
 .plone.versioncheck.tracked.json
 checkversion.html

diff --git a/actions/dockerhub/action.yml b/actions/dockerhub/action.yml