Merge branch 'development' into development-genquery2

.ansible-lint

@@ -1,5 +1,25 @@
+profile: production
+
 skip_list:
   - experimental
   - var-naming
+  - yaml[line-length]
 
 parseable: true
+
+mock_modules:
+  - irods_advanced
+  - irods_config
+  - irods_indexing
+  - irods_mkuser
+  - irods_postgres
+  - irods_python
+  - irods_resource
+  - irods_rulesets
+
+exclude_paths:
+  - .github/
+  - docker/
+  - docs/
+  - roles/yoda_test/
+  - roles/yoda_test_users_eus/

.github/workflows/ansible-lint.yml

@@ -7,27 +7,20 @@ on:
     - 'Vagrantfile'
     - 'docs/**'
     - 'docker/**'
-    - '.github/workflows/ansible-lint-zabbix.yml'
     - '.github/workflows/documentation.yml'
   pull_request:
     paths-ignore:
     - 'README.md'
     - 'Vagrantfile'
     - 'docker/**'
     - 'docs/**'
-    - '.github/workflows/ansible-lint-zabbix.yml'
     - '.github/workflows/documentation.yml'
 
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
-      # Important: This sets up your GITHUB_WORKSPACE environment variable
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Run ansible-lint
-        # replace `main` with any valid ref, or tags like `v6`
-        uses: ansible-community/[email protected]
-        with:
-          path: "playbook.yml"
+        uses: ansible/[email protected]

.github/workflows/build-push-image-davrods.yml

@@ -0,0 +1,38 @@
+---
+name: "Build DavRODS image and push it to registry"
+
+on:
+  push:
+    branches:
+      - 'development'
+    paths:
+      - 'docker/images/davrods/**'
+
+jobs:
+  push-image:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+      packages: write
+    steps:
+    - name: Check out Yoda repository
+      uses: actions/checkout@v3
+      with:
+        path: yoda
+        repository: UtrechtUniversity/yoda
+        ref: development
+
+    - name: Authenticate to the container registry
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v4
+      with:
+        context: yoda/docker/images/davrods
+        file: yoda/docker/images/davrods/Dockerfile
+        push: true
+        tags: ghcr.io/utrechtuniversity/davrods:dev-1.9

.github/workflows/build-push-image-eus.yml

@@ -0,0 +1,38 @@
+---
+name: "Build EUS web server image and push it to registry"
+
+on:
+  push:
+    branches:
+      - 'development'
+    paths:
+      - 'docker/images/yoda_eus/**'
+
+jobs:
+  push-image:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+      packages: write
+    steps:
+    - name: Check out Yoda repository
+      uses: actions/checkout@v3
+      with:
+        path: yoda
+        repository: UtrechtUniversity/yoda
+        ref: development
+
+    - name: Authenticate to the container registry
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v4
+      with:
+        context: yoda/docker/images/yoda_eus
+        file: yoda/docker/images/yoda_eus/Dockerfile
+        push: true
+        tags: ghcr.io/utrechtuniversity/yoda-eus:dev-1.9

.github/workflows/build-push-image-mailpit.yml

@@ -0,0 +1,39 @@
+---
+name: "Build mailpit image and push it to registry"
+
+on:
+  push:
+    branches:
+      - 'development'
+    paths:
+      - 'docker/images/mailpit/**'
+
+jobs:
+  push-image:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+      packages: write
+    steps:
+    - name: Check out Yoda repository
+      uses: actions/checkout@v3
+      with:
+        path: yoda
+        repository: UtrechtUniversity/yoda
+        ref: development
+
+    - name: Authenticate to the container registry
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    # Use the manual build script rather than a regular build-push-action
+    # so that we don't have to duplicate version information across CI and
+    # the manual build script
+    - name: Build and push Docker image
+      run: |
+        cd yoda/docker/images/mailpit
+        ./build.sh
+        docker push ghcr.io/utrechtuniversity/yoda-mailpit:dev-1.9

.github/workflows/build-push-image-portal.yml

@@ -0,0 +1,38 @@
+---
+name: "Build portal image and push it to registry"
+
+on:
+  push:
+    branches:
+      - 'development'
+    paths:
+      - 'docker/images/yoda_portal/**'
+
+jobs:
+  push-image:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+      packages: write
+    steps:
+    - name: Check out Yoda repository
+      uses: actions/checkout@v3
+      with:
+        path: yoda
+        repository: UtrechtUniversity/yoda
+        ref: development
+
+    - name: Authenticate to the container registry
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v4
+      with:
+        context: yoda/docker/images/yoda_portal
+        file: yoda/docker/images/yoda_portal/Dockerfile
+        push: true
+        tags: ghcr.io/utrechtuniversity/yoda-portal:dev-1.9

