Skip to content

static: Use bin/share/doc layout in archives #460

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

Open
vvoland wants to merge 1 commit into
base: main
Choose a base branch
from
+52 −52
Open

static: Use bin/share/doc layout in archives #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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,21 +70,21 @@ mkdir -p "${pkgoutput}"
cd "$BUILDDIR"
for pkgname in *; do
workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
mkdir -p "$workdir/${pkgname}"
mkdir -p "$workdir/bin" "$workdir/share/doc/${pkgname}"
(
set -x
cp "${pkgname}"/* ${SRCDIR}/LICENSE ${SRCDIR}/README.md "$workdir/${pkgname}/"
cp "${pkgname}"/* "$workdir/bin/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/share/doc/${pkgname}/"
)
if [ "$(xx-info os)" = "windows" ]; then
(
set -x
cd "$workdir"
zip -r "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip" "${pkgname}"
cd "$workdir" && zip -r "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip" .
)
else
(
set -x
tar -czf "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz" -C "$workdir" "${pkgname}"
tar -czf "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz" -C "$workdir" .
)
fi
done
2 changes: 1 addition & 1 deletion pkg/agent/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ RUN --mount=from=bin,target=/build <<EOT
for package in $(find $dir -type f -name '*.tgz'); do
(
set -x
tar zxvf $package -C /usr/bin --strip-components=1
tar zxvf $package -C /usr/local
)
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,21 +67,21 @@ mkdir -p "${pkgoutput}"
cd "$BUILDDIR"
for pkgname in *; do
workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
mkdir -p "$workdir/${pkgname}"
mkdir -p "$workdir/bin" "$workdir/share/doc/${pkgname}"
(
set -x
cp "${pkgname}"/* ${SRCDIR}/LICENSE ${SRCDIR}/README.md "$workdir/${pkgname}/"
cp "${pkgname}"/* "$workdir/bin/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/share/doc/${pkgname}/"
)
if [ "$(xx-info os)" = "windows" ]; then
(
set -x
cd "$workdir"
zip -r "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip" "${pkgname}"
cd "$workdir" && zip -r "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip" .
)
else
(
set -x
tar -czf "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz" -C "$workdir" "${pkgname}"
tar -czf "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz" -C "$workdir" .
)
fi
done
2 changes: 1 addition & 1 deletion pkg/buildx/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ RUN --mount=from=bin,target=/build <<EOT
for package in $(find $dir -type f -name '*.tgz'); do
(
set -x
tar zxvf $package -C /usr/bin --strip-components=1
tar zxvf $package -C /usr/local
)
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,21 +72,21 @@ mkdir -p "${pkgoutput}"
cd "$BUILDDIR"
for pkgname in *; do
workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
mkdir -p "$workdir/${pkgname}"
mkdir -p "$workdir/bin" "$workdir/share/doc/${pkgname}"
(
set -x
cp "${pkgname}"/* ${SRCDIR}/LICENSE ${SRCDIR}/README.md "$workdir/${pkgname}/"
cp "${pkgname}"/* "$workdir/bin/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/share/doc/${pkgname}/"
)
if [ "$(xx-info os)" = "windows" ]; then
(
set -x
cd "$workdir"
zip -r "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip" "${pkgname}"
cd "$workdir" && zip -r "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip" .
)
else
(
set -x
tar -czf "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz" -C "$workdir" "${pkgname}"
tar -czf "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz" -C "$workdir" .
)
fi
done
2 changes: 1 addition & 1 deletion pkg/compose/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ RUN --mount=from=bin,target=/build <<EOT
for package in $(find $dir -type f -name '*.tgz'); do
(
set -x
tar zxvf $package -C /usr/bin --strip-components=1
tar zxvf $package -C /usr/local
)
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 @@ -119,28 +119,28 @@ mkdir -p "${pkgoutput}"
cd "$BUILDDIR"
for pkgname in *; do
workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
mkdir -p "$workdir/${pkgname}"
mkdir -p "$workdir/bin" "$workdir/share/doc/${pkgname}"
(
set -x
cp "${pkgname}"/* ${SRCDIR}/LICENSE ${SRCDIR}/README.md "$workdir/${pkgname}/"
cp "${pkgname}"/* "$workdir/bin/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/share/doc/${pkgname}/"
if [ "$(xx-info os)" = "windows" ]; then
cp ${RUNHCS_SRCDIR}/LICENSE "$workdir/${pkgname}/runhcs.LICENSE"
cp ${RUNHCS_SRCDIR}/README.md "$workdir/${pkgname}/runhcs.README.md"
cp "${RUNHCS_SRCDIR}/LICENSE" "$workdir/share/doc/${pkgname}/runhcs.LICENSE"
cp "${RUNHCS_SRCDIR}/README.md" "$workdir/share/doc/${pkgname}/runhcs.README.md"
else
cp ${RUNC_SRCDIR}/LICENSE "$workdir/${pkgname}/runc.LICENSE"
cp ${RUNC_SRCDIR}/README.md "$workdir/${pkgname}/runc.README.md"
cp "${RUNC_SRCDIR}/LICENSE" "$workdir/share/doc/${pkgname}/runc.LICENSE"
cp "${RUNC_SRCDIR}/README.md" "$workdir/share/doc/${pkgname}/runc.README.md"
fi
)
if [ "$(xx-info os)" = "windows" ]; then
(
set -x
cd "$workdir"
zip -r "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip" "${pkgname}"
cd "$workdir" && zip -r "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip" .
)
else
(
set -x
tar -czf "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz" -C "$workdir" "${pkgname}"
tar -czf "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz" -C "$workdir" .
)
fi
done
2 changes: 1 addition & 1 deletion pkg/containerd/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ RUN --mount=from=bin,target=/build <<EOT
for package in $(find $dir -type f -name '*.tgz'); do
(
set -x
tar zxvf $package -C /usr/bin --strip-components=1
tar zxvf $package -C /usr/local
)
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,21 +94,21 @@ mkdir -p "${pkgoutput}"
cd "$BUILDDIR"
for pkgname in *; do
workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
mkdir -p "$workdir/${pkgname}"
mkdir -p "$workdir/bin" "$workdir/share/doc/${pkgname}"
(
set -x
cp "${pkgname}"/* ${SRCDIR}/LICENSE ${SRCDIR}/README.md "$workdir/${pkgname}/"
cp "${pkgname}"/* "$workdir/bin/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/share/doc/${pkgname}/"
)
if [ "$(xx-info os)" = "windows" ]; then
(
set -x
cd "$workdir"
zip -r "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip" "${pkgname}"
cd "$workdir" && zip -r "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip" .
)
else
(
set -x
tar -czf "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz" -C "$workdir" "${pkgname}"
tar -czf "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz" -C "$workdir" .
)
fi
done
2 changes: 1 addition & 1 deletion pkg/credential-helpers/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ RUN --mount=from=bin,target=/build <<EOT
for package in $(find $dir -type f -name '*.tgz'); do
(
set -x
tar zxvf $package -C /usr/bin --strip-components=1
tar zxvf $package -C /usr/local
)
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 @@ -74,21 +74,21 @@ mkdir -p "${pkgoutput}"
cd "$BUILDDIR"
for pkgname in *; do
workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
mkdir -p "$workdir/${pkgname}"
mkdir -p "$workdir/bin" "$workdir/share/doc/${pkgname}"
(
set -x
cp "${pkgname}"/* ${SRCDIR}/LICENSE ${SRCDIR}/README.md "$workdir/${pkgname}/"
cp "${pkgname}"/* "$workdir/bin/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/share/doc/${pkgname}/"
)
if [ "$(xx-info os)" = "windows" ]; then
(
set -x
cd "$workdir"
zip -r "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip" "${pkgname}"
cd "$workdir" && zip -r "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip" .
)
else
(
set -x
tar -czf "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz" -C "$workdir" "${pkgname}"
tar -czf "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz" -C "$workdir" .
)
fi
done
2 changes: 1 addition & 1 deletion pkg/docker-cli/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ RUN --mount=from=bin,target=/build <<EOT
for package in $(find $dir -type f -name '*.tgz'); do
(
set -x
tar zxvf $package -C /usr/bin --strip-components=1
tar zxvf $package -C /usr/local
)
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 @@ -92,21 +92,21 @@ mkdir -p "${pkgoutput}"
cd "$BUILDDIR"
for pkgname in *; do
workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
mkdir -p "$workdir/${pkgname}"
mkdir -p "$workdir/bin" "$workdir/share/doc/${pkgname}"
(
set -x
cp "${pkgname}"/* ${SRCDIR}/LICENSE ${SRCDIR}/README.md "$workdir/${pkgname}/"
cp "${pkgname}"/* "$workdir/bin/"
cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/share/doc/${pkgname}/"
)
if [ "$(xx-info os)" = "windows" ]; then
(
set -x
cd "$workdir"
zip -r "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip" "${pkgname}"
cd "$workdir" && zip -r "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip" .
)
else
(
set -x
tar -czf "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz" -C "$workdir" "${pkgname}"
tar -czf "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz" -C "$workdir" .
)
fi
done
2 changes: 1 addition & 1 deletion pkg/docker-engine/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ RUN --mount=from=bin,target=/build <<EOT
for package in $(find $dir -type f -name '*.tgz'); do
(
set -x
tar zxvf $package -C /usr/bin --strip-components=1
tar zxvf $package -C /usr/local
)
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,21 +68,21 @@ mkdir -p "${pkgoutput}"
cd "$BUILDDIR"
for pkgname in *; do
workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
mkdir -p "$workdir/${pkgname}"
mkdir -p "$workdir/bin" "$workdir/share/doc/${pkgname}"
(
set -x
cp "${pkgname}"/* ${SRCDIR}/LICENSE "$workdir/${pkgname}/"
cp "${pkgname}"/* "$workdir/bin/"
cp "${SRCDIR}/LICENSE" "$workdir/share/doc/${pkgname}/"
)
if [ "$(xx-info os)" = "windows" ]; then
(
set -x
cd "$workdir"
zip -r "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip" "${pkgname}"
cd "$workdir" && zip -r "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip" .
)
else
(
set -x
tar -czf "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz" -C "$workdir" "${pkgname}"
tar -czf "${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz" -C "$workdir" .
)
fi
done
2 changes: 1 addition & 1 deletion pkg/model/verify.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ RUN --mount=from=bin,target=/build <<EOT
for package in $(find $dir -type f -name '*.tgz'); do
(
set -x
tar zxvf $package -C /usr/bin --strip-components=1
tar zxvf $package -C /usr/local
)
done
set -x
Expand Down
Loading