From 1a9f2173d3f18a3c168f66c71bbd9144befeabae Mon Sep 17 00:00:00 2001
From: Sven Gottwald <svengo@gmx.net>
Date: Sat, 20 Apr 2019 12:44:01 +0200
Subject: [PATCH] Rename Dockerfile and use more RUN commands

---
 ....multistage-build => Dockerfile.self-contained | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
 rename Dockerfile.multistage-build => Dockerfile.self-contained (66%)

diff --git a/Dockerfile.multistage-build b/Dockerfile.self-contained
similarity index 66%
rename from Dockerfile.multistage-build
rename to Dockerfile.self-contained
index 9012805..64d5dc0 100644
--- a/Dockerfile.multistage-build
+++ b/Dockerfile.self-contained
@@ -7,16 +7,15 @@ FROM golang:alpine as builder
 # use version (for example "v0.3.3") or "master"
 ARG WATCHTOWER_VERSION=master
 
-RUN \
-  apk add --no-cache \
+RUN apk add --no-cache \
     alpine-sdk \
     ca-certificates \
     git \
-    tzdata && \
-  \
-  mkdir --parents $GOPATH/src/github.com/containrrr && \
-  cd $GOPATH/src/github.com/containrrr && \
-  git clone --branch "${WATCHTOWER_VERSION}" https://github.com/containrrr/watchtower.git && \
+    tzdata
+
+RUN git clone --branch "${WATCHTOWER_VERSION}" https://github.com/containrrr/watchtower.git
+
+RUN \
   cd watchtower && \
   \
   GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' . && \
@@ -34,6 +33,6 @@ LABEL "com.centurylinklabs.watchtower"="true"
 # copy files from other container
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo
-COPY --from=builder /go/src/github.com/containrrr/watchtower/watchtower /watchtower
+COPY --from=builder /go/watchtower/watchtower /watchtower
 
 ENTRYPOINT ["/watchtower"]