Skip to content

Commit f50d256

Browse files
paweljwclaude
andauthored
Opus: Strip uts property for Docker Compose v2 < 2.15.1 (#121)
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 27c70cf commit f50d256

2 files changed

Lines changed: 11 additions & 0 deletions

File tree

deploy-to-swarm.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,14 @@ deploy_ebpf_to_node() {
414414
if ! grep -q '^version:' docker-compose.yml; then
415415
sed -i '1i version: "2.4"' docker-compose.yml
416416
fi
417+
else
418+
# Strip uts: for Docker Compose v2 < 2.15.1
419+
COMPOSE_VERSION=\$(docker compose version --short 2>/dev/null || docker compose version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -n1)
420+
COMPOSE_V_NUM=\$(echo "\$COMPOSE_VERSION" | awk -F. '{printf "%d%02d%02d", \$1, \$2, \$3}')
421+
if [ "\$COMPOSE_V_NUM" -lt 21501 ]; then
422+
echo "Docker Compose \$COMPOSE_VERSION does not support 'uts' property (requires >= 2.15.1), removing it"
423+
sed -i '/^[[:space:]]*uts:[[:space:]]/d' docker-compose.yml
424+
fi
417425
fi
418426
419427
# Export environment variables

install.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,9 @@ fi
299299

300300
if [ "$COMPOSE_CMD" = "docker-compose" ]; then
301301
docker_v1_compatibility docker-compose.yml
302+
elif version_lt "$COMPOSE_VERSION" "2.15.1"; then
303+
echo "Docker Compose $COMPOSE_VERSION does not support 'uts' property (requires >= 2.15.1), removing it"
304+
sed -i.bak '/^[[:space:]]*uts:[[:space:]]/d' docker-compose.yml && rm -f docker-compose.yml.bak
302305
fi
303306

304307
# Pull images first

0 commit comments

Comments
 (0)