ports@,
Here an update for docker-compose to the last version which was released a
few hours ago.
The good news that this release includes our patches that allows to drop it
from ports tree.
The only patch that left was also merged to upstream of buildkit and the
next release of buildkit will include that.
After that this port can be rewritten to usual go port and vendor artifact
can be avoided.
Thus, it is future, but todays diff which was tested on -current/amd64 here:
diff --git sysutils/docker-compose/Makefile sysutils/docker-compose/Makefile
index 8bdc3f60815..bd083d35e85 100644
--- sysutils/docker-compose/Makefile
+++ sysutils/docker-compose/Makefile
@@ -1,6 +1,6 @@
COMMENT = Define and run multi-container applications with Docker
-V = 2.27.0
+V = 2.27.1
GH_ACCOUNT = docker
GH_PROJECT = compose
GH_TAGNAME = v${V}
diff --git sysutils/docker-compose/distinfo sysutils/docker-compose/distinfo
index 75831691d2b..f915416d0cc 100644
--- sysutils/docker-compose/distinfo
+++ sysutils/docker-compose/distinfo
@@ -1,4 +1,4 @@
-SHA256 (compose-2.27.0.tar.gz) = KbIjLRYJ3/A9t0GIp5RMhbqLYS9Hp+OZOKQ9uPt9cGc=
-SHA256 (docker-compose-vendor-2.27.0.tar.gz) =
gfFgyn+dE4/19KZn3l1pTlq66MTphFnmoa8I2FkgQ8g=
-SIZE (compose-2.27.0.tar.gz) = 362705
-SIZE (docker-compose-vendor-2.27.0.tar.gz) = 10982638
+SHA256 (compose-2.27.1.tar.gz) = Wr+N46QTiUwu0GGBLWjI2OtOJVslvzjirFjTugVGohg=
+SHA256 (docker-compose-vendor-2.27.1.tar.gz) =
02IuUOzG0Y9wHvpq8UUuZ7V56Ru9Z1g7r327OAzVo4k=
+SIZE (compose-2.27.1.tar.gz) = 364183
+SIZE (docker-compose-vendor-2.27.1.tar.gz) = 11020667
diff --git
sysutils/docker-compose/patches/patch-internal_locker_runtime_unix_go
sysutils/docker-compose/patches/patch-internal_locker_runtime_unix_go
deleted file mode 100644
index 001fd508615..00000000000
--- sysutils/docker-compose/patches/patch-internal_locker_runtime_unix_go
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: internal/locker/runtime_unix.go
---- internal/locker/runtime_unix.go.orig
-+++ internal/locker/runtime_unix.go
-@@ -1,4 +1,4 @@
--//go:build linux
-+//go:build linux || openbsd
-
- /*
- Copyright 2020 Docker Compose CLI authors
diff --git sysutils/docker-compose/patches/patch-pkg_remote_cache_unix_go
sysutils/docker-compose/patches/patch-pkg_remote_cache_unix_go
deleted file mode 100644
index 39747f09165..00000000000
--- sysutils/docker-compose/patches/patch-pkg_remote_cache_unix_go
+++ /dev/null
@@ -1,9 +0,0 @@
-Index: pkg/remote/cache_unix.go
---- pkg/remote/cache_unix.go.orig
-+++ pkg/remote/cache_unix.go
-@@ -1,4 +1,4 @@
--//go:build linux
-+//go:build linux || openbsd
-
- /*
- Copyright 2020 Docker Compose CLI authors
diff --git
sysutils/docker-compose/patches/patch-vendor_github_com_moby_buildkit_cmd_buildkitd_config_gcpolicy_unix_go
sysutils/docker-compose/patches/patch-vendor_github_com_moby_buildkit_cmd_buildkitd_config_gcpolicy_unix_go
index fb57f54ecbb..b7cb69e4f3f 100644
---
sysutils/docker-compose/patches/patch-vendor_github_com_moby_buildkit_cmd_buildkitd_config_gcpolicy_unix_go
+++
sysutils/docker-compose/patches/patch-vendor_github_com_moby_buildkit_cmd_buildkitd_config_gcpolicy_unix_go
@@ -1,12 +1,11 @@
Index: vendor/github.com/moby/buildkit/cmd/buildkitd/config/gcpolicy_unix.go
--- vendor/github.com/moby/buildkit/cmd/buildkitd/config/gcpolicy_unix.go.orig
+++ vendor/github.com/moby/buildkit/cmd/buildkitd/config/gcpolicy_unix.go
-@@ -23,7 +23,7 @@ func (d DiskSpace) AsBytes(root string) int64 {
+@@ -14,6 +14,6 @@ func getDiskSize(root string) (int64, error) {
if err := syscall.Statfs(root, &st); err != nil {
- return defaultCap
+ return 0, err
}
- diskSize := int64(st.Bsize) * int64(st.Blocks)
+ diskSize := int64(st.F_bsize) * int64(st.F_blocks)
- avail := diskSize * d.Percentage / 100
- return (avail/(1<<30) + 1) * 1e9 // round up
+ return diskSize, nil
}
--
wbr, Kirill
