Skip to content

Commit

Permalink
Switch base image to Fedora 41 (#622)
Browse files Browse the repository at this point in the history
Related to #613.
  • Loading branch information
nforro authored Dec 10, 2024
2 parents a82fcb2 + 50c9a08 commit 61dbcb1
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
15 changes: 11 additions & 4 deletions .github/workflows/base-image-rebuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
branches:
- main
paths:
- containers/Containerfile.c9s
- containers/Containerfile

jobs:
build:
Expand All @@ -20,8 +20,15 @@ jobs:
strategy:
matrix:
include:
- containerfile: containers/Containerfile.c9s
tags: "c9s latest"
- containerfile: containers/Containerfile
tags: "fedora latest"
archs: "amd64"
- containerfile: containers/Containerfile
tags: "fedora latest"
archs: "arm64"
- containerfile: containers/Containerfile
tags: "fedora latest"
archs: "ppc64le"

steps:
- uses: actions/checkout@v3
Expand All @@ -38,7 +45,7 @@ jobs:
containerfiles: ${{ matrix.containerfile }}
image: base
tags: ${{ matrix.tags }}
archs: amd64, arm64, ppc64le
archs: ${{ matrix.archs }}
# Uncomment once we stop using oc cluster up for tests
# oci: true

Expand Down
8 changes: 2 additions & 6 deletions containers/Containerfile.c9s → containers/Containerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
# Be aware that this image is used for all stages, so if a dependency is removed be sure that it is
# not required in anywhere

FROM quay.io/centos/centos:stream9
FROM registry.fedoraproject.org/fedora:41

ENV ANSIBLE_PYTHON_INTERPRETER=/usr/bin/python3 \
ANSIBLE_STDOUT_CALLBACK=debug

RUN dnf -y install epel-release && \
crb enable && \
# TODO: revert this change after psql:15 works fine
dnf -y module enable postgresql:16 && \
dnf -y upgrade && \
RUN dnf -y upgrade && \
dnf -y install ansible python3-pip && \
dnf clean all

0 comments on commit 61dbcb1

Please sign in to comment.