updated compose files to use janitor

Author: Dpbm

.github/workflows/release.yml

@@ -198,16 +198,50 @@ jobs:
           file: './server/worker/Dockerfile'
 
 
+
+    push_janitor_dockerhub:
+      permissions:
+          packages: write
+          contents: read
+          attestations: write
+          id-token: write
+
+      uses: ./.github/workflows/dockerhub-publish.yml
+      secrets: 
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          DOCKERHUB_NAMESPACE: ${{ secrets.DOCKERHUB_NAMESPACE }}
+      with:
+          image_name: 'qJanitor'
+          context: './janitor'
+          file: './janitor/Dockerfile'
+
+    push_janitor_ghcr:
+      permissions:
+        contents: read
+        packages: write
+        attestations: write
+        id-token: write
+
+      uses: ./.github/workflows/ghcr-publish.yml
+      secrets: 
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+          image_name: 'qJanitor'
+          context: './janitor'
+          file: './janitor/Dockerfile'
+
+
 
     test-dockerhub-production-compose-file:
-        needs: [push_api_dockerhub, push_database_dockerhub, push_jobs_server_dockerhub, push_proxy_dockerhub, push_worker_dockerhub]
+        needs: [push_api_dockerhub, push_database_dockerhub, push_jobs_server_dockerhub, push_proxy_dockerhub, push_worker_dockerhub, push_janitor_dockerhub]
         uses: ./.github/workflows/compose-test.yml
         with:
           file: './compose.yml'
 
 
     test-ghcr-production-compose-file:
-        needs: [push_api_ghcr, push_database_ghcr, push_jobs_server_ghcr, push_proxy_ghcr, push_worker_ghcr]
+        needs: [push_api_ghcr, push_database_ghcr, push_jobs_server_ghcr, push_proxy_ghcr, push_worker_ghcr, push_janitor_ghcr]
         uses: ./.github/workflows/compose-test.yml
         with:
           file: './ghcr-prod-compose.yml'

.vscode/settings.json

@@ -65,6 +65,7 @@
         "qasm",
         "qexec",
         "qiskit",
+        "qjanitor",
         "qjobsserver",
         "qnet",
         "qproxy",

compose.yml

@@ -142,6 +142,18 @@ services:
             - logs:/logs
         networks:
             - qnet
+    
+    janitor:
+        container_name: janitor
+        image: dpbm32/qjanitor
+        environment:
+            - LOGS_PATH=/data/logs
+            - QASM_PATH=/data/qasm
+            - TIME_TO_DELETE=5 # in days
+        restart: always
+        volumes:
+            - qasm:/data/qasm
+            - logs:/data/logs
 
 volumes:
     data:

dev-compose.yml

@@ -136,9 +136,10 @@ services:
             context: ./janitor
             dockerfile: Dockerfile
         environment:
-            - LOGS_PATH=/data/logs
-            - QASM_PATH=/data/qasm
-            - TIME_TO_DELETE=5 # in days
+            LOGS_PATH: /data/logs
+            QASM_PATH: /data/qasm
+            TIME_TO_DELETE: 5 # in days
+        restart: always
         volumes:
             - qasm:/data/qasm
             - logs:/data/logs

ghcr-prod-compose.yml

@@ -143,6 +143,18 @@ services:
         networks:
             - qnet
 
+    janitor:
+        container_name: janitor
+        image: ghcr.io/dpbm/qjanitor
+        environment:
+            - LOGS_PATH=/data/logs
+            - QASM_PATH=/data/qasm
+            - TIME_TO_DELETE=5 # in days
+        restart: always
+        volumes:
+            - qasm:/data/qasm
+            - logs:/data/logs
+
 volumes:
     data:
         external: false