Skip to content

Upgrade build image #39

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

Merged
merged 2 commits into from
Nov 24, 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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ 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
```

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

```console
$ mkdir <name> && cd <name>
$ 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
```

Expand Down
14 changes: 7 additions & 7 deletions build-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 && \
Expand All @@ -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
Expand All @@ -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
Expand Down