Skip to content

add redhat 7, 8, 9 images #72

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

Merged
merged 2 commits into from
Feb 14, 2024
Merged

add redhat 7, 8, 9 images #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63190f4
add support for redhat 7, 8, 9 images
h0tw1r3 Feb 8, 2024
d6f8b73
(fix) empty github event input from ci workflow
h0tw1r3 Feb 14, 2024
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
14 changes: 7 additions & 7 deletions .github/workflows/template_build_deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ env:
REGISTRY_PASSWORD: ${{ secrets.DOCKER_PASSWORD != '' && secrets.DOCKER_PASSWORD || secrets.GITHUB_TOKEN }}
REPOSITORY: ${{ vars.DOCKER_REPOSITORY != '' && vars.DOCKER_REPOSITORY || github.repository }}
BOLT_GEM: 1
GEM_PUPPET_LITMUS: ${{ github.event.inputs.puppet_litmus }}
GEM_PUPPET_LITMUS: ${{ inputs.puppet_litmus }}

jobs:
select:
Expand All @@ -47,18 +47,18 @@ jobs:
def valid_json?(data)
!!(JSON.parse(data) || true) rescue false
end
event = JSON.parse(File.read(ENV['GITHUB_EVENT_PATH']))
event['inputs'].select! do |key, val|
next if val.nil? || val.empty?
inputs = JSON.parse('${{ toJSON(inputs) }}')
inputs.select! do |key, val|
next if val.nil? || val.to_s.empty?
case key
when "puppet_litmus"
when 'puppet_litmus'
!valid_json?(val) || val.match?(%r{[();]})
end
end
event['inputs'].each do |key, value|
inputs.each do |key, value|
puts "::error title=#{key} invalid::#{value}"
end
exit 1 unless event['inputs'].empty?
exit 1 unless inputs.empty?

- name: Checkout repository
uses: actions/checkout@v4
Expand Down
55 changes: 29 additions & 26 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,35 @@ Images get [uploaded automatically][2] and are rebuilt [nightly if necessary][3]

## Buildable images

