Skip to content

Commit

Permalink
Refactor docker package to reuse in fips image (#35679)
Browse files Browse the repository at this point in the history
Refacored docker package- removed docker dependency to reuse in fips
image.

Note: Some tests were removed as well, checking for version/help. I have
verified no image used these subpackages so we will just have to be
careful with our docker and docker fips image module

---------

Signed-off-by: anushkamittal20 <[email protected]>
Signed-off-by: Anushka Mittal <[email protected]>
  • Loading branch information
anushkamittal20 authored Dec 3, 2024
1 parent f4e083c commit 8c70f45
Showing 1 changed file with 3 additions and 13 deletions.
16 changes: 3 additions & 13 deletions docker.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: docker
version: 27.3.1
epoch: 3
epoch: 4
description: A meta package for Docker Engine and Docker CLI
copyright:
- license: Apache-2.0
Expand Down Expand Up @@ -111,23 +111,18 @@ subpackages:
- name: docker-oci-entrypoint
description: "docker OCI entrypoint"
dependencies:
runtime:
- docker
pipeline:
- runs: |
install -Dm755 /home/docker-library/docker-entrypoint.sh "${{targets.subpkgdir}}"/usr/bin/docker-entrypoint.sh
test:
pipeline:
- runs: |
docker-entrypoint.sh --version
docker-entrypoint.sh --help
stat /usr/bin/docker-entrypoint.sh
- name: dockerd-oci-entrypoint
description: "dockerd OCI entrypoint"
dependencies:
runtime:
- docker
# Used as a fallback in the dockerd-entrypoint.sh script
- docker-oci-entrypoint
# Used as a fallback in the dockerd-entrypoint.sh script
Expand All @@ -138,8 +133,7 @@ subpackages:
test:
pipeline:
- runs: |
dockerd-entrypoint.sh --version
dockerd-entrypoint.sh --help
stat /usr/bin/dockerd-entrypoint.sh
- name: docker-rootless
description: "dockerd rootless"
Expand All @@ -158,9 +152,6 @@ subpackages:
# Ref: https://github.com/docker-library/docker/blob/master/Dockerfile-dind.template
- name: docker-dind
description: "Docker in Docker"
dependencies:
runtime:
- docker
pipeline:
- runs: |
install -Dm755 /home/build/hack/dind "${{targets.subpkgdir}}"/usr/bin/dind
Expand All @@ -169,7 +160,6 @@ subpackages:
description: "Systemd services for docker"
dependencies:
runtime:
- docker
- containerd-service
- systemd
pipeline:
Expand Down

0 comments on commit 8c70f45

Please sign in to comment.