diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index 2019358..237d128 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -56,9 +56,9 @@ jobs: working-directory: wordpdf-web run: npm run lint - images: + images-app: runs-on: ubuntu-latest - needs: [java, web] + needs: java steps: - uses: actions/checkout@v5 @@ -95,6 +95,33 @@ jobs: docker push "$REGISTRY/wordpdf-app:prod" 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 env: REGISTRY: ${{ vars.REGISTRY }} @@ -110,7 +137,7 @@ jobs: deploy: runs-on: ubuntu-latest - needs: images + needs: [images-app, images-web] env: DEPLOY_HOST: ${{ vars.DEPLOY_HOST }} DEPLOY_USER: ${{ vars.DEPLOY_USER }}