| image | tag | dockerfile | base_image | base_tag |
| ----- | --- | ---------- | ---------- | -------- |
| ubuntu | 18.04 | apt_sysvinit-utils | ubuntu | 18.04 |
| ubuntu | 20.04 | apt_sysvinit-utils | ubuntu | 20.04 |
| ubuntu | 22.04 | apt_sysvinit-utils | ubuntu | 22.04 |
| centos | 6 | yum_initd | centos | 6 |
| centos | 7 | yum_systemd | centos | 7 |
| centos | stream8 | yum_systemd | quay.io/centos/centos | stream8 |
| centos | stream9 | yum_systemd | quay.io/centos/centos | stream9 |
| scientificlinux | 6 | yum_initd | scientificlinux/sl | 6 |
| scientificlinux | 7 | yum_systemd | scientificlinux/sl | 7 |
| sles | 15 | zypper_systemd | registry.suse.com/suse/sle15 | 15.5 |
| oraclelinux | 6 | yum_initd | oraclelinux | 6 |
| oraclelinux | 7 | yum_systemd | oraclelinux | 7 |
| oraclelinux | 8 | yum_systemd | oraclelinux | 8 |
| oraclelinux | 9 | yum_systemd | oraclelinux | 9 |
| rockylinux | 8 | yum_systemd | rockylinux/rockylinux | 8 |
| rockylinux | 9 | yum_systemd | rockylinux/rockylinux | 9 |
| almalinux | 8 | yum_systemd | almalinux | 8 |
| almalinux | 9 | yum_systemd | almalinux | 9 |
| debian | 10 | apt_sysvinit-utils | debian | 10 |
| debian | 11 | apt_sysvinit-utils | debian | bullseye |
| debian | 12 | apt_sysvinit-utils | debian | 12 |
| amazonlinux | 2 | yum_systemd | amazonlinux | 2 |
| amazonlinux | 2023 | yum_systemd | amazonlinux | 2023 |
| fedora | 36 | yum_systemd | fedora | 36 |
| image | tag | dockerfile | base_image | base_tag |
|-----------------|---------|--------------------|------------------------------------------|----------|
| ubuntu | 18.04 | apt_sysvinit-utils | ubuntu | 18.04 |
| ubuntu | 20.04 | apt_sysvinit-utils | ubuntu | 20.04 |
| ubuntu | 22.04 | apt_sysvinit-utils | ubuntu | 22.04 |
| centos | 6 | yum_initd | centos | 6 |
| centos | 7 | yum_systemd | centos | 7 |
| centos | stream8 | yum_systemd | quay.io/centos/centos | stream8 |
| centos | stream9 | yum_systemd | quay.io/centos/centos | stream9 |
| scientificlinux | 6 | yum_initd | scientificlinux/sl | 6 |
| scientificlinux | 7 | yum_systemd | scientificlinux/sl | 7 |
| sles | 15 | zypper_systemd | registry.suse.com/suse/sle15 | 15.5 |
| oraclelinux | 6 | yum_initd | oraclelinux | 6 |
| oraclelinux | 7 | yum_systemd | oraclelinux | 7 |
| oraclelinux | 8 | yum_systemd | oraclelinux | 8 |
| oraclelinux | 9 | yum_systemd | oraclelinux | 9 |
| rockylinux | 8 | yum_systemd | rockylinux/rockylinux | 8 |
| rockylinux | 9 | yum_systemd | rockylinux/rockylinux | 9 |
| almalinux | 8 | yum_systemd | almalinux | 8 |
| almalinux | 9 | yum_systemd | almalinux | 9 |
| redhat | 7 | yum_systemd | registry.access.redhat.com/ubi7/ubi-init | latest |
| redhat | 8 | yum_systemd | redhat/ubi8-init | latest |
| redhat | 9 | yum_systemd | redhat/ubi9-init | latest |
| debian | 10 | apt_sysvinit-utils | debian | 10 |
| debian | 11 | apt_sysvinit-utils | debian | bullseye |
| debian | 12 | apt_sysvinit-utils | debian | 12 |
| amazonlinux | 2 | yum_systemd | amazonlinux | 2 |
| amazonlinux | 2023 | yum_systemd | amazonlinux | 2023 |
| fedora | 36 | yum_systemd | fedora | 36 |

## Manual Building

Expand Down
3 changes: 3 additions & 0 deletions images.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
{ "image": "rockylinux", "tag": "9", "dockerfile": "yum_systemd", "base_image": "rockylinux/rockylinux", "base_tag": "9" },
{ "image": "almalinux", "tag": "8", "dockerfile": "yum_systemd", "base_image": "almalinux", "base_tag": "8" },
{ "image": "almalinux", "tag": "9", "dockerfile": "yum_systemd", "base_image": "almalinux", "base_tag": "9" },
{ "image": "redhat", "tag": "7", "dockerfile": "yum_systemd", "base_image": "registry.access.redhat.com/ubi7/ubi", "base_tag": "latest" },
{ "image": "redhat", "tag": "8", "dockerfile": "yum_systemd", "base_image": "redhat/ubi8", "base_tag": "latest" },
{ "image": "redhat", "tag": "9", "dockerfile": "yum_systemd", "base_image": "redhat/ubi9", "base_tag": "latest" },
{ "image": "debian", "tag": "10", "dockerfile": "apt_sysvinit-utils", "base_image": "debian", "base_tag": "10" },
{ "image": "debian", "tag": "11", "dockerfile": "apt_sysvinit-utils", "base_image": "debian", "base_tag": "bullseye" },
{ "image": "debian", "tag": "12", "dockerfile": "apt_sysvinit-utils", "base_image": "debian", "base_tag": "12" },
Expand Down