1

2025-06-20 10:17:46 +02:00 · 2025-06-20 10:17:46 +02:00 · d099e8395c
commit d099e8395c
parent 4e79d98c78
6 changed files with 226 additions and 60 deletions
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@ -1,46 +1,13 @@
 when:
  instance: ci.kokuwa.io
-  repo: woodpecker/dockerd
+  repo: woodpecker/docker
  event: [manual, push, pull_request]
  branch: main
  path: [.woodpecker/build.yaml, Dockerfile, Dockerfile.dockerignore, entrypoint.sh]

-steps:
-
-  build:
-    image: kokuwaio/buildctl
-    settings: &settings
-      name: registry.kokuwa.io/kokuwaio/dockerd:ci-${CI_PIPELINE_NUMBER}
-      auth:
-        registry.kokuwa.io:
-          username: {from_secret: kokuwa_io_username}
-          password: {from_secret: kokuwa_io_password}
+variables:
+  - settings: &settings
      platform: [linux/amd64, linux/arm64]
-      annotation:
-        org.opencontainers.image.title: Docker Daemon WoodpeckerCI Plugin
-        org.opencontainers.image.description: Docker daemon for usage in WoodpeckerCI.
-        org.opencontainers.image.url: $CI_REPO_URL
-        org.opencontainers.image.documentation: $CI_REPO_URL/README.md
-        org.opencontainers.image.source: $CI_REPO_CLONE_URL
-        org.opencontainers.image.revision: $CI_COMMIT_SHA
-        org.opencontainers.image.vendor: kokuwa.io
-        org.opencontainers.image.licenses: EUPL-1.2
-        org.opencontainers.image.ref.name: kokuwaio/dockerd
-        org.opencontainers.image.version: 28.1.1
-    when:
-      event: pull_request
-
-  push:
-    image: kokuwaio/buildctl
-    settings:
-      <<: *settings
-      name:
-        - registry.kokuwa.io/kokuwaio/dockerd:latest
-        - registry.kokuwa.io/kokuwaio/dockerd:28.1.1
-        - docker.io/kokuwaio/dockerd:latest
-        - docker.io/kokuwaio/dockerd:28.1.1
-        - ghcr.io/kokuwaio/dockerd:latest
-        - ghcr.io/kokuwaio/dockerd:28.1.1
      auth:
        "https://index.docker.io/v1/":
          username: {from_secret: docker_io_username}
@ -51,6 +18,143 @@ steps:
        registry.kokuwa.io:
          username: {from_secret: kokuwa_io_username}
          password: {from_secret: kokuwa_io_password}
