Skip to content

deb packaging updates #134

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
crazy-max merged 7 commits into from
Aug 4, 2023
Merged

deb packaging updates #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2f087ed
pkg(buildx): update debhelper compat to 12 and set override_dh_dwz
crazy-max Aug 4, 2023
baf8042
pkg(compose): update debhelper compat to 12 and set override_dh_dwz
crazy-max Aug 4, 2023
1b7e28d
pkg(containerd): update debhelper compat to 12 and set override_dh_dwz
crazy-max Aug 4, 2023
3cb3a90
pkg(credential-helpers): update debhelper compat to 12 and set overri…
crazy-max Aug 4, 2023
6f3ad5b
pkg(docker-cli): update debhelper compat to 12 and set override_dh_dwz
crazy-max Aug 4, 2023
712e381
pkg(docker-engine): update debhelper compat to 12 and set override_dh…
crazy-max Aug 4, 2023
58f5607
pkg(sbom): update debhelper compat to 12 and set override_dh_dwz
crazy-max Aug 4, 2023
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
1 change: 0 additions & 1 deletion pkg/buildx/deb/compat
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/buildx/deb/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Vcs-Browser: https://github.com/docker/buildx
Vcs-Git: git://github.com/docker/buildx.git
Standards-Version: 3.9.6
Build-Depends: bash,
debhelper (>= 10~) | dh-systemd
debhelper-compat (= 12)

Package: docker-buildx-plugin
Priority: optional
Expand Down
6 changes: 6 additions & 0 deletions pkg/buildx/deb/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ override_dh_auto_test:
override_dh_strip:
# Go has lots of problems with stripping, so just don't

# http://manpages.debian.org/dh_dwz
override_dh_dwz:
# dh_dwz in debhelper versions less than 13 has issues with files that are missing debug symbols (once we update to debhelper-compat 13+ this can be removed)
@# https://packages.debian.org/debhelper
@# https://packages.ubuntu.com/debhelper

override_dh_auto_install:
install -D -m 0755 /usr/libexec/docker/cli-plugins/docker-buildx debian/docker-buildx-plugin/usr/libexec/docker/cli-plugins/docker-buildx

Expand Down
2 changes: 1 addition & 1 deletion pkg/buildx/scripts/pkg-deb-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ mkdir -p "${pkgoutput}"

set -x

chmod -x debian/compat debian/control debian/docs
chmod -x debian/control debian/docs
VERSION=${GENVER_VERSION} REVISION=${GENVER_COMMIT} dpkg-buildpackage $PKG_DEB_BUILDFLAGS --host-arch $(xx-info debian-arch) --target-arch $(xx-info debian-arch)
cp /root/docker-* "${pkgoutput}"/
1 change: 0 additions & 1 deletion pkg/compose/deb/compat
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/compose/deb/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Vcs-Browser: https://github.com/docker/compose
Vcs-Git: git://github.com/docker/compose.git
Standards-Version: 3.9.6
Build-Depends: bash,
debhelper (>= 10~) | dh-systemd,
debhelper-compat (= 12),
make

Package: docker-compose-plugin
Expand Down
6 changes: 6 additions & 0 deletions pkg/compose/deb/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ override_dh_auto_test:
override_dh_strip:
# Go has lots of problems with stripping, so just don't

# http://manpages.debian.org/dh_dwz
override_dh_dwz:
# dh_dwz in debhelper versions less than 13 has issues with files that are missing debug symbols (once we update to debhelper-compat 13+ this can be removed)
@# https://packages.debian.org/debhelper
@# https://packages.ubuntu.com/debhelper

override_dh_auto_install:
install -D -m 0755 /usr/libexec/docker/cli-plugins/docker-compose debian/docker-compose-plugin/usr/libexec/docker/cli-plugins/docker-compose

Expand Down
2 changes: 1 addition & 1 deletion pkg/compose/scripts/pkg-deb-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@ mkdir -p "${pkgoutput}"

set -x

chmod -x debian/compat debian/control debian/docs
chmod -x debian/control debian/docs
VERSION=${GENVER_VERSION} dpkg-buildpackage $PKG_DEB_BUILDFLAGS --host-arch $(xx-info debian-arch) --target-arch $(xx-info debian-arch)
cp /root/docker-* "${pkgoutput}"/
1 change: 0 additions & 1 deletion pkg/containerd/deb/compat
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/containerd/deb/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: containerd.io
Section: devel
Priority: optional
Maintainer: Containerd team <help@containerd.io>
Build-Depends: debhelper (>= 10~) | dh-systemd,
Build-Depends: debhelper-compat (= 12),
pkg-config,
libseccomp-dev
Standards-Version: 4.1.4
Expand Down
8 changes: 7 additions & 1 deletion pkg/containerd/deb/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.

