Merge pull request #520 from deNBI/staging

dweinholz · web-flow · commit c55aac00fc9b · 2024-05-16T10:35:55.000+02:00
Staging
diff --git a/.github/workflows/build_image.yml b/.github/workflows/build_image.yml
@@ -8,5 +8,5 @@ jobs:
               uses: rokroskar/workflow-run-cleanup-action@v0.3.3
               env:
                 GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-            - uses: actions/checkout@v4.1.4
+            - uses: actions/checkout@v4.1.5
             - run: docker build --no-cache .
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -35,7 +35,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4.1.4
+      uses: actions/checkout@v4.1.5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/master-protection.yml b/.github/workflows/master-protection.yml
@@ -14,7 +14,7 @@ jobs:
         uses: rokroskar/workflow-run-cleanup-action@v0.3.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/checkout@v4.1.4
+      - uses: actions/checkout@v4.1.5
 
       - name: Check Tag
         run: |
diff --git a/.github/workflows/publish_docker.yml b/.github/workflows/publish_docker.yml
@@ -15,7 +15,7 @@ jobs:
         uses: rokroskar/workflow-run-cleanup-action@v0.3.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/checkout@v4.1.4
+      - uses: actions/checkout@v4.1.5
       - name: Extract branch name
         shell: bash
         run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
diff --git a/.github/workflows/release_image.yml b/.github/workflows/release_image.yml
@@ -11,7 +11,7 @@ jobs:
      - name: Get the version
        id: get_version
        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
-     - uses: actions/checkout@v4.1.4
+     - uses: actions/checkout@v4.1.5
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3
      - name: Login to Quay.io
diff --git a/docker-compose.bibigrid.host.yml b/docker-compose.bibigrid.host.yml
@@ -43,7 +43,7 @@ services:
 
   simplevm_client_filebeat:
     container_name: simplevm_client_filebeat
-    image: docker.elastic.co/beats/filebeat:8.13.3
+    image: docker.elastic.co/beats/filebeat:8.13.4
     network_mode: host  # Use the host network namespace
 
     env_file:
diff --git a/docker-compose.bibigrid.yml b/docker-compose.bibigrid.yml
@@ -44,7 +44,7 @@ services:
 
   # filebeat
   simplevm_filebeat:
-    image: docker.elastic.co/beats/filebeat:8.13.3
+    image: docker.elastic.co/beats/filebeat:8.13.4
     env_file:
       - .env
     volumes:
diff --git a/docker-compose.host.yml b/docker-compose.host.yml
@@ -30,7 +30,7 @@ services:
 
   simplevm_client_filebeat:
     container_name: simplevm_client_filebeat
-    image: docker.elastic.co/beats/filebeat:8.13.3
+    image: docker.elastic.co/beats/filebeat:8.13.4
     env_file:
       - .env
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -30,7 +30,7 @@ services:
   # filebeat
   simplevm_client_filebeat:
     container_name: simplevm_client_filebeat
-    image: docker.elastic.co/beats/filebeat:8.13.3
+    image: docker.elastic.co/beats/filebeat:8.13.4
     env_file:
       - .env
     volumes:
diff --git a/plays/setup_client.yml b/plays/setup_client.yml
@@ -144,18 +144,18 @@
       when: "'bibigrid' not in ansible_run_tags and 'host_network' not in ansible_run_tags"
 
     - name: Start client docker container in host network without bibigrid
-      shell: docker compose -f {{ client.REPO_PATH }}/docker-compose.host.yml up -d
+      shell: docker compose -f {{ client.REPO_PATH }}/docker-compose.host.yml up --pull=always -d
       become: yes
       tags: [ 'never', 'host_network' ]
 
     - name: Start client docker container in host network with bibigrid
-      shell: docker compose -f {{ client.REPO_PATH }}/docker-compose.bibigrid.host.yml up -d
+      shell: docker compose -f {{ client.REPO_PATH }}/docker-compose.bibigrid.host.yml up --pull=always -d
       become: yes
       tags: [ 'never', 'host_network_bibigrid', ]
 
 
     - name: Start docker container with bibigrid
-      shell: docker compose -f {{ client.REPO_PATH }}/docker-compose.bibigrid.yml up -d
+      shell: docker compose -f {{ client.REPO_PATH }}/docker-compose.bibigrid.yml up --pull=always -d
 
       become: yes
       tags: [ 'never', 'bibigrid' ]
diff --git a/portal_client.thrift b/portal_client.thrift
@@ -143,7 +143,15 @@ struct Image{
 
 	/** If the Image is a snapshot*/
 	10:optional bool is_snapshot,
+
+    /** OS version of the image */
 	11:optional string os_version
+
+    /** OS distro of the image */
+    12:optional string os_distro
+
+    /** Title of the image */
+    13:optional string title
 }
 /**
  * This Struct defines a VirtualMachine.
diff --git a/requirements.txt b/requirements.txt
@@ -12,7 +12,7 @@ pyvim==3.0.3
 redis==5.0.4
 requests==2.31.0
 pyyaml==6.0.1
-pre-commit==3.7.0
+pre-commit==3.7.1
 types-PyYAML==6.0.12.20240311
 sympy==1.12
 colorama==0.4.6
diff --git a/simple_vm_client/VirtualMachineService-remote b/simple_vm_client/VirtualMachineService-remote
diff --git a/simple_vm_client/VirtualMachineService.py b/simple_vm_client/VirtualMachineService.py
diff --git a/simple_vm_client/__init__.py b/simple_vm_client/__init__.py
diff --git a/simple_vm_client/constants.py b/simple_vm_client/constants.py
diff --git a/simple_vm_client/ttypes.py b/simple_vm_client/ttypes.py
diff --git a/simple_vm_client/util/thrift_converter.py b/simple_vm_client/util/thrift_converter.py

-Original file line number
+Diff line change
               uses: rokroskar/[email protected]
               env:
                 GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 -            - uses: actions/[email protected].4
 +            - uses: actions/[email protected].5
             - run: docker build --no-cache .