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.

Sign up for GitHub

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

Jump to bottom

versions: Bump fedora base image to f40 #2135

Merged
merged 1 commit into from
Oct 29, 2024
+7 −7
Merged

versions: Bump fedora base image to f40 #2135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 hack/Dockerfile.golang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1.5-labs

ARG BASE_IMAGE=registry.fedoraproject.org/fedora:39
ARG BASE_IMAGE=registry.fedoraproject.org/fedora:40
FROM --platform=$TARGETPLATFORM ${BASE_IMAGE} AS base

# DO NOT UPDATE THIS BY HAND !!
Expand Down
2 changes: 1 addition & 1 deletion src/cloud-api-adaptor/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG BUILD_TYPE=dev
ARG BUILDER_BASE=quay.io/confidential-containers/golang-fedora:1.22.7-39
ARG BASE=registry.fedoraproject.org/fedora:39
ARG BASE=registry.fedoraproject.org/fedora:40

# This dockerfile uses Go cross-compilation to build the binary,
# we build on the host platform ($BUILDPLATFORM) and then copy the
Expand Down
2 changes: 1 addition & 1 deletion src/cloud-api-adaptor/podvm-mkosi/Dockerfile.podvm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Adapted from https://github.com/kubernetes-sigs/kind/blob/main/images/base/Dockerfile

ARG BASE_IMAGE=registry.fedoraproject.org/fedora:39
ARG BASE_IMAGE=registry.fedoraproject.org/fedora:40
FROM $BASE_IMAGE AS base

RUN echo "Installing Packages ..." \
Expand Down
6 changes: 3 additions & 3 deletions src/cloud-api-adaptor/podvm/Dockerfile.podvm_builder.fedora
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# Build binaries for mkosi podvm image
#
FROM registry.fedoraproject.org/fedora:39
FROM registry.fedoraproject.org/fedora:40

ARG ARCH="amd64"
ARG YQ_ARCH="amd64"
Expand All @@ -25,8 +25,8 @@ RUN dnf groupinstall -y 'Development Tools' && \
dnf clean all

RUN dnf install 'dnf-command(config-manager)' && \
dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo && \
dnf install -y gh --repo gh-cli
dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo && \
dnf install -y gh --repo gh-cli

ADD https://dl.google.com/go/go${GO_VERSION}.linux-${ARCH}.tar.gz go${GO_VERSION}.linux-${ARCH}.tar.gz
RUN rm -rf /usr/local/go && tar -C /usr/local -xzf go${GO_VERSION}.linux-${ARCH}.tar.gz && rm -f go${GO_VERSION}.linux-${ARCH}.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion src/peerpod-ctrl/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ COPY peerpod-ctrl/controllers/ controllers/
RUN CC=gcc CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build ${GOFLAGS} -a -o manager main.go

# Target Image
FROM --platform=$TARGETPLATFORM registry.fedoraproject.org/fedora:39
FROM --platform=$TARGETPLATFORM registry.fedoraproject.org/fedora:40
ARG CGO_ENABLED=1

RUN if [ "$CGO_ENABLED" = 1 ] ; then dnf install -y libvirt-libs openssh-clients && dnf clean all; fi
Expand Down
Loading