diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index f4b314f..f8294dd 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -13,10 +13,11 @@ jobs: strategy: matrix: base-image: - - quay.io/kairos/core-opensuse-leap:v2.0.3 - - quay.io/kairos/core-ubuntu-20-lts:v2.0.3 - - quay.io/kairos/core-ubuntu-22-lts:v2.0.3 + - quay.io/kairos/core-opensuse-leap:v2.2.0 + - quay.io/kairos/core-ubuntu-20-lts:v2.2.0 + - quay.io/kairos/core-ubuntu-22-lts:v2.2.0 rke2-version: + - v1.26.4+rke2r1 - v1.25.3+rke2r1 - v1.25.2+rke2r1 - v1.25.0+rke2r1 diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 2981b66..a1e3ff6 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -42,10 +42,11 @@ jobs: strategy: matrix: base-image: - - quay.io/kairos/core-opensuse-leap:v2.0.3 - - quay.io/kairos/core-ubuntu-20-lts:v2.0.3 - - quay.io/kairos/core-ubuntu-22-lts:v2.0.3 + - quay.io/kairos/core-opensuse-leap:v2.2.0 + - quay.io/kairos/core-ubuntu-20-lts:v2.2.0 + - quay.io/kairos/core-ubuntu-22-lts:v2.2.0 rke2-version: + - v1.26.4+rke2r1 - v1.25.2+rke2r1 - v1.24.6+rke2r1 - v1.23.12+rke2r1 diff --git a/Earthfile b/Earthfile index 450a136..cd2aa3f 100644 --- a/Earthfile +++ b/Earthfile @@ -1,12 +1,12 @@ VERSION 0.6 FROM alpine -ARG BASE_IMAGE=quay.io/kairos/core-opensuse-leap:latest +ARG BASE_IMAGE=quay.io/kairos/core-opensuse-leap:v2.2.0 ARG IMAGE_REPOSITORY=quay.io/kairos ARG LUET_VERSION=0.34.0 ARG GOLINT_VERSION=v1.52.2 -ARG GOLANG_VERSION=1.19.8 +ARG GOLANG_VERSION=1.19.10 ARG RKE2_VERSION=latest ARG BASE_IMAGE_NAME=$(echo $BASE_IMAGE | grep -o [^/]*: | rev | cut -c2- | rev) @@ -26,7 +26,7 @@ go-deps: WORKDIR /build COPY go.mod go.sum ./ RUN go mod download - RUN apt-get update && apt-get install -y upx + RUN apt-get update SAVE ARTIFACT go.mod AS LOCAL go.mod SAVE ARTIFACT go.sum AS LOCAL go.sum @@ -37,7 +37,7 @@ BUILD_GOLANG: ARG BIN ARG SRC - RUN go build -ldflags "-s -w" -o ${BIN} ./${SRC} && upx ${BIN} + RUN go build -ldflags "-s -w" -o ${BIN} ./${SRC} SAVE ARTIFACT ${BIN} ${BIN} AS LOCAL build/${BIN} VERSION: