diff --git a/.github/workflows/docker-buildx-dev.yml b/.github/workflows/docker-buildx-dev.yml index 0227aa2..2e4d9af 100644 --- a/.github/workflows/docker-buildx-dev.yml +++ b/.github/workflows/docker-buildx-dev.yml @@ -1,6 +1,7 @@ name: docker-buildx-dev on: + workflow_dispatch: push: branches: - dev diff --git a/.github/workflows/docker-buildx-latest.yml b/.github/workflows/docker-buildx-latest.yml index 1361d4b..fad3cd3 100644 --- a/.github/workflows/docker-buildx-latest.yml +++ b/.github/workflows/docker-buildx-latest.yml @@ -1,6 +1,7 @@ name: docker-buildx-latest on: + workflow_dispatch: push: branches: - master diff --git a/run.sh b/run.sh index 9f44fc7..3ef2ebd 100755 --- a/run.sh +++ b/run.sh @@ -172,7 +172,7 @@ Jroot=`echo $Jroot|jq --argjson JibDNS "${JibDNS}" --argjson JibSOCKS "${JibSOCK # Add routing config Jrouting='{"routing":{"domainStrategy":"AsIs"}}' -Jrouting=`echo "${Jrouting}" |jq --argjson jrules "${Jrules}" '.routing += $jrules'` +Jrouting=`echo "${Jrouting}" |jq --argjson Jrules "${Jrules}" '.routing += $Jrules'` Jroot=`echo $Jroot|jq --argjson Jrouting "${Jrouting}" '.routing += $Jrouting'` # Add debug config @@ -189,6 +189,7 @@ if [ -n "${INJECT}" ]; then done fi +# Add Dnsmasq config if [ -n "${DNSLOCAL}" ]; then for dnslocal in "${DNSLOCAL[@]}" do