aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Brancaleoni <abc@pompel.me>2025-02-25 16:11:17 +0000
committerAndrea Brancaleoni <abc@pompel.me>2025-02-25 16:39:24 +0000
commit76c36dd57a997b8bc2d1c6e2b7b72d15c54e4997 (patch)
treef19a55c8658deafe84fb3dca9d4ea3f48a3888c2
parent7750dad5523fdfbface8f7624d5ba77dd08e7fec (diff)
downloadvoid-packages-76c36dd57a997b8bc2d1c6e2b7b72d15c54e4997.tar
void-packages-76c36dd57a997b8bc2d1c6e2b7b72d15c54e4997.tar.gz
void-packages-76c36dd57a997b8bc2d1c6e2b7b72d15c54e4997.tar.bz2
void-packages-76c36dd57a997b8bc2d1c6e2b7b72d15c54e4997.tar.lz
void-packages-76c36dd57a997b8bc2d1c6e2b7b72d15c54e4997.tar.xz
void-packages-76c36dd57a997b8bc2d1c6e2b7b72d15c54e4997.tar.zst
void-packages-76c36dd57a997b8bc2d1c6e2b7b72d15c54e4997.zip
moby: fix docker-proxy issue
Resolves https://github.com/void-linux/void-packages/issues/54486
-rw-r--r--srcpkgs/moby/template48
1 files changed, 16 insertions, 32 deletions
diff --git a/srcpkgs/moby/template b/srcpkgs/moby/template
index 8e1c2bd3a89..950103a2878 100644
--- a/srcpkgs/moby/template
+++ b/srcpkgs/moby/template
@@ -2,13 +2,8 @@
# should be kept in sync with docker-cli
pkgname=moby
version=28.0.0
-revision=1
-# libnetwork commit is mentioned in vendor.conf
-_libnetwork_commit=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
-create_wrksrc=yes
-build_style=go
-go_import_path="github.com/docker/docker"
-hostmakedepends="pkg-config"
+revision=2
+hostmakedepends="go pkg-config"
makedepends="libbtrfs-devel device-mapper-devel libseccomp-devel"
depends="containerd iptables xz"
short_desc="Container engine for the Docker ecosystem"
@@ -16,43 +11,32 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
homepage="https://www.docker.com"
changelog="https://github.com/moby/moby/releases"
-distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz>moby-$version.tar.gz
- https://github.com/moby/libnetwork/archive/$_libnetwork_commit.tar.gz>libnetwork-$_libnetwork_commit.tar.gz"
+distfiles="https://github.com/moby/moby/archive/v${version}.tar.gz"
checksum="89e26ecb0c13ef7037305811b0eb6dd4c70741c34ec3428d4396d68b03deb641
5c5e3aa7599e85036438a65016796aa11df4afb44d13b5927dcfb0ec5947a86b"
system_groups="docker"
+make_check=no
-_moby_builddir="moby-$version"
-_libnetwork_builddir="libnetwork-$_libnetwork_commit"
+case $XBPS_TARGET_MACHINE in
+ i686*) broken="libnetwork/drivers/bridge/port_mapping_linux.go:679:45: undefined\: syscall.SYS_SETSOCKOPT";;
+esac
case $XBPS_TARGET_MACHINE in
i686*) broken="libnetwork/drivers/bridge/port_mapping_linux.go:679:45: undefined: syscall.SYS_SETSOCKOPT";;
esac
do_build() {
- export AUTO_GOPATH=1
- export DOCKER_GITCOMMIT="tag v${version}"
- export DOCKER_BUILDTAGS="seccomp"
- export DISABLE_WARN_OUTSIDE_CONTAINER=1
-
- mkdir -p "$wrksrc/$_moby_builddir"
- mkdir -p "$wrksrc/$_libnetwork_builddir"
+ export AUTO_GOPATH=1
+ export DOCKER_GITCOMMIT="tag v${version}"
+ export DOCKER_BUILDTAGS="seccomp"
+ export DISABLE_WARN_OUTSIDE_CONTAINER=1
- msg_normal "Building docker-proxy (libnetwork)\n"
- cd "$wrksrc/$_libnetwork_builddir"
- mkdir -p src/github.com/docker/
- ln -sf "$wrksrc/$_libnetwork_builddir" src/github.com/docker/libnetwork
- GOPATH="$PWD" go build -v -ldflags="-linkmode=external" -o docker-proxy github.com/docker/libnetwork/cmd/proxy
-
- msg_normal "Building docker-engine (moby)\n"
- cd "$wrksrc/$_moby_builddir"
- mkdir -p src/github.com/docker/
- ln -sf "$wrksrc/$_moby_builddir" src/github.com/docker/docker
- GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
+ GOPATH="$PWD" VERSION="$version" hack/make.sh dynbinary
}
do_install() {
- vbin $_libnetwork_builddir/docker-proxy
- vbin $_moby_builddir/bundles/dynbinary-daemon/dockerd
- vsv docker
+ vbin bundles/dynbinary-daemon/dockerd
+ vbin bundles/dynbinary-daemon/docker-proxy
+ vsv docker
}
+