Correcting url used for portainer ping

docker_updater.sh

@@ -5,6 +5,6 @@ set -e
 PROJECT_NAME=$1
 COMPOSE_FILE=$2
 
-docker compose -p $PROJECT_NAME -f $COMPOSE_FILE stop
-docker compose -p $PROJECT_NAME -f $COMPOSE_FILE pull
-docker compose -p $PROJECT_NAME -f $COMPOSE_FILE up -d
+docker compose -p "$PROJECT_NAME" -f "$COMPOSE_FILE" pull
+docker compose -p "$PROJECT_NAME" -f "$COMPOSE_FILE" down
+docker compose -p "$PROJECT_NAME" -f "$COMPOSE_FILE" up -d

main.py

@@ -1,14 +1,17 @@
+#!/usr/bin/env python3
+
 import os
 import json
+from time import sleep
 
 import requests
 
 import config
 
-
 DOCKER_COMPOSE_PATH = config.portainer_compose_dir + '/{}/docker-compose.yml'
-BASH_COMPANION_SCRIPT = os.getcwd() + '/docker_updater.sh'
-REPO_UPDATER_SCRIPT = os.getcwd() + '/update_repos.sh'
+SCRIPT_DIR = os.path.dirname(__file__)
+BASH_COMPANION_SCRIPT = f'{SCRIPT_DIR}/docker_updater.sh'
+REPO_UPDATER_SCRIPT = f'{SCRIPT_DIR}/update_repos.sh'
 
 
 class PortainerClient:
@@ -25,16 +28,30 @@ class PortainerClient:
             "X-API-Key": self.access_token
         }
 
-    def list_stacks(self):
-        response = requests.get(f"{self.api_url}/stacks", headers=self._get_headers())
+    def _get(self, uri):
+        response = requests.get(f"{self.api_url}/{uri}", headers=self._get_headers())
         return response.json()
 
+    def list_endpoints(self):
+        return self._get("endpoints")
+
+    def list_stacks(self, endpoint_id=None):
+        filters = f'?filters={{"EndpointID":{endpoint_id}}}' if endpoint_id else ""
+        return self._get(f'stacks{filters}')
+
     def get_stack(self, stack_id):
-        response = requests.get(f"{self.api_url}/stacks/{stack_id}", headers=self._get_headers())
-        return response.json()
+        return self._get(f'stacks/{stack_id}')
 
     def get_stack_file(self, stack_id):
-        response = requests.get(f"{self.api_url}/stacks/{stack_id}/file", headers=self._get_headers())
+        return self._get(f'stacks/{stack_id}/file')
+
+    def _put(self, uri, payload):
+        response = requests.put(
+            f"{self.api_url}/{uri}",
+            headers=self._get_headers(),
+            json=payload
+        )
+
         return response.json()
 
     def upgrade_stack(self, stack):
@@ -45,22 +62,12 @@ class PortainerClient:
             "StackFileContent": file_response["StackFileContent"],
             "Env": stack["Env"]
         }
-        response = requests.put(
-            f"{self.api_url}/stacks/{stack['Id']}?endpointId={stack['EndpointId']}",
-            headers=self._get_headers(),
-            json=payload
-        )
 
-        return response.json()
+        return self._put(f"stacks/{stack['Id']}?endpointId={stack['EndpointId']}", payload)
 
     def list_stack_containers(self, endpoint, stack_name):
         filters = '{"label":["com.docker.compose.project=' + stack_name + '"]}'
