commit fe0b308d85264c1b350591489a19ab0d8c6e6767 Author: Matt Housh <jaeger@crux.ninja> Date: Tue Aug 22 13:38:56 2023 -0500 docker-compose: tweaked build command to fix version output diff --git a/docker-compose/.signature b/docker-compose/.signature index 0c6f118b1..fee20e9ca 100644 --- a/docker-compose/.signature +++ b/docker-compose/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38iI+Ey4OmtYvA1KdoYjQsIl4oscEmRoYNjKiit4hg05YgZ07JrfwCmGMYJ5P6ggT7wOZoVCpiVFsvh4ez3Yxwg= -SHA256 (Pkgfile) = d0ec047c204cea18970b54c7a4412b903257042a02befc5f20cefb31c1a62339 +RWSagIOpLGJF3zDGfI0UsCo72JjeL+t5NUNs+BwH4P6rd72Pxr0Rr1nUPVVhBl3SrjKeaKx4UYkqWE3E+GviwFUVH+fQJsbP6As= +SHA256 (Pkgfile) = 2448ea9c55204218d2bad7f44de37de4e8cea3fcf7473388da56d3b24a99089f SHA256 (.footprint) = ba1446d4c34513c3c11ed15f4ce8e6419704b4d7fac645e9bc0d0421db4e6adf SHA256 (docker-compose-2.20.3.tar.gz) = af8025623de3991a15a89575ae4fc4f3f38a17311af9641815500c01f0775950 diff --git a/docker-compose/Pkgfile b/docker-compose/Pkgfile index 73b412629..85f1e2e24 100644 --- a/docker-compose/Pkgfile +++ b/docker-compose/Pkgfile @@ -13,8 +13,8 @@ build() { export CGO_CPPFLAGS="${CXXFLAGS}" export CGO_CXXFLAGS="${CXXFLAGS}" cd compose-$version - go build -trimpath -o ${name} ./cmd - install -Dm0755 ${name} ${PKG}/usr/bin/${name} + make VERSION=v$version + install -Dm0755 bin/build/${name} ${PKG}/usr/bin/${name} install -dm0755 ${PKG}/usr/lib/docker/cli-plugins ln -s /usr/bin/docker-compose ${PKG}/usr/lib/docker/cli-plugins/ }