-    when:
-      event: [manual, push]
-      branch: main
+      annotation: &annotation
+        org.opencontainers.image.title: Docker CLI for WoodpeckerCI
+        org.opencontainers.image.description: Docker CLI for usage in WoodpeckerCI.
+        org.opencontainers.image.url: $CI_REPO_URL
+        org.opencontainers.image.documentation: $CI_REPO_URL/README.md
+        org.opencontainers.image.source: $CI_REPO_CLONE_URL
+        org.opencontainers.image.revision: $CI_COMMIT_SHA
+        org.opencontainers.image.vendor: kokuwa.io
+        org.opencontainers.image.licenses: EUPL-1.2
+        org.opencontainers.image.ref.name: kokuwaio/docker-cli
+        org.opencontainers.image.version: 28.1.1
+  - step: &pr
+      image: kokuwaio/buildctl
+      depends_on: []
+      when:
+        event: pull_request
+  - step: &push
+      image: kokuwaio/buildctl
+      depends_on: []
+      when:
+        event: [manual, push]
+        branch: main
+
+steps:
+
+  dockerd-pr:
+    <<: *pr
+    settings:
+      <<: *settings
+      name: registry.kokuwa.io/kokuwaio/dockerd:ci-${CI_PIPELINE_NUMBER}
+      target: dockerd
+      annotation:
+        <<: *annotation
+        org.opencontainers.image.title: Docker Daemon for WoodpeckerCI
+        org.opencontainers.image.description: Docker daemon for usage in WoodpeckerCI.
+        org.opencontainers.image.ref.name: kokuwaio/dockerd
+
+  cli-pr:
+    <<: *pr
+    settings:
+      <<: *settings
+      name: registry.kokuwa.io/kokuwaio/docker-cli:ci-${CI_PIPELINE_NUMBER}
+      target: cli
+
+  cli-git-pr:
+    <<: *pr
+    depends_on: [cli-pr]
+    settings:
+      <<: *settings
+      name: registry.kokuwa.io/kokuwaio/docker-cli:ci-${CI_PIPELINE_NUMBER}-git
+      target: cli-git
+
+  cli-az-pr:
+    <<: *pr
+    depends_on: [cli-pr]
+    settings:
+      <<: *settings
+      name: registry.kokuwa.io/kokuwaio/docker-cli:ci-${CI_PIPELINE_NUMBER}-az
+      target: cli-az
+
+  cli-az-git-pr:
+    <<: *pr
+    depends_on: [cli-az-pr]
+    settings:
+      <<: *settings
+      name: registry.kokuwa.io/kokuwaio/docker-cli:ci-${CI_PIPELINE_NUMBER}-az-git
+      target: cli-az-git
+
+  dockerd:
+    <<: *push
+    settings:
+      <<: *settings
+      name:
+        - registry.kokuwa.io/kokuwaio/dockerd:latest
+        - registry.kokuwa.io/kokuwaio/dockerd:28.1.1
+        - docker.io/kokuwaio/dockerd:latest
+        - docker.io/kokuwaio/dockerd:28.1.1
+        - ghcr.io/kokuwaio/dockerd:latest
+        - ghcr.io/kokuwaio/dockerd:28.1.1
+      target: dockerd
+      annotation:
+        <<: *annotation
+        org.opencontainers.image.title: Docker Daemon for WoodpeckerCI
+        org.opencontainers.image.description: Docker daemon for usage in WoodpeckerCI.
+        org.opencontainers.image.ref.name: kokuwaio/dockerd
+
+  cli:
+    <<: *push
+    depends_on: [cli]
+    settings:
+      <<: *settings
+      name:
+        - registry.kokuwa.io/kokuwaio/docker-cli:latest
+        - registry.kokuwa.io/kokuwaio/dockerd:28.1.1
+        - docker.io/kokuwaio/dockerd:latest
+        - docker.io/kokuwaio/dockerd:28.1.1
+        - ghcr.io/kokuwaio/dockerd:latest
+        - ghcr.io/kokuwaio/dockerd:28.1.1
+      target: cli
+
+  cli-git:
+    <<: *push
+    settings:
+      <<: *settings
+      name:
+        - registry.kokuwa.io/kokuwaio/docker-cli:git
+        - registry.kokuwa.io/kokuwaio/dockerd:28.1.1-git
+        - docker.io/kokuwaio/dockerd:git
+        - docker.io/kokuwaio/dockerd:28.1.1-git
+        - ghcr.io/kokuwaio/dockerd:git
+        - ghcr.io/kokuwaio/dockerd:28.1.1-git
+      target: cli-git
+
+  cli-az:
+    <<: *push
+    depends_on: [cli]
+    settings:
+      <<: *settings
+      name:
+        - registry.kokuwa.io/kokuwaio/docker-cli:az
+        - registry.kokuwa.io/kokuwaio/dockerd:28.1.1-az
+        - docker.io/kokuwaio/dockerd:az
+        - docker.io/kokuwaio/dockerd:28.1.1-az
+        - ghcr.io/kokuwaio/dockerd:az
+        - ghcr.io/kokuwaio/dockerd:28.1.1-az
+      target: cli-az
+
+  cli-az-git:
+    <<: *push
+    depends_on: [cli-az]
+    settings:
+      <<: *settings
+      name:
+        - registry.kokuwa.io/kokuwaio/docker-cli:az-git
+        - registry.kokuwa.io/kokuwaio/dockerd:28.1.1-az-git
+        - docker.io/kokuwaio/dockerd:az-git
+        - docker.io/kokuwaio/dockerd:28.1.1-az-git
+        - ghcr.io/kokuwaio/dockerd:az-git
+        - ghcr.io/kokuwaio/dockerd:28.1.1-az-git
+      target: cli-az-git
--- a/.woodpecker/dockerhub.yaml
+++ b/.woodpecker/dockerhub.yaml
@ -1,17 +1,28 @@
 when:
  instance: ci.kokuwa.io
-  repo: woodpecker/dockerd
+  repo: woodpecker/docker
  event: [manual, push]
  branch: main
  path: [.woodpecker/dockerhub.yaml, README.md]

 steps:

-  metadata:
+  dockerd:
    image: kokuwaio/dockerhub-metadata
+    depends_on: []
    settings:
      repository: kokuwaio/dockerd
      description-short: Docker daemon for usage in WoodpeckerCI.
      categories: [developer-tools, integration-and-delivery]
      username: {from_secret: dockerhub_username}
      password: {from_secret: dockerhub_password}
+
+  docker-cli:
+    image: kokuwaio/dockerhub-metadata
+    depends_on: []
+    settings:
+      repository: kokuwaio/docker-cli
+      description-short: Docker CLI for usage in WoodpeckerCI.
+      categories: [developer-tools, integration-and-delivery]
+      username: {from_secret: dockerhub_username}
+      password: {from_secret: dockerhub_password}
--- a/.woodpecker/test.yaml
+++ b/.woodpecker/test.yaml
@ -1,6 +1,6 @@
 when:
  instance: ci.kokuwa.io
-  repo: woodpecker/dockerd
+  repo: woodpecker/docker
  event: pull_request
  path: [.woodpecker/build.yaml, .woodpecker/test.yaml, Dockerfile, Dockerfile.dockerignore, entrypoint.sh]

@ -19,19 +19,13 @@ services:
 steps:

  info:
-    image: kokuwaio/docker-cli
+    image: registry.kokuwa.io/kokuwaio/docker-cli:ci-${CI_PIPELINE_NUMBER}
    commands: docker info
-    environment:
-      DOCKER_HOST: tcp://dockerd:2375

  pull:
-    image: kokuwaio/docker-cli
+    image: registry.kokuwa.io/kokuwaio/docker-cli:ci-${CI_PIPELINE_NUMBER}
    commands: docker pull bash
-    environment:
-      DOCKER_HOST: tcp://dockerd:2375

  run:
-    image: kokuwaio/docker-cli
+    image: registry.kokuwa.io/kokuwaio/docker-cli:ci-${CI_PIPELINE_NUMBER}
    commands: docker run --rm bash uname -a
-    environment:
-      DOCKER_HOST: tcp://dockerd:2375