From cfa6e80301312d65910d3a8095ab9cc6ef4eb7af Mon Sep 17 00:00:00 2001
From: Alexandre <alexandre.pary@gmail.com>
Date: Sat, 20 May 2023 21:39:00 +0200
Subject: [PATCH] test

---
 portainer_agent/Dockerfile  | 18 ++++++++++++++----
 portainer_agent/build.json  |  6 +++---
 portainer_agent/config.json |  2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/portainer_agent/Dockerfile b/portainer_agent/Dockerfile
index d65d18f64..5efa588c1 100644
--- a/portainer_agent/Dockerfile
+++ b/portainer_agent/Dockerfile
@@ -14,9 +14,22 @@
 # 1 Build Image #
 #################
 
-ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:11.0.0
+FROM portainer/agent:2.6.3 as agent
+
+ARG BUILD_FROM
 FROM ${BUILD_FROM}
 
+ENV PORTAINER_AGENT_ARGS=""
+ENV FIRST_HEALTHCHECK_TIMEOUT=20
+
+# Copy Portainer agent binaries
+COPY --from=agent / /
+
+RUN chmod a+x /usr/sbin/healthcheck && \
+    chmod a+x /usr/sbin/wait-for-signal
+
+ENTRYPOINT [ "/init" ]
+
 ##################
 # 2 Modify Image #
 ##################
@@ -26,9 +39,6 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
     S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
     S6_SERVICES_GRACETIME=0
 
-# Set shell
-SHELL ["/usr/bin/env bash", "-o", "pipefail", "-c"]
-
 ##################
 # 3 Install apps #
 ##################
diff --git a/portainer_agent/build.json b/portainer_agent/build.json
index 54edf803c..02c1ea834 100644
--- a/portainer_agent/build.json
+++ b/portainer_agent/build.json
@@ -1,8 +1,8 @@
 {
   "build_from": {
-    "aarch64": "portainer/agent:alpine",
-    "amd64": "portainer/agent:alpine",
-    "armv7": "portainer/agent:alpine"
+    "aarch64": "ghcr.io/hassio-addons/base/aarch64:11.1.0",
+    "amd64": "ghcr.io/hassio-addons/base/amd64:11.1.0",
+    "armv7": "ghcr.io/hassio-addons/base/armv7:11.1.0"
   },
   "codenotary": {
     "signer": "alexandrep.github@gmail.com"
diff --git a/portainer_agent/config.json b/portainer_agent/config.json
index baaa43f73..5fefc531e 100644
--- a/portainer_agent/config.json
+++ b/portainer_agent/config.json
@@ -40,5 +40,5 @@
   },
   "slug": "portainer_agent",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "2.18.2-test6"
+  "version": "2.18.2-test7"
 }
\ No newline at end of file