From 6c26d878ad2a749dc62cc9de718cc46c39d6565d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franc=CC=A7ois=20Bonelle?= <francois.bonelle@gmail.com>
Date: Sat, 18 Jun 2022 23:52:46 +0200
Subject: [PATCH] fix

---
 docker-socket-proxy/Dockerfile  | 12 +++++++-----
 docker-socket-proxy/build.yaml  |  5 +++++
 docker-socket-proxy/config.yaml |  2 ++
 docker-socket-proxy/haproxy.cfg |  1 -
 docker-socket-proxy/settings.sh |  5 ++++-
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/docker-socket-proxy/Dockerfile b/docker-socket-proxy/Dockerfile
index 74746c0..8f306f8 100755
--- a/docker-socket-proxy/Dockerfile
+++ b/docker-socket-proxy/Dockerfile
@@ -12,6 +12,8 @@ ARG BUILD_VERSION
 ARG TELEGRAF_VERSION
 ARG BASHIO_VERSION
 ARG TEMPIO_VERSION
+ARG HAPROXY_VERSION
+ARG HAPROXY_SHA256
 
 # Environment variables
 ENV \
@@ -52,7 +54,7 @@ RUN \
         jq=1.6-r1 \
         tzdata=2022a-r0 && \
     curl -J -L -o /tmp/bashio.tar.gz \
-        "https://github.com/hassio-addons/bashio/archive/v0.14.3.tar.gz" && \
+        "https://github.com/hassio-addons/bashio/archive/${BASHIO_VERSION}.tar.gz" && \
     mkdir /tmp/bashio && \
     tar zxvf \
         /tmp/bashio.tar.gz \
@@ -60,7 +62,7 @@ RUN \
     mv /tmp/bashio/lib /usr/lib/bashio && \
     ln -s /usr/lib/bashio/bashio /usr/bin/bashio && \
     curl -L -s -o /usr/bin/tempio \
-        "https://github.com/home-assistant/tempio/releases/download/2021.09.0/tempio_${BUILD_ARCH}" && \
+        "https://github.com/home-assistant/tempio/releases/download/${TEMPIO_VERSION}/tempio_${BUILD_ARCH}" && \
     chmod a+x /usr/bin/tempio && \
     apk del --no-cache --purge .build-dependencies && \
     rm -f -r \
@@ -80,9 +82,9 @@ RUN set -eux; \
 	mkdir /var/lib/haproxy; \
 	chown haproxy:haproxy /var/lib/haproxy
 
-ENV HAPROXY_VERSION 2.6.0
-ENV HAPROXY_URL https://www.haproxy.org/download/2.6/src/haproxy-2.6.0.tar.gz
-ENV HAPROXY_SHA256 90f8e608aacd513b0f542e0438fa12e7fb4622cf58bd4375f3fe0350146eaa59
+ENV HAPROXY_VERSION ${HAPROXY_VERSION}
+ENV HAPROXY_URL https://www.haproxy.org/download/2.6/src/haproxy-${HAPROXY_VERSION}.tar.gz
+ENV HAPROXY_SHA256 ${HAPROXY_SHA256}
 
 RUN set -eux; \
 	\
diff --git a/docker-socket-proxy/build.yaml b/docker-socket-proxy/build.yaml
index 2714a12..bdb2dc8 100644
--- a/docker-socket-proxy/build.yaml
+++ b/docker-socket-proxy/build.yaml
@@ -4,3 +4,8 @@ build_from:
   armhf: library/alpine:3.16
   armv7: library/alpine:3.16
   i386: library/alpine:3.16
+args:
+  BASHIO_VERSION: v0.14.3
+  TEMPIO_VERSION: 2021.09.0
+  HAPROXY_VERSION: 2.6.0
+  HAPROXY_SHA256: 90f8e608aacd513b0f542e0438fa12e7fb4622cf58bd4375f3fe0350146eaa59
\ No newline at end of file
diff --git a/docker-socket-proxy/config.yaml b/docker-socket-proxy/config.yaml
index 9a78f13..7cdbcb2 100644
--- a/docker-socket-proxy/config.yaml
+++ b/docker-socket-proxy/config.yaml
@@ -32,6 +32,7 @@ docker_api: true
 host_pid: true
 full_access: true
 options:
+  socket_path: "/var/run/docker.sock"
   events: true
   ping: true
   version: true
@@ -58,6 +59,7 @@ options:
   secrets: false
   post: false
 schema:
+  socket_path: str
   events: bool
   ping: bool
   version: bool
diff --git a/docker-socket-proxy/haproxy.cfg b/docker-socket-proxy/haproxy.cfg
index 9cea2f4..d005f81 100644
--- a/docker-socket-proxy/haproxy.cfg
+++ b/docker-socket-proxy/haproxy.cfg
@@ -68,4 +68,3 @@ frontend dockerfrontend
     http-request allow if { path,url_dec -m reg -i ^(/v[\d\.]+)?/volumes } { env(ENABLE_VOLUMES) -m bool }
     http-request deny
     default_backend dockerbackend
-    
\ No newline at end of file
diff --git a/docker-socket-proxy/settings.sh b/docker-socket-proxy/settings.sh
index 35016bc..50e7338 100755
--- a/docker-socket-proxy/settings.sh
+++ b/docker-socket-proxy/settings.sh
@@ -1,11 +1,14 @@
 #!/usr/bin/env bashio
-set -x
 declare hostname
 bashio::require.unprotected
 
 SETTINGS_CONF=/variables.sh
 touch ${SETTINGS_CONF}
 
+SOCKET_PATH=$(bashio::config 'socket_path')
+bashio::log.info "Setting socket path: ${SOCKET_PATH}"
+echo "export SOCKET_PATH=${SOCKET_PATH}" >> ${SETTINGS_CONF}
+
 if bashio::var.true 'events'; then
   bashio::log.info "Enabling events"
   echo "export ENABLE_EVENTS=1" >> ${SETTINGS_CONF}