From a91f17d43e7c953283e2fe34cdc5c0ed7d72a259 Mon Sep 17 00:00:00 2001 From: Erik Brakkee Date: Mon, 12 Aug 2024 20:57:08 +0200 Subject: [PATCH] now upgraded to go 1.22.5 and mofified coker file to use newer alpine version with GOTOOLCHAIN=auto setting to automatically download newer versions. Also added a .dockerignore file to speed up building images. --- .dockerignore | 2 ++ Dockerfile | 3 ++- go.mod | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..46ea6cb --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +bin +kubernetes diff --git a/Dockerfile b/Dockerfile index 07c1aa2..4f186e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19.3 as builder +FROM alpine:3.20.2 as builder RUN apk update && apk add go curl RUN mkdir -p /opt/converge/bin @@ -10,6 +10,7 @@ RUN curl -L https://github.com/a-h/templ/releases/download/v0.2.747/templ_Linux_ mv templ /bin COPY cmd pkg static go.mod go.sum /opt/converge/ WORKDIR /opt/converge +ENV GOTOOLCHAIN=auto RUN go mod download COPY . /opt/converge/ RUN templ generate diff --git a/go.mod b/go.mod index cb454ed..700389d 100755 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module converge -go 1.21.9 +go 1.22.5 require ( github.com/ActiveState/termtest/conpty v0.5.0