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

Make monolithic image work when built with buildah #19920

Merged
merged 2 commits into from
Mar 3, 2020

Conversation

carbonin
Copy link
Member

@carbonin carbonin commented Mar 3, 2020

This moves the volume commands down to avoid running into containers/buildah#2202 when using podman or buildah to create the image.

Additionally it removes some unnecessary ssh configuration as we haven't been running sshd since we removed systemd from this image.

@carbonin
Copy link
Member Author

carbonin commented Mar 3, 2020

Some of these changes were made to ivanchuk in #19919

@carbonin
Copy link
Member Author

carbonin commented Mar 3, 2020

cc @simaishi after this you can use buildah for the nightly images if you want.

Dockerfile Show resolved Hide resolved
@miq-bot
Copy link
Member

miq-bot commented Mar 3, 2020

Checked commits carbonin/manageiq@41d7c4f~...d137874 with ruby 2.5.7, rubocop 0.69.0, haml-lint 0.20.0, and yamllint
0 files checked, 0 offenses detected
Everything looks fine. 🍰

@simaishi
Copy link
Contributor

simaishi commented Mar 3, 2020

cc @simaishi after this you can use buildah for the nightly images if you want.

Oh nice. All pods images can be built using podman/buildah as well? If so, we can probably switch to or at least make it an option in pods build script.

@carbonin
Copy link
Member Author

carbonin commented Mar 3, 2020

All pods images can be built using podman/buildah as well?

I believe so.

@bdunne bdunne merged commit d013803 into ManageIQ:master Mar 3, 2020
@bdunne bdunne added this to the Sprint 132 Ending Mar 16, 2020 milestone Mar 3, 2020
@carbonin carbonin deleted the update_dockerfile branch March 3, 2020 22:06
simaishi pushed a commit that referenced this pull request Mar 12, 2020
Make monolithic image work when built with buildah

(cherry picked from commit d013803)
@simaishi
Copy link
Contributor

This is in ivanchuk branch (via #19919), so backported to jansa. Also, without this change, it fails to build on our build machine.

commit 4aba85cbeeb0c876bf3f4122c2a6cc37e6de71d1
Author: Brandon Dunne <bdunne@redhat.com>
Date:   Tue Mar 3 16:28:12 2020 -0500

    Merge pull request #19920 from carbonin/update_dockerfile

    Make monolithic image work when built with buildah

    (cherry picked from commit d013803ebb1e39e794f74a1626d61a1301549b36)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants