Merge pull request #5 from xenit-eu/MNTSUP-171

Mntsup 171

.github/workflows/ci.yml

@@ -14,27 +14,47 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+
+    - name: Setup Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.11"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip mypy
+        pip install -r src/main/docker/docker_root/requirements.txt
+    - name: Check static typing
+      run: mypy src/main/docker/docker_root/swarmclean.py
+    - name: Check formatting
+      run: |
+        pip install ruff
+        ruff format --diff src/main/docker/docker_root/swarmclean.py
+    # - name: Run tests
+    #   run: |
+    #     pip install -r src/test/requirements.txt
+    #     pytest --cov --cov-report=xml
+    # - name: SonarCloud Scan
+    #   uses: SonarSource/sonarcloud-github-action@master
+    #   env:
+    #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+    #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
     - name: Set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
         java-version: 11
+        distribution: temurin
     - name: Login to Docker
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
-        registry: private.docker.xenit.eu
+        registry: open-source.docker.xenit.eu
         username: ${{ secrets.CLOUDSMITH_USER }}
         password: ${{ secrets.CLOUDSMITH_APIKEY }}
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
     - name: Build docker image
-      uses: gradle/[email protected]
-      env:
-        BRANCH_NAME: ${{ github.ref_name }}
-      with:
-        arguments: buildDockerImage
+      run: ./gradlew buildDockerImage
     - name: Publish docker image
       if: ${{ startsWith(github.ref, 'refs/heads/master') }}
-      uses: gradle/[email protected]
-      env:
-        BRANCH_NAME: ${{ github.ref_name }}
-      with:
-        arguments: pushDockerImage
+      run: ./gradlew pushDockerImage

build.gradle

@@ -5,8 +5,8 @@ plugins {
 
 ext {
     base_img = 'open-source.docker.xenit.eu/oracle-python'
-    base_img_version = 'main-2.1.1'
-    img_version = '2.1.0'
+    base_img_version = 'main-2.1.2'
+    img_version = '2.2.0'
 }
 
 createDockerFile {

src/main/docker/docker_root/requirements.txt

@@ -1,4 +1,10 @@
 configargparse
 requests[socks]
 records
+attrs
 humanfriendly
+python-dateutil
+pytimeparse2
+types-python-dateutil
+types-requests
+types-humanfriendly