Merge branch 'main' of gitea.pena:SQuiz/frontAnswerer

This commit is contained in:
Nastya 2025-07-29 00:18:46 +03:00
commit c8ebf9cff0
4 changed files with 16 additions and 14 deletions

@ -4,7 +4,7 @@ run-name: ${{ gitea.actor }} build image and push to container registry
on: on:
registry_package: registry_package:
types: [published] types: [published]
package_name: "squiz/frontanswerer/main" #package_name: "gitea.pena/squiz/frontanswerer/main:latest"
jobs: jobs:
# CreateImage: # CreateImage:
@ -17,6 +17,7 @@ jobs:
# REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} # REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
DeployService: DeployService:
runs-on: [frontprod] runs-on: [frontprod]
if: contains(github.event.package.name, 'main')
# needs: CreateImage # needs: CreateImage
uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7 uses: https://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7
with: with:

@ -2,20 +2,20 @@ name: Deploy
run-name: ${{ gitea.actor }} build image and push to container registry run-name: ${{ gitea.actor }} build image and push to container registry
on: on:
push: registry_package:
branches: types: [published]
- "staging"
jobs: jobs:
CreateImage: # CreateImage:
runs-on: [skeris] # runs-on: [skeris]
uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.6-p # uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/build-image.yml@v1.1.6-p
with: # with:
runner: hubstaging # runner: hubstaging
secrets: # secrets:
REGISTRY_USER: ${{ secrets.REGISTRY_USER }} # REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} # REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
DeployService: DeployService:
if: contains(github.event.package.name, 'staging')
runs-on: [frontstaging] runs-on: [frontstaging]
needs: CreateImage needs: CreateImage
uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7 uses: http://gitea.pena/PenaDevops/actions.git/.gitea/workflows/deploy.yml@v1.1.4-p7

@ -2,6 +2,7 @@ services:
respondent: respondent:
container_name: respondent container_name: respondent
restart: unless-stopped restart: unless-stopped
image: gitea.pena/squiz/frontanswerer/main:202507260140 image: gitea.pena/squiz/frontanswerer/main:latest
hostname: respondent hostname: respondent
tty: true tty: true
pull_policy: always

@ -26,7 +26,7 @@
"preview": "vite preview", "preview": "vite preview",
"cypress:open": "cypress open", "cypress:open": "cypress open",
"prepublishOnly": "npm run build:package", "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" "prepare": "husky"
}, },
"devDependencies": { "devDependencies": {