Skip to content

Commit

Permalink
Pin dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate[bot] authored Oct 18, 2024
1 parent 409dc0d commit 002c484
Show file tree
Hide file tree
Showing 24 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/image-arm-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
repository: quay.io/kairos/packages
packages: utils/earthly
- name: Restore trivy cache
uses: yogeshlonkar/trivy-cache-action@v0
uses: yogeshlonkar/trivy-cache-action@b89810131e7efaff0ab831e058f4564e6d2bfb3a # v0
with:
gh-token: ${{ secrets.GITHUB_TOKEN }}
- name: Populate trivy Cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/image-arm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
repository: quay.io/kairos/packages
packages: utils/earthly
- name: Restore trivy cache
uses: yogeshlonkar/trivy-cache-action@v0
uses: yogeshlonkar/trivy-cache-action@b89810131e7efaff0ab831e058f4564e6d2bfb3a # v0
with:
gh-token: ${{ secrets.GITHUB_TOKEN }}
- name: Populate trivy Cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/image-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
repository: quay.io/kairos/packages
packages: utils/earthly
- name: Restore trivy cache
uses: yogeshlonkar/trivy-cache-action@v0
uses: yogeshlonkar/trivy-cache-action@b89810131e7efaff0ab831e058f4564e6d2bfb3a # v0
with:
gh-token: ${{ secrets.GITHUB_TOKEN }}
- name: Populate trivy Cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
repository: quay.io/kairos/packages
packages: utils/earthly
- name: Restore trivy cache
uses: yogeshlonkar/trivy-cache-action@v0
uses: yogeshlonkar/trivy-cache-action@b89810131e7efaff0ab831e058f4564e6d2bfb3a # v0
with:
gh-token: ${{ secrets.GITHUB_TOKEN }}
- name: Populate trivy Cache
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-arm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
repository: quay.io/kairos/packages
packages: utils/earthly
- name: Restore trivy cache
uses: yogeshlonkar/trivy-cache-action@v0
uses: yogeshlonkar/trivy-cache-action@b89810131e7efaff0ab831e058f4564e6d2bfb3a # v0
with:
gh-token: ${{ secrets.GITHUB_TOKEN }}
- name: Populate trivy Cache
Expand Down Expand Up @@ -187,7 +187,7 @@ jobs:
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}
- name: Restore trivy cache
uses: yogeshlonkar/trivy-cache-action@v0
uses: yogeshlonkar/trivy-cache-action@b89810131e7efaff0ab831e058f4564e6d2bfb3a # v0
with:
gh-token: ${{ secrets.GITHUB_TOKEN }}
- name: Populate trivy Cache
Expand Down Expand Up @@ -302,7 +302,7 @@ jobs:
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}
- name: Restore trivy cache
uses: yogeshlonkar/trivy-cache-action@v0
uses: yogeshlonkar/trivy-cache-action@b89810131e7efaff0ab831e058f4564e6d2bfb3a # v0
with:
gh-token: ${{ secrets.GITHUB_TOKEN }}
- name: Populate trivy Cache
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
repository: quay.io/kairos/packages
packages: utils/earthly
- name: Restore trivy cache
uses: yogeshlonkar/trivy-cache-action@v0
uses: yogeshlonkar/trivy-cache-action@b89810131e7efaff0ab831e058f4564e6d2bfb3a # v0
with:
gh-token: ${{ secrets.GITHUB_TOKEN }}
- name: Populate trivy Cache
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
repository: quay.io/kairos/packages
packages: utils/earthly
- name: Restore trivy cache
uses: yogeshlonkar/trivy-cache-action@v0
uses: yogeshlonkar/trivy-cache-action@b89810131e7efaff0ab831e058f4564e6d2bfb3a # v0
with:
gh-token: ${{ secrets.GITHUB_TOKEN }}
- name: Populate trivy Cache
Expand Down Expand Up @@ -439,7 +439,7 @@ jobs:
- name: Login to Quay Registry
run: echo ${{ secrets.QUAY_PASSWORD }} | docker login -u ${{ secrets.QUAY_USERNAME }} --password-stdin quay.io
- name: Restore trivy cache
uses: yogeshlonkar/trivy-cache-action@v0
uses: yogeshlonkar/trivy-cache-action@b89810131e7efaff0ab831e058f4564e6d2bfb3a # v0
with:
gh-token: ${{ secrets.GITHUB_TOKEN }}
- name: Populate trivy Cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-build-flavor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
run: |
earthly account login --token ${{ secrets.EARTHLY_TOKEN }} && earthly org select Kairos
- name: Restore trivy cache
uses: yogeshlonkar/trivy-cache-action@v0
uses: yogeshlonkar/trivy-cache-action@b89810131e7efaff0ab831e058f4564e6d2bfb3a # v0
with:
gh-token: ${{ secrets.GITHUB_TOKEN }}
- name: Populate trivy Cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-build-provider.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
run: |
earthly account login --token ${{ secrets.EARTHLY_TOKEN }} && earthly org select Kairos
- name: Restore trivy cache
uses: yogeshlonkar/trivy-cache-action@v0
uses: yogeshlonkar/trivy-cache-action@b89810131e7efaff0ab831e058f4564e6d2bfb3a # v0
with:
gh-token: ${{ secrets.GITHUB_TOKEN }}
- name: Populate trivy Cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable-docker-arm-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
run: |
earthly account login --token ${{ secrets.EARTHLY_TOKEN }} && earthly org select Kairos
- name: Restore trivy cache
uses: yogeshlonkar/trivy-cache-action@v0
uses: yogeshlonkar/trivy-cache-action@b89810131e7efaff0ab831e058f4564e6d2bfb3a # v0
with:
gh-token: ${{ secrets.GITHUB_TOKEN }}
- name: Populate trivy Cache
Expand Down
2 changes: 1 addition & 1 deletion examples/bundle/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine as build
FROM alpine@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d as build

