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

Add a beta registry pre-release #17151

Merged
merged 2 commits into from
Jul 10, 2024

Conversation

milosgajdos
Copy link
Contributor

@milosgajdos milosgajdos requested a review from a team as a code owner July 10, 2024 13:46
@milosgajdos
Copy link
Contributor Author

milosgajdos commented Jul 10, 2024

I am not sure Distribution Maintainers have a GH handle and I'm extremely reluctant to type in all 12 or however many there are 😄

NOTE: I've put back mine and Seb's handles, but we need to come up with some way to address that. The image is owned by all maintainers.

Ping @tianon

@milosgajdos milosgajdos force-pushed the registry-beta-pre-release branch from 5939a1d to 07ff6a9 Compare July 10, 2024 13:58

This comment has been minimized.

Copy link
Contributor

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

library/registry Outdated
Tags: 3.0.0-beta.1
Architectures: amd64, arm64v8, arm32v6, arm32v7, ppc64le, s390x
GitCommit: a943e89c3efe06134cd9a4b439203c5341082cbc

Tags: 3.0.0-alpha.1
Copy link
Member

Choose a reason for hiding this comment

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

The release of beta.1 means that alpha.1 is now effectively unsupported, right? (ie, there won't ever be an alpha.2 now that beta.1 is out, right?)

So this section should be removed/replaced. 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok I binned that: 6984730

Copy link
Contributor

Choose a reason for hiding this comment

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

Good catch; thank you! 🙏

@tianon
Copy link
Member

tianon commented Jul 10, 2024

Yeah, unfortunately we do need at least GitHub handles (email address is optional) -- we use it most often for notifying maintainers of things (such as the ping on this PR, but also pings like #16801 (comment) for base image EOL notifications). I really wish GitHub had some way to be able to specify that a "team" should be public so we could let folks list a team here instead, but it won't let us @-mention teams from a different organization (even if we're members of it!)

Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
@milosgajdos milosgajdos requested a review from tianon July 10, 2024 16:07
@milosgajdos
Copy link
Contributor Author

I really wish GitHub had some way to be able to specify that a "team" should be public so we could let folks list a team here instead, but it won't let us @-mention teams from a different organization (even if we're members of it!)

Yeah this would be the most welcome...alas 😮‍💨

Copy link

Diff for 6984730:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index e5c42fa..50f4ff6 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,10 +1,10 @@
 Maintainers: Milos Gajdos (@milosgajdos), Sebastiaan van Stijn (@thajeztah)
-GitRepo: https://github.com/docker/distribution-library-image.git
+GitRepo: https://github.com/distribution/distribution-library-image.git
 
 Tags: 2.8.3, 2.8, 2, latest
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
 GitCommit: 39dd72feaab7066334829d6945c54bc51a0aee98
 
-Tags: 3.0.0-alpha.1
+Tags: 3.0.0-beta.1
 Architectures: amd64, arm32v6, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 6356e8dbe1969f7340ca25a9874faa26e6e6f71d
+GitCommit: a943e89c3efe06134cd9a4b439203c5341082cbc
diff --git a/_bashbrew-list b/_bashbrew-list
index 95b4a8f..72d3c92 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,5 +1,5 @@
 registry:2
 registry:2.8
 registry:2.8.3
-registry:3.0.0-alpha.1
+registry:3.0.0-beta.1
 registry:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 3b6052a..576583f 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,2 +1,2 @@
-registry:3.0.0-alpha.1
+registry:3.0.0-beta.1
 registry:latest
diff --git a/registry_3.0.0-alpha.1/Dockerfile b/registry_3.0.0-beta.1/Dockerfile
similarity index 43%
rename from registry_3.0.0-alpha.1/Dockerfile
rename to registry_3.0.0-beta.1/Dockerfile
index 91d59d8..949b653 100644
--- a/registry_3.0.0-alpha.1/Dockerfile
+++ b/registry_3.0.0-beta.1/Dockerfile
@@ -1,18 +1,18 @@
-FROM alpine:3.18
+FROM alpine:3.20
 
 RUN apk add --no-cache ca-certificates
 
 RUN set -eux; \
 # https://github.com/distribution/distribution/releases
-	version='3.0.0-alpha.1'; \
+	version='3.0.0-beta.1'; \
 	apkArch="$(apk --print-arch)"; \
 	case "$apkArch" in \
-		x86_64)  arch='amd64';   sha256='968a6dcc648aa842963ae00a28128200b6134732ff73db6fc1e52c6f9099d1f9' ;; \
-		aarch64) arch='arm64';   sha256='4f0d3ab06b8f77abf5ae39f08a214c2451b9eec4b1b9bb2eb9b9b9da3a3ad4cf' ;; \
-		armhf)   arch='armv6';   sha256='5ac4ac9cd5c7c658cd719efc44a67a0ef4b03e0618aa359ae726938eade66300' ;; \
-		armv7)   arch='armv7';   sha256='3c2eb167a162a17453dee0e43fb97b5abb771decf60b492e2867a2354fd0618d' ;; \
-		ppc64le) arch='ppc64le'; sha256='1e39ce43428437faf31f5df636d94c4dc21958076ebf96c1bd3baf67c3f7199a' ;; \
-		s390x)   arch='s390x';   sha256='94c53ba2254013b3e38d0c0a8d8005e41681f1f394c23a61db9953d61c134c07' ;; \
+		x86_64)  arch='amd64';   sha256='96344f15da3ddbef8cf300f9642d03a2b0a7aaa0b593dfe89a9ad266c5aa4ff4' ;; \
+		aarch64) arch='arm64';   sha256='62e3e0c168f62ac274672446a3f6ea89ebdfedc6630e4b02d93900b7022dbe88' ;; \
+		armhf)   arch='armv6';   sha256='01a5373d1e05bf539a1ddf5892c3bfa7377bbc02b340f6260eb7a3c62da99897' ;; \
+		armv7)   arch='armv7';   sha256='fb3748b3108950ba3a0b2868f4cd2317ab308d7436944bdcd3ac62f734b68eb5' ;; \
+		ppc64le) arch='ppc64le'; sha256='eccd060cf2d0d801fad27994d09aa43c945629cff7664f5d27bee9698b58f2a6' ;; \
+		s390x)   arch='s390x';   sha256='b4c415a28c9d58453455068542e92b94b080dbbbc6e990f2360098a64756c71d' ;; \
 		*) echo >&2 "error: unsupported architecture: $apkArch"; exit 1 ;; \
 	esac; \
 	wget -O registry.tar.gz "https://github.com/distribution/distribution/releases/download/v${version}/registry_${version}_linux_${arch}.tar.gz"; \
