From f13df84fec3e909e9c5d86b705bdd9fd83369df3 Mon Sep 17 00:00:00 2001 From: skeris Date: Tue, 29 Jul 2025 18:26:07 +0300 Subject: [PATCH] ci: workaround branch error on registry deploy --- .gitea/workflows/deployStaging.yml | 15 ++++++++++----- deployments/staging/docker-compose.yaml | 5 +---- package.json | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/deployStaging.yml b/.gitea/workflows/deployStaging.yml index 2c944a6..5ef395b 100644 --- a/.gitea/workflows/deployStaging.yml +++ b/.gitea/workflows/deployStaging.yml @@ -17,8 +17,13 @@ jobs: 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 - with: - runner: frontstaging - actionid: ${{ gitea.run_id }} + container: + image: gitea.pena:3000/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:3000/PenaDevops/actions.git/checkout@v1 + - run: compose -f deployments/staging/docker-compose.yaml up -d diff --git a/deployments/staging/docker-compose.yaml b/deployments/staging/docker-compose.yaml index de6f8a3..d3c9ac5 100644 --- a/deployments/staging/docker-compose.yaml +++ b/deployments/staging/docker-compose.yaml @@ -2,9 +2,6 @@ services: respondent: container_name: respondent restart: unless-stopped - labels: - com.pena.domains: s.hbpn.link - com.pena.front_headers: "Access-Control-Allow-Origin $$http_origin always" - image: gitea.pena:3000/squiz/frontanswerer/staging:$GITHUB_RUN_NUMBER + image: gitea.pena/squiz/frontanswerer/staging:latest hostname: respondent tty: true diff --git a/package.json b/package.json index 1a8f25f..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):latest . && docker push gitea.pena/squiz/frontanswerer/$(git branch --show-current):latest", + "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": {