Update .gitlab-ci.yml file

.gitlab-ci.yml

@@ -21,14 +21,12 @@ 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/python-custom:latest
     script:
-      - python3 -m venv venv
-      - source venv/bin/activate
-      - pip install pyinstaller requests tabulate gitpython prompt_toolkit
       - pyinstaller --onefile portainer.py
-      - scp -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.80.222:/myapps/bin/ || true
-      - scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null dist/portainer jd@morefine.home.lan:/myapps/bin/ || true
+      - scp -o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null dist/portainer jd@morefine.home.lan:/myapps/bin/ || true
-      - scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null dist/portainer jd@m-server.home.lan:/myapps/bin/ || true
+      - scp -o ConnectTimeout=5 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null dist/portainer jd@m-server.home.lan:/myapps/bin/ || true
       - rm -rf /home/gitlab-runner/builds/1fLwHSKm2/0/jaydee/portainer.tmp
     artifacts:
       paths:

portainer.py

@@ -354,6 +354,10 @@ def prompt_missing_args(args_in, defaults_in, fields, action=None,stacks=None):
         
         if field == "site" and value_in != cur_site:
             por.get_site(value_in)
+            if value_in == "portainer":
+                defaults_in["PORTAINER_ENDPOINT_ID"] = "m-s"
+            elif value_in == "port":
+                defaults_in["PORTAINER_ENDPOINT_ID"] = "vm01"
         if field == "stack" and value_in != cur_site:
             os.environ[field] = ",".join(value_in)
         else: