Merge branch 'ZOO-Project:main' into main

sdhoundiyal · Mar 17, 2024 · acdbc87 · acdbc87
2 parents 94451ce + 0d8b68e
commit acdbc87
Show file tree

Hide file tree

Showing 215 changed files with 18,036 additions and 3,110 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,12 @@
+# Overview
+
+# Related Issue / Discussion
+
+# Additional Information
+
+# Contributions and Licensing
+
+(as per https://zoo-project.github.io/docs/contribute/howto.html#licensing)
+
+- [ ] I'd like to contribute [feature X|bugfix Y|docs|something else] to ZOO-Project. I confirm that my contributions to ZOO-Project will be compatible with the ZOO-Project license guidelines at the time of contribution.
+- [ ] I have already previously agreed to the ZOO-Project Contributions and Licensing Guidelines
diff --git a/.github/workflows/docker-ciab-image.yml b/.github/workflows/docker-ciab-image.yml
@@ -0,0 +1,70 @@
+name: Docker Image CI (DRU with OpenEO UDP support)
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: docker/setup-buildx-action@v2
+    - name: Cache Docker layers
+      uses: actions/cache@v3
+      with:
+        path: /tmp/.buildx-cache
+        key: ${{ runner.os }}-buildx-${{ github.sha }}
+        restore-keys: ${{ runner.os }}-buildx-
+    - name: docker login
+      env:
+        DOCKER_USER: ${{secrets.DOCKER_USER}}
+        DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
+      run: |
+        docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+    - name: Build and push
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        push: true
+        file: docker/ciab/Dockerfile
+        tags: ${{secrets.DOCKER_USER}}/zookernel:ciab-${{ github.sha }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+    - name: Build and push (official image)
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        push: true
+        file: docker/ciab/Dockerfile
+        tags: zooproject/zoo-project:ciab-${{ github.sha }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+    - name: Move cache
+      run: |
+        rm -rf /tmp/.buildx-cache
+        mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+    - name: Build and push latest
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        push: true
+        file: docker/ciab/Dockerfile
+        tags: ${{secrets.DOCKER_USER}}/zookernel:ciab-latest
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+    - name: Build and push latest
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        push: true
+        file: docker/ciab/Dockerfile
+        tags: zooproject/zoo-project:ciab-latest
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
diff --git a/.github/workflows/docker-dru-image.yml b/.github/workflows/docker-dru-image.yml
@@ -0,0 +1,85 @@
+name: Docker Image CI (DRU support)
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: docker/setup-buildx-action@v2
+    - name: Cache Docker layers
+      uses: actions/cache@v3
+      with:
+        path: /tmp/.buildx-cache
+        key: ${{ runner.os }}-buildx-${{ github.sha }}
+        restore-keys: ${{ runner.os }}-buildx-
+    - name: docker login
+      env:
+        DOCKER_USER: ${{secrets.DOCKER_USER}}
+        DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
+      run: |
+        docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+    - name: Build and push
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        push: true
+        file: docker/dru/Dockerfile
+        tags: ${{secrets.DOCKER_USER}}/zookernel:dru-${{ github.sha }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+    - name: Build and push (official dru image)
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        push: true
+        file: docker/dru/Dockerfile
+        tags: zooproject/zoo-project:dru-${{ github.sha }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+    - name: Build and push (official eoepca image)
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        push: true
+        file: docker/dru/Dockerfile
+        build-args: |
+          CONDA_ENV_NAME=env_zoo_calrissian
+          PY_VER=3.10
+          CONDA_ENV_FILE=https://raw.githubusercontent.com/EOEPCA/eoepca-proc-service-template/master/.devcontainer/environment.yml
+        tags: zooproject/zoo-project:eoepca-${{ github.sha }}
+        cache-from: type=local,src=/tmp/.buildx-eoepca-cache
+        cache-to: type=local,dest=/tmp/.buildx-eoepca-cache-new,mode=max
+    - name: Move cache
+      run: |
+        rm -rf /tmp/.buildx-cache
+        mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+        rm -rf /tmp/.buildx-eoepca-cache
+        mv /tmp/.buildx-eoepca-cache-new /tmp/.buildx-eoepca-cache
+    - name: Build and push latest
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        push: true
+        file: docker/dru/Dockerfile
+        tags: ${{secrets.DOCKER_USER}}/zookernel:dru-latest
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+    - name: Build and push latest
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        push: true
+        file: docker/dru/Dockerfile
+        tags: zooproject/zoo-project:dru-latest
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
diff --git a/.github/workflows/docker-hpgc-image.yml b/.github/workflows/docker-hpgc-image.yml
@@ -0,0 +1,70 @@
+name: Docker Image CI (DRU with HPC and OGC Application Package support)
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: docker/setup-buildx-action@v2
+    - name: Cache Docker layers
+      uses: actions/cache@v3
+      with:
+        path: /tmp/.buildx-cache
+        key: ${{ runner.os }}-buildx-${{ github.sha }}
+        restore-keys: ${{ runner.os }}-buildx-
+    - name: docker login
+      env:
+        DOCKER_USER: ${{secrets.DOCKER_USER}}
+        DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
+      run: |
+        docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
+    - name: Build and push
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        push: true
+        file: docker/hpgc/Dockerfile
+        tags: ${{secrets.DOCKER_USER}}/zookernel:hpgc-${{ github.sha }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+    - name: Build and push (official image)
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        push: true
+        file: docker/hpgc/Dockerfile
+        tags: zooproject/zoo-project:hpgc-${{ github.sha }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+    - name: Move cache
+      run: |
+        rm -rf /tmp/.buildx-cache
+        mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+    - name: Build and push latest
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        push: true
+        file: docker/hpgc/Dockerfile
+        tags: ${{secrets.DOCKER_USER}}/zookernel:hpgc-latest
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+    - name: Build and push latest
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        push: true
+        file: docker/hpgc/Dockerfile
+        tags: zooproject/zoo-project:hpgc-latest
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: docker/setup-buildx-action@v1
+    - uses: actions/checkout@v3
+    - uses: docker/setup-buildx-action@v2
     - name: Cache Docker layers
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: /tmp/.buildx-cache
         key: ${{ runner.os }}-buildx-${{ github.sha }}
@@ -28,29 +28,49 @@ jobs:
       run: |
         docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
     - name: Build and push
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v4
       with:
         context: .
         push: true
-        tags: ${{secrets.DOCKER_USER}}/zookernel:${{ github.sha }}
+        tags: ${{secrets.DOCKER_USER}}/zookernel:node-${{ github.sha }}
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+    - name: Build and push Official image
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        push: true
+        tags: zooproject/zoo-project:node-${{ github.sha }}
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-    - name: Move cache
-      run: |
-        rm -rf /tmp/.buildx-cache
-        mv /tmp/.buildx-cache-new /tmp/.buildx-cache
     - name: Build and push latest
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v4
       with:
         context: .
         push: true
-        tags: ${{secrets.DOCKER_USER}}/zookernel:latest
+        tags: ${{secrets.DOCKER_USER}}/zookernel:node-latest
         cache-from: type=local,src=/tmp/.buildx-cache
         cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+    - name: Build and push latest
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        push: true
+        tags: zooproject/zoo-project:node-latest
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+    - name: Move cache
+      run: |
+        rm -rf /tmp/.buildx-cache
+        mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+    - name: Build TeamEngine and the ETS for OGC API - Processes and add it to the docker-compose
+      run: docker/ets-ogcapi-processes/build.sh && head -n $(expr $(grep "^networks:" -rn docker-compose.yml | cut -d':' -f1) - 1) docker-compose.yml > docker-compose1.yml && cat docker/ets-ogcapi-processes/docker-compose-ets-part.yml >> docker-compose1.yml && cat docker-compose.yml| grep "^networks" -A10 >> docker-compose1.yml && mv docker-compose1.yml docker-compose.yml
     - name: Start the test env
       run: mkdir docker/tmp; chmod 777 -R docker ; docker-compose up -d
     - name: Install required package
       run: docker exec zoo-project_zookernel_1 /bin/bash -c "apt-get update ; DEBIAN_FRONTEND=noninteractive apt-get -y install lynx;"
+    - name: Run the ETS for OGC API - Processes (see test-run-props.xml for settings)
+      run: docker-compose exec -T teamengine /root/test.sh
     - name: Run GetCapabilities tests version 1.0.0
       run: docker exec zoo-project_zookernel_1 /bin/bash -c "cd /var/www/html/cptesting/scripts/; mkdir ../tmp; ./run.sh http://localhost/cgi-bin/zoo_loader.cgi 1.0.0 Buffer \"GetCapabilities\" 0 0 > outputGC.html 2> log; lynx -dump outputGC.html"
     - name: Run DescribeProcess tests version 1.0.0

diff --git a/.github/workflows/docker-jammy-image.yml b/.github/workflows/docker-jammy-image.yml
@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: docker/setup-buildx-action@v1
+    - uses: actions/checkout@v3
+    - uses: docker/setup-buildx-action@v2
     - name: Cache Docker layers
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: /tmp/.buildx-osgeolive-cache
         key: ${{ runner.os }}-buildx-osgeolive-${{ github.sha }}
@@ -28,7 +28,7 @@ jobs:
       run: |
         docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
     - name: Build and push
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v4
       with:
         context: .
         push: true
@@ -41,14 +41,23 @@ jobs:
         rm -rf /tmp/.buildx-osgeolive-cache
         mv /tmp/.buildx-osgeolive-cache-new /tmp/.buildx-osgeolive-cache
     - name: Build and push osgeolive-latest
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v4
       with:
         context: .
         push: true
         file: Dockerfile-OSGeoLive
         tags: ${{secrets.DOCKER_USER}}/zookernel:osgeolive-latest
         cache-from: type=local,src=/tmp/.buildx-osgeolive-cache
         cache-to: type=local,dest=/tmp/.buildx-osgeolive-cache-new,mode=max
+    - name: Build and push osgeolive-latest
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        push: true
+        file: Dockerfile-OSGeoLive
+        tags: zooproject/zoo-project:osgeolive-latest
+        cache-from: type=local,src=/tmp/.buildx-osgeolive-cache
+        cache-to: type=local,dest=/tmp/.buildx-osgeolive-cache-new,mode=max
     - name: Start the test env
       run: mkdir docker/tmp; chmod 777 -R docker ; sed "s=djayzen/zookernel:latest=djayzen/zookernel:osgeolive-latest=g" -i docker-compose.yml ; docker-compose up -d
     - name: Install required package