.github/workflows/build-push-image-provider.yml

@@ -0,0 +1,46 @@
+---
+name: "Build Yoda iRODS provider image and push it to registry"
+
+on:
+  push:
+    branches:
+      - 'development'
+    paths:
+      - 'docker/images/yoda_irods_icat/**'
+      - 'roles/irods_completion/files/irods_completion.sh'
+      - 'roles/pam_python/files/pam_python.so'
+      - 'roles/yoda_rulesets/files/run-intake-movetovault.sh'
+
+jobs:
+  push-image:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+      packages: write
+    steps:
+    - name: Check out Yoda repository
+      uses: actions/checkout@v3
+      with:
+        path: yoda
+        repository: UtrechtUniversity/yoda
+        ref: development
+
+    - name: Authenticate to the container registry
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Stage files for Docker image
+      run: |
+        cd yoda/docker/images/yoda_irods_icat
+        ./stage-uploads.sh
+
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v4
+      with:
+        context: yoda/docker/images/yoda_irods_icat
+        file: yoda/docker/images/yoda_irods_icat/Dockerfile
+        push: true
+        tags: ghcr.io/utrechtuniversity/yoda-provider:dev-1.9

.github/workflows/build-push-image-public.yml

@@ -0,0 +1,44 @@
+---
+name: "Build public web server image and push it to registry"
+
+on:
+  push:
+    branches:
+      - 'development'
+    paths:
+      - 'docker/images/yoda_public/**'
+      - 'roles/yoda_landingpages/files/**'
+
+jobs:
+  push-image:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+      packages: write
+    steps:
+    - name: Check out Yoda repository
+      uses: actions/checkout@v3
+      with:
+        path: yoda
+        repository: UtrechtUniversity/yoda
+        ref: development
+
+    - name: Authenticate to the container registry
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Stage landing page files for Docker image
+      run: |
+        cd yoda/docker/images/yoda_public
+        ./stage-uploads.sh
+
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v4
+      with:
+        context: yoda/docker/images/yoda_public
+        file: yoda/docker/images/yoda_public/Dockerfile
+        push: true
+        tags: ghcr.io/utrechtuniversity/yoda-public:dev-1.9

.github/workflows/build-push-image-web-mock.yml

@@ -0,0 +1,38 @@
+---
+name: "Build web mock service image and push it to registry"
+
+on:
+  push:
+    branches:
+      - 'development'
+    paths:
+      - 'docker/images/yoda_web_mock/**'
+
+jobs:
+  push-image:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+      packages: write
+    steps:
+    - name: Check out Yoda repository
+      uses: actions/checkout@v3
+      with:
+        path: yoda
+        repository: UtrechtUniversity/yoda
+        ref: development
+
+    - name: Authenticate to the container registry
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build and push Docker image
+      uses: docker/build-push-action@v4
+      with:
+        context: yoda/docker/images/yoda_web_mock
+        file: yoda/docker/images/yoda_web_mock/Dockerfile
+        push: true
+        tags: ghcr.io/utrechtuniversity/yoda-web-mock:dev-1.9

CITATION.cff

@@ -36,10 +36,14 @@ authors:
   given-names: Sietse
 - family-names: Zondergeld
   given-names: Jelmer
+- family-names: Kaur
+  given-names: Sirjan
+- family-names: Saliers
+  given-names: Claire
 repository-code: "https://github.com/utrechtuniversity/yoda"
 license: GPL-3.0-only
-version: "1.7.0"
-date-released: 2021-06-23
+version: "1.8.11"
+date-released: 2023-10-11
 contact:
 - name: Utrecht University Yoda Team
   email: [email protected]

Vagrantfile

@@ -70,6 +70,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       controller.vm.synced_folder ".", "/vagrant", disabled: true
       controller.vm.provision "shell",
         inline: "sudo timedatectl set-timezone Europe/Amsterdam"
+      controller.vm.provision "shell",
+        inline: "sudo echo \"192.168.56.10 eus.yoda.test\" | sudo tee -a /etc/hosts"
     end
   end
 end