diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 1e6567b..1be8951 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -4,38 +4,34 @@ on: push: branches: [main] -env: - IMAGE: gea.i80.dk/hjess/citti - jobs: deploy: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Login to Gitea registry - run: | - echo "${{ secrets.GITEA_TOKEN }}" | \ - docker login gea.i80.dk -u ${{ github.actor }} --password-stdin + - name: Login to registry + run: echo "${{ secrets.GITEA_TOKEN }}" | docker login gea.i80.dk -u hjess --password-stdin - - name: Build & push image + - name: Build & push run: | docker build \ - -t ${{ env.IMAGE }}:latest \ - -t ${{ env.IMAGE }}:${{ github.sha }} . - docker push ${{ env.IMAGE }}:latest - docker push ${{ env.IMAGE }}:${{ github.sha }} + -t gea.i80.dk/hjess/citti:latest \ + -t gea.i80.dk/hjess/citti:${{ gitea.sha }} . + docker push gea.i80.dk/hjess/citti:latest + docker push gea.i80.dk/hjess/citti:${{ gitea.sha }} - name: Deploy to Nomad env: NOMAD_ADDR: ${{ secrets.NOMAD_ADDR }} NOMAD_TOKEN: ${{ secrets.NOMAD_TOKEN }} run: | - JOB_JSON=$(curl -sf "${NOMAD_ADDR}/v1/jobs/parse" \ + job_hcl=$(jq -Rs . < citti.nomad) + job_json=$(curl -sf "${NOMAD_ADDR}/v1/jobs/parse" \ -H "Content-Type: application/json" \ - -d "{\"JobHCL\": $(jq -Rs . < citti.nomad)}") + -d "{\"JobHCL\": ${job_hcl}}") curl -sf -X POST "${NOMAD_ADDR}/v1/jobs" \ -H "X-Nomad-Token: ${NOMAD_TOKEN}" \ -H "Content-Type: application/json" \ - -d "{\"Job\": ${JOB_JSON}}" - echo "✓ Deployed" + -d "{\"Job\": ${job_json}}" + echo "Deployed ${{ gitea.sha }}"