From 17bd5cd53f7e1aaf30f0b41ee80819b8ce7213af Mon Sep 17 00:00:00 2001 From: skeris Date: Sat, 26 Jul 2025 17:20:58 +0300 Subject: [PATCH] ci: debug on pacjage deploy --- .gitea/workflows/deployProd.yml | 3 ++- .gitea/workflows/deployStaging.yml | 22 +++++++++++----------- deployments/main/docker-compose.yaml | 3 ++- package.json | 2 +- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/deployProd.yml b/.gitea/workflows/deployProd.yml index d9d99cd..a48e4c1 100644 --- a/.gitea/workflows/deployProd.yml +++ b/.gitea/workflows/deployProd.yml @@ -4,7 +4,7 @@ run-name: ${{ gitea.actor }} build image and push to container registry on: registry_package: types: [published] - package_name: "squiz/frontanswerer/main" + #package_name: "gitea.pena/squiz/frontanswerer/main:latest" jobs: # CreateImage: @@ -17,6 +17,7 @@ jobs: # REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} DeployService: runs-on: [frontprod] + if: contains(github.event.package.name, 'main') # needs: CreateImage uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7 with: diff --git a/.gitea/workflows/deployStaging.yml b/.gitea/workflows/deployStaging.yml index eb82c9a..8451c73 100644 --- a/.gitea/workflows/deployStaging.yml +++ b/.gitea/workflows/deployStaging.yml @@ -2,20 +2,20 @@ name: Deploy run-name: ${{ gitea.actor }} build image and push to container registry on: - push: - branches: - - "staging" + registry_package: + types: [published] jobs: - CreateImage: - runs-on: [skeris] - uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.6-p - with: - runner: hubstaging - secrets: - REGISTRY_USER: ${{ secrets.REGISTRY_USER }} - REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} + # CreateImage: + # runs-on: [skeris] + # uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.6-p + # with: + # runner: hubstaging + # secrets: + # REGISTRY_USER: ${{ secrets.REGISTRY_USER }} + # REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} DeployService: + if: contains(github.event.package.name, 'staging') runs-on: [frontstaging] needs: CreateImage uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7 diff --git a/deployments/main/docker-compose.yaml b/deployments/main/docker-compose.yaml index d7a0ed4..c168306 100644 --- a/deployments/main/docker-compose.yaml +++ b/deployments/main/docker-compose.yaml @@ -2,6 +2,7 @@ services: respondent: container_name: respondent restart: unless-stopped - image: gitea.pena/squiz/frontanswerer/main:202507260140 + image: gitea.pena/squiz/frontanswerer/main:latest hostname: respondent tty: true + pull_policy: always diff --git a/package.json b/package.json index 5960217..a36d76b 100755 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "preview": "vite preview", "cypress:open": "cypress open", "prepublishOnly": "npm run build:package", - "deploy": "docker login gitea.pena && docker build -t gitea.pena/squiz/frontanswerer/$(git branch --show-current):202507260140 . && docker push gitea.pena/squiz/frontanswerer/$(git branch --show-current):202507260140", + "deploy": "podman login gitea.pena && podman build -t gitea.pena/squiz/frontanswerer/$(git branch --show-current):latest . && podman push gitea.pena/squiz/frontanswerer/$(git branch --show-current):latest", "prepare": "husky" }, "devDependencies": {