From 5e8d1d75466af13322424dcfb15987be9a935e75 Mon Sep 17 00:00:00 2001 From: lucky-lusa Date: Fri, 13 Aug 2021 08:34:00 +0200 Subject: [PATCH] Next attempt to integrate the version into the build --- docker/Eps.dockerfile | 4 +++- docker/InternalServer.dockerfile | 3 +++ docker/Proxy.dockerfile | 4 +++- docker/Sd.dockerfile | 4 +++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/docker/Eps.dockerfile b/docker/Eps.dockerfile index 207fd2d..5b4b1c0 100644 --- a/docker/Eps.dockerfile +++ b/docker/Eps.dockerfile @@ -6,7 +6,9 @@ RUN bash RUN mkdir -p /go/src /go/bin && chmod -R 777 /go ENV GOPATH /go ENV PATH /go/bin:$PATH -ENV VERSION $VERSION +ARG VERSION +ENV VERSION=$VERSION +RUN echo $VERSION WORKDIR /app COPY . . RUN make diff --git a/docker/InternalServer.dockerfile b/docker/InternalServer.dockerfile index 03034c3..07b8a96 100644 --- a/docker/InternalServer.dockerfile +++ b/docker/InternalServer.dockerfile @@ -6,6 +6,9 @@ RUN bash RUN mkdir -p /go/src /go/bin && chmod -R 777 /go ENV GOPATH /go ENV PATH /go/bin:$PATH +ARG VERSION +ENV VERSION=$VERSION +RUN echo $VERSION WORKDIR /app COPY . . RUN make examples diff --git a/docker/Proxy.dockerfile b/docker/Proxy.dockerfile index 0991b0d..d1f969c 100644 --- a/docker/Proxy.dockerfile +++ b/docker/Proxy.dockerfile @@ -6,7 +6,9 @@ RUN bash RUN mkdir -p /go/src /go/bin && chmod -R 777 /go ENV GOPATH /go ENV PATH /go/bin:$PATH -ENV VERSION $VERSION +ARG VERSION +ENV VERSION=$VERSION +RUN echo $VERSION WORKDIR /app COPY . . RUN make diff --git a/docker/Sd.dockerfile b/docker/Sd.dockerfile index 235012c..7daa5ec 100644 --- a/docker/Sd.dockerfile +++ b/docker/Sd.dockerfile @@ -6,7 +6,9 @@ RUN bash RUN mkdir -p /go/src /go/bin && chmod -R 777 /go ENV GOPATH /go ENV PATH /go/bin:$PATH -ENV VERSION $VERSION +ARG VERSION +ENV VERSION=$VERSION +RUN echo $VERSION WORKDIR /app COPY . . RUN make