From d228838c362c4d823f28f5b3d50a0142e6790e56 Mon Sep 17 00:00:00 2001
From: Sergey Ivanov <delta_001@bk.ru>
Date: Thu, 18 Dec 2025 01:05:49 +0500
Subject: [PATCH] Use glibc Temurin base image

---
 .github/workflows/portainer-deploy.yml | 44 ++++++++++++++++++++------
 Dockerfile                             | 12 +++++--
 mvnw                                   |  0
 3 files changed, 43 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 mvnw

diff --git a/.github/workflows/portainer-deploy.yml b/.github/workflows/portainer-deploy.yml
index 82d59c3..34df925 100644
--- a/.github/workflows/portainer-deploy.yml
+++ b/.github/workflows/portainer-deploy.yml
@@ -27,9 +27,12 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: '17'
+          java-version: '8'
           cache: maven
 
+      - name: Make Maven wrapper executable
+        run: chmod +x mvnw
+
       - name: Build application
         run: ./mvnw -B package -DskipTests
 
@@ -58,26 +61,47 @@ jobs:
           import json
           import os
           import sys
-          from urllib import request
+          from urllib import error, request
+
+          def exit_with_http_details(exc: error.HTTPError) -> None:
+              body = exc.read().decode(errors="replace") if exc.fp else ""
+              sys.exit(f"HTTP {exc.code} when calling {exc.url}: {body}")
+
           url = os.environ.get("PORTAINER_URL")
           username = os.environ.get("PORTAINER_USERNAME")
           password = os.environ.get("PORTAINER_PASSWORD")
           stack_id = os.environ.get("PORTAINER_STACK_ID")
           if not all([url, username, password, stack_id]):
               sys.exit("Portainer secrets are not configured")
-          data = json.dumps({"Username": username, "Password": password}).encode()
-          req = request.Request(f"{url}/api/auth", data=data, headers={"Content-Type": "application/json"})
-          with request.urlopen(req) as resp:
-              token = json.loads(resp.read().decode()).get("jwt")
+
+          auth_request = request.Request(
+              f"{url.rstrip('/')}/api/auth",
+              data=json.dumps({"Username": username, "Password": password}).encode(),
+              headers={"Content-Type": "application/json"},
+          )
+          try:
+              with request.urlopen(auth_request) as resp:
+                  token = json.loads(resp.read().decode()).get("jwt")
+          except error.HTTPError as exc:
+              exit_with_http_details(exc)
+          except error.URLError as exc:
+              sys.exit(f"Failed to reach Portainer auth endpoint: {exc.reason}")
+
           if not token:
               sys.exit("Failed to obtain Portainer JWT token")
+
           deploy_request = request.Request(
-              f"{url}/api/stacks/{stack_id}/deploy",
+              f"{url.rstrip('/')}/api/stacks/{stack_id}/deploy",
               data=json.dumps({"prune": True, "pullImage": True}).encode(),
               headers={"Authorization": f"Bearer {token}", "Content-Type": "application/json"},
               method="POST",
           )
-          with request.urlopen(deploy_request) as resp:
-              print(f"Deploy response status: {resp.status}")
-              print(resp.read().decode())
+          try:
+              with request.urlopen(deploy_request) as resp:
+                  print(f"Deploy response status: {resp.status}")
+                  print(resp.read().decode())
+          except error.HTTPError as exc:
+              exit_with_http_details(exc)
+          except error.URLError as exc:
+              sys.exit(f"Failed to reach Portainer deploy endpoint: {exc.reason}")
           PY
diff --git a/Dockerfile b/Dockerfile
index 180c04d..e08df37 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,11 @@
-FROM openjdk:8-jdk-alpine
+FROM eclipse-temurin:8-jdk
+
 VOLUME /tmp
 COPY target/botplatform-0.0.1-SNAPSHOT.jar app.jar
-RUN apk update && apk add fontconfig ttf-dejavu && rm -rf /var/cache/apk/*
-ENTRYPOINT ["java","-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
\ No newline at end of file
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends ca-certificates fontconfig fonts-dejavu-core \
+    && update-ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
+
+ENTRYPOINT ["java","-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
diff --git a/mvnw b/mvnw
old mode 100644
new mode 100755