@@ -21,12 +21,12 @@ RUN set -eux; \
 	rm registry.tar.gz; \
 	registry --version
 
-COPY ./config-example.yml /etc/docker/registry/config.yml
+COPY ./config-example.yml /etc/distribution/config.yml
 
 VOLUME ["/var/lib/registry"]
 EXPOSE 5000
 
-COPY docker-entrypoint.sh /entrypoint.sh
+COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
 
-CMD ["/etc/docker/registry/config.yml"]
+CMD ["/etc/distribution/config.yml"]
diff --git a/registry_3.0.0-alpha.1/config-example.yml b/registry_3.0.0-beta.1/config-example.yml
similarity index 30%
rename from registry_3.0.0-alpha.1/config-example.yml
rename to registry_3.0.0-beta.1/config-example.yml
index 3277f9a..448dfc6 100644
--- a/registry_3.0.0-alpha.1/config-example.yml
+++ b/registry_3.0.0-beta.1/config-example.yml
@@ -1,16 +1,25 @@
 version: 0.1
 log:
+  level: debug
   fields:
     service: registry
+    environment: development
 storage:
+    delete:
+      enabled: true
     cache:
         blobdescriptor: inmemory
     filesystem:
         rootdirectory: /var/lib/registry
+    tag:
+      concurrencylimit: 5
 http:
     addr: :5000
-  headers:
-    X-Content-Type-Options: [nosniff]
+    debug:
+        addr: :5001
+        prometheus:
+            enabled: true
+            path: /metrics
 health:
   storagedriver:
     enabled: true
diff --git a/registry_3.0.0-alpha.1/docker-entrypoint.sh b/registry_3.0.0-beta.1/entrypoint.sh
similarity index 100%
rename from registry_3.0.0-alpha.1/docker-entrypoint.sh
rename to registry_3.0.0-beta.1/entrypoint.sh

Relevant Maintainers:

@tianon tianon merged commit cecf830 into docker-library:master Jul 10, 2024
7 checks passed
@thaJeztah
Copy link
Contributor

but it won't let us @-mention teams from a different organization (even if we're members of it!)

would it be an option to create teams (with no additional permissions) in this org? So just for pinging / possibly review approval? I guess that could involve extra work to maintain though

@tianon
Copy link
Member

tianon commented Jul 10, 2024

Yeah, that would then be us maintaining the list, which I think would be even more error prone than y'all doing so 😓

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.

3 participants