From 58c30d10fb75e1a4101b81f409f818fad0641031 Mon Sep 17 00:00:00 2001 From: casjay Date: Mon, 11 Sep 2023 12:03:04 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile --- Dockerfile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5d115e2..1bb8848 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data" ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config" ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" -ARG IMAGE_REPO="alpine" +ARG IMAGE_REPO="casjaysdev/alpine" ARG IMAGE_VERSION="latest" ARG CONTAINER_VERSION="${IMAGE_VERSION}" @@ -23,14 +23,7 @@ ARG USER="root" ARG DISTRO_VERSION="${IMAGE_VERSION}" ARG BUILD_VERSION="${DISTRO_VERSION}" -FROM golang:1.15-buster AS src - -ENV GO111MODULE=on CGO_ENABLED=0 -WORKDIR /go/src/github.com/mpolden/echoip -RUN apt update && apt install -yy git -RUN git clone -q https://github.com/mpolden/echoip /go/src/github.com/mpolden/echoip && cd /go/src/github.com/mpolden/echoip && make - -FROM mpolden/echoip:latest as html +FROM mpolden/echoip:latest as src FROM tianon/gosu:latest AS gosu FROM ${IMAGE_REPO}:${DISTRO_VERSION} AS build ARG USER @@ -68,8 +61,7 @@ RUN set -ex ; \ mkdir -p "/opt/echoip" COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/gosu -COPY --from=html /opt/echoip/. /opt/echoip/ -COPY --from=src /go/bin/echoip /opt/echoip/ +COPY --from=src /opt/echoip/. /opt/echoip/ COPY ./Dockerfile /root/Dockerfile COPY ./rootfs/. /