Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps, releasing): Update to Alpine 3.18 #17695

Merged
merged 1 commit into from
Jun 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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