From d4fc7343f266daf422946771acaec9f0e6b370ac Mon Sep 17 00:00:00 2001 From: nathan Date: Mon, 17 Apr 2023 13:21:29 +1000 Subject: [PATCH 1/5] use newer json2excel release --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 68c5583..f4a8b6e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,9 +21,9 @@ WORKDIR /src ENV CGO_LDFLAGS "-static -w -s" -RUN wget https://git.coadcorp.com/nathan/json2excel/archive/v0.1.zip && \ - unzip v0.1.zip && \ - rm v0.1.zip && \ +RUN wget https://git.coadcorp.com/nathan/json2excel/archive/v0.1.2.zip && \ + unzip v0.1.2.zip && \ + rm v0.1.2.zip && \ cd json2excel && \ go mod download && \ go build -o /json2excel cmd/main/main.go From c78a3268c40a8ea1874032916e0fbbf0e94b002d Mon Sep 17 00:00:00 2001 From: nathan Date: Tue, 18 Apr 2023 09:22:00 +1000 Subject: [PATCH 2/5] use newer json2excel --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f4a8b6e..89b32c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,9 +21,9 @@ WORKDIR /src ENV CGO_LDFLAGS "-static -w -s" -RUN wget https://git.coadcorp.com/nathan/json2excel/archive/v0.1.2.zip && \ - unzip v0.1.2.zip && \ - rm v0.1.2.zip && \ +RUN wget https://git.coadcorp.com/nathan/json2excel/archive/v0.1.3.zip && \ + unzip v0.1.3.zip && \ + rm v0.1.3.zip && \ cd json2excel && \ go mod download && \ go build -o /json2excel cmd/main/main.go From 267f035e81d6f8332c644ba21725fd559e37362b Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 31 May 2023 10:45:10 +1000 Subject: [PATCH 3/5] Update versions --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 89b32c8..bbd0a53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18.2-alpine as build +FROM golang:1.20.4-alpine3.18 as build WORKDIR /src @@ -15,15 +15,16 @@ ENV CGO_LDFLAGS "-static -w -s" RUN go build -tags osusergo,netgo -o /application cmd/export-xlsx-server/main.go; -FROM golang:1.18.2-alpine as build2 +FROM golang:1.20.4-alpine3.18 as build2 WORKDIR /src ENV CGO_LDFLAGS "-static -w -s" +ENV J2E_VERSION "v0.1.4" -RUN wget https://git.coadcorp.com/nathan/json2excel/archive/v0.1.3.zip && \ - unzip v0.1.3.zip && \ - rm v0.1.3.zip && \ +RUN wget https://git.coadcorp.com/nathan/json2excel/archive/${J2E_VERSION}.zip && \ + unzip ${J2E_VERSION}.zip && \ + rm ${J2E_VERSION}.zip && \ cd json2excel && \ go mod download && \ go build -o /json2excel cmd/main/main.go From aa1da933817f16da8e9cbac1b964506a3395b867 Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 31 May 2023 11:52:33 +1000 Subject: [PATCH 4/5] use json2excel with bugfix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bbd0a53..31907df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ FROM golang:1.20.4-alpine3.18 as build2 WORKDIR /src ENV CGO_LDFLAGS "-static -w -s" -ENV J2E_VERSION "v0.1.4" +ENV J2E_VERSION "v0.1.5" RUN wget https://git.coadcorp.com/nathan/json2excel/archive/${J2E_VERSION}.zip && \ unzip ${J2E_VERSION}.zip && \ From 284819f3d387be33d8de0f9ec6c8ea1ca6275a2b Mon Sep 17 00:00:00 2001 From: nathan Date: Thu, 15 Jun 2023 12:26:56 +1000 Subject: [PATCH 5/5] Use new json2excel version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 31907df..71940cd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ FROM golang:1.20.4-alpine3.18 as build2 WORKDIR /src ENV CGO_LDFLAGS "-static -w -s" -ENV J2E_VERSION "v0.1.5" +ENV J2E_VERSION "v0.1.6" RUN wget https://git.coadcorp.com/nathan/json2excel/archive/${J2E_VERSION}.zip && \ unzip ${J2E_VERSION}.zip && \