Skip to content

Commit cbb7997

Browse files
authored
Upgrade build image (#39)
* Upgrade build-image alpine 3.18 tanka 0.26.0 go 1.21 Signed-off-by: Friedrich Gonzalez <[email protected]> * Update ci.yaml Signed-off-by: Friedrich Gonzalez <[email protected]> --------- Signed-off-by: Friedrich Gonzalez <[email protected]>
1 parent c9f3e20 commit cbb7997

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

.github/workflows/ci.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
jobs:
1010
lint:
1111
runs-on: ubuntu-latest
12-
container: quay.io/cortexproject/cortex-jsonnet-build-image:e63d87f
12+
container: quay.io/cortexproject/cortex-jsonnet-build-image:e158eda
1313
steps:
1414
- uses: actions/checkout@v2
1515
name: Checkout
@@ -23,7 +23,7 @@ jobs:
2323
run: make lint-playbooks
2424
build:
2525
runs-on: ubuntu-latest
26-
container: quay.io/cortexproject/cortex-jsonnet-build-image:e63d87f
26+
container: quay.io/cortexproject/cortex-jsonnet-build-image:e158eda
2727
steps:
2828
- uses: actions/checkout@v2
2929
name: Checkout
@@ -34,7 +34,7 @@ jobs:
3434
run: make build-mixin
3535
readme:
3636
runs-on: ubuntu-latest
37-
container: quay.io/cortexproject/cortex-jsonnet-build-image:e63d87f
37+
container: quay.io/cortexproject/cortex-jsonnet-build-image:e158eda
3838
steps:
3939
- uses: actions/checkout@v2
4040
name: Checkout

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ To generate the YAMLs for deploying Cortex:
1717

1818
```console
1919
$ # make sure to be outside of GOPATH or a go.mod project
20-
$ GO111MODULE=on go install github.com/grafana/tanka/cmd/tk@v0.24.0
20+
$ GO111MODULE=on go install github.com/grafana/tanka/cmd/tk@v0.26.0
2121
$ GO111MODULE=on go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/[email protected]
2222
```
2323

2424
1. Initialise the Tanka repo, install the Cortex and Kubernetes Jsonnet libraries.
2525

2626
```console
2727
$ mkdir <name> && cd <name>
28-
$ tk init --k8s=1.24 # this includes github.com/jsonnet-libs/k8s-libsonnet/1.24@main
28+
$ tk init --k8s=1.26 # this includes github.com/jsonnet-libs/k8s-libsonnet/1.26@main
2929
$ jb install github.com/cortexproject/cortex-jsonnet/cortex@main
3030
```
3131

build-image/Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build jsonnet
2-
FROM alpine:3.17 AS jsonnet-builder
2+
FROM alpine:3.18 AS jsonnet-builder
33
RUN apk add --no-cache git make g++
44
RUN git clone https://github.com/google/jsonnet && \
55
git -C jsonnet checkout v0.20.0 && \
@@ -8,7 +8,7 @@ RUN git clone https://github.com/google/jsonnet && \
88
cp jsonnet/jsonnetfmt /usr/bin
99

1010
# Build jb
11-
FROM alpine:3.17 AS jb-builder
11+
FROM alpine:3.18 AS jb-builder
1212
ARG JSONNET_BUNDLER_VERSION=0.5.1
1313
ARG JSONNET_BUNDLER_CHECKSUM="f5bccc94d28fbbe8ad1d46fd4f208619e45d368a5d7924f6335f4ecfa0605c85 /usr/bin/jb"
1414
RUN apk add --no-cache curl
@@ -17,19 +17,19 @@ RUN echo "${JSONNET_BUNDLER_CHECKSUM}" | sha256sum -c || (printf "wanted: %s\n
1717
RUN chmod +x /usr/bin/jb
1818

1919
# Build tanka
20-
FROM alpine:3.17 AS tk-builder
21-
ARG TANKA_VERSION=0.24.0
22-
ARG TANKA_CHECKSUM="82c8c533c29eefea0af9c28f487203b19dec84ce2624702f99196e777f946ddc /usr/bin/tk"
20+
FROM alpine:3.18 AS tk-builder
21+
ARG TANKA_VERSION=0.26.0
22+
ARG TANKA_CHECKSUM="089796ae2ce65390501b2c68ceca1ce99ff12787d5ae3b4823c825a07e6e22f4 /usr/bin/tk"
2323
RUN apk add --no-cache curl
2424
RUN curl -fSL -o "/usr/bin/tk" "https://github.com/grafana/tanka/releases/download/v${TANKA_VERSION}/tk-linux-amd64"
2525
RUN echo "${TANKA_CHECKSUM}" | sha256sum -c || (printf "wanted: %s\n got: %s\n" "${TANKA_CHECKSUM}" "$(sha256sum /usr/bin/tk)"; exit 1)
2626
RUN chmod +x /usr/bin/tk
2727

2828
# Build mixtool
29-
FROM golang:1.20-alpine AS mixtool-builder
29+
FROM golang:1.21-alpine AS mixtool-builder
3030
RUN GO111MODULE=on go install github.com/monitoring-mixins/mixtool/cmd/mixtool@ae18e31161ea10545b9c1ac0d23c10122f2c12b5
3131

32-
FROM alpine:3.17
32+
FROM alpine:3.18
3333
RUN apk add --no-cache git make libgcc libstdc++ zip findutils sed yq
3434
COPY --from=jsonnet-builder /usr/bin/jsonnetfmt /usr/bin
3535
COPY --from=jsonnet-builder /usr/bin/jsonnet /usr/bin

0 commit comments

Comments
 (0)