diff --git a/.gitea/workflows/deployProd.yml b/.gitea/workflows/deployProd.yml index 4acdeb8..0abb78b 100644 --- a/.gitea/workflows/deployProd.yml +++ b/.gitea/workflows/deployProd.yml @@ -2,25 +2,29 @@ name: Deploy run-name: ${{ gitea.actor }} build image and push to container registry on: - push: - branches: - - 'main' + registry_package: + types: [published] + #package_name: "gitea.pena/squiz/frontanswerer/main:latest" jobs: - CreateImage: - runs-on: [skeris] - uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.6-p - with: - runner: skeris - secrets: - REGISTRY_USER: ${{ secrets.REGISTRY_USER }} - REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} + # CreateImage: + # runs-on: [skeris] + # uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.6-p + # with: + # runner: skeris + # secrets: + # REGISTRY_USER: ${{ secrets.REGISTRY_USER }} + # REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} DeployService: + if: contains(github.event.package.name, 'main') runs-on: [frontprod] - #needs: CreateImage - uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7 - with: - runner: frontprod - actionid: ${{ gitea.run_id }} - - + container: + image: gitea.pena/penadevops/container-images/node-compose:main + env: + GITHUB_RUN_NUMBER: "${{ inputs.actionid }}" + volumes: + - /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock + steps: + - name: Check out repository code + uses: http://gitea.pena/PenaDevops/actions.git/checkout@v1 + - run: compose -f deployments/main/docker-compose.yaml up -d diff --git a/deployments/main/docker-compose.yaml b/deployments/main/docker-compose.yaml index 228ad07..1b89e3a 100644 --- a/deployments/main/docker-compose.yaml +++ b/deployments/main/docker-compose.yaml @@ -1,9 +1,10 @@ services: admin_front: restart: unless-stopped - image: gitea.pena/penaside/adminfront/main:1102 + image: gitea.pena/penaside/adminfront/main:latest hostname: admin ports: - 10.8.0.131:80:80 - 10.8.0.131:443:443 tty: true + pull_policy: always