%:
dh $@ --with systemd
dh $@

# GO_SRC_PATH and PKG_NAME are defined in the dockerfile
# VERSION and REF are defined in scripts/build-deb
Expand Down Expand Up @@ -51,6 +51,12 @@ man: ## Create containerd man pages
override_dh_builddeb:
dh_builddeb -- -Zxz

# http://manpages.debian.org/dh_dwz
override_dh_dwz:
# dh_dwz in debhelper versions less than 13 has issues with files that are missing debug symbols (once we update to debhelper-compat 13+ this can be removed)
@# https://packages.debian.org/debhelper
@# https://packages.ubuntu.com/debhelper

override_dh_auto_build: binaries bin/runc man

override_dh_systemd_start:
Expand Down
2 changes: 1 addition & 1 deletion pkg/containerd/scripts/pkg-deb-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ set -x

sed 's#/usr/local/bin/containerd#/usr/bin/containerd#g' "${SRCDIR}/containerd.service" > /common/containerd.service

chmod -x debian/compat debian/control debian/copyright debian/manpages
chmod -x debian/control debian/copyright debian/manpages
VERSION=${GENVER_VERSION} REVISION=${GENVER_COMMIT} dpkg-buildpackage $PKG_DEB_BUILDFLAGS --host-arch $(xx-info debian-arch) --target-arch $(xx-info debian-arch)
cp /root/${PKG_NAME}* "${pkgoutput}"/
1 change: 0 additions & 1 deletion pkg/credential-helpers/deb/compat
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/credential-helpers/deb/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Homepage: https://www.docker.com
Vcs-Browser: https://github.com/docker/docker-credential-helpers
Vcs-Git: git://github.com/docker/docker-credential-helpers.git
Standards-Version: 3.9.6
Build-Depends: debhelper (>= 10~) | dh-systemd,
Build-Depends: debhelper-compat (= 12),
gcc,
libsecret-1-dev,
make
Expand Down
6 changes: 6 additions & 0 deletions pkg/credential-helpers/deb/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ override_dh_auto_build:
override_dh_strip:
# Go has lots of problems with stripping, so just don't

# http://manpages.debian.org/dh_dwz
override_dh_dwz:
# dh_dwz in debhelper versions less than 13 has issues with files that are missing debug symbols (once we update to debhelper-compat 13+ this can be removed)
@# https://packages.debian.org/debhelper
@# https://packages.ubuntu.com/debhelper

override_dh_auto_install:
install -D bin/docker-credential-secretservice debian/docker-credential-secretservice/usr/bin/docker-credential-secretservice
install -D bin/docker-credential-pass debian/docker-credential-pass/usr/bin/docker-credential-pass
Expand Down
2 changes: 1 addition & 1 deletion pkg/credential-helpers/scripts/pkg-deb-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ fi

set -x

chmod -x debian/compat debian/control debian/docs
chmod -x debian/control debian/docs
VERSION=${GENVER_VERSION} REVISION=${GENVER_COMMIT} dpkg-buildpackage $PKG_DEB_BUILDFLAGS --host-arch $(xx-info debian-arch) --target-arch $(xx-info debian-arch)
mkdir -p "${pkgoutput}"
cp /root/docker-credential-* "${pkgoutput}"/
1 change: 0 additions & 1 deletion pkg/docker-cli/deb/compat
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/docker-cli/deb/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Vcs-Git: git://github.com/docker/cli.git
Standards-Version: 3.9.6
Build-Depends: bash,
bash-completion,
debhelper (>= 10~) | dh-systemd,
debhelper-compat (= 12),
gcc,
libc-dev,
make
Expand Down
6 changes: 6 additions & 0 deletions pkg/docker-cli/deb/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ override_dh_auto_test:
override_dh_strip:
# Go has lots of problems with stripping, so just don't

# http://manpages.debian.org/dh_dwz
override_dh_dwz:
# dh_dwz in debhelper versions less than 13 has issues with files that are missing debug symbols (once we update to debhelper-compat 13+ this can be removed)
@# https://packages.debian.org/debhelper
@# https://packages.ubuntu.com/debhelper

override_dh_auto_install:
install -D -m 0644 cli/contrib/completion/fish/docker.fish debian/docker-ce-cli/usr/share/fish/vendor_completions.d/docker.fish
install -D -m 0644 cli/contrib/completion/zsh/_docker debian/docker-ce-cli/usr/share/zsh/vendor-completions/_docker
Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-cli/scripts/pkg-deb-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ mkdir -p "${pkgoutput}"

