From 2eaf561f04c9d4950ab1bb20858192cbdd9cb2b1 Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Sun, 25 Apr 2021 21:04:01 +0200
Subject: [PATCH] Synchronize dockerfiles

---
 Dockerfile             |  2 +-
 docker/tmpl.Dockerfile | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ef087264c..675e94acc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,7 +57,7 @@ COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /build/evcc /usr/local/bin/evcc
 
-COPY entrypoint.sh /app/
+COPY docker/bin/* /app/
 
 # UI and /api
 EXPOSE 7070/tcp
diff --git a/docker/tmpl.Dockerfile b/docker/tmpl.Dockerfile
index 846b6ee73..2877c8d2c 100644
--- a/docker/tmpl.Dockerfile
+++ b/docker/tmpl.Dockerfile
@@ -50,6 +50,8 @@ RUN GOARCH={{ .GoARCH }} GOARM={{ .GoARM }} make build
 # STEP 3 build a small image including module support
 FROM {{ .RuntimeImage }}
 
+WORKDIR /app
+
 ENV TZ=Europe/Berlin
 
 # Import from builder
@@ -57,11 +59,16 @@ COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /build/evcc /usr/local/bin/evcc
 
-COPY docker/bin/* /evcc/
+COPY docker/bin/* /app/
 
-EXPOSE 7070
+# UI and /api
+EXPOSE 7070/tcp
+# KEBA charger
+EXPOSE 7090/udp
+# SMA Energy Manager
+EXPOSE 9522/udp
 
 HEALTHCHECK --interval=60s --start-period=60s --timeout=30s --retries=3 CMD [ "evcc", "health" ]
 
-ENTRYPOINT [ "/evcc/entrypoint.sh" ]
+ENTRYPOINT [ "/app/entrypoint.sh" ]
 CMD [ "evcc" ]