Merge pull request 'CI: параллельная сборка образов — job images разбит на images-app и images-web' (#31) from split-images-jobs into main
Main: tests, deploy, autotests / java (push) Successful in 1m10s
Main: tests, deploy, autotests / web (push) Successful in 53s
Main: tests, deploy, autotests / images-web (push) Successful in 30s
Main: tests, deploy, autotests / images-app (push) Successful in 4m15s
Main: tests, deploy, autotests / deploy (push) Successful in 1m57s
Main: tests, deploy, autotests / autotests (push) Successful in 1m9s
Main: tests, deploy, autotests / rollback (push) Has been skipped

Reviewed-on: #31
This commit was merged in pull request #31.
This commit is contained in:
2026-10-22 21:06:39 +03:00
+30 -3
View File
@@ -56,9 +56,9 @@ jobs:
working-directory: wordpdf-web working-directory: wordpdf-web
run: npm run lint run: npm run lint
images: images-app:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: [java, web] needs: java
steps: steps:
- uses: actions/checkout@v5 - uses: actions/checkout@v5
@@ -95,6 +95,33 @@ jobs:
docker push "$REGISTRY/wordpdf-app:prod" docker push "$REGISTRY/wordpdf-app:prod"
docker push "$REGISTRY/wordpdf-app:sha-$sha" docker push "$REGISTRY/wordpdf-app:sha-$sha"
images-web:
runs-on: ubuntu-latest
needs: web
steps:
- uses: actions/checkout@v5
- name: Check registry vars and secret
env:
REGISTRY: ${{ vars.REGISTRY }}
REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
run: |
[ -n "$REGISTRY" ] && [ -n "$REGISTRY_USER" ] && [ -n "$REGISTRY_PASSWORD" ] || {
echo "Задайте Actions Variable REGISTRY и Secrets REGISTRY_USER/REGISTRY_PASSWORD — см. GITEA-vars.md" >&2
exit 1
}
- name: Docker auth
env:
REGISTRY: ${{ vars.REGISTRY }}
REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
run: |
mkdir -p ~/.docker
printf '{"auths":{"%s":{"auth":"%s"}}}' "$REGISTRY" \
"$(printf '%s:%s' "$REGISTRY_USER" "$REGISTRY_PASSWORD" | base64 -w0)" > ~/.docker/config.json
- name: Build and push web image - name: Build and push web image
env: env:
REGISTRY: ${{ vars.REGISTRY }} REGISTRY: ${{ vars.REGISTRY }}
@@ -110,7 +137,7 @@ jobs:
deploy: deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: images needs: [images-app, images-web]
env: env:
DEPLOY_HOST: ${{ vars.DEPLOY_HOST }} DEPLOY_HOST: ${{ vars.DEPLOY_HOST }}
DEPLOY_USER: ${{ vars.DEPLOY_USER }} DEPLOY_USER: ${{ vars.DEPLOY_USER }}