apitech
/
loki
mirror of https://github.com/grafana/loki
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[release-2.9.x] Update alpine versions (#10577)

Browse Source 
Backport 4681386775 from #10573

---

**What this PR does / why we need it**:
Update alpine versions used by our images to `3.18.3`

**Which issue(s) this PR fixes**:
N/A

**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
- [ ] `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)

---------

Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
Co-authored-by: Dylan Guedes <djmgguedes@gmail.com>
Co-authored-by: Michel Hollands <michel.hollands@gmail.com>
pull/10568/head^2
Grot (@grafanabot) 2 years ago committed by GitHub
parent eba6333802
commit 4a80e8aa1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 20 additions and 20 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      .drone/drone.yml
  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-boringcrypto/Dockerfile
  7. 2
      cmd/loki-canary/Dockerfile
  8. 2
      cmd/loki-canary/Dockerfile.cross
  9. 2
      cmd/loki/Dockerfile
  10. 2
      cmd/loki/Dockerfile.cross
  11. 2
      cmd/loki/Dockerfile.debug
  12. 2
      cmd/migrate/Dockerfile
  13. 2
      cmd/querytee/Dockerfile
  14. 2
      cmd/querytee/Dockerfile.cross
  15. 8
      loki-build-image/Dockerfile
  16. 2
      tools/dev/loki-boltdb-storage-s3/dev.dockerfile
  17. 2
      tools/lambda-promtail/Dockerfile

2
.drone/drone.yml
Unescape View File

@ -2016,6 +2016,6 @@ kind: secret
name: gpg_private_key
---
kind: signature
hmac: 6aff5ae73eeaed171dafbc08b599abaf9a4ef4c1d68212da1a1442f36f5c7d8b
hmac: 19efaf699db1315f0ea71fb80d521dec5ab67ecbfa7975fa36ca7f4679e27c23
...

2
clients/cmd/docker-driver/Dockerfile
Unescape View File

@ -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.7
FROM alpine:3.18.3
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/

2
clients/cmd/promtail/Dockerfile.debug
Unescape View File

@ -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.7
FROM alpine:3.18.3
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

2
cmd/logcli/Dockerfile
Unescape View File

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

2
cmd/logql-analyzer/Dockerfile
Unescape View File

@ -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.7
FROM alpine:3.18.3
RUN apk add --no-cache ca-certificates

2
cmd/loki-canary-boringcrypto/Dockerfile
Unescape View File

@ -5,7 +5,7 @@ WORKDIR /src/loki
RUN go env GOARCH > /goarch
RUN make clean && make GOARCH=$(cat /goarch) BUILD_IN_CONTAINER=true GOEXPERIMENT=boringcrypto loki-canary-boringcrypto
FROM alpine:3.16.7
FROM alpine:3.18.3
RUN apk add --update --no-cache ca-certificates
COPY --from=build /src/loki/cmd/loki-canary-boringcrypto/loki-canary-boringcrypto /usr/bin/loki-canary
ENTRYPOINT [ "/usr/bin/loki-canary" ]

2
cmd/loki-canary/Dockerfile
Unescape View File

@ -4,7 +4,7 @@ COPY . /src/loki
WORKDIR /src/loki
RUN make clean && make BUILD_IN_CONTAINER=false loki-canary
FROM alpine:3.16.7
FROM alpine:3.18.3
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" ]

2
cmd/loki-canary/Dockerfile.cross
Unescape View File

@ -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.7
FROM alpine:3.18.3
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" ]

2
cmd/loki/Dockerfile
Unescape View File

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

2
cmd/loki/Dockerfile.cross
Unescape View File

@ -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
FROM alpine:3.18.2
FROM alpine:3.18.3
RUN apk add --no-cache ca-certificates

2
cmd/loki/Dockerfile.debug
Unescape View File

@ -15,7 +15,7 @@ WORKDIR /src/loki
RUN make clean && \
GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false loki-debug
FROM alpine:3.18.2
FROM alpine:3.18.3
RUN apk add --update --no-cache ca-certificates
COPY --from=build /src/loki/cmd/loki/loki-debug /usr/bin/loki-debug
COPY --from=goenv /go/bin/dlv /usr/bin/dlv

2
cmd/migrate/Dockerfile
Unescape View File

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

2
cmd/querytee/Dockerfile
Unescape View File

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

2
cmd/querytee/Dockerfile.cross
Unescape View File

@ -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.7
FROM alpine:3.18.3
RUN apk add --update --no-cache ca-certificates
COPY --from=build /src/loki/cmd/querytee/querytee /usr/bin/querytee
ENTRYPOINT [ "/usr/bin/querytee" ]

8
loki-build-image/Dockerfile
Unescape View File

@ -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.7 as lychee
FROM alpine:3.18.3 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.7 as golangci
FROM alpine:3.18.3 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.7 as buf
FROM alpine:3.18.3 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.7 as docker
FROM alpine:3.18.3 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

2
tools/dev/loki-boltdb-storage-s3/dev.dockerfile
Unescape View File

@ -2,7 +2,7 @@ FROM golang:1.20.4
ENV CGO_ENABLED=0
RUN go install github.com/go-delve/delve/cmd/dlv@v1.20.2
FROM alpine:3.16.4
FROM alpine:3.18.3
RUN mkdir /loki
WORKDIR /loki

2
tools/lambda-promtail/Dockerfile
Unescape View File

@ -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.7
FROM alpine:3.18.3
WORKDIR /app

Write Preview
Loading…
Cancel
Save