Skip to content

Commit e4904d5

Browse files
committed
Switch Foreman images to images from foreman-oci-images
Signed-off-by: Eric D. Helms <ericdhelms@gmail.com>
1 parent 7a18343 commit e4904d5

File tree

9 files changed

+7
-96
lines changed

9 files changed

+7
-96
lines changed

.github/workflows/container.yml

Lines changed: 0 additions & 35 deletions
This file was deleted.

container-images/foreman-proxy/Containerfile

Lines changed: 0 additions & 16 deletions
This file was deleted.

container-images/foreman-proxy/Makefile

Lines changed: 0 additions & 8 deletions
This file was deleted.

container-images/foreman/Containerfile

Lines changed: 0 additions & 22 deletions
This file was deleted.

container-images/foreman/Makefile

Lines changed: 0 additions & 8 deletions
This file was deleted.

docs/container-image-builds.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The base image will be `quay.io/centos/centos:stream9`.
1919

2020
Container files will be stored in repositories for each service that mimic packaging.
2121

22-
* foreman-oci-images
22+
* [foreman-oci-images](https://github.com/theforeman/foreman-oci-images)
2323
* pulpcore-oci-images
2424
* [candlepin-oci-images](https://github.com/theforeman/candlepin-oci-images)
2525

src/roles/foreman/defaults/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
foreman_container_image: "quay.io/evgeni/foreman-rpm"
2+
foreman_container_image: "quay.io/foreman/foreman"
33
foreman_container_tag: "nightly"
44

55
foreman_database_name: foreman

src/roles/foreman_proxy/defaults/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
foreman_proxy_container_image: "quay.io/evgeni/foreman-proxy-rpm"
2+
foreman_proxy_container_image: "quay.io/foreman/foreman-proxy"
33
foreman_proxy_container_tag: "nightly"
44
foreman_proxy_pulp_url: "https://{{ ansible_fqdn }}"
55
foreman_proxy_pulp_content_url: "{{ foreman_proxy_pulp_url }}/pulp/content/"

src/vars/images.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
candlepin_container_image: quay.io/foreman/candlepin
22
candlepin_container_tag: 4.4.14
3-
foreman_container_image: "quay.io/evgeni/foreman-rpm"
4-
foreman_container_tag: "nightly"
5-
foreman_proxy_container_image: "quay.io/evgeni/foreman-proxy-rpm"
6-
foreman_proxy_container_tag: "nightly"
3+
foreman_container_image: quay.io/foreman/foreman
4+
foreman_container_tag: nightly
5+
foreman_proxy_container_image: quay.io/foreman/foreman-proxy
6+
foreman_proxy_container_tag: nightly
77
pulp_image: quay.io/pulp/pulp-minimal:3.73
88
redis_image: quay.io/sclorg/redis-6-c9s:latest
99

0 commit comments

Comments
 (0)