From 0b085abfa0894971b95d1bf0ceda36fc834d0eba Mon Sep 17 00:00:00 2001 From: schmidtw Date: Thu, 27 Oct 2022 16:36:51 -0700 Subject: [PATCH] Restore the prior changes that were accidentally overwritten. --- CHANGELOG.md | 3 ++- Dockerfile | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a84cd5d..d41e926b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -213,7 +213,8 @@ fixed build upload ### Added - Initial creation -[Unreleased]: https://github.com/xmidt-org/caduceus/compare/v0.6.10...HEAD +[Unreleased]: https://github.com/xmidt-org/caduceus/compare/v0.6.11...HEAD +[v0.6.11]: https://github.com/xmidt-org/caduceus/compare/v0.6.10...v0.6.11 [v0.6.10]: https://github.com/xmidt-org/caduceus/compare/v0.6.9...v0.6.10 [v0.6.9]: https://github.com/xmidt-org/caduceus/compare/v0.6.6...v0.6.9 [v0.6.6]: https://github.com/xmidt-org/caduceus/compare/v0.6.5...v0.6.6 diff --git a/Dockerfile b/Dockerfile index 99106dd0..6c628f62 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,4 @@ -FROM docker.io/library/golang:1.15-alpine as builder - -MAINTAINER Jack Murdock +FROM docker.io/library/golang:1.19-alpine as builder WORKDIR /src @@ -8,17 +6,19 @@ ARG VERSION ARG GITCOMMIT ARG BUILDTIME - RUN apk add --no-cache --no-progress \ ca-certificates \ make \ + curl \ git \ openssh \ gcc \ libc-dev \ upx -RUN go get github.com/geofffranks/spruce/cmd/spruce && chmod +x /go/bin/spruce +RUN mkdir -p /go/bin && \ + curl -o /go/bin/spruce https://github.com/geofffranks/spruce/releases/download/v1.29.0/spruce-linux-amd64 && \ + chmod +x /go/bin/spruce COPY . . RUN make test release