diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index f850579..aa110c5 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -3,11 +3,6 @@ name: Deploy Docker Image on: workflow_dispatch: # Позволяет запускать вручную -env: - TARGET_DOMAINS: "muffin77.ru,git.muffin77.ru,cloud.muffin77.ru,mail.muffin77.ru,dev.muffin77.ru,google.com" - TARGET_PROTOCOL: "https" - TARGET_SSL_VERIFY: true - jobs: deploy: runs-on: small @@ -23,16 +18,25 @@ jobs: key: ${{ secrets.SSH_PRIVATE_KEY }} script: | echo "0" >> /tmp/test.log - sudo docker login -u ${{ secrets.GIT_USERNAME }} -p ${{ secrets.GIT_TOKEN }} ${{ vars.GIT_INSTANCE }} + sudo docker login -u $GIT_USERNAME -p $GIT_TOKEN $GIT_INSTANCE echo "1" >> /tmp/test.log - sudo docker pull ${{ vars.GIT_INSTANCE }}/mt77/monitor:latest + sudo docker pull $GIT_INSTANCE/mt77/monitor:latest sudo docker stop monitor || true sudo docker rm monitor || true sudo docker run -d --name monitor \ - -e BOT_TOKEN="${{ secret.BOT_TOKEN }}" \ - -e BOT_CHATID=${{ secret.BOT_CHATID }} \ - -e TARGET_DOMAINS="${{ env.TARGET_DOMAINS }}" \ - -e TARGET_PROTOCOL="${{ env.TARGET_PROTOCOL }}" \ - -e TARGET_SSL_VERIFY=${{ env.TARGET_SSL_VERIFY }} \ - ${{ vars.GIT_INSTANCE }}/mt77/monitor:latest - docker logout ${{ vars.GIT_INSTANCE }} \ No newline at end of file + -e BOT_TOKEN="$BOT_TOKEN" \ + -e BOT_CHATID=$BOT_CHATID \ + -e TARGET_DOMAINS="$TARGET_DOMAINS" \ + -e TARGET_PROTOCOL="$TARGET_PROTOCOL" \ + -e TARGET_SSL_VERIFY=$TARGET_SSL_VERIFY \ + $GIT_INSTANCE/mt77/monitor:latest + docker logout $GIT_INSTANCE + env: + GIT_INSTANCE: ${{ vars.GIT_INSTANCE }} + GIT_USERNAME: ${{ secret.GIT_USERNAME }} + GIT_TOKEN: ${{ secret.GIT_USERNAME }} + TARGET_DOMAINS: "muffin77.ru,git.muffin77.ru,cloud.muffin77.ru,mail.muffin77.ru,dev.muffin77.ru,google.com" + TARGET_PROTOCOL: "https" + TARGET_SSL_VERIFY: true + BOT_TOKEN: ${{ secret.BOT_TOKEN }} + BOT_CHATID: ${{ secret.BOT_CHATID }} \ No newline at end of file