Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sclorg/s2i-python-container
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c539eecca5aab3e3e060fc98e710b9a577a5eac1
Choose a base ref
..
head repository: sclorg/s2i-python-container
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f70a57b0f51b1645ba25705e7069585d824e5ade
Choose a head ref
Showing with 6 additions and 4 deletions.
  1. +1 −1 .github/workflows/build-and-push.yml
  2. +1 −1 .github/workflows/container-tests.yml
  3. +2 −2 3.12-minimal/Dockerfile.fedora
  4. +2 −0 specs/multispec.yml
2 changes: 1 addition & 1 deletion .github/workflows/build-and-push.yml
View file
Original file line number Diff line number Diff line change
@@ -129,6 +129,6 @@ jobs:
dockerfile: ${{ matrix.dockerfile }}
tag: ${{ matrix.tag }}
image_name: ${{ matrix.image_name }}
archs: amd64, arm64
archs: amd64, arm64, ppc64le
readme: "${{ matrix.docker_context }}/README.md"
quay_application_token: ${{ secrets.QUAY_IMAGE_SCLORG_UPDATE_DESC }}
2 changes: 1 addition & 1 deletion .github/workflows/container-tests.yml
View file
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ jobs:
fail-fast: false
matrix:
version: [ "3.8", "3.9", "3.9-minimal", "3.11", "3.11-minimal", "3.12", "3.12-minimal" ]
os_test: [ "fedora", "rhel8", "rhel9", "c9s" ]
os_test: [ "fedora", "rhel8", "rhel9", "c9s", "c10s" ]
test_case: [ "container" ]
if: |
github.event.issue.pull_request
4 changes: 2 additions & 2 deletions 3.12-minimal/Dockerfile.fedora
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM
FROM quay.io/fedora/fedora-minimal:39


EXPOSE 8080
@@ -47,7 +47,7 @@ LABEL summary="$SUMMARY" \
io.openshift.expose-services="8080:http" \
io.openshift.tags="builder,python,python312,python-312,rh-python312" \
com.redhat.component="python-312-container" \
name="/python-312-minimal" \
name="fedora/python-312-minimal" \
version="1" \
usage="s2i build https://github.com/sclorg/s2i-python-container.git --context-dir=3.12-minimal/test/setup-test-app/ ubi/python-312-minimal python-sample-app" \
com.redhat.license_terms="https://www.redhat.com/en/about/red-hat-end-user-license-agreements#UBI" \
2 changes: 2 additions & 0 deletions specs/multispec.yml
View file
Original file line number Diff line number Diff line change
@@ -85,8 +85,10 @@ specs:
distros:
- fedora-39-x86_64
fedora_version: "39"
minimal_image: "quay.io/fedora/fedora-minimal:39"
s2i_base: quay.io/fedora/s2i-base
img_tag: "39"
org: "fedora"
python_pkgs: ['python3', 'python3-devel', 'python3-setuptools', 'python3-pip']
base_pkgs: ['nss_wrapper', 'httpd', 'httpd-devel', 'atlas-devel', 'gcc-gfortran',
'libffi-devel', 'libtool-ltdl', 'enchant', 'redhat-rpm-config',