From 6d30afc469c0f33736d111cbfd556944f62512f8 Mon Sep 17 00:00:00 2001 From: Laci Dusa Date: Thu, 26 Feb 2026 15:20:37 +0100 Subject: [PATCH] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b1523de..3bf3d16 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ notify1: - rm -rf /home/gitlab-runner/builds/1fLwHSKm2/0/jaydee/portainer.tmp lint: stage: lint - image: r.sectorq.eu/jaydee/builder-portainer:latest + image: r.sectorq.eu/jaydee/builder:latest before_script: - python3 -m pip install --break-system-packages flake8 black pylint tabulate prompt_toolkit hvac - export PATH="$PATH:/home/gitlab-runner/.local/bin" @@ -31,7 +31,7 @@ lint: - if: '$CI_COMMIT_MESSAGE =~ /lint/' build-job: # This job runs in the build stage, which runs first. stage: build - image: r.sectorq.eu/jaydee/builder-portainer:latest + image: r.sectorq.eu/jaydee/builder:latest script: - mkdir -p ~/.ssh - echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa @@ -43,7 +43,7 @@ build-job: # This job runs in the build stage, which runs first. - pyinstaller --onefile --clean -n portainer main.py #- scp -o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null dist/portainer jd@192.168.80.222:/myapps/bin/ || true - scp -o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null dist/portainer jd@192.168.77.12:/myapps/bin/ || true - - scp -o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null dist/portainer jd@192.168.77.101:/myapps/bin/ || true + - curl -F "file=@dist/portainer" https://myapps.sectorq.eu/ - rm -rf /home/gitlab-runner/builds/1fLwHSKm2/0/jaydee/portainer.tmp artifacts: paths: @@ -65,10 +65,10 @@ build-job-arm: # This job runs in the build stage, which runs first. #- pyinstaller --onefile --add-data "port.py:." portainer.py - rm -rf build dist *.spec - python3 main.py -h - - pyinstaller --onefile --clean -n portainer-arm main.py + - pyinstaller --onefile --clean -n portainer_arm main.py #- scp -o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null dist/portainer jd@192.168.80.222:/myapps/bin/ || true - - scp -o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null dist/portainer-arm jd@192.168.77.238:/myapps/bin/ || true - - scp -o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null dist/portainer-arm jd@192.168.77.101:/myapps/bin/ || true + - scp -o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null dist/portainer_arm jd@192.168.77.12:/myapps/bin/ || true + - curl -F "file=@dist/portainer_arm" https://myapps.sectorq.eu/ - rm -rf /home/gitlab-runner/builds/1fLwHSKm2/0/jaydee/portainer.tmp artifacts: paths: @@ -78,7 +78,9 @@ build-job-arm: # This job runs in the build stage, which runs first. # - echo "${flow_id}" # - curl -X POST https://kestra.sectorq.eu/api/v1/executions/webhook/jaydee/ansible-all/${flow_id} -d '{"tag":["proxmox"],"target":["servers"]}' -H "Content-Type${column} application/json" rules: - - if: '$CI_COMMIT_MESSAGE =~ /build/' + - if: '$CI_COMMIT_MESSAGE =~ /build-all/' + + clean-job: # This job runs in the build stage, which runs first. stage: clean script: