Upgrade alpine 3.16.5 -> 3.16.7 (#10188)

**What this PR does / why we need it**:

**Which issue(s) this PR fixes**:
Fixes #10181

Fixes Open SSL vulnerabilities
[CVE-2023-1255](https://security.alpinelinux.org/vuln/CVE-2023-1255),
[CVE-2023-2650](https://security.alpinelinux.org/vuln/CVE-2023-2650),
[CVE-2023-2975](https://security.alpinelinux.org/vuln/CVE-2023-2975),
[CVE-2023-3446](https://security.alpinelinux.org/vuln/CVE-2023-3446),
[CVE-2023-3817](https://security.alpinelinux.org/vuln/CVE-2023-3817)

Alpine Release Notes:

[3.16.7](https://www.alpinelinux.org/posts/Alpine-3.15.10-3.16.7-3.17.5-3.18.3-released.html)

[3.16.6](https://www.alpinelinux.org/posts/Alpine-3.15.9-3.16.6-3.17.4-3.18.2-released.html)

**Special notes for your reviewer**:

**Checklist**
- [ ] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [x] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/setup/upgrade/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e3ec)
pull/10203/head^2
Shantanu Alsi 2 years ago committed by GitHub
parent 38556c1d37
commit b57d260ddc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      CHANGELOG.md
  2. 2
      clients/cmd/docker-driver/Dockerfile
  3. 2
      clients/cmd/promtail/Dockerfile.debug
  4. 2
      cmd/logcli/Dockerfile
  5. 2
      cmd/logql-analyzer/Dockerfile
  6. 2
      cmd/loki-canary/Dockerfile
  7. 2
      cmd/loki-canary/Dockerfile.cross
  8. 2
      cmd/migrate/Dockerfile
  9. 2
      cmd/querytee/Dockerfile
  10. 2
      cmd/querytee/Dockerfile.cross
  11. 8
      loki-build-image/Dockerfile
  12. 4
      production/helm/loki/src/helm-test/Dockerfile
  13. 2
      tools/lambda-promtail/Dockerfile

@ -2,6 +2,10 @@
### All Changes
##### Security
* [10188](https://github.com/grafana/loki/pull/10188) **shantanualsi**: Bump alpine version from 3.16.5 -> 3.16.7
#### Loki
##### Enhancements

@ -9,7 +9,7 @@ COPY . /src/loki
WORKDIR /src/loki
RUN make clean && make BUILD_IN_CONTAINER=false clients/cmd/docker-driver/docker-driver
FROM alpine:3.16.5
FROM alpine:3.16.7
RUN apk add --update --no-cache ca-certificates tzdata
COPY --from=build /src/loki/clients/cmd/docker-driver/docker-driver /bin/docker-driver
WORKDIR /bin/

@ -9,7 +9,7 @@ WORKDIR /src/loki
RUN make clean && make BUILD_IN_CONTAINER=false PROMTAIL_JOURNAL_ENABLED=true promtail-debug
FROM alpine:3.16.5
FROM alpine:3.16.7
RUN apk add --update --no-cache ca-certificates tzdata
COPY --from=build /src/loki/clients/cmd/promtail/promtail-debug /usr/bin/promtail-debug
COPY --from=build /usr/bin/dlv /usr/bin/dlv

@ -4,7 +4,7 @@ COPY . /src/loki
WORKDIR /src/loki
RUN make clean && make BUILD_IN_CONTAINER=false logcli
FROM alpine:3.16.5
FROM alpine:3.16.7
RUN apk add --no-cache ca-certificates

@ -4,7 +4,7 @@ COPY . /src/loki
WORKDIR /src/loki
RUN make clean && CGO_ENABLED=0 go build ./cmd/logql-analyzer/
FROM alpine:3.16.5
FROM alpine:3.16.7
RUN apk add --no-cache ca-certificates

@ -4,7 +4,7 @@ COPY . /src/loki
WORKDIR /src/loki
RUN make clean && make BUILD_IN_CONTAINER=false loki-canary
FROM alpine:3.16.5
FROM alpine:3.16.7
RUN apk add --update --no-cache ca-certificates
COPY --from=build /src/loki/cmd/loki-canary/loki-canary /usr/bin/loki-canary
ENTRYPOINT [ "/usr/bin/loki-canary" ]

@ -12,7 +12,7 @@ COPY . /src/loki
WORKDIR /src/loki
RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false loki-canary
FROM alpine:3.16.5
FROM alpine:3.16.7
RUN apk add --update --no-cache ca-certificates
COPY --from=build /src/loki/cmd/loki-canary/loki-canary /usr/bin/loki-canary
ENTRYPOINT [ "/usr/bin/loki-canary" ]

@ -3,7 +3,7 @@ COPY . /src/loki
WORKDIR /src/loki
RUN make clean && make BUILD_IN_CONTAINER=false migrate
FROM alpine:3.16.5
FROM alpine:3.16.7
RUN apk add --update --no-cache ca-certificates
COPY --from=build /src/loki/cmd/migrate/migrate /usr/bin/migrate
#ENTRYPOINT [ "/usr/bin/migrate" ]

@ -4,7 +4,7 @@ COPY . /src/loki
WORKDIR /src/loki
RUN make clean && make BUILD_IN_CONTAINER=false loki-querytee
FROM alpine:3.16.5
FROM alpine:3.16.7
RUN apk add --update --no-cache ca-certificates
COPY --from=build /src/loki/cmd/querytee/querytee /usr/bin/querytee
ENTRYPOINT [ "/usr/bin/querytee" ]

@ -12,7 +12,7 @@ COPY . /src/loki
WORKDIR /src/loki
RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false loki-querytee
FROM alpine:3.16.5
FROM alpine:3.16.7
RUN apk add --update --no-cache ca-certificates
COPY --from=build /src/loki/cmd/querytee/querytee /usr/bin/querytee
ENTRYPOINT [ "/usr/bin/querytee" ]

@ -13,7 +13,7 @@ RUN curl -L -o /tmp/helm-$HELM_VER.tgz https://get.helm.sh/helm-${HELM_VER}-linu
rm -rf /tmp/linux-amd64 /tmp/helm-$HELM_VER.tgz
RUN GO111MODULE=on go install github.com/norwoodj/helm-docs/cmd/helm-docs@v1.11.0
FROM alpine:3.16.5 as lychee
FROM alpine:3.16.7 as lychee
ARG LYCHEE_VER="0.7.0"
RUN apk add --no-cache curl && \
curl -L -o /tmp/lychee-$LYCHEE_VER.tgz https://github.com/lycheeverse/lychee/releases/download/${LYCHEE_VER}/lychee-${LYCHEE_VER}-x86_64-unknown-linux-gnu.tar.gz && \
@ -21,18 +21,18 @@ RUN apk add --no-cache curl && \
mv /tmp/lychee /usr/bin/lychee && \
rm -rf /tmp/linux-amd64 /tmp/lychee-$LYCHEE_VER.tgz
FROM alpine:3.16.5 as golangci
FROM alpine:3.16.7 as golangci
RUN apk add --no-cache curl && \
cd / && \
curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.51.2
FROM alpine:3.16.5 as buf
FROM alpine:3.16.7 as buf
RUN apk add --no-cache curl && \
curl -sSL "https://github.com/bufbuild/buf/releases/download/v1.4.0/buf-$(uname -s)-$(uname -m)" -o "/usr/bin/buf" && \
chmod +x "/usr/bin/buf"
FROM alpine:3.16.5 as docker
FROM alpine:3.16.7 as docker
RUN apk add --no-cache docker-cli
# TODO this should be fixed to download and extract the specific release binary from github as we do for golangci and helm above

@ -7,7 +7,7 @@ COPY . /src/loki
WORKDIR /src/loki
RUN make clean && make BUILD_IN_CONTAINER=false helm-test
FROM alpine:3.16.5
RUN apk add --update --no-cache ca-certificates=20220614-r0
FROM alpine:3.16.7
RUN apk add --update --no-cache ca-certificates=20230506-r0
COPY --from=build /src/loki/production/helm/loki/src/helm-test/helm-test /usr/bin/helm-test
ENTRYPOINT [ "/usr/bin/helm-test" ]

@ -12,7 +12,7 @@ RUN go mod download
RUN go build -o ./main -tags lambda.norpc -ldflags="-s -w" lambda-promtail/*.go
FROM alpine:3.16.5
FROM alpine:3.16.7
WORKDIR /app

Loading…
Cancel
Save