Skip to content
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.

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

[Scheduled] Update to the upstream #44

Merged
merged 7 commits into from
Jun 26, 2020
Merged

Conversation

github-actions[bot]
Copy link

No description provided.

AndrienkoAleksandr and others added 7 commits June 10, 2020 01:18
)

looks like 1.5.0-Final needs more memory
also skipping tests
* make build.sh a bit more generic so it's more closely aligned to plugin reg script and downstream version

Change-Id: Ieb49c304ef2735c19483c089b6c768313541b288
Signed-off-by: nickboldt <[email protected]>

* make README a bit more generic so it's more closely aligned to plugin reg script and downstream version

Change-Id: Id12076bd563675ec1093329db61cda8463965bf1
Signed-off-by: nickboldt <[email protected]>

* rename build/dockerfiles/fedora.repo to build/dockerfiles/content_sets_fedora30.repo for consistency/accuracy

Change-Id: I97fc9d44d471f24d45ff655a700a4f1a8b43be8c
Signed-off-by: nickboldt <[email protected]>

* rename build/dockerfiles/content_sets_centos8_appstream.repo to build/dockerfiles/content_sets_centos8.repo and include baseos repo too

Change-Id: I593d5c0ba825409d95919a24b09e51630dbd9565
Signed-off-by: nickboldt <[email protected]>

* clean up build/dockerfiles/rhel.install.sh - no need to merge commands

Change-Id: I8598fdfb6da5d9c8a3981d0a5bd461d47f047027
Signed-off-by: nickboldt <[email protected]>

* update to latest base images, generate cert (required in rhel8/httpd-24:1-92) and remove unneeded ref to ./build/dockerfiles/fedora.repo

Change-Id: I881be4864f77855d76bfc9db46450199a464e0f5
Signed-off-by: nickboldt <[email protected]>
…esFromKuberntesReferencedObjects

Include referenced images from referenced kubernetes content to external_images.txt
Signed-off-by: Masaki Muranaka <[email protected]>
It looks `master` branch was gone.

Signed-off-by: Masaki Muranaka <[email protected]>
@monaka monaka merged commit 31d277a into pizzafactory Jun 26, 2020
@monaka monaka deleted the prp-update-to-the-upstream branch June 26, 2020 04:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants