Skip to content

Commit

Permalink
chore(deps, releasing): Update to Alpine 3.18
Browse files Browse the repository at this point in the history
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 <jesse.szwedko@datadoghq.com>
  • Loading branch information
jszwedko committed Jun 15, 2023
1 parent ee480cd commit 9cf1001
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/minor-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ The week before the release:
- `git fetch && git checkout origin/master && git checkout -b v0.<new version number> && git push -u`
- [ ] Create a new release preparation branch from `master`
- `git checkout -b prepare-v0.<new version number> && 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 <last release tag>...`
Expand Down
4 changes: 2 additions & 2 deletions distribution/docker/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/alpine:3.14 AS builder
FROM docker.io/alpine:3.18 AS builder

WORKDIR /vector

Expand All @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion distribution/docker/distroless-static/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/alpine:3.14 AS builder
FROM docker.io/alpine:3.18 AS builder

WORKDIR /vector

Expand Down

0 comments on commit 9cf1001

Please sign in to comment.