diff --git a/CHANGELOG.md b/CHANGELOG.md index 2af4e8b1..d0bdabca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ * Bump `golang` container base images from `1.17.2` to `1.17.3` (via [#95](https://github.com/CycloneDX/cyclonedx-gomod/pull/95)) * Reference container base images by their SHA digest ([#89](https://github.com/CycloneDX/cyclonedx-gomod/issues/89) via [#90](https://github.com/CycloneDX/cyclonedx-gomod/pull/90)) * Introduce multi-platform container image builds ([#87](https://github.com/CycloneDX/cyclonedx-gomod/issues/87) via [#90](https://github.com/CycloneDX/cyclonedx-gomod/pull/90)) +* Bump alpine-based `golang` container base images from `alpine3.14` to `alpine3.15` (via [`47cee81`](https://github.com/CycloneDX/cyclonedx-gomod/commit/47cee81da4713561ff30a7450b13688d691da976)) ## v1.0.0 diff --git a/Dockerfile b/Dockerfile index 3582f74e..10ed4b7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM golang:1.17.3-alpine3.14@sha256:7bd9bf011a76c21b70a1e507de7f8d67656e1f293fd72af80aa46f7b054db515 as build +FROM golang:1.17.3-alpine3.15@sha256:a207b29286084e7342286de809756f61558b00b81f794406399027631e0dba8b as build ARG VERSION=latest WORKDIR /tmp/cyclonedx-gomod RUN apk --no-cache add git make COPY . . RUN make install -FROM golang:1.17.3-alpine3.14@sha256:7bd9bf011a76c21b70a1e507de7f8d67656e1f293fd72af80aa46f7b054db515 +FROM golang:1.17.3-alpine3.15@sha256:a207b29286084e7342286de809756f61558b00b81f794406399027631e0dba8b COPY --from=build /go/bin/cyclonedx-gomod /usr/local/bin/ USER 1000 ENTRYPOINT ["cyclonedx-gomod"] diff --git a/Dockerfile.goreleaser b/Dockerfile.goreleaser index 27c9f466..75a2cfee 100644 --- a/Dockerfile.goreleaser +++ b/Dockerfile.goreleaser @@ -1,6 +1,6 @@ # This Dockerfile is meant for GoReleaser exclusively, see .goreleaser.yml. # For manual builds, please use the regular Dockerfile or simply run "make docker". -FROM golang:1.17.3-alpine3.14@sha256:7bd9bf011a76c21b70a1e507de7f8d67656e1f293fd72af80aa46f7b054db515 +FROM golang:1.17.3-alpine3.15@sha256:a207b29286084e7342286de809756f61558b00b81f794406399027631e0dba8b COPY cyclonedx-gomod /usr/local/bin/ USER 1000 ENTRYPOINT ["cyclonedx-gomod"] diff --git a/README.md b/README.md index 1c3e02b1..26a37b09 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Prebuilt binaries are available on the [releases](https://github.com/CycloneDX/c ### From Source ```shell -go install github.com/CycloneDX/cyclonedx-gomod@v1.0.0 +go install github.com/CycloneDX/cyclonedx-gomod@v1.1.0 ``` Building from source requires Go 1.17 or newer.