diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8489f89..8ab4dcf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,8 +39,7 @@ jobs: - name: Trigger dot-cli uses: ./actions/dot-cli id: dot-cli - with: - pass: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhcGkwM2ZiY2ZjZi04ZDA2LTQ5ZTUtYTUwZC1mYTY1Yzk4NGI4YjQiLCJ4bW9kIjoxNjk0NDY5MTA5MDAwLCJuYmYiOjE2OTQ0NjkxMDksImlzcyI6IjRhZmYwZGZiMDciLCJsYWJlbCI6ImNsaSIsImV4cCI6MTc4OTEwNjQwMSwiaWF0IjoxNjk0NDY5MTA5LCJqdGkiOiIxYmI5YjhjNC1lZTcwLTRiMmYtYjFjNC0wYWY3NTMzNmM0MGQifQ.y6s9pXsMnavzoGD-FkMLpKEXEBIhB8QtP3n5EYFzQF4' + with: command: 'ct' sub-command: 'pull' default-action-arg: 'FileAsset' diff --git a/actions/dot-cli/action.yml b/actions/dot-cli/action.yml index 7400771..cb90c9c 100644 --- a/actions/dot-cli/action.yml +++ b/actions/dot-cli/action.yml @@ -2,9 +2,6 @@ name: 'dot-cli' description: 'Fire dotCMS cli' inputs: - pass: - description: 'safe pass' - required: true command: description: 'dot-cli command' required: true @@ -27,8 +24,7 @@ outputs: runs: using: 'docker' image: 'Dockerfile' - args: # 'ct pull FileAsset --workspace /github/workspace/' - - ${{ inputs.pass }} + args: # 'ct pull FileAsset --workspace /github/workspace/' - ${{ inputs.command }} - ${{ inputs.sub-command }} - ${{ inputs.default-action-arg }} diff --git a/actions/dot-cli/dot-service.yml b/actions/dot-cli/dot-service.yml index f5fb33c..915ba40 100755 --- a/actions/dot-cli/dot-service.yml +++ b/actions/dot-cli/dot-service.yml @@ -3,4 +3,4 @@ active: true credentials: user: "admin@dotcms.com" - token: "plchldr" \ No newline at end of file + token: "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhcGkwM2ZiY2ZjZi04ZDA2LTQ5ZTUtYTUwZC1mYTY1Yzk4NGI4YjQiLCJ4bW9kIjoxNjk0NDY5MTA5MDAwLCJuYmYiOjE2OTQ0NjkxMDksImlzcyI6IjRhZmYwZGZiMDciLCJsYWJlbCI6ImNsaSIsImV4cCI6MTc4OTEwNjQwMSwiaWF0IjoxNjk0NDY5MTA5LCJqdGkiOiIxYmI5YjhjNC1lZTcwLTRiMmYtYjFjNC0wYWY3NTMzNmM0MGQifQ.y6s9pXsMnavzoGD-FkMLpKEXEBIhB8QtP3n5EYFzQF4" \ No newline at end of file diff --git a/actions/dot-cli/entrypoint.sh b/actions/dot-cli/entrypoint.sh index ce80f2b..287a857 100755 --- a/actions/dot-cli/entrypoint.sh +++ b/actions/dot-cli/entrypoint.sh @@ -2,22 +2,19 @@ ls /dot-cli - echo "config::::" - #proof that we can access the repo from within the script cat /github/workspace/README.md - tkn="$1" - echo "Safe pass is :: $tkn" + #tkn="$1" + #echo "Safe pass is :: $tkn" #Replace the safe-pass with the value passed in the docker workflow action - sed -i -e "s/plchldr/$tkn/g" "${DOT_SERVICES_HOME}dot-service.yml" - + #sed -i -e "s/plchldr/$tkn/g" "${DOT_SERVICES_HOME}dot-service.yml" - echo "$@"; # will echo all args - shift; # will remove first arg from the "$@" - echo "$@"; # will echo all args except first one + #echo "$@"; # will echo all args + #shift; # will remove first arg from the "$@" + #echo "$@"; # will echo all args except first one var=$(bash /dot-cli/run-java.sh "$@" ) echo "var: $var"