.ci/gen_output.sh

@@ -1,28 +0,0 @@
-echo "\`\`\`" > output.txt
-
-process_output() {
-    if [ $? -eq 0 ]; then
-        head -n 5 output_tmp.txt >> output.txt
-        echo "... [See pipeline output for full details]" >> output.txt
-        tail -n 5 output_tmp.txt >> output.txt
-    else
-        cat output_tmp.txt >> output.txt
-    fi
-}
-
-echo "-- START Port attribution watcher --" | tee -a output.txt
-python3 .ci/port_attribution_watcher.py | tee output_tmp.txt
-
-process_output
-
-echo "-- END Port attribution watcher --" | tee -a output.txt
-echo "" >> output.txt
-echo "-- START Traefik label watcher --" | tee -a output.txt
-
-python3 .ci/traefik_label_watcher.py | tee output_tmp.txt
-
-process_output
-
-echo "-- END Traefik label watcher --" | tee -a output.txt
-echo "\`\`\`" >> output.txt # Close the code block
-

.ci/lint_wrap.sh

@@ -1,11 +0,0 @@
-set -o pipefail
-sh .ci/lint.sh 2>&1 | tee output_tmp.txt
-EXIT_CODE=$?
-echo "\`\`\`" > output.txt
-
-grep -n 'msg=' output_tmp.txt | awk -F'msg="' '{print $2}' | sed 's/"$//' | sed 's/\\"/"/g' >> output.txt
-grep -v 'msg=' output_tmp.txt >> output.txt
-
-echo "\`\`\`" >> output.txt
-echo "END"
-exit $EXIT_CODE

.ci/port_attribution_watcher.py

@@ -52,20 +52,25 @@ def main(watchFolder: str):
         # Get exposed ports
         exposedPorts = getExposedPortsFromDockerComposeFile(dockerComposeFile)
         ports[dockerComposeFile] = exposedPorts
-        if len(exposedPorts) != 0:
+        if len(exposedPorts) == 0:
             print(f"\n📦 {dockerComposeFile}"
-                f"\n🔗 Exposed ports: {exposedPorts}")
+                  f"\n🔴 No exposed ports found"
+                  f"\n")
+        else:
+            print(f"\n📦 {dockerComposeFile}"
+                f"\n🔗 Exposed ports: {exposedPorts}"
+                f"\n")
     
     wrong = checkPortUnique(ports)
     
     if wrong:
         exit(1)
     else:
-        print("\n✅ All ports are unique")
+        print("\n\n✅ All ports are unique\n\n")
         exit(0)
 
 if __name__ == "__main__":
-    print("Port Attribution Watcher")
+    print("Traefik label watcher CI/CD")
     # Read folder from env
     watchFolder = os.getenv("WATCH_FOLDER")
     if watchFolder == None:

.ci/traefik_label_watcher.py

@@ -85,7 +85,7 @@ def main(watchFolder: str):
     if wrong:
         exit(1)
     else:
-        print("\n\n✅ All routers are unique")
+        print("\n\n✅ All routers are unique\n\n")
         exit(0)
 
 if __name__ == "__main__":

.woodpecker/lint.yml

@@ -3,36 +3,23 @@ steps:
     image: python:3.13-slim
     commands:
       - pip3 install -r .ci/requirements.txt
-      - ./.ci/gen_output.sh
-  comment:
-      image: git.gnous.eu/enpls/gitea-comment-plugin:1.1
-      settings:
-        gitea_address: https://git.gnous.eu
-        gitea_token:
-          from_secret: gnous_cicd_token
-        comment_file: output.txt
-      when:
-        status: [failure, success]
-        event: [pull_request]
+      - python3 .ci/port_attribution_watcher.py
+      - python3 .ci/traefik_labels_watcher.py
+    when:
+      - event: pull_request
+        repo: gnouseu/docker-services
+      - event: push
+        branch: main
   lint:
-    image: debian:stable
+    image: debian:stable-slim
     commands:
-      - rm -rf output.txt
       - apt-get update
       - apt-get install -y curl
       - curl -SL https://github.com/docker/compose/releases/download/v2.20.3/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
       - chmod +x /usr/local/bin/docker-compose
-      - bash .ci/lint_wrap.sh
-  comment_2:
-      image: git.gnous.eu/enpls/gitea-comment-plugin:1.1
-      settings:
-        gitea_address: https://git.gnous.eu
-        gitea_token:
-          from_secret: gnous_cicd_token
-        comment_file: output.txt
-      when:
-        status: [failure, success]
-        event: [pull_request]
-when:
-  - event: [push, pull_request]
-  - evaluate: 'CI_COMMIT_AUTHOR in ["gnous-ci-bot", "mael", "ada"]'
+      - sh .ci/lint.sh
+    when:
+      - event: pull_request
+        repo: gnouseu/docker-services
+      - event: push
+        branch: main