Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pin dependencies #2722

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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:b89d9c93e9ed3597455c90a0b88a8bbb5cb7188438f70953fede212a0c4394e0 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:6ad4d6ccf0dc0570b817271fe1b6a5c6b714405152182fecf025c3984cf3621c 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:6ad4d6ccf0dc0570b817271fe1b6a5c6b714405152182fecf025c3984cf3621c 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:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc as base

# Generate os-release file
FROM quay.io/kairos/osbuilder-tools:latest as osbuilder
FROM quay.io/kairos/osbuilder-tools:latest@sha256:6ad4d6ccf0dc0570b817271fe1b6a5c6b714405152182fecf025c3984cf3621c 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:340d9b015b194dc6e2a13938944e0d016e57b9679963fdeb9ce021daac430221
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:af4785ccdbcd5cde71bfd5b93eabd34250b98651f19fe218c91de6c8d10e21c5
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:45461c02ed0ca82ae6fed79f4d9e8c8e1f503b5d237355ba10b8972386e490e7
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:af4785ccdbcd5cde71bfd5b93eabd34250b98651f19fe218c91de6c8d10e21c5
ARG VARIANT
ARG VERSION
ARG FRAMEWORK_VERSION=main
ARG FRAMEWORK_VERSION=main@sha256:e58eb0cd1a5372b959ef52520ba752a6b63e904e4e89c3ea9d46ca2eefcbff90

###############################################################
#### 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:45461c02ed0ca82ae6fed79f4d9e8c8e1f503b5d237355ba10b8972386e490e7
ARG VARIANT
ARG VERSION
ARG FRAMEWORK_VERSION=main
ARG FRAMEWORK_VERSION=main@sha256:e58eb0cd1a5372b959ef52520ba752a6b63e904e4e89c3ea9d46ca2eefcbff90

###############################################################
#### 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 @@ -10,7 +10,7 @@ ARG MODEL=generic
ARG BASE_IMAGE
ARG VARIANT
ARG VERSION
ARG FRAMEWORK_VERSION=main
ARG FRAMEWORK_VERSION=main@sha256:e58eb0cd1a5372b959ef52520ba752a6b63e904e4e89c3ea9d46ca2eefcbff90

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:e58eb0cd1a5372b959ef52520ba752a6b63e904e4e89c3ea9d46ca2eefcbff90
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:e58eb0cd1a5372b959ef52520ba752a6b63e904e4e89c3ea9d46ca2eefcbff90
ARG BOOTLOADER=grub

###############################################################
Expand All @@ -41,7 +41,7 @@ FROM ${BASE_IMAGE} AS ubuntu-22.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:340d9b015b194dc6e2a13938944e0d016e57b9679963fdeb9ce021daac430221 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:0b897358ff6624825fb50d20ffb605ab0eaea77ced0adb8c6a4b756513dec6fc 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 @@ -42,7 +42,7 @@ FROM ${BASE_IMAGE} AS ubuntu-22.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:340d9b015b194dc6e2a13938944e0d016e57b9679963fdeb9ce021daac430221 as nohang-src
WORKDIR /root
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
Loading