From 9cf10012adfe95451e46f88418ce2576dfe46e3e Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Thu, 15 Jun 2023 09:00:54 -0700 Subject: [PATCH] chore(deps, releasing): Update to Alpine 3.18 Also added a note to the release checklists to look for new versions. Ideally dependabot could help us keep up-to-date here. Signed-off-by: Jesse Szwedko --- .github/ISSUE_TEMPLATE/minor-release.md | 2 ++ distribution/docker/alpine/Dockerfile | 4 ++-- distribution/docker/distroless-static/Dockerfile | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/minor-release.md b/.github/ISSUE_TEMPLATE/minor-release.md index 40f950e1f6982..0ea25a30c0432 100644 --- a/.github/ISSUE_TEMPLATE/minor-release.md +++ b/.github/ISSUE_TEMPLATE/minor-release.md @@ -11,6 +11,8 @@ The week before the release: - `git fetch && git checkout origin/master && git checkout -b v0. && git push -u` - [ ] Create a new release preparation branch from `master` - `git checkout -b prepare-v0. && git push -u` +- [ ] Check if there is a newer version of Alpine or Debian available to update the release images + in `distribution/docker/`. Update if so. - [ ] Run `cargo vdev build release-cue` to generate a new cue file for the release - [ ] Add `changelog` key to generated cue file - [ ] `git log --no-merges --cherry-pick --right-only ...` diff --git a/distribution/docker/alpine/Dockerfile b/distribution/docker/alpine/Dockerfile index 3ca4900b4fe2d..c3479f1001191 100644 --- a/distribution/docker/alpine/Dockerfile +++ b/distribution/docker/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/alpine:3.14 AS builder +FROM docker.io/alpine:3.18 AS builder WORKDIR /vector @@ -7,7 +7,7 @@ RUN tar -xvf vector-0*-"$(cat /etc/apk/arch)"-unknown-linux-musl*.tar.gz --strip RUN mkdir -p /var/lib/vector -FROM docker.io/alpine:3.14 +FROM docker.io/alpine:3.18 RUN apk --no-cache add ca-certificates tzdata COPY --from=builder /vector/bin/* /usr/local/bin/ diff --git a/distribution/docker/distroless-static/Dockerfile b/distribution/docker/distroless-static/Dockerfile index dc5ef9cd955bd..874c165d64457 100644 --- a/distribution/docker/distroless-static/Dockerfile +++ b/distribution/docker/distroless-static/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/alpine:3.14 AS builder +FROM docker.io/alpine:3.18 AS builder WORKDIR /vector