add new env to manage rustfs

docker/registrar.sh

@@ -1,46 +1,71 @@
 #!/bin/sh
 set -eu
 
+: "${CONSUL_HTTP_ADDR:?need CONSUL_HTTP_ADDR}"
 : "${SERVICE_NAME:?need SERVICE_NAME}"
 : "${SERVICE_ADDR:?need SERVICE_ADDR}"
 : "${SERVICE_PORT:?need SERVICE_PORT}"
-CONSUL="${CONSUL_HTTP_ADDR:-http://127.0.0.1:8500}"
 
-echo "[registrar] waiting consul agent at $CONSUL ..."
-for i in $(seq 1 60); do
-  if wget -qO- "$CONSUL/v1/status/leader" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
+SERVICE_ID="${SERVICE_ID:-${SERVICE_NAME}-${SERVICE_ADDR}-${SERVICE_PORT}}"
+SERVICE_TAGS="${SERVICE_TAGS:-}"
+CHECK_TYPE="${CHECK_TYPE:-tcp}"          # tcp|http
+CHECK_PATH="${CHECK_PATH:-/healthz}"     # http 模式才用
+CHECK_INTERVAL="${CHECK_INTERVAL:-10s}"
+CHECK_TIMEOUT="${CHECK_TIMEOUT:-2s}"
+DEREG_AFTER="${DEREG_AFTER:-1m}"
 
-ID="${SERVICE_NAME}-${SERVICE_ADDR}-${SERVICE_PORT}"
+# 组装 Tags 的 JSON 数组
+if [ -n "$SERVICE_TAGS" ]; then
+  # 逗号分隔转 JSON 数组
+  TAGS_JSON=$(printf '%s' "$SERVICE_TAGS" | awk -F, '
+    BEGIN{printf "["}
+    {for(i=1;i<=NF;i++){gsub(/^ *| *$/, "", $i); printf "%s\"%s\"", (i>1?",":""), $i}}
+    END{printf "]"}
+  ')
+else
+  TAGS_JSON="[]"
+fi
 
-cat > /tmp/svc.json <<EOF
+# 组装 Check JSON
+if [ "$CHECK_TYPE" = "http" ]; then
+  CHECK_JSON=$(cat <<EOF
 {
-  "service": {
-    "id": "${ID}",
-    "name": "${SERVICE_NAME}",
-    "address": "${SERVICE_ADDR}",
-    "port": ${SERVICE_PORT},
-    "check": {
-      "http": "http://${SERVICE_ADDR}:${SERVICE_PORT}/",
-      "interval": "10s",
-      "timeout": "2s"
-    }
-  }
+  "Name": "http-${SERVICE_PORT}",
+  "HTTP": "http://${SERVICE_ADDR}:${SERVICE_PORT}${CHECK_PATH}",
+  "Method": "GET",
+  "Interval": "${CHECK_INTERVAL}",
+  "Timeout": "${CHECK_TIMEOUT}",
+  "DeregisterCriticalServiceAfter": "${DEREG_AFTER}"
 }
 EOF
-
-echo "[registrar] registering ${ID} ..."
-consul services register -http-addr="$CONSUL" /tmp/svc.json
-
-term() {
-  echo "[registrar] deregister ${ID} ..."
-  consul services deregister -http-addr="$CONSUL" /tmp/svc.json || true
-  exit 0
+)
+else
+  CHECK_JSON=$(cat <<EOF
+{
+  "Name": "tcp-${SERVICE_PORT}",
+  "TCP": "${SERVICE_ADDR}:${SERVICE_PORT}",
+  "Interval": "${CHECK_INTERVAL}",
+  "Timeout": "${CHECK_TIMEOUT}",
+  "DeregisterCriticalServiceAfter": "${DEREG_AFTER}"
 }
-trap term TERM INT
+EOF
+)
+fi
 
+# 注册 payload
+cat > /tmp/service.json <<JSON
+{
+  "Name": "${SERVICE_NAME}",
+  "ID": "${SERVICE_ID}",
+  "Address": "${SERVICE_ADDR}",
+  "Port": ${SERVICE_PORT},
+  "Tags": ${TAGS_JSON},
+  "Checks": [ ${CHECK_JSON} ]
+}
+JSON
+
+echo "[registrar] registering ${SERVICE_ID} -> ${SERVICE_ADDR}:${SERVICE_PORT} ..."
+curl -fsS -X PUT -d @/tmp/service.json "${CONSUL_HTTP_ADDR}/v1/agent/service/register"
+echo "[registrar] done."
+# 阻塞防退出（可选）
 tail -f /dev/null
-