# Install a binary
RUN wget https://github.com/ipfs/kubo/releases/download/v0.15.0/kubo_v0.15.0_linux-amd64.tar.gz -O kubo.tar.gz
Expand Down
6 changes: 3 additions & 3 deletions examples/byoi/fedora-fips/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARG BASE_IMAGE=fedora:36
ARG BASE_IMAGE=fedora:36@sha256:64cd00a0e2b92d527c0a0954162a73e85f160e3a53c38325b51e87d6aab4e266
FROM $BASE_IMAGE as base

# Generate os-release file
FROM quay.io/kairos/osbuilder-tools:latest as osbuilder
FROM quay.io/kairos/osbuilder-tools:latest@sha256:2276b404e26a1c4cb2288521e27c2d62c2982a9ea6ee3aed9d8ef8a41ffd539e as osbuilder
RUN zypper install -y gettext && zypper clean
RUN mkdir /workspace
COPY --from=base /etc/os-release /workspace/os-release
Expand Down Expand Up @@ -76,7 +76,7 @@ RUN mkdir -p /run/lock && \
# Copy the os-release file to identify the OS
COPY --from=osbuilder /workspace/os-release /etc/os-release

COPY --from=quay.io/kairos/framework:master_fips-systemd / /
COPY --from=quay.io/kairos/framework:master_fips-systemd@sha256:b4c475bba210cff0ba503ba15da67d463f2a93b470cb3432b4e2d755af25f64c / /

# Copy the custom dracut config file
COPY dracut.conf /etc/dracut.conf.d/kairos-fips.conf
Expand Down
4 changes: 2 additions & 2 deletions examples/byoi/fedora/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=fedora:36
ARG BASE_IMAGE=fedora:36@sha256:64cd00a0e2b92d527c0a0954162a73e85f160e3a53c38325b51e87d6aab4e266

FROM $BASE_IMAGE

Expand Down Expand Up @@ -46,7 +46,7 @@ RUN dnf install -y \
RUN mkdir -p /run/lock
RUN touch /usr/libexec/.keep

COPY --from=quay.io/kairos/framework:master_fedora / /
COPY --from=quay.io/kairos/framework:master_fedora@sha256:e4d8facc9464a2cfdf0b32cf7bf9832ed7f76cd7113f194975d9278d89c7e6a6 / /