set -x

chmod -x debian/compat debian/control debian/docs debian/*.bash-completion debian/*.manpages
chmod -x debian/control debian/docs debian/*.bash-completion debian/*.manpages
VERSION=${GENVER_VERSION} REVISION=${GENVER_COMMIT} dpkg-buildpackage $PKG_DEB_BUILDFLAGS --host-arch $(xx-info debian-arch) --target-arch $(xx-info debian-arch)
cp /root/docker-* "${pkgoutput}"/
1 change: 0 additions & 1 deletion pkg/docker-engine/deb/compat
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/docker-engine/deb/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Standards-Version: 3.9.6
Build-Depends: ca-certificates,
cmake,
dh-apparmor,
debhelper (>= 10~) | dh-systemd,
debhelper-compat (= 12),
gcc,
libc-dev,
libdevmapper-dev,
Expand Down
72 changes: 0 additions & 72 deletions pkg/docker-engine/deb/docker-ce.docker.upstart
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions pkg/docker-engine/deb/docker-ce.maintscript
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rm_conffile /etc/init/docker.conf 5:24.0.5-1~
10 changes: 10 additions & 0 deletions pkg/docker-engine/deb/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ override_dh_auto_test:
override_dh_strip:
# Go has lots of problems with stripping, so just don't

# http://manpages.debian.org/dh_dwz
override_dh_dwz:
# dh_dwz in debhelper versions less than 13 has issues with files that are missing debug symbols (once we update to debhelper-compat 13+ this can be removed)
@# https://packages.debian.org/debhelper
@# https://packages.ubuntu.com/debhelper

override_dh_auto_install:
install -D -m 0644 /common/systemd/docker.service debian/docker-ce/lib/systemd/system/docker.service
install -D -m 0644 /common/systemd/docker.socket debian/docker-ce/lib/systemd/system/docker.socket
Expand All @@ -37,6 +43,10 @@ override_dh_installinit:
# use "docker" as our service name, not "docker-ce"
dh_installinit --name=docker

override_dh_installsystemd:
# use "docker" as our service name, not "docker-ce"
dh_installsystemd --name=docker

override_dh_shlibdeps:
dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info

Expand Down
2 changes: 1 addition & 1 deletion pkg/docker-engine/scripts/pkg-deb-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ mkdir -p "${pkgoutput}"

set -x

chmod -x debian/compat debian/control debian/docs
chmod -x debian/control debian/docs
VERSION=${GENVER_VERSION} REVISION=${GENVER_COMMIT_SHORT} dpkg-buildpackage $PKG_DEB_BUILDFLAGS --host-arch $(xx-info debian-arch) --target-arch $(xx-info debian-arch)
cp /root/docker-* "${pkgoutput}"/
1 change: 0 additions & 1 deletion pkg/sbom/deb/compat
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkg/sbom/deb/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Vcs-Browser: https://github.com/docker/sbom-cli-plugin
Vcs-Git: git://github.com/docker/sbom-cli-plugin.git
Standards-Version: 3.9.6
Build-Depends: bash,
debhelper (>= 10~) | dh-systemd,
debhelper-compat (= 12),
make

Package: docker-sbom-plugin
Expand Down
6 changes: 6 additions & 0 deletions pkg/sbom/deb/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ override_dh_auto_test:
override_dh_strip:
# Go has lots of problems with stripping, so just don't

# http://manpages.debian.org/dh_dwz
override_dh_dwz:
# dh_dwz in debhelper versions less than 13 has issues with files that are missing debug symbols (once we update to debhelper-compat 13+ this can be removed)
@# https://packages.debian.org/debhelper
@# https://packages.ubuntu.com/debhelper

override_dh_auto_install:
install -D -m 0755 /usr/libexec/docker/cli-plugins/docker-sbom debian/docker-sbom-plugin/usr/libexec/docker/cli-plugins/docker-sbom

Expand Down
2 changes: 1 addition & 1 deletion pkg/sbom/scripts/pkg-deb-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@ mkdir -p "${pkgoutput}"

set -x

chmod -x debian/compat debian/control debian/docs
chmod -x debian/control debian/docs
VERSION=${GENVER_VERSION} REVISION=${GENVER_COMMIT} dpkg-buildpackage $PKG_DEB_BUILDFLAGS --host-arch $(xx-info debian-arch) --target-arch $(xx-info debian-arch)
cp /root/docker-* "${pkgoutput}"/