From 5d237b7a0aa0e0497afc75defaea39751640760c Mon Sep 17 00:00:00 2001
From: Nicolas Duchon <nicolas.duchon@gmail.com>
Date: Mon, 8 May 2023 20:00:34 +0200
Subject: [PATCH] build: get Forego from pre-built image

---
 Dockerfile        | 19 +------------------
 Dockerfile.alpine | 19 +------------------
 2 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 30389b355..55a8a37cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,6 @@
-# setup build arguments for version of dependencies to use
-ARG FOREGO_VERSION=v0.17.0
-
 FROM nginxproxy/docker-gen:0.10.4-debian AS docker-gen
 
-# Build forego from scratch
-FROM golang:1.20.4 as forego
-
-ARG FOREGO_VERSION
-
-RUN git clone https://github.com/nginx-proxy/forego/ \
-   && cd /go/forego \
-   && git -c advice.detachedHead=false checkout $FOREGO_VERSION \
-   && go mod download \
-   && CGO_ENABLED=0 GOOS=linux go build -o forego . \
-   && go clean -cache \
-   && mv forego /usr/local/bin/ \
-   && cd - \
-   && rm -rf /go/forego
+FROM nginxproxy/forego:0.17.1-debian AS forego
 
 # Build the final image
 FROM nginx:1.23.4
@@ -35,7 +19,6 @@ RUN apt-get update \
    && apt-get clean \
    && rm -r /var/lib/apt/lists/*
 
-
 # Configure Nginx
 RUN echo "daemon off;" >> /etc/nginx/nginx.conf \
    && sed -i 's/worker_processes  1/worker_processes  auto/' /etc/nginx/nginx.conf \
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 04343e177..b3d33042f 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -1,23 +1,6 @@
-# setup build arguments for version of dependencies to use
-ARG FOREGO_VERSION=v0.17.0
-
 FROM nginxproxy/docker-gen:0.10.4 AS docker-gen
 
-# Build forego from scratch
-FROM golang:1.20.4-alpine as forego
-
-ARG FOREGO_VERSION
-
-RUN apk add --no-cache git musl-dev \
-   && git clone https://github.com/nginx-proxy/forego/ \
-   && cd /go/forego \
-   && git -c advice.detachedHead=false checkout $FOREGO_VERSION \
-   && go mod download \
-   && CGO_ENABLED=0 go build -o forego . \
-   && go clean -cache \
-   && mv forego /usr/local/bin/ \
-   && cd - \
-   && rm -rf /go/forego
+FROM nginxproxy/forego:0.17.1 AS forego
 
 # Build the final image
 FROM nginx:1.23.4-alpine