# Activate Kairos services
RUN systemctl enable cos-setup-reconcile.timer && \
Expand Down
6 changes: 3 additions & 3 deletions examples/byoi/rockylinux-fips/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARG BASE_IMAGE=rockylinux:9
ARG BASE_IMAGE=rockylinux:9@sha256:d7be1c094cc5845ee815d4632fe377514ee6ebcf8efaed6892889657e5ddaaa6
FROM $BASE_IMAGE as base

# Generate os-release file
FROM quay.io/kairos/osbuilder-tools:latest as osbuilder
FROM quay.io/kairos/osbuilder-tools:latest@sha256:2276b404e26a1c4cb2288521e27c2d62c2982a9ea6ee3aed9d8ef8a41ffd539e as osbuilder
RUN zypper install -y gettext && zypper clean
RUN mkdir /workspace
COPY --from=base /etc/os-release /workspace/os-release
Expand Down Expand Up @@ -78,7 +78,7 @@ RUN systemctl enable sshd
# Copy the os-release file to identify the OS
COPY --from=osbuilder /workspace/os-release /etc/os-release

COPY --from=quay.io/kairos/framework:master_fips-systemd / /
COPY --from=quay.io/kairos/framework:master_fips-systemd@sha256:b4c475bba210cff0ba503ba15da67d463f2a93b470cb3432b4e2d755af25f64c / /

# Copy the custom dracut config file
COPY dracut.conf /etc/dracut.conf.d/kairos-fips.conf
Expand Down
6 changes: 3 additions & 3 deletions examples/byoi/ubuntu-fips/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

# Kairos framework packages for ubuntu fips
FROM quay.io/kairos/framework:master_fips-systemd as kairos-fips
FROM quay.io/kairos/framework:master_fips-systemd@sha256:b4c475bba210cff0ba503ba15da67d463f2a93b470cb3432b4e2d755af25f64c as kairos-fips

# Base ubuntu image (focal)
FROM ubuntu:focal as base
FROM ubuntu:focal@sha256:e341aa0d58bb9480bd092a137658bd1a7a5e8ae4fca31769df0eb7d6c4b8266e as base

# Generate os-release file
FROM quay.io/kairos/osbuilder-tools:latest as osbuilder
FROM quay.io/kairos/osbuilder-tools:latest@sha256:2276b404e26a1c4cb2288521e27c2d62c2982a9ea6ee3aed9d8ef8a41ffd539e as osbuilder
RUN zypper install -y gettext && zypper clean
RUN mkdir /workspace
COPY --from=base /etc/os-release /workspace/os-release
Expand Down
2 changes: 1 addition & 1 deletion examples/byoi/ubuntu-non-hwe/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04
FROM ubuntu:22.04@sha256:58b87898e82351c6cf9cf5b9f3c20257bb9e2dcf33af051e12ce532d7f94e3fe
RUN apt-get update && \
apt-get install -y --no-install-recommends \
linux-image-generic
2 changes: 1 addition & 1 deletion images/Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG FAMILY=alpine
ARG FLAVOR
ARG FLAVOR_RELEASE
ARG MODEL=generic
ARG BASE_IMAGE=alpine:3.19
ARG BASE_IMAGE=alpine:3.19@sha256:ae65dbf8749a7d4527648ccee1fa3deb6bfcae34cbc30fc67aa45c44dcaa90ee
ARG VARIANT
ARG VERSION
ARG FRAMEWORK_VERSION=main
Expand Down
2 changes: 1 addition & 1 deletion images/Dockerfile.debian
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG FAMILY=debian
ARG FLAVOR
ARG FLAVOR_RELEASE
ARG MODEL=generic
ARG BASE_IMAGE=debian:testing
ARG BASE_IMAGE=debian:testing@sha256:9e0fe246f9b448b7b39c4f910d8bc76ef50a170e311e7f199eebde5339bcc94f
ARG VARIANT
ARG VERSION
ARG FRAMEWORK_VERSION=main
Expand Down
4 changes: 2 additions & 2 deletions images/Dockerfile.kairos-alpine
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ ARG FAMILY=alpine
ARG FLAVOR
ARG FLAVOR_RELEASE
ARG MODEL=generic
ARG BASE_IMAGE=alpine:3.19
ARG BASE_IMAGE=alpine:3.19@sha256:ae65dbf8749a7d4527648ccee1fa3deb6bfcae34cbc30fc67aa45c44dcaa90ee
ARG VARIANT
ARG VERSION
ARG FRAMEWORK_VERSION=main
ARG FRAMEWORK_VERSION=main@sha256:a54ba6aab9732531de6d009e32149138fa8f2bc1502a2b57e4c6eab4419a513a

