Skip to content

static: Simplify archive directory layout #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vvoland merged 2 commits into from
Nov 12, 2026
Merged

static: Simplify archive directory layout #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8793d65
static: Simplify archive directory layout
tianon-sso Nov 11, 2026
fa85e22
Also drop the `<pkgname>/` prefix in the new artifacts
tianon-sso Nov 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkg/agent/scripts/pkg-static-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,24 +70,24 @@ mkdir -p "${pkgoutput}"
cd "$BUILDDIR"
for pkgname in *; do
workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
mkdir -p "$workdir/${pkgname}/libexec/docker/cli-plugins" "$workdir/${pkgname}/share/doc/${pkgname}"
mkdir -p "$workdir/cli-plugins" "$workdir/doc"
(
set -x
cp "${pkgname}"/* "$workdir/${pkgname}/libexec/docker/cli-plugins/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/${pkgname}/share/doc/${pkgname}/"
cp "${pkgname}"/* "$workdir/cli-plugins/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/doc/"
)
if [ "$(xx-info os)" = "windows" ]; then
pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip"
(
set -x
cd "$workdir"
zip -r "$pkgfile" "${pkgname}"
zip -r "$pkgfile" cli-plugins doc
)
else
pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz"
(
set -x
tar -czf "$pkgfile" -C "$workdir" "${pkgname}"
tar -czf "$pkgfile" -C "$workdir" cli-plugins doc
)
fi
write-sha256sum "$pkgfile"
Expand Down
6 changes: 5 additions & 1 deletion pkg/agent/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ RUN --mount=from=bin,target=/build <<EOT
set -x
cd "${package%/*}"
sha256sum -c "${package##*/}.sha256"
tar zxvf "${package##*/}" -C /usr/local --strip-components=1
pkgname="${package##*/}"
pkgname="${pkgname%%_*}"
mkdir -p /usr/local/libexec/docker/cli-plugins "/usr/local/share/doc/${pkgname}"
tar zxvf "${package##*/}" -C /usr/local/libexec/docker/cli-plugins --strip-components=1 cli-plugins
tar zxvf "${package##*/}" -C "/usr/local/share/doc/${pkgname}" --strip-components=1 doc
)
done
set -x
Expand Down
10 changes: 5 additions & 5 deletions pkg/buildx/scripts/pkg-static-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,24 +67,24 @@ mkdir -p "${pkgoutput}"
cd "$BUILDDIR"
for pkgname in *; do
workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
mkdir -p "$workdir/${pkgname}/libexec/docker/cli-plugins" "$workdir/${pkgname}/share/doc/${pkgname}"
mkdir -p "$workdir/cli-plugins" "$workdir/doc"
(
set -x
cp "${pkgname}"/* "$workdir/${pkgname}/libexec/docker/cli-plugins/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/${pkgname}/share/doc/${pkgname}/"
cp "${pkgname}"/* "$workdir/cli-plugins/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/doc/"
)
if [ "$(xx-info os)" = "windows" ]; then
pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip"
(
set -x
cd "$workdir"
zip -r "$pkgfile" "${pkgname}"
zip -r "$pkgfile" cli-plugins doc
)
else
pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz"
(
set -x
tar -czf "$pkgfile" -C "$workdir" "${pkgname}"
tar -czf "$pkgfile" -C "$workdir" cli-plugins doc
)
fi
write-sha256sum "$pkgfile"
Expand Down
6 changes: 5 additions & 1 deletion pkg/buildx/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ RUN --mount=from=bin,target=/build <<EOT
set -x
cd "${package%/*}"
sha256sum -c "${package##*/}.sha256"
tar zxvf "${package##*/}" -C /usr/local --strip-components=1
pkgname="${package##*/}"
pkgname="${pkgname%%_*}"
mkdir -p /usr/local/libexec/docker/cli-plugins "/usr/local/share/doc/${pkgname}"
tar zxvf "${package##*/}" -C /usr/local/libexec/docker/cli-plugins --strip-components=1 cli-plugins
tar zxvf "${package##*/}" -C "/usr/local/share/doc/${pkgname}" --strip-components=1 doc
)
done
set -x
Expand Down
10 changes: 5 additions & 5 deletions pkg/compose/scripts/pkg-static-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,24 +72,24 @@ mkdir -p "${pkgoutput}"
cd "$BUILDDIR"
for pkgname in *; do
workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
mkdir -p "$workdir/${pkgname}/libexec/docker/cli-plugins" "$workdir/${pkgname}/share/doc/${pkgname}"
mkdir -p "$workdir/cli-plugins" "$workdir/doc"
(
set -x
cp "${pkgname}"/* "$workdir/${pkgname}/libexec/docker/cli-plugins/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/${pkgname}/share/doc/${pkgname}/"
cp "${pkgname}"/* "$workdir/cli-plugins/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/doc/"
)
if [ "$(xx-info os)" = "windows" ]; then
pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip"
(
set -x
cd "$workdir"
zip -r "$pkgfile" "${pkgname}"
zip -r "$pkgfile" cli-plugins doc
)
else
pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz"
(
set -x
tar -czf "$pkgfile" -C "$workdir" "${pkgname}"
tar -czf "$pkgfile" -C "$workdir" cli-plugins doc
)
fi
write-sha256sum "$pkgfile"
Expand Down
6 changes: 5 additions & 1 deletion pkg/compose/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ RUN --mount=from=bin,target=/build <<EOT
set -x
cd "${package%/*}"
sha256sum -c "${package##*/}.sha256"
tar zxvf "${package##*/}" -C /usr/local --strip-components=1
pkgname="${package##*/}"
pkgname="${pkgname%%_*}"
mkdir -p /usr/local/libexec/docker/cli-plugins "/usr/local/share/doc/${pkgname}"
tar zxvf "${package##*/}" -C /usr/local/libexec/docker/cli-plugins --strip-components=1 cli-plugins
tar zxvf "${package##*/}" -C "/usr/local/share/doc/${pkgname}" --strip-components=1 doc
)
done
set -x
Expand Down
18 changes: 9 additions & 9 deletions pkg/containerd/scripts/pkg-static-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,31 +120,31 @@ mkdir -p "${pkgoutput}"
cd "$BUILDDIR"
for pkgname in *; do
workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
mkdir -p "$workdir/${pkgname}/bin" "$workdir/${pkgname}/share/doc/${pkgname}"
mkdir -p "$workdir/bin" "$workdir/doc"
(
set -x
cp "${pkgname}"/* "$workdir/${pkgname}/bin/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/${pkgname}/share/doc/${pkgname}/"
cp "${pkgname}"/* "$workdir/bin/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/doc/"
if [ "$(xx-info os)" = "windows" ]; then
cp "${RUNHCS_SRCDIR}/LICENSE" "$workdir/${pkgname}/share/doc/${pkgname}/runhcs.LICENSE"
cp "${RUNHCS_SRCDIR}/README.md" "$workdir/${pkgname}/share/doc/${pkgname}/runhcs.README.md"
cp "${RUNHCS_SRCDIR}/LICENSE" "$workdir/doc/runhcs.LICENSE"
cp "${RUNHCS_SRCDIR}/README.md" "$workdir/doc/runhcs.README.md"
else
cp "${RUNC_SRCDIR}/LICENSE" "$workdir/${pkgname}/share/doc/${pkgname}/runc.LICENSE"
cp "${RUNC_SRCDIR}/README.md" "$workdir/${pkgname}/share/doc/${pkgname}/runc.README.md"
cp "${RUNC_SRCDIR}/LICENSE" "$workdir/doc/runc.LICENSE"
cp "${RUNC_SRCDIR}/README.md" "$workdir/doc/runc.README.md"
fi
)
if [ "$(xx-info os)" = "windows" ]; then
pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip"
(
set -x
cd "$workdir"
zip -r "$pkgfile" "${pkgname}"
zip -r "$pkgfile" bin doc
)
else
pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz"
(
set -x
tar -czf "$pkgfile" -C "$workdir" "${pkgname}"
tar -czf "$pkgfile" -C "$workdir" bin doc
)
fi
write-sha256sum "$pkgfile"
Expand Down
6 changes: 5 additions & 1 deletion pkg/containerd/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,11 @@ RUN --mount=from=bin,target=/build <<EOT
set -x
cd "${package%/*}"
sha256sum -c "${package##*/}.sha256"
tar zxvf "${package##*/}" -C /usr/local --strip-components=1
pkgname="${package##*/}"
pkgname="${pkgname%%_*}"
mkdir -p "/usr/local/share/doc/${pkgname}"
tar zxvf "${package##*/}" -C /usr/local/bin --strip-components=1 bin
tar zxvf "${package##*/}" -C "/usr/local/share/doc/${pkgname}" --strip-components=1 doc
)
done
set -x
Expand Down
10 changes: 5 additions & 5 deletions pkg/credential-helpers/scripts/pkg-static-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,24 +94,24 @@ mkdir -p "${pkgoutput}"
cd "$BUILDDIR"
for pkgname in *; do
workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
mkdir -p "$workdir/${pkgname}/bin" "$workdir/${pkgname}/share/doc/${pkgname}"
mkdir -p "$workdir/bin" "$workdir/doc"
(
set -x
cp "${pkgname}"/* "$workdir/${pkgname}/bin/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/${pkgname}/share/doc/${pkgname}/"
cp "${pkgname}"/* "$workdir/bin/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/doc/"
)
if [ "$(xx-info os)" = "windows" ]; then
pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip"
(
set -x
cd "$workdir"
zip -r "$pkgfile" "${pkgname}"
zip -r "$pkgfile" bin doc
)
else
pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz"
(
set -x
tar -czf "$pkgfile" -C "$workdir" "${pkgname}"
tar -czf "$pkgfile" -C "$workdir" bin doc
)
fi
write-sha256sum "$pkgfile"
Expand Down
6 changes: 5 additions & 1 deletion pkg/credential-helpers/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,11 @@ RUN --mount=from=bin,target=/build <<EOT
set -x
cd "${package%/*}"
sha256sum -c "${package##*/}.sha256"
tar zxvf "${package##*/}" -C /usr/local --strip-components=1
pkgname="${package##*/}"
pkgname="${pkgname%%_*}"
mkdir -p "/usr/local/share/doc/${pkgname}"
tar zxvf "${package##*/}" -C /usr/local/bin --strip-components=1 bin
tar zxvf "${package##*/}" -C "/usr/local/share/doc/${pkgname}" --strip-components=1 doc
)
done
set -x
Expand Down
10 changes: 5 additions & 5 deletions pkg/docker-cli/scripts/pkg-static-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,24 +81,24 @@ dirname="docker-cli"
cd "$BUILDDIR"
for pkgname in *; do
workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
mkdir -p "$workdir/${dirname}/bin" "$workdir/${dirname}/share/doc/${dirname}"
mkdir -p "$workdir/bin" "$workdir/doc"
(
set -x
cp -L "${pkgname}/docker" "$workdir/${dirname}/bin/${clibin}"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/${dirname}/share/doc/${dirname}/"
cp -L "${pkgname}/docker" "$workdir/bin/${clibin}"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/doc/"
)
if [ "$(xx-info os)" = "windows" ]; then
pkgfile="${pkgoutput}/${dirname}_${GENVER_VERSION#v}.zip"
(
set -x
cd "$workdir"
zip -r "$pkgfile" "${dirname}"
zip -r "$pkgfile" bin doc
)
else
pkgfile="${pkgoutput}/${dirname}_${GENVER_VERSION#v}.tgz"
(
set -x
tar -czf "$pkgfile" -C "$workdir" "${dirname}"
tar -czf "$pkgfile" -C "$workdir" bin doc
)
fi
write-sha256sum "$pkgfile"
Expand Down
6 changes: 5 additions & 1 deletion pkg/docker-cli/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ RUN --mount=from=bin,target=/build <<EOT
set -x
cd "${package%/*}"
sha256sum -c "${package##*/}.sha256"
tar zxvf "${package##*/}" -C /usr/local --strip-components=1
pkgname="${package##*/}"
pkgname="${pkgname%%_*}"
mkdir -p "/usr/local/share/doc/${pkgname}"
tar zxvf "${package##*/}" -C /usr/local/bin --strip-components=1 bin
tar zxvf "${package##*/}" -C "/usr/local/share/doc/${pkgname}" --strip-components=1 doc
)
done
set -x
Expand Down
10 changes: 5 additions & 5 deletions pkg/docker-engine/scripts/pkg-static-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,24 +96,24 @@ dirname="docker-engine"
cd "$BUILDDIR"
for pkgname in *; do
workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
mkdir -p "$workdir/${dirname}/bin" "$workdir/${dirname}/share/doc/${dirname}"
mkdir -p "$workdir/bin" "$workdir/doc"
(
set -x
cp "${pkgname}"/* "$workdir/${dirname}/bin/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/${dirname}/share/doc/${dirname}/"
cp "${pkgname}"/* "$workdir/bin/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/doc/"
)
if [ "$(xx-info os)" = "windows" ]; then
pkgfile="${pkgoutput}/${dirname}_${GENVER_VERSION#v}.zip"
(
set -x
cd "$workdir"
zip -r "$pkgfile" "${dirname}"
zip -r "$pkgfile" bin doc
)
else
pkgfile="${pkgoutput}/${dirname}_${GENVER_VERSION#v}.tgz"
(
set -x
tar -czf "$pkgfile" -C "$workdir" "${dirname}"
tar -czf "$pkgfile" -C "$workdir" bin doc
)
fi
write-sha256sum "$pkgfile"
Expand Down
6 changes: 5 additions & 1 deletion pkg/docker-engine/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,11 @@ RUN --mount=from=bin,target=/build <<EOT
set -x
cd "${package%/*}"
sha256sum -c "${package##*/}.sha256"
tar zxvf "${package##*/}" -C /usr/local --strip-components=1
pkgname="${package##*/}"
pkgname="${pkgname%%_*}"
mkdir -p "/usr/local/share/doc/${pkgname}"
tar zxvf "${package##*/}" -C /usr/local/bin --strip-components=1 bin
tar zxvf "${package##*/}" -C "/usr/local/share/doc/${pkgname}" --strip-components=1 doc
)
done
set -x
Expand Down
10 changes: 5 additions & 5 deletions pkg/model/scripts/pkg-static-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,24 +68,24 @@ mkdir -p "${pkgoutput}"
cd "$BUILDDIR"
for pkgname in *; do
workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
mkdir -p "$workdir/${pkgname}/libexec/docker/cli-plugins" "$workdir/${pkgname}/share/doc/${pkgname}"
mkdir -p "$workdir/cli-plugins" "$workdir/doc"
(
set -x
cp "${pkgname}"/* "$workdir/${pkgname}/libexec/docker/cli-plugins/"
cp "${SRCDIR}/LICENSE" "$workdir/${pkgname}/share/doc/${pkgname}/"
cp "${pkgname}"/* "$workdir/cli-plugins/"
cp "${SRCDIR}/LICENSE" "$workdir/doc/"
)
if [ "$(xx-info os)" = "windows" ]; then
pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip"
(
set -x
cd "$workdir"
zip -r "$pkgfile" "${pkgname}"
zip -r "$pkgfile" cli-plugins doc
)
else
pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz"
(
set -x
tar -czf "$pkgfile" -C "$workdir" "${pkgname}"
tar -czf "$pkgfile" -C "$workdir" cli-plugins doc
)
fi
write-sha256sum "$pkgfile"
Expand Down
6 changes: 5 additions & 1 deletion pkg/model/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,11 @@ RUN --mount=from=bin,target=/build <<EOT
set -x
cd "${package%/*}"
sha256sum -c "${package##*/}.sha256"
tar zxvf "${package##*/}" -C /usr/local --strip-components=1
pkgname="${package##*/}"
pkgname="${pkgname%%_*}"
mkdir -p /usr/local/libexec/docker/cli-plugins "/usr/local/share/doc/${pkgname}"
tar zxvf "${package##*/}" -C /usr/local/libexec/docker/cli-plugins --strip-components=1 cli-plugins
tar zxvf "${package##*/}" -C "/usr/local/share/doc/${pkgname}" --strip-components=1 doc
)
done
set -x
Expand Down
Loading