Skip to content
Merged
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
30 changes: 0 additions & 30 deletions .github/workflows/container-pytests.yml

This file was deleted.

32 changes: 9 additions & 23 deletions .github/workflows/container-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,14 @@ on:
types:
- created
jobs:
check-readme:
uses: "sclorg/ci-actions/.github/workflows/check-readme.yml@main"
container-tests:
name: "Container tests: ${{ matrix.version }} - ${{ matrix.os_test }}"
runs-on: ubuntu-latest
concurrency:
group: container-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }}
cancel-in-progress: true
strategy:
fail-fast: false
matrix:
version: [ "2.4", "2.4-micro" ]
os_test: [ "fedora", "rhel8", "rhel9", "rhel10", "c9s", "c10s" ]
test_case: [ "container" ]
needs: check-readme
uses: "sclorg/ci-actions/.github/workflows/container-tests.yml@main"
with:
enabled-tests: '["container","container-pytest","openshift-4","openshift-pytest"]'
versions: '["2.4", "2.4-micro"]'
openshift-versions: '["2.4"]'
secrets: inherit

if: |
github.event.issue.pull_request
&& (contains(github.event.comment.body, '[test]') || contains(github.event.comment.body, '[test-all]'))
&& contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
steps:
- uses: sclorg/tfaga-wrapper@main
with:
os_test: ${{ matrix.os_test }}
version: ${{ matrix.version }}
test_case: ${{ matrix.test_case }}
public_api_key: ${{ secrets.TF_PUBLIC_API_KEY }}
private_api_key: ${{ secrets.TF_INTERNAL_API_KEY }}
41 changes: 0 additions & 41 deletions .github/workflows/openshift-pytests.yml

This file was deleted.

41 changes: 0 additions & 41 deletions .github/workflows/openshift-tests.yml

This file was deleted.

27 changes: 11 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ Apache HTTP Server Container Images

[![Build and push images to Quay.io registry](https://github.com/sclorg/httpd-container/actions/workflows/build-and-push.yml/badge.svg)](https://github.com/sclorg/httpd-container/actions/workflows/build-and-push.yml)

Images available on Quay are:
* Fedora [httpd-2.4](https://quay.io/repository/fedora/httpd-24)

This repository contains Dockerfiles for Apache HTTP Server images for OpenShift and general usage.
Users can choose between RHEL and CentOS based images.

Expand All @@ -17,19 +14,17 @@ For more information about concepts used in these container images, see the

Versions
--------
Apache HTTPD versions currently provided are:
* [httpd-2.4](2.4)
* [httpd-2.4-micro](2.4-micro)

RHEL versions currently supported are:
* RHEL 8
* RHEL 9
* RHEL 10

CentOS Stream versions currently supported are:
* CentOS Stream 9
* CentOS Stream 10

Currently supported versions are visible in the following table, expand an entry to see its container registry address.
<!--
Table start
-->
||CentOS Stream 9|CentOS Stream 10|Fedora|RHEL 8|RHEL 9|RHEL 10|
|:--|:--:|:--:|:--:|:--:|:--:|:--:|
|2.4-micro|<details><summary>✓</summary>`quay.io/sclorg/httpd-24-micro-c9s`</details>|<details><summary>✓</summary>`quay.io/sclorg/httpd-24-micro-c10s`</details>|<details><summary>✓</summary>`quay.io/fedora/httpd-24-micro`</details>||||
|2.4|<details><summary>✓</summary>`quay.io/sclorg/httpd-24-c9s`</details>|<details><summary>✓</summary>`quay.io/sclorg/httpd-24-c10s`</details>|<details><summary>✓</summary>`quay.io/fedora/httpd-24`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel8/httpd-24`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel9/httpd-24`</details>|<details><summary>✓</summary>`registry.redhat.io/rhel10/httpd-24`</details>|
<!--
Table end
-->

Installation
------------
Expand Down