From 93b70a99c63b0101c3b127e2d2760c08f09e4943 Mon Sep 17 00:00:00 2001
From: Umputun <umputun@gmail.com>
Date: Fri, 24 May 2024 16:12:29 -0500
Subject: [PATCH] fix (revert) regression causing docker connection refusal,
 introduced by 899e101d7abb744fd8fb2e864d64df6abe0ab542

the reason for this regression is not fully understood yet, probably related to some differences between the "manually" created final image on top of scratch and the updated one from the base images.
---
 Dockerfile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cb06c36..3f76871 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,12 +18,18 @@ RUN \
     echo "version=$version" && \
     cd app && go build -o /build/reproxy -ldflags "-X main.revision=${version} -s -w"
 
-FROM umputun/baseimage:scratch-latest
-# enables automatic changelog generation by tools like Dependabot
+
+FROM ghcr.io/umputun/baseimage/app:v1.12.0 as base
+
+FROM scratch
 LABEL org.opencontainers.image.source="https://github.com/umputun/reproxy"
 ENV REPROXY_IN_DOCKER=1
 
 COPY --from=backend /build/reproxy /srv/reproxy
+COPY --from=base /usr/share/zoneinfo /usr/share/zoneinfo
+COPY --from=base /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=base /etc/passwd /etc/passwd
+COPY --from=base /etc/group /etc/group
 
 WORKDIR /srv
 ENTRYPOINT ["/srv/reproxy"]