###############################################################
#### Common ####
Expand Down
4 changes: 2 additions & 2 deletions images/Dockerfile.kairos-debian
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ ARG FAMILY=debian
ARG FLAVOR
ARG FLAVOR_RELEASE
ARG MODEL=generic
ARG BASE_IMAGE=debian:testing
ARG BASE_IMAGE=debian:testing@sha256:9e0fe246f9b448b7b39c4f910d8bc76ef50a170e311e7f199eebde5339bcc94f
ARG VARIANT
ARG VERSION
ARG FRAMEWORK_VERSION=main
ARG FRAMEWORK_VERSION=main@sha256:a54ba6aab9732531de6d009e32149138fa8f2bc1502a2b57e4c6eab4419a513a

###############################################################
#### Upstream Images ####
Expand Down
2 changes: 1 addition & 1 deletion images/Dockerfile.kairos-opensuse
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ARG MODEL=generic
ARG BASE_IMAGE
ARG VARIANT
ARG VERSION
ARG FRAMEWORK_VERSION=main
ARG FRAMEWORK_VERSION=main@sha256:a54ba6aab9732531de6d009e32149138fa8f2bc1502a2b57e4c6eab4419a513a

FROM $BASE_IMAGE AS base

Expand Down
2 changes: 1 addition & 1 deletion images/Dockerfile.kairos-rhel
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ARG MODEL=generic
ARG BASE_IMAGE
ARG VARIANT
ARG VERSION
ARG FRAMEWORK_VERSION=main
ARG FRAMEWORK_VERSION=main@sha256:a54ba6aab9732531de6d009e32149138fa8f2bc1502a2b57e4c6eab4419a513a
ARG BOOTLOADER=grub

FROM $BASE_IMAGE AS base
Expand Down
4 changes: 2 additions & 2 deletions images/Dockerfile.kairos-ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ARG MODEL=generic
ARG BASE_IMAGE
ARG VARIANT
ARG VERSION
ARG FRAMEWORK_VERSION=main
ARG FRAMEWORK_VERSION=main@sha256:a54ba6aab9732531de6d009e32149138fa8f2bc1502a2b57e4c6eab4419a513a
ARG BOOTLOADER=grub

###############################################################
Expand All @@ -38,7 +38,7 @@ FROM ${BASE_IMAGE} AS ubuntu-20.04-upstream
# Ubuntu and the zfsutils-linux package, there is a fix in
# nohang upstream but it's not yet available in the Ubuntu
# package, so we build it from source
FROM ubuntu:22.04 as nohang-src
FROM ubuntu:22.04@sha256:58b87898e82351c6cf9cf5b9f3c20257bb9e2dcf33af051e12ce532d7f94e3fe as nohang-src
WORKDIR /root
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
2 changes: 1 addition & 1 deletion images/Dockerfile.nvidia
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04 as base
FROM ubuntu:20.04@sha256:e341aa0d58bb9480bd092a137658bd1a7a5e8ae4fca31769df0eb7d6c4b8266e as base

RUN apt-get update
RUN apt-get install -y ca-certificates
Expand Down
2 changes: 1 addition & 1 deletion images/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ FROM ${BASE_IMAGE} AS ubuntu-20.04-upstream
# Ubuntu and the zfsutils-linux package, there is a fix in
# nohang upstream but it's not yet available in the Ubuntu
# package, so we build it from source
FROM ubuntu:22.04 as nohang-src
FROM ubuntu:22.04@sha256:58b87898e82351c6cf9cf5b9f3c20257bb9e2dcf33af051e12ce532d7f94e3fe as nohang-src
WORKDIR /root
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down

0 comments on commit 002c484

Please sign in to comment.