build

.gitlab-ci.yml

@@ -33,15 +33,8 @@ 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:latest
+    image: r.sectorq.eu/jaydee/builder:amd64
     script:
-      - mkdir -p ~/.ssh
-      - echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa
-      - chmod 600 ~/.ssh/id_rsa
-      - pip install uuid
-      #- pyinstaller --onefile --add-data "port.py:." portainer.py
-      - rm -rf build dist *.spec
-      - python3 main.py  -h
       - 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
@@ -58,15 +51,8 @@ build-job:       # This job runs in the build stage, which runs first.
       - if: '$CI_COMMIT_MESSAGE =~ /build/'
 build-job-arm:       # This job runs in the build stage, which runs first.
     stage: build
-    image: r.sectorq.eu/jaydee/builder-arm:latest
+    image: r.sectorq.eu/jaydee/builder:arm64
     script:
-      - mkdir -p ~/.ssh
-      - echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa
-      - chmod 600 ~/.ssh/id_rsa
-      - pip install uuid
-      #- 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
       #- 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.12:/myapps/bin/ || true

main.py

@@ -46,7 +46,7 @@ def setup_vault():
     # Specify the mount point of your KV engine
     return vclient
 
-VERSION = "0.1.64"
+VERSION = "0.1.66"
 
 
 defaults = {

portainer/api.py

@@ -1139,7 +1139,7 @@ class PortainerApi:
         path = f"/endpoints/{self.endpoint_id}/forceupdateservice"
         params={"serviceID": service_id, "pullImage": pool}
         try:
-            resp = self._api_put(path, json=params, timeout=20)
+            resp = self._api_put(path, json=params, timeout=120)
             # print(resp)
         except ValueError as e:
             print(f"Error restarting service: {e}")