From a769cc89d5a1b18cc3a2175bb8e484429e586970 Mon Sep 17 00:00:00 2001
From: Umputun <umputun@gmail.com>
Date: Sun, 11 Apr 2021 14:12:40 -0500
Subject: [PATCH] switch Dockerfile to standard base images #11 #18

---
 Dockerfile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 53e7f78..8aa9843 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,23 +1,25 @@
-FROM umputun/baseimage:buildgo-latest as backend
+FROM golang:1.16-alpine as backend
 
 ARG GIT_BRANCH
 ARG GITHUB_SHA
 ARG CI
 
 ENV GOFLAGS="-mod=vendor"
+ENV CGO_ENABLED=0
 
 ADD . /build
 WORKDIR /build
 
+RUN apk add -u git
 RUN \
     if [ -z "$CI" ] ; then \
-    echo "runs outside of CI" && version=$(/script/git-rev.sh); \
+    echo "runs outside of CI" && version=$(git log -1 --format=%h)-$(date +%Y%m%dT%H:%M:%S); \
     else version=${GIT_BRANCH}-${GITHUB_SHA:0:7}-$(date +%Y%m%dT%H:%M:%S); fi && \
     echo "version=$version" && \
     cd app && go build -o /build/reproxy -ldflags "-X main.revision=${version} -s -w"
 
 
-FROM umputun/baseimage:app-latest
+FROM alpine:3.13
 
 COPY --from=backend /build/reproxy /srv/reproxy
 RUN chmod +x /srv/reproxy
@@ -25,4 +27,3 @@ LABEL reproxy.enabled="false"
 WORKDIR /srv
 
 CMD ["/srv/reproxy"]
-ENTRYPOINT ["/init-root.sh"]