Modified version scheme to drop base image version

This commit is contained in:
venkatnsrinivasan
2022-10-12 12:15:44 +05:30
parent cfeb43eb44
commit 5133d1f356
3 changed files with 12 additions and 12 deletions

View File

@@ -13,9 +13,10 @@ jobs:
strategy: strategy:
matrix: matrix:
base-image: base-image:
- quay.io/kairos/core-opensuse:v1.1.0 - quay.io/kairos/core-opensuse:v1.1.1
- quay.io/kairos/core-alpine:v1.1.0 - quay.io/kairos/core-alpine:v1.1.1
- quay.io/kairos/core-ubuntu:v1.1.0 - quay.io/kairos/core-ubuntu-20-lts:v1.1.1
- quay.io/kairos/core-ubuntu-22-lts:v1.1.1
k3s-version: k3s-version:
- v1.25.2+k3s1 - v1.25.2+k3s1
- v1.24.6+k3s1 - v1.24.6+k3s1

View File

@@ -26,9 +26,10 @@ jobs:
strategy: strategy:
matrix: matrix:
base-image: base-image:
- quay.io/kairos/core-opensuse:latest - quay.io/kairos/core-opensuse:v1.1.1
- quay.io/kairos/core-alpine:latest - quay.io/kairos/core-alpine:v1.1.1
- quay.io/kairos/core-ubuntu:latest - quay.io/kairos/core-ubuntu-20-lts:v1.1.1
- quay.io/kairos/core-ubuntu-22-lts:v1.1.1
k3s-version: k3s-version:
- v1.25.0+k3s1 - v1.25.0+k3s1
steps: steps:

View File

@@ -86,9 +86,8 @@ docker:
ENV OS_LABEL=${BASE_IMAGE_TAG}_${K3S_VERSION_TAG}_${VERSION} ENV OS_LABEL=${BASE_IMAGE_TAG}_${K3S_VERSION_TAG}_${VERSION}
RUN envsubst >/etc/os-release </usr/lib/os-release.tmpl RUN envsubst >/etc/os-release </usr/lib/os-release.tmpl
SAVE IMAGE --push $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${BASE_IMAGE_TAG} SAVE IMAGE --push $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${K3S_VERSION_TAG}
SAVE IMAGE --push $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${BASE_IMAGE_TAG}_${K3S_VERSION_TAG} SAVE IMAGE --push $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${K3S_VERSION_TAG}_${VERSION}
SAVE IMAGE --push $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${BASE_IMAGE_TAG}_${K3S_VERSION_TAG}_${VERSION}
cosign: cosign:
ARG --required ACTIONS_ID_TOKEN_REQUEST_TOKEN ARG --required ACTIONS_ID_TOKEN_REQUEST_TOKEN
@@ -115,9 +114,8 @@ cosign:
RUN echo $REGISTRY_PASSWORD | docker login -u $REGISTRY_USER --password-stdin $REGISTRY RUN echo $REGISTRY_PASSWORD | docker login -u $REGISTRY_USER --password-stdin $REGISTRY
RUN cosign sign $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${BASE_IMAGE_TAG} RUN cosign sign $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${K3S_VERSION_TAG}
RUN cosign sign $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${BASE_IMAGE_TAG}_${K3S_VERSION_TAG} RUN cosign sign $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${K3S_VERSION_TAG}_${VERSION}
RUN cosign sign $IMAGE_REPOSITORY/${BASE_IMAGE_NAME}-k3s:${BASE_IMAGE_TAG}_${K3S_VERSION_TAG}_${VERSION}
docker-all-platforms: docker-all-platforms:
BUILD --platform=linux/amd64 +docker BUILD --platform=linux/amd64 +docker