-        response = requests.get(
-            f"{self.api_url}/endpoints/{endpoint}/docker/containers/json?all=1&filters={filters}",
-            headers=self._get_headers()
-        )
-
-        return response.json()
+        return self._get(f'endpoints/{endpoint}/docker/containers/json?all=1&filters={filters}')
 
     def update_image(self, endpoint, image):
         response = requests.post(
@@ -75,6 +82,20 @@ class PortainerClient:
 
         return f"Downloaded newer image for {image}" in status
 
+    def delete_image(self, endpoint, image):
+        response = requests.delete(
+            f"{self.api_url}/endpoints/{endpoint}/docker/images/{image}?force=false",
+            headers=self._get_headers()
+        )
+
+    def ping_server(self):
+        try:
+            r = requests.get(f"{self.portainer_url}/", headers=self._get_headers())
+        except requests.exceptions.ConnectionError:
+            return False
+
+        return r.status_code == 200
+
 
 def update_repositories():
     for repo_path in config.git_repositories:
@@ -83,7 +104,19 @@ def update_repositories():
             exit(ret)
 
 
-def update_local_stack(stack):
+def update_stack_images(endpoint, stack_name):
+    containers = client.list_stack_containers(endpoint, stack_name)
+
+    updated_images = []
+    for c in containers:
+        if client.update_image(endpoint, c['Image']):
+            print(f"{c['Image']} was updated.")
+            updated_images.append(c['ImageID'])
+
+    return updated_images
+
+
+def upgrade_local_stack(stack):
     project_name = stack['Name']
 
     print(f"Updating stack: {project_name}")
@@ -96,29 +129,42 @@ def update_local_stack(stack):
     print(f"Stack {project_name} updated!\n")
 
 
+def upgrade_endpoint_stack(client, endpoint):
+    endpoint_id = endpoint['Id']
+    endpoint_updated_images = []
+    for stack in client.list_stacks(endpoint_id):
+        if stack['Status'] == 1:
+            stack_name = stack['Name']
+
+            print(f"Checking {stack_name} for updates.")
+
+            updated_images = update_stack_images(endpoint_id, stack_name)
+            if updated_images:
+                endpoint_updated_images += updated_images
+                print(f"{stack_name} was updated. Restarting...")
+                if endpoint_id == 2 and stack_name in ('portainer', 'traefik'):
+                    upgrade_local_stack(stack)
+                    while not client.ping_server():
+                        print("Waiting for server to be back online...")
+                        sleep(1)
+                else:
+                    client.upgrade_stack(stack)
+                print(f"{stack_name} restarted.")
+            else:
+                print(f"{stack_name} is up to date. Skipping.")
+
+    if endpoint_updated_images:
+        print("Deleting obsolete images")
+        for image_id in endpoint_updated_images:
+            client.delete_image(endpoint_id, image_id)
+    else:
+        print("No obsolete image to delete")
+
+
 if __name__ == '__main__':
     update_repositories()
 
     client = PortainerClient(portainer_url=config.portainer_url, access_token=config.access_token)
 
-    for stack in client.list_stacks():
-        endpoint = stack['EndpointId']
-        stack_name = stack['Name']
-        if stack['Status'] == 1:
-            containers = client.list_stack_containers(endpoint, stack_name)
-
-            an_image_was_updated = False
-            for c in containers:
-                this_image_was_updated = client.update_image(endpoint, c['Image'])
-                if this_image_was_updated:
-                    print(f"{c['Image']} was updated")
-                    an_image_was_updated = True
-
-            if an_image_was_updated:
-                print(f"Restarting {stack_name}")
-                if endpoint == 2 and stack_name in ('portainer', 'traefik'):
-                    update_local_stack(stack)
-                else:
-                    client.upgrade_stack(stack)
-
-    os.system('docker image prune -fa')
+    for e in client.list_endpoints():
+        upgrade_endpoint_stack(client, e)

update_repos.sh

@@ -1,6 +1,6 @@
 REPO_PATH=$1
 
-git -C $REPO_PATH fetch --tags
-LAST_HASH=`git -C $REPO_PATH rev-list --tags --max-count=1`
-LAST_TAG=`git -C $REPO_PATH describe --tags $LAST_HASH`
-git -C $REPO_PATH checkout $LAST_TAG
+git -C "$REPO_PATH" fetch --tags
+LAST_HASH=$(git -C "$REPO_PATH" rev-list --tags --max-count=1)
+LAST_TAG=$(git -C "$REPO_PATH" describe --tags "$LAST_HASH")
+git -C "$REPO_PATH" checkout "$LAST_TAG"