Add zot unsecure container

Signed-off-by: Valentin Delaye <[email protected]>

Author: jonesbusy

src/test/java/land/oras/RegistryTest.java

@@ -36,6 +36,7 @@
 import land.oras.utils.RegistryContainer;
 import land.oras.utils.SupportedAlgorithm;
 import land.oras.utils.ZotContainer;
+import land.oras.utils.ZotUnsecureContainer;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -52,6 +53,9 @@ class RegistryTest {
     @Container
     private final ZotContainer registry = new ZotContainer().withStartupAttempts(3);
 
+    @Container
+    private final ZotUnsecureContainer unsecureRegistry = new ZotUnsecureContainer().withStartupAttempts(3);
+
     @TempDir
     private Path blobDir;
 
@@ -157,6 +161,14 @@ void shouldFailWithoutAuthentication() {
         });
     }
 
+    @Test
+    void shouldPushUnsecure() {
+        Registry registry = Registry.Builder.builder().insecure().build();
+        ContainerRef containerRef =
+                ContainerRef.parse("%s/library/artifact-text".formatted(this.unsecureRegistry.getRegistry()));
+        registry.pushBlob(containerRef, "hello".getBytes());
+    }
+
     @Test
     void shouldFailWithoutAuthenticationAndRegistry() {
         Registry registry =

src/test/java/land/oras/utils/ZotContainer.java

@@ -47,8 +47,8 @@ public class ZotContainer extends GenericContainer<ZotContainer> {
      */
     public ZotContainer() {
         super("ghcr.io/project-zot/zot-linux-amd64:v2.1.5");
-        addExposedPort(5000);
-        setWaitStrategy(Wait.forHttp("/v2/_catalog").forPort(5000).forStatusCode(401));
+        addExposedPort(ZOT_PORT);
+        setWaitStrategy(Wait.forHttp("/v2/_catalog").forPort(ZOT_PORT).forStatusCode(401));
 
         try {
             // Auth file
@@ -64,7 +64,7 @@ public ZotContainer() {
                       "storage": { "rootDirectory": "/var/lib/registry" },
                       "http": {
                         "address": "0.0.0.0",
-                        "port": 5000,
+                        "port": %s,
                         "auth": {
                           "htpasswd": { "path": "/etc/zot/auth.htpasswd" }
                         }
@@ -73,7 +73,8 @@ public ZotContainer() {
                         "search": { "enable": true }
                       }
                     }
-              """;
+              """
+                            .formatted(ZOT_PORT);
 
             Files.writeString(configFile, configJson);
 
@@ -93,7 +94,7 @@ public ZotContainer() {
      * @return The registry URL
      */
     public String getRegistry() {
-        return getHost() + ":" + getMappedPort(5000);
+        return getHost() + ":" + getMappedPort(ZOT_PORT);
     }
 
     public ZotContainer withFollowOutput() {

src/test/java/land/oras/utils/ZotUnsecureContainer.java

@@ -0,0 +1,93 @@
+/*-
+ * =LICENSE=
+ * ORAS Java SDK
+ * ===
+ * Copyright (C) 2024 - 2025 ORAS
+ * ===
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =LICENSEEND=
+ */
+
+package land.oras.utils;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import org.jspecify.annotations.NullMarked;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.utility.MountableFile;
+
+@NullMarked
+public class ZotUnsecureContainer extends GenericContainer<ZotUnsecureContainer> {
+
+    /**
+     * Logger
+     */
+    private Logger LOG = LoggerFactory.getLogger(ZotUnsecureContainer.class);
+
+    // myuser:mypass
+    public static final int ZOT_PORT = 5001;
+
+    /**
+     * Create a new registry container
+     */
+    public ZotUnsecureContainer() {
+        super("ghcr.io/project-zot/zot-linux-amd64:v2.1.5");
+        addExposedPort(ZOT_PORT);
+        setWaitStrategy(Wait.forHttp("/v2/_catalog").forPort(ZOT_PORT).forStatusCode(200));
+
+        try {
+            // Zot config file
+            Path configFile = Files.createTempFile("zot-config", ".json");
+            String configJson =
+                    """
+                    {
+                      "storage": { "rootDirectory": "/var/lib/registry" },
+                      "http": {
+                        "address": "0.0.0.0",
+                        "port": %s
+                      },
+                      "extensions": {
+                        "search": { "enable": true }
+                      }
+                    }
+              """
+                            .formatted(ZOT_PORT);
+
+            Files.writeString(configFile, configJson);
+
+            // Copy it into the container
+            withCopyFileToContainer(
+                    MountableFile.forHostPath(configFile.toAbsolutePath().toString()), "/etc/zot/config.json");
+
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to create auth.htpasswd", e);
+        }
+    }
+
+    /**
+     * Get the registry URL
+     * @return The registry URL
+     */
+    public String getRegistry() {
+        return getHost() + ":" + getMappedPort(ZOT_PORT);
+    }
+
+    public ZotUnsecureContainer withFollowOutput() {
+        followOutput(new Slf4jLogConsumer(LOG));
+        return this;
+    }
+}

updatecli/updatecli.d/zot.yaml

@@ -41,6 +41,15 @@ targets:
       matchPattern: "ghcr.io/project-zot/zot-linux-amd64:v(\\d.\\d.\\d{1,2})"
       replacePattern: 'ghcr.io/project-zot/zot-linux-amd64:{{ source "zotLatestVersion" }}'
     scmid: default
+  updateZotUnsecureContainer:
+    name: "Update the value in the ZotUnsecureContainer.java file"
+    kind: file
+    sourceid: zotLatestVersion
+    spec:
+      file: src/test/java/land/oras/utils/ZotUnsecureContainer.java
+      matchPattern: "ghcr.io/project-zot/zot-linux-amd64:v(\\d.\\d.\\d{1,2})"
+      replacePattern: 'ghcr.io/project-zot/zot-linux-amd64:{{ source "zotLatestVersion" }}'
+    scmid: default
 
 actions:
   default: