Bump github.com/docker/docker from 24.0.9+incompatible to 25.0.6+inco…

…mpatible (#75)

.env_example

@@ -1,11 +1,11 @@
-STARLIGHT_CONTAINER_REGISTRY=reg.yuri.moe
+STARLIGHT_CONTAINER_REGISTRY=registry.yuri.moe
 STARLIGHT_SANDBOX_DIR=../.sandbox
 
 TEST_DOCKER_SOURCE_IMAGE=docker.io/library/redis:6.2.1
 
-TEST_HARBOR_REGISTRY=reg.yuri.moe
-TEST_HARBOR_IMAGE_FROM=reg.yuri.moe/starlight/test-harbor:test
-TEST_HARBOR_IMAGE_TO=reg.yuri.moe/starlight/test-harbor123:starlight2
+TEST_HARBOR_REGISTRY=registry.yuri.moe
+TEST_HARBOR_IMAGE_FROM=registry.yuri.moe/starlight/test-harbor:test
+TEST_HARBOR_IMAGE_TO=registry.yuri.moe/starlight/test-harbor123:starlight2
 
 HARBOR_USERNAME=
 HARBOR_PASSWORD=

.github/workflows/debian-package.yml

@@ -36,7 +36,7 @@ jobs:
           echo "minor="`git describe --tags --match "v*" | cut -d '-' -f 1 | sed -e "s/^v//" | cut -d '.' -f 2` >> $GITHUB_OUTPUT
           echo "patch="`git describe --tags --match "v*" | cut -d '-' -f 1 | sed -e "s/^v//" | cut -d '.' -f 3` >> $GITHUB_OUTPUT
       - name: Build deb package
-        # This needs container image from reg.yuri.moe. It is a small image that you can upload your deb package to. and save in a patial directory.
+        # This needs container image from registry.yuri.moe. It is a small image that you can upload your deb package to. and save in a patial directory.
         # Please make sure that the registry is available
         # status is available at: http://status-production.mc256.workers.dev
         env:
@@ -48,7 +48,7 @@ jobs:
           curl -fsSL https://get.docker.com -o /tmp/get-docker.sh
           sh /tmp/get-docker.sh
           docker run --privileged --rm tonistiigi/binfmt --install all
-          docker run -d --hostname helper --expose 8080 --name helper -v "$(pwd)"/sandbox:/app/upload:rw reg.yuri.moe/public/helper:latest
+          docker run -d --hostname helper --expose 8080 --name helper -v "$(pwd)"/sandbox:/app/upload:rw registry.yuri.moe/public/helper:latest
           export UPLOAD_URL=http://`docker inspect helper | grep "IPAddress" | grep -o -E '[0-9.]+' | head -n 1`:8080/
           make docker-buildx-multi-arch
       - name: Release

.github/workflows/test.yml

@@ -52,6 +52,6 @@ jobs:
         run: |
           mkdir -p `pwd`/sandbox/etc/starlight
           docker-compose -f demo/compose/docker-compose-example.yaml up -d
-          echo '{"port": 8090,"address": "0.0.0.0","log_level": "info","postgres": "postgres://postgres:postgres@localhost:5432/postgres?sslmode=disable","default_registry": "reg.yuri.moe","default_registry_alias": ["reg.yuri.moe"],"cache_timeout": 3600}' > `pwd`/sandbox/etc/starlight/starlight-proxy.json
+          echo '{"port": 8090,"address": "0.0.0.0","log_level": "info","postgres": "postgres://postgres:postgres@localhost:5432/postgres?sslmode=disable","default_registry": "registry.yuri.moe","default_registry_alias": ["registry.yuri.moe"],"cache_timeout": 3600}' > `pwd`/sandbox/etc/starlight/starlight-proxy.json
           ls -al `pwd`
           make test

DETAILS.md

@@ -8,7 +8,7 @@ The prebuild image is available in
 
 ```url
 ghcr.io/mc256/starlight/proxy:latest
-reg.yuri.moe/starlight-proxy:latest
+registry.yuri.moe/starlight-proxy:latest
 ```
 
 Please first clone this project and go to the proxy demo folder

Makefile

@@ -219,5 +219,5 @@ install-systemd-service:
 	systemctl daemon-reload
 
 docker-image:
-	docker build -t reg.yuri.moe/public/starlight-proxy:latest -f Dockerfile --target starlight-proxy .
-	docker build -t reg.yuri.moe/public/starlight-cli:latest -f Dockerfile --target starlight-cli .
+	docker build -t registry.yuri.moe/public/starlight-proxy:latest -f Dockerfile --target starlight-proxy .
+	docker build -t registry.yuri.moe/public/starlight-cli:latest -f Dockerfile --target starlight-cli .

README.md

@@ -80,7 +80,7 @@ and starting the Starlight snapshotter daemon
    ```shell
     ctr-starlight convert --notify \
       --platform=linux/amd64 \
-      docker.io/library/redis:6.2.7 reg.yuri.moe/x/redis:6.2.7
+      docker.io/library/redis:6.2.7 registry.yuri.moe/x/redis:6.2.7
    ```
     In addition, the proxy needs some metadata about the list of files in the container to compute the data for deployment. 
     The `--nofity` flag tells the proxy to fetch the metadata from the registry and store it in the metadata database.
@@ -92,12 +92,12 @@ and starting the Starlight snapshotter daemon
    The **Starlight CLI tool** features trace collection, example:
    ```shell
    sudo ctr-starlight optimizer on
-   sudo ctr-starlight pull reg.yuri.moe/x/redis:6.2.7 && \
+   sudo ctr-starlight pull registry.yuri.moe/x/redis:6.2.7 && \
    mkdir /tmp/redis-data && \
    sudo ctr c create --snapshotter=starlight \
         --mount type=bind,src=/tmp/redis-data,dst=/data,options=rbind:rw \
         --env-file ./demo/config/all.env --network=host \
-        reg.yuri.moe/x/redis:6.2.7
+        registry.yuri.moe/x/redis:6.2.7
         instance1 && \
    sudo ctr t start instance1
    ```
@@ -126,27 +126,27 @@ The good news is that they should be quick, a few minutes for each container.
 
 Start a container using Starlight
 ```shell
-sudo ctr-starlight pull reg.yuri.moe/starlight/redis:6.2.7 && \
+sudo ctr-starlight pull registry.yuri.moe/starlight/redis:6.2.7 && \
 mkdir /tmp/test-redis-data && \
 sudo ctr c create \
     --snapshotter=starlight \
     --mount type=bind,src=/tmp/test-redis-data,dst=/data,options=rbind:rw \
     --env-file ./demo/config/all.env \
     --net-host \
-    reg.yuri.moe/x/redis:6.2.7 \
+    registry.yuri.moe/x/redis:6.2.7 \
     instance3 && \
 sudo ctr t start instance3
 ```
 
 Update a container using Starlight (Step 3 and Step 4 need to be done for `redis:7.0.5`)
 ```shell
-sudo ctr-starlight pull reg.yuri.moe/starlight/redis:7.0.5 && \
+sudo ctr-starlight pull registry.yuri.moe/starlight/redis:7.0.5 && \
 sudo ctr c create \
     --snapshotter=starlight  \
     --mount type=bind,src=/tmp/test-redis-data,dst=/data,options=rbind:rw \
     --env-file ./demo/config/all.env \
     --net-host \
-    reg.yuri.moe/x/redis:7.0.5 \
+    registry.yuri.moe/x/redis:7.0.5 \
     instance4 && \
 sudo ctr t start instance4
 ```

client/client_test.go

@@ -109,7 +109,7 @@ func TestClient_PullImageNotUpdate(t *testing.T) {
 
 	operator := snapshotter.NewOperator(c.ctx, c, client.SnapshotService("starlight"))
 	img, err := c.pullImageSync(client, nil,
-		"reg.yuri.moe/starlight/redis:6.2.7", "linux/amd64", "")
+		"registry.yuri.moe/starlight/redis:6.2.7", "linux/amd64", "")
 	if err != nil {
 		t.Error(err)
 		return
@@ -181,7 +181,7 @@ func TestClient_FindBaseImage(t *testing.T) {
 		t.Error(err)
 		return
 	}
-	img, err := c.FindBaseImage(client, "", "reg.yuri.moe/starlight/redis:7.0.5")
+	img, err := c.FindBaseImage(client, "", "registry.yuri.moe/starlight/redis:7.0.5")
 	if err != nil {
 		t.Error(err)
 		return
@@ -201,21 +201,21 @@ func TestClient_PullImageWithUpdate(t *testing.T) {
 
 	//plt := platforms.Format(platforms.DefaultSpec())
 	//t.Log("pulling image", "platform", plt)
-	//"reg.yuri.moe/starlight/redis@sha256:50a0f37293a4d0880a49e0c41dd71e1d556d06d8fa6c8716afc467b1c7c52965"
+	//"registry.yuri.moe/starlight/redis@sha256:50a0f37293a4d0880a49e0c41dd71e1d556d06d8fa6c8716afc467b1c7c52965"
 
 	client, err := containerd.New(cfg.Containerd, containerd.WithDefaultNamespace(cfg.Namespace))
 	if err != nil {
 		t.Error(err)
 		return
 	}
-	base, err := c.FindBaseImage(client, "", "reg.yuri.moe/starlight/redis:7.0.5")
+	base, err := c.FindBaseImage(client, "", "registry.yuri.moe/starlight/redis:7.0.5")
 	if err != nil {
 		t.Error(err)
 		return
 	}
 
 	img, err := c.pullImageSync(client, base,
-		"reg.yuri.moe/starlight/redis:7.0.5",
+		"registry.yuri.moe/starlight/redis:7.0.5",
 		"linux/amd64",
 		"")
 	if err != nil {

go.mod

@@ -53,7 +53,7 @@ require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
 	github.com/docker/cli v20.10.17+incompatible // indirect
 	github.com/docker/distribution v2.8.2+incompatible // indirect
-	github.com/docker/docker v24.0.9+incompatible // indirect
+	github.com/docker/docker v25.0.6+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.6.3 // indirect
 	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect

go.sum

@@ -253,8 +253,8 @@ github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4Kfc
 github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
 github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0=
-github.com/docker/docker v24.0.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v25.0.6+incompatible h1:5cPwbwriIcsua2REJe8HqQV+6WlWc1byg2QSXzBxBGg=
+github.com/docker/docker v25.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ=
 github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=

proxy/builder_test.go

@@ -95,7 +95,7 @@ func TestDatabase_GetImageByDigest(t *testing.T) {
 	}
 
 	// if it is a multi-arch image, the digest is the platform digest
-	// docker pull reg.yuri.moe/starlight/redis@sha256:1a98eb2e5ef8dcbb007d3b821a62a96c93744db78581e99a669cee3ef1e0917a
+	// docker pull registry.yuri.moe/starlight/redis@sha256:1a98eb2e5ef8dcbb007d3b821a62a96c93744db78581e99a669cee3ef1e0917a
 	i, err := b.getImageByDigest("starlight/redis@sha256:1a98eb2e5ef8dcbb007d3b821a62a96c93744db78581e99a669cee3ef1e0917a")
 	if err != nil {
 		t.Error(err)
@@ -175,7 +175,7 @@ func TestNewBuilder2(t *testing.T) {
 		return
 	}
 
-	// docker pull reg.yuri.moe/starlight/mariadb@sha256:a5c4423aed41c35e45452a048b467eb80ddec1856cbf76edbe92d42699268798
+	// docker pull registry.yuri.moe/starlight/mariadb@sha256:a5c4423aed41c35e45452a048b467eb80ddec1856cbf76edbe92d42699268798
 	b, err := NewBuilder(server,
 		"starlight/mariadb@sha256:a5c4423aed41c35e45452a048b467eb80ddec1856cbf76edbe92d42699268798",
 		"starlight/redis:7.0.5",
@@ -224,7 +224,7 @@ func TestBuilder_WriteHeader(t *testing.T) {
 		return
 	}
 
-	// docker pull reg.yuri.moe/starlight/mariadb@sha256:9c0c61b8c8c7e406f48ab2c9fb73181e2f0e07ec327f6a8409f7b64c8fc0a0d6
+	// docker pull registry.yuri.moe/starlight/mariadb@sha256:9c0c61b8c8c7e406f48ab2c9fb73181e2f0e07ec327f6a8409f7b64c8fc0a0d6
 	b, err := NewBuilder(server,
 		"starlight/mariadb@sha256:9c0c61b8c8c7e406f48ab2c9fb73181e2f0e07ec327f6a8409f7b64c8fc0a0d6",
 		"starlight/mariadb:10.11.4", "linux/amd64", false)