From 2080bb517f29298141f99ae91622395080942bf6 Mon Sep 17 00:00:00 2001 From: Santhosh Date: Tue, 20 Jun 2023 00:26:00 +0530 Subject: [PATCH] kairos v2.2.0 update Signed-off-by: Santhosh --- .github/workflows/publish.yaml | 7 ++++--- .github/workflows/pull_request.yaml | 6 +++--- Earthfile | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index f38c1c6..76c6696 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 k3s-version: + - v1.26.4+k3s1 - v1.25.2+k3s1 - v1.25.0+k3s1 - v1.24.6+k3s1 diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 1ad221b..5d48b1c 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -42,9 +42,9 @@ 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 k3s-version: - v1.25.0+k3s1 steps: diff --git a/Earthfile b/Earthfile index 3385cb8..104837c 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 K3S_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 @@ -39,7 +39,7 @@ BUILD_GOLANG: ENV CGO_ENABLED=0 - 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: