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

Pinned registry to 2.6 #178

Merged
merged 4 commits into from
Jun 22, 2020
Merged

Pinned registry to 2.6 #178

merged 4 commits into from
Jun 22, 2020

Conversation

mrmrcoleman
Copy link
Contributor

It looks like htpasswd was removed from the upstream registry image. Pinned to 2.7 and added apache2-utils.

@mmlb
Copy link
Contributor

mmlb commented Jun 18, 2020

@mrmrcoleman can you split into 2 commits please? I'd prefer first for the apache-utils with a message that it went away in 2.7. And the second pinning the image to 2.7 with a message along the lines of so it doesn't happen again ;).

@mrmrcoleman
Copy link
Contributor Author

@mmlb It seems 2.7 doesn't work, 2.6 does. Want me to pin it there without the apk add?

@mrmrcoleman
Copy link
Contributor Author

@mmlb Updated to show the steps in between.

@mrmrcoleman mrmrcoleman changed the title Pinned registry to 2.7 and added apache2-utils Pinned registry to 2.6 Jun 21, 2020
@alexellis
Copy link
Contributor

Since we are deriving a new custom image anyway, why don’t we use the later image and just add it back in?

@alexellis
Copy link
Contributor

Adding this step to your custom Dockerfile would save your butt for when someone comes along and innocently bumps the version back up to 2.7.

/ # apk add --update apache2-utils
(1/5) Installing libuuid (2.34-r1)
(2/5) Installing apr (1.7.0-r0)
(3/5) Installing expat (2.2.9-r1)
(4/5) Installing apr-util (1.6.1-r6)
(5/5) Installing apache2-utils (2.4.43-r0)
Executing busybox-1.31.1-r9.trigger
OK: 7 MiB in 20 packages
/ # htpasswd
Usage:
	htpasswd [-cimBdpsDv] [-C cost] passwordfile username
	htpasswd -b[cmBdpsDv] [-C cost] passwordfile username password

@@ -1,4 +1,4 @@
FROM registry:2
FROM registry:2.6.2
RUN apk add --no-cache --update curl
Copy link
Contributor

Choose a reason for hiding this comment

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

A solution that would last the tests of time would be the following:

RUN apk add --no-cache --update curl apache2-utils

Instead of pinning to an earlier version.

@mrmrcoleman
Copy link
Contributor Author

I'm fine with either approach. Perhaps I misunderstood what @mmlb wanted to see?

@gianarb
Copy link
Contributor

gianarb commented Jun 22, 2020

As we discussed during a chat this is blocking set up and people are asking all over what is going on.
A better fix can land as a separate PR!

@gianarb gianarb added the ready-to-merge Signal to Mergify to merge the PR. label Jun 22, 2020
@mergify mergify bot merged commit 922c78f into tinkerbell:master Jun 22, 2020
@mmlb mmlb removed the ready-to-merge Signal to Mergify to merge the PR. label Jan 25, 2021
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