diff --git a/docker.yaml b/docker-28.yaml similarity index 87% rename from docker.yaml rename to docker-28.yaml index d8fe0f667b4..64e167705f9 100644 --- a/docker.yaml +++ b/docker-28.yaml @@ -1,19 +1,21 @@ package: - name: docker + name: docker-28 version: "28.5.2" - epoch: 9 # GHSA-jv3w-x3r3-g6rm + epoch: 10 # GHSA-jv3w-x3r3-g6rm description: A meta package for Docker Engine and Docker CLI copyright: - license: Apache-2.0 dependencies: runtime: + - ${{package.name}}-dockerd + - ${{package.name}}-init - busybox - docker-cli - docker-cli-buildx - docker-compose - - docker-init - - dockerd - openssh-client # used by docker-cli + provides: + - docker=${{package.full-version}} checks: disabled: # docker is a meta package pulling in several subpackages at runtime @@ -98,7 +100,7 @@ pipeline: # this exists to appease yam subpackages: - - name: dockerd + - name: ${{package.name}}-dockerd description: "Docker Engine (dockerd)" dependencies: runtime: @@ -121,6 +123,8 @@ subpackages: - xfsprogs - xz - zfs + provides: + - dockerd=${{package.full-version}} pipeline: - runs: | install -Dm755 bundles/dynbinary-daemon/docker-proxy ${{targets.contextdir}}/usr/bin/docker-proxy @@ -137,11 +141,13 @@ subpackages: bins: dockerd docker-proxy version-flag: "--version" - - name: docker-init + - name: ${{package.name}}-init description: "Docker init" dependencies: runtime: - tini-static + provides: + - docker-init=${{package.full-version}} pipeline: - runs: | mkdir -p ${{targets.contextdir}}/usr/bin @@ -152,7 +158,7 @@ subpackages: [ -f /usr/bin/docker-init ] [ -x /usr/bin/docker-init ] - - name: docker-oci-entrypoint + - name: ${{package.name}}-oci-entrypoint description: "docker OCI entrypoint" pipeline: - runs: | @@ -160,20 +166,24 @@ subpackages: dependencies: runtime: - busybox + provides: + - docker-oci-entrypoint=${{package.full-version}} test: pipeline: - runs: | stat /usr/bin/docker-entrypoint.sh - - name: dockerd-oci-entrypoint + - name: ${{package.name}}-dockerd-oci-entrypoint description: "dockerd OCI entrypoint" dependencies: runtime: - busybox # Used as a fallback in the dockerd-entrypoint.sh script - - docker-oci-entrypoint + - ${{package.name}}-oci-entrypoint # Used as a fallback in the dockerd-entrypoint.sh script - - docker-dind + - ${{package.name}}-dind + provides: + - dockerd-oci-entrypoint=${{package.full-version}} pipeline: - runs: | install -Dm755 /home/docker-library/dockerd-entrypoint.sh "${{targets.subpkgdir}}"/usr/bin/dockerd-entrypoint.sh @@ -182,12 +192,14 @@ subpackages: - runs: | stat /usr/bin/dockerd-entrypoint.sh - - name: docker-rootless + - name: ${{package.name}}-rootless description: "dockerd rootless" dependencies: runtime: - busybox - rootlesskit + provides: + - docker-rootless=${{package.full-version}} pipeline: - runs: | install -Dm755 contrib/dockerd-rootless-setuptool.sh "${{targets.subpkgdir}}"/usr/bin/dockerd-rootless-setuptool.sh @@ -198,8 +210,11 @@ subpackages: dockerd-rootless-setuptool.sh --help # Ref: https://github.com/docker-library/docker/blob/master/Dockerfile-dind.template - - name: docker-dind + - name: ${{package.name}}-dind description: "Docker in Docker" + dependencies: + provides: + - docker-dind=${{package.full-version}} pipeline: - runs: | install -Dm755 /home/build/hack/dind "${{targets.subpkgdir}}"/usr/bin/dind @@ -209,8 +224,11 @@ subpackages: runs: stat /usr/bin/dind # ref: https://github.com/docker-library/docker/blob/bce646b7ffd6d126d920a3e06dd59d9192be8d9c/28/dind/dockerd-entrypoint.sh#L229-L231 - - name: docker-dind-compat + - name: ${{package.name}}-dind-compat description: compat package for docker-dind + dependencies: + provides: + - docker-dind-compat=${{package.full-version}} pipeline: - runs: | mkdir -p ${{targets.contextdir}}/usr/local/bin @@ -223,8 +241,11 @@ subpackages: pipeline: - uses: test/tw/symlink-check - - name: docker-config-mirror-gcr + - name: ${{package.name}}-config-mirror-gcr description: "Docker daemon config to use gcr.io to mirror docker.io" + dependencies: + provides: + - docker-config-mirror-gcr=${{package.full-version}} pipeline: # https://docs.docker.com/docker-hub/image-library/mirror/#configure-the-docker-daemon # https://cloud.google.com/artifact-registry/docs/pull-cached-dockerhub-images @@ -238,13 +259,15 @@ subpackages: } EOF - - name: dockerd-service + - name: ${{package.name}}-dockerd-service description: "Systemd services for docker" dependencies: runtime: - - docker + - ${{package.name}} - containerd-service - systemd + provides: + - dockerd-service=${{package.full-version}} pipeline: - runs: | mkdir -p "${{targets.subpkgdir}}"/usr/lib/systemd/system/ @@ -270,7 +293,7 @@ update: github: identifier: moby/moby strip-prefix: v - tag-filter: v + tag-filter-prefix: v28. test: pipeline: