From e158eda71303d7dc1cfb9f76686938a4099e2f85 Mon Sep 17 00:00:00 2001 From: Friedrich Gonzalez Date: Fri, 24 Nov 2023 03:57:52 +0100 Subject: [PATCH 1/2] Upgrade build-image alpine 3.18 tanka 0.26.0 go 1.21 Signed-off-by: Friedrich Gonzalez --- README.md | 4 ++-- build-image/Dockerfile | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index b0a5133..539559a 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ To generate the YAMLs for deploying Cortex: ```console $ # make sure to be outside of GOPATH or a go.mod project - $ GO111MODULE=on go install github.com/grafana/tanka/cmd/tk@v0.24.0 + $ GO111MODULE=on go install github.com/grafana/tanka/cmd/tk@v0.26.0 $ GO111MODULE=on go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb@v0.5.1 ``` @@ -25,7 +25,7 @@ To generate the YAMLs for deploying Cortex: ```console $ mkdir && cd - $ tk init --k8s=1.24 # this includes github.com/jsonnet-libs/k8s-libsonnet/1.24@main + $ tk init --k8s=1.26 # this includes github.com/jsonnet-libs/k8s-libsonnet/1.26@main $ jb install github.com/cortexproject/cortex-jsonnet/cortex@main ``` diff --git a/build-image/Dockerfile b/build-image/Dockerfile index a874e69..70d2fd9 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -1,5 +1,5 @@ # Build jsonnet -FROM alpine:3.17 AS jsonnet-builder +FROM alpine:3.18 AS jsonnet-builder RUN apk add --no-cache git make g++ RUN git clone https://github.com/google/jsonnet && \ git -C jsonnet checkout v0.20.0 && \ @@ -8,7 +8,7 @@ RUN git clone https://github.com/google/jsonnet && \ cp jsonnet/jsonnetfmt /usr/bin # Build jb -FROM alpine:3.17 AS jb-builder +FROM alpine:3.18 AS jb-builder ARG JSONNET_BUNDLER_VERSION=0.5.1 ARG JSONNET_BUNDLER_CHECKSUM="f5bccc94d28fbbe8ad1d46fd4f208619e45d368a5d7924f6335f4ecfa0605c85 /usr/bin/jb" RUN apk add --no-cache curl @@ -17,19 +17,19 @@ RUN echo "${JSONNET_BUNDLER_CHECKSUM}" | sha256sum -c || (printf "wanted: %s\n RUN chmod +x /usr/bin/jb # Build tanka -FROM alpine:3.17 AS tk-builder -ARG TANKA_VERSION=0.24.0 -ARG TANKA_CHECKSUM="82c8c533c29eefea0af9c28f487203b19dec84ce2624702f99196e777f946ddc /usr/bin/tk" +FROM alpine:3.18 AS tk-builder +ARG TANKA_VERSION=0.26.0 +ARG TANKA_CHECKSUM="089796ae2ce65390501b2c68ceca1ce99ff12787d5ae3b4823c825a07e6e22f4 /usr/bin/tk" RUN apk add --no-cache curl RUN curl -fSL -o "/usr/bin/tk" "https://github.com/grafana/tanka/releases/download/v${TANKA_VERSION}/tk-linux-amd64" RUN echo "${TANKA_CHECKSUM}" | sha256sum -c || (printf "wanted: %s\n got: %s\n" "${TANKA_CHECKSUM}" "$(sha256sum /usr/bin/tk)"; exit 1) RUN chmod +x /usr/bin/tk # Build mixtool -FROM golang:1.20-alpine AS mixtool-builder +FROM golang:1.21-alpine AS mixtool-builder RUN GO111MODULE=on go install github.com/monitoring-mixins/mixtool/cmd/mixtool@ae18e31161ea10545b9c1ac0d23c10122f2c12b5 -FROM alpine:3.17 +FROM alpine:3.18 RUN apk add --no-cache git make libgcc libstdc++ zip findutils sed yq COPY --from=jsonnet-builder /usr/bin/jsonnetfmt /usr/bin COPY --from=jsonnet-builder /usr/bin/jsonnet /usr/bin From c87a3f13b586585312daa8e8717712c3d0e6b1d3 Mon Sep 17 00:00:00 2001 From: Friedrich Gonzalez Date: Fri, 24 Nov 2023 04:10:14 +0100 Subject: [PATCH 2/2] Update ci.yaml Signed-off-by: Friedrich Gonzalez --- .github/workflows/ci.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e0eac22..fa49025 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ on: jobs: lint: runs-on: ubuntu-latest - container: quay.io/cortexproject/cortex-jsonnet-build-image:e63d87f + container: quay.io/cortexproject/cortex-jsonnet-build-image:e158eda steps: - uses: actions/checkout@v2 name: Checkout @@ -23,7 +23,7 @@ jobs: run: make lint-playbooks build: runs-on: ubuntu-latest - container: quay.io/cortexproject/cortex-jsonnet-build-image:e63d87f + container: quay.io/cortexproject/cortex-jsonnet-build-image:e158eda steps: - uses: actions/checkout@v2 name: Checkout @@ -34,7 +34,7 @@ jobs: run: make build-mixin readme: runs-on: ubuntu-latest - container: quay.io/cortexproject/cortex-jsonnet-build-image:e63d87f + container: quay.io/cortexproject/cortex-jsonnet-build-image:e158eda steps: - uses: actions/checkout@v2 name: Checkout