124 Star 0 Fork 18

src-openEuler/resource-agents

加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
backport-docker-compose-use-docker-compose-when-not-using-old.patch 1.01 KB
一键复制 编辑 原始数据 按行查看 历史
From 33d73b0113b3acf77b8346ceac1bfdcf3cdaebe6 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <[email protected]>
Date: Fri, 13 Sep 2024 09:41:20 +0200
Subject: [PATCH 02/10] docker-compose: use "docker compose" when not using
older docker-compose command
---
heartbeat/docker-compose | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/heartbeat/docker-compose b/heartbeat/docker-compose
index 696f3a36..9d11ee4b 100755
--- a/heartbeat/docker-compose
+++ b/heartbeat/docker-compose
@@ -113,9 +113,15 @@ exit $OCF_SUCCESS
if [ -r "$OCF_RESKEY_binpath" -a -x "$OCF_RESKEY_binpath" ]; then
COMMAND="$OCF_RESKEY_binpath"
else
+ OCF_RESKEY_binpath="$OCF_RESKEY_binpath_default"
COMMAND="$OCF_RESKEY_binpath_default"
fi
+if ! $COMMAND -v 2>&1 | grep -q "^docker-compose version 1\."; then
+ OCF_RESKEY_binpath="${OCF_RESKEY_binpath%%-compose}"
+ COMMAND="$OCF_RESKEY_binpath compose"
+fi
+
DIR="$OCF_RESKEY_dirpath"
PRE="$(echo ${DIR##*/} | tr A-Z a-z | sed 's/[^a-z0-9]//g')"
YML="$OCF_RESKEY_ymlfile"
--
2.25.1
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/src-openeuler/resource-agents.git
[email protected]:src-openeuler/resource-agents.git
src-openeuler
resource-agents
resource-agents
master

搜索帮助