From f0f0d03071d1d1920d51a4b7a6dc19c2b7081b38 Mon Sep 17 00:00:00 2001 From: Santhosh Date: Fri, 14 Apr 2023 08:55:20 +0530 Subject: [PATCH] kairos 2.0, golint and go version update Signed-off-by: Santhosh --- .github/workflows/publish.yaml | 6 +++--- .github/workflows/pull_request.yaml | 6 +++--- Earthfile | 10 +++++++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 08c0915..7191bd6 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -13,9 +13,9 @@ jobs: strategy: matrix: base-image: - - quay.io/kairos/core-opensuse-leap:v1.5.0 - - quay.io/kairos/core-ubuntu-20-lts:v1.5.0 - - quay.io/kairos/core-ubuntu-22-lts:v1.5.0 + - quay.io/kairos/core-opensuse-leap:v2.0.0 + - quay.io/kairos/core-ubuntu-20-lts:v2.0.0 + - quay.io/kairos/core-ubuntu-22-lts:v2.0.0 rke2-version: - v1.25.3+rke2r1 - v1.25.2+rke2r1 diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 9b49ce9..55d0fa7 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:v1.5.0 - - quay.io/kairos/core-ubuntu-20-lts:v1.5.0 - - quay.io/kairos/core-ubuntu-22-lts:v1.5.0 + - quay.io/kairos/core-opensuse-leap:v2.0.0 + - quay.io/kairos/core-ubuntu-20-lts:v2.0.0 + - quay.io/kairos/core-ubuntu-22-lts:v2.0.0 rke2-version: - v1.25.2+rke2r1 - v1.24.6+rke2r1 diff --git a/Earthfile b/Earthfile index e396694..e6d3dd3 100644 --- a/Earthfile +++ b/Earthfile @@ -4,15 +4,19 @@ FROM alpine ARG BASE_IMAGE=quay.io/kairos/core-opensuse-leap:latest ARG IMAGE_REPOSITORY=quay.io/kairos -ARG LUET_VERSION=0.33.0 -ARG GOLINT_VERSION=v1.50.1 -ARG GOLANG_VERSION=1.19.2 +ARG LUET_VERSION=0.34.0 +ARG GOLINT_VERSION=v1.52.2 +ARG GOLANG_VERSION=1.20.3 ARG RKE2_VERSION=latest ARG BASE_IMAGE_NAME=$(echo $BASE_IMAGE | grep -o [^/]*: | rev | cut -c2- | rev) ARG BASE_IMAGE_TAG=$(echo $BASE_IMAGE | grep -o :.* | cut -c2-) ARG RKE2_VERSION_TAG=$(echo $RKE2_VERSION | sed s/+/-/) +luet: + FROM quay.io/luet/base:$LUET_VERSION + SAVE ARTIFACT /usr/bin/luet /luet + build-cosign: FROM gcr.io/projectsigstore/cosign:v1.13.1 SAVE ARTIFACT /ko-app/cosign cosign