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

Cirrus: Fix missing htpasswd command in registry image #2427

Merged
merged 1 commit into from
Jun 30, 2020

Conversation

cevich
Copy link
Member

@cevich cevich commented Jun 26, 2020

Recently the registry image was updated significantly with breaking
changes. Most were caught, this one was not. Instead of relying on the
(clearly) unreliable container image, simply install the package
providing the htpasswd command locally.

Signed-off-by: Chris Evich [email protected]

@cevich cevich mentioned this pull request Jun 26, 2020
@TomSweeneyRedHat
Copy link
Member

This will fixe the build issues in #2422 and a few others.

@cevich cevich changed the title Cirrus: After build, bin/buildah links to buildah Cirrus: Fix missing htpasswd command in registry image Jun 26, 2020
@TomSweeneyRedHat
Copy link
Member

tests still aren't happy @cevich :^(

@cevich
Copy link
Member Author

cevich commented Jun 29, 2020

&^:angry: ^%$!:angry: :angry: !!FFS#@&!!!!!!!!!!:angry:

@cevich cevich force-pushed the fix_missing_bin_buildah branch 2 times, most recently from ca98619 to 15e5edb Compare June 29, 2020 15:43
@TomSweeneyRedHat
Copy link
Member

ping @cevich still lots of unlove here for you.

Recently the registry image was updated significantly with breaking
changes.  Most were caught, this one was not.  Instead of relying on the
(clearly) unreliable container image, simply install the package
providing the htpasswd command locally.

Signed-off-by: Chris Evich <[email protected]>
@cevich
Copy link
Member Author

cevich commented Jun 30, 2020

@TomSweeneyRedHat got it!

@cevich
Copy link
Member Author

cevich commented Jun 30, 2020

TODO Items addressed here: containers/podman#6822

@TomSweeneyRedHat
Copy link
Member

@ccevich WOOT!

@rhatdan
Copy link
Member

rhatdan commented Jun 30, 2020

bors r+

@bors
Copy link
Contributor

bors bot commented Jun 30, 2020

Build succeeded:

  • cirrus-ci/success

@bors bors bot merged commit 4fd8811 into containers:master Jun 30, 2020
Copy link
Member

@edsantiago edsantiago left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but I'm wondering why the packages are installed here instead of packer? (Which I don't actually see in this repo)?

PS looks like you need to rebase Edit: never mind, I must've misread a status message.

@cevich
Copy link
Member Author

cevich commented Jul 8, 2020

LGTM but I'm wondering why the packages are installed here instead of packer? (Which I don't actually see in this repo)?

FWIW: This is a temporary change, I've got containers/podman#6822 running to get the package added in the proper packer place.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 2, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants