Compare commits

..

5 Commits

Author SHA1 Message Date
00207786f9 improvement: workflow bypassed temporarily. 2026-05-05 16:29:44 +03:30
7dfff53c71 improvement: workflow bypassed temporarily. 2026-05-05 16:21:31 +03:30
517ce0d5ba improvement: workflow updated for git actions. 2026-05-05 00:33:30 +03:30
d03ecdfc7c Merge branch 'master' into improvement/infrastructure 2026-05-05 00:04:36 +03:30
f943b2c7be Merge pull request 'improvement: docker infrastructure overhauled.' (#10) from improvement/infrastructure into master
Some checks failed
Registry — build, push, deploy / build-and-push (push) Failing after 29s
Registry — build, push, deploy / deploy (push) Has been skipped
Reviewed-on: http://178.131.50.201:3000/admin/dyolink/pulls/10
2026-05-03 20:32:33 +03:30
2 changed files with 191 additions and 110 deletions

View File

@@ -9,16 +9,22 @@
# REGISTRY_USERNAME Gitea username for docker login
# REGISTRY_PASSWORD Gitea access token (packages:read/write) or account password
#
# HTTP registry (typical self-hosted Gitea): Docker defaults to HTTPS. If login/push fails with
# "server gave HTTP response to HTTPS client", add REGISTRY_HOST (e.g. 192.168.1.100:3000) to the
# Docker daemon "insecure-registries" on the RUNNER machine, then restart Docker (Docker Desktop
# → Settings → Docker Engine → JSON → "insecure-registries": ["host:port"]).
#
# Optional:
# STAGING_HTTP_PORT host port for nginx (default 8088)
#
# Required for deploy job (absolute path on the runner host — forward slashes ok on Windows):
# Required for deploy job (absolute path on the runner host):
# DEPLOY_SECRETS_DIR folder containing database.staging.env + backend.staging.env
#
# Runner: self-hosted with Docker; Git Bash recommended on Windows (shell: bash).
# Runner: self-hosted with Docker. Default shell is powershell (Windows act_runner often has no WSL bash).
# For a Linux runner, change defaults.run.shell to bash and restore bash syntax if needed.
#
# We do NOT use gitea.com/actions/checkout — many restricted networks cannot reach gitea.com.
# Checkout is a plain `git clone` from the same Gitea host (github.server_url / gitea alias).
# Checkout is a plain git clone from the same Gitea host.
name: Registry — build, push, deploy
@@ -29,118 +35,192 @@ on:
defaults:
run:
shell: bash
shell: powershell
jobs:
build-and-push:
runs-on: self-hosted
outputs:
image_tag: ${{ steps.meta.outputs.image_tag }}
steps:
- name: Checkout (clone from this Gitea — no gitea.com)
run: |
set -e
SERVER="${{ github.server_url }}"
SERVER="${SERVER%/}"
REPO="${{ github.repository }}"
BRANCH="${{ github.ref_name }}"
TOKEN="${{ github.token }}"
ACTOR="${{ github.actor }}"
HP="${SERVER#http://}"
HP="${HP#https://}"
if [[ "$SERVER" == https://* ]]; then
CLONE_URL="https://${ACTOR}:${TOKEN}@${HP}/${REPO}.git"
else
CLONE_URL="http://${ACTOR}:${TOKEN}@${HP}/${REPO}.git"
fi
GIT_TERMINAL_PROMPT=0 git clone --depth 1 --branch "$BRANCH" "$CLONE_URL" .
- name: Image tag and registry prefix
id: meta
run: |
echo "image_tag=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
echo "REGISTRY_PREFIX=${{ vars.REGISTRY_HOST }}/${{ vars.REGISTRY_OWNER }}" >> "$GITHUB_ENV"
- name: Log in to container registry
run: |
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login "${{ vars.REGISTRY_HOST }}" \
-u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
- name: Build and push backend
run: |
TAG="${{ steps.meta.outputs.image_tag }}"
docker build \
-t "${REGISTRY_PREFIX}/dyolink-backend:${TAG}" \
-t "${REGISTRY_PREFIX}/dyolink-backend:latest" \
./backend
docker push "${REGISTRY_PREFIX}/dyolink-backend:${TAG}"
docker push "${REGISTRY_PREFIX}/dyolink-backend:latest"
- name: Build and push frontend
env:
PUBLIC_BASE_URL: ${{ vars.PUBLIC_BASE_URL }}
run: |
TAG="${{ steps.meta.outputs.image_tag }}"
docker build \
--build-arg NEXT_PUBLIC_API_URL="${PUBLIC_BASE_URL}/api" \
--build-arg NEXT_PUBLIC_APP_URL="${PUBLIC_BASE_URL}" \
--build-arg NEXT_PUBLIC_APP_NAME="Dyolink" \
-t "${REGISTRY_PREFIX}/dyolink-frontend:${TAG}" \
-t "${REGISTRY_PREFIX}/dyolink-frontend:latest" \
./frontend
docker push "${REGISTRY_PREFIX}/dyolink-frontend:${TAG}"
docker push "${REGISTRY_PREFIX}/dyolink-frontend:latest"
deploy:
needs: build-and-push
temp-success:
runs-on: self-hosted
steps:
- name: Checkout (shallow clone from this Gitea — no gitea.com)
- name: Temporary placeholder (always success)
run: |
set -e
SERVER="${{ github.server_url }}"
SERVER="${SERVER%/}"
REPO="${{ github.repository }}"
BRANCH="${{ github.ref_name }}"
TOKEN="${{ github.token }}"
ACTOR="${{ github.actor }}"
HP="${SERVER#http://}"
HP="${HP#https://}"
if [[ "$SERVER" == https://* ]]; then
CLONE_URL="https://${ACTOR}:${TOKEN}@${HP}/${REPO}.git"
else
CLONE_URL="http://${ACTOR}:${TOKEN}@${HP}/${REPO}.git"
fi
GIT_TERMINAL_PROMPT=0 git clone --depth 1 --branch "$BRANCH" "$CLONE_URL" .
$ErrorActionPreference = 'Stop'
Write-Host "Temporary workflow is active."
Write-Host "Trigger: ${{ github.event_name }}"
Write-Host "Branch: ${{ github.ref_name }}"
Write-Host "Commit: ${{ github.sha }}"
Write-Host "Production build/push/deploy steps are intentionally commented."
exit 0
- name: Write deploy.registry.env and validate secrets path
run: |
SD='${{ vars.DEPLOY_SECRETS_DIR }}'
if [ -z "$SD" ]; then
echo "Set repository variable DEPLOY_SECRETS_DIR to the absolute path on this runner"
echo "where database.staging.env and backend.staging.env live (not in git)."
exit 1
fi
test -f "${SD}/database.staging.env" || { echo "Missing ${SD}/database.staging.env"; exit 1; }
test -f "${SD}/backend.staging.env" || { echo "Missing ${SD}/backend.staging.env"; exit 1; }
cd infrastructure
STAGING_PORT='${{ vars.STAGING_HTTP_PORT }}'
STAGING_PORT="${STAGING_PORT:-8088}"
{
echo "REGISTRY_PREFIX=${{ vars.REGISTRY_HOST }}/${{ vars.REGISTRY_OWNER }}"
echo "IMAGE_TAG=${{ needs.build-and-push.outputs.image_tag }}"
echo "STAGING_HTTP_PORT=${STAGING_PORT}"
echo "DEPLOY_SECRETS_DIR=${SD}"
} > deploy.registry.env
# ---------------------------------------------------------------------------
# Production pipeline is temporarily disabled.
# Uncomment these jobs after split-DNS / registry reachability is fixed.
# ---------------------------------------------------------------------------
#
# build-and-push:
# runs-on: self-hosted
# outputs:
# image_tag: ${{ steps.meta.outputs.image_tag }}
# steps:
# - name: Checkout (clone from this Gitea — no gitea.com)
# - name: Image tag and registry prefix
# - name: Log in to container registry
# - name: Build and push backend
# - name: Build and push frontend
#
# deploy:
# needs: build-and-push
# runs-on: self-hosted
# steps:
# - name: Checkout (shallow clone from this Gitea — no gitea.com)
# - name: Write deploy.registry.env and validate secrets path
# - name: Log in to container registry (for pull)
# - name: Pull and start stack
- name: Log in to container registry (for pull)
run: |
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login "${{ vars.REGISTRY_HOST }}" \
-u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
- name: Pull and start stack
run: |
set -e
cd infrastructure
docker compose -f docker-compose.registry.yml --env-file deploy.registry.env pull backend frontend
docker compose -f docker-compose.registry.yml --env-file deploy.registry.env up -d
####SAMPLE
# name: Registry — build, push, deploy
# on:
# push:
# branches: [main, master]
# workflow_dispatch:
# defaults:
# run:
# shell: powershell
# jobs:
# build-and-push:
# runs-on: self-hosted
# outputs:
# image_tag: ${{ steps.meta.outputs.image_tag }}
# steps:
# - name: Checkout (clone from this Gitea — no gitea.com)
# run: |
# $ErrorActionPreference = 'Stop'
# $Server = "${{ github.server_url }}".TrimEnd('/')
# $Repo = "${{ github.repository }}"
# $Branch = "${{ github.ref_name }}"
# $Token = "${{ github.token }}"
# $Actor = "${{ github.actor }}"
# $hp = $Server -replace '^https?://', ''
# if ($Server.StartsWith('https')) {
# $cloneUrl = 'https://' + $Actor + ':' + $Token + '@' + $hp + '/' + $Repo + '.git'
# } else {
# $cloneUrl = 'http://' + $Actor + ':' + $Token + '@' + $hp + '/' + $Repo + '.git'
# }
# $env:GIT_TERMINAL_PROMPT = '0'
# git clone --depth 1 --branch $Branch $cloneUrl .
# - name: Image tag and registry prefix
# id: meta
# run: |
# $ErrorActionPreference = 'Stop'
# $short = (git rev-parse --short HEAD).Trim()
# $utf8 = New-Object System.Text.UTF8Encoding $false
# [System.IO.File]::AppendAllText($env:GITHUB_OUTPUT, "image_tag=$short`n", $utf8)
# $prefix = "${{ vars.REGISTRY_HOST }}/${{ vars.REGISTRY_OWNER }}"
# [System.IO.File]::AppendAllText($env:GITHUB_ENV, "REGISTRY_PREFIX=$prefix`n", $utf8)
# - name: Log in to container registry
# run: |
# $ErrorActionPreference = 'Stop'
# $pass = @'
# ${{ secrets.REGISTRY_PASSWORD }}
# '@
# $pass.Trim() | docker login "${{ vars.REGISTRY_HOST }}" -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
# - name: Build and push backend
# run: |
# $ErrorActionPreference = 'Stop'
# $tag = "${{ steps.meta.outputs.image_tag }}"
# docker build `
# -t "$env:REGISTRY_PREFIX/dyolink-backend:$tag" `
# -t "$env:REGISTRY_PREFIX/dyolink-backend:latest" `
# ./backend
# docker push "$env:REGISTRY_PREFIX/dyolink-backend:$tag"
# docker push "$env:REGISTRY_PREFIX/dyolink-backend:latest"
# - name: Build and push frontend
# env:
# PUBLIC_BASE_URL: ${{ vars.PUBLIC_BASE_URL }}
# run: |
# $ErrorActionPreference = 'Stop'
# $tag = "${{ steps.meta.outputs.image_tag }}"
# $base = $env:PUBLIC_BASE_URL
# docker build `
# --build-arg "NEXT_PUBLIC_API_URL=$base/api" `
# --build-arg "NEXT_PUBLIC_APP_URL=$base" `
# --build-arg "NEXT_PUBLIC_APP_NAME=Dyolink" `
# -t "$env:REGISTRY_PREFIX/dyolink-frontend:$tag" `
# -t "$env:REGISTRY_PREFIX/dyolink-frontend:latest" `
# ./frontend
# docker push "$env:REGISTRY_PREFIX/dyolink-frontend:$tag"
# docker push "$env:REGISTRY_PREFIX/dyolink-frontend:latest"
# deploy:
# needs: build-and-push
# runs-on: self-hosted
# steps:
# - name: Checkout (shallow clone from this Gitea — no gitea.com)
# run: |
# $ErrorActionPreference = 'Stop'
# $Server = "${{ github.server_url }}".TrimEnd('/')
# $Repo = "${{ github.repository }}"
# $Branch = "${{ github.ref_name }}"
# $Token = "${{ github.token }}"
# $Actor = "${{ github.actor }}"
# $hp = $Server -replace '^https?://', ''
# if ($Server.StartsWith('https')) {
# $cloneUrl = 'https://' + $Actor + ':' + $Token + '@' + $hp + '/' + $Repo + '.git'
# } else {
# $cloneUrl = 'http://' + $Actor + ':' + $Token + '@' + $hp + '/' + $Repo + '.git'
# }
# $env:GIT_TERMINAL_PROMPT = '0'
# git clone --depth 1 --branch $Branch $cloneUrl .
# - name: Write deploy.registry.env and validate secrets path
# run: |
# $ErrorActionPreference = 'Stop'
# $SD = '${{ vars.DEPLOY_SECRETS_DIR }}'.Trim()
# if ([string]::IsNullOrWhiteSpace($SD)) {
# Write-Host "Set repository variable DEPLOY_SECRETS_DIR to the absolute path on this runner"
# Write-Host "where database.staging.env and backend.staging.env live (not in git)."
# exit 1
# }
# if (-not (Test-Path (Join-Path $SD "database.staging.env"))) {
# Write-Host "Missing $(Join-Path $SD 'database.staging.env')"
# exit 1
# }
# if (-not (Test-Path (Join-Path $SD "backend.staging.env"))) {
# Write-Host "Missing $(Join-Path $SD 'backend.staging.env')"
# exit 1
# }
# $stagingPort = '${{ vars.STAGING_HTTP_PORT }}'.Trim()
# if ([string]::IsNullOrWhiteSpace($stagingPort)) { $stagingPort = '8088' }
# $imageTag = "${{ needs.build-and-push.outputs.image_tag }}"
# $lines = @(
# "REGISTRY_PREFIX=${{ vars.REGISTRY_HOST }}/${{ vars.REGISTRY_OWNER }}",
# "IMAGE_TAG=$imageTag",
# "STAGING_HTTP_PORT=$stagingPort",
# "DEPLOY_SECRETS_DIR=$SD"
# )
# Set-Location infrastructure
# $lines | Set-Content -Path deploy.registry.env -Encoding utf8
# - name: Log in to container registry (for pull)
# run: |
# $ErrorActionPreference = 'Stop'
# $pass = @'
# ${{ secrets.REGISTRY_PASSWORD }}
# '@
# $pass.Trim() | docker login "${{ vars.REGISTRY_HOST }}" -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
# - name: Pull and start stack
# run: |
# $ErrorActionPreference = 'Stop'
# Set-Location infrastructure
# docker compose -f docker-compose.registry.yml --env-file deploy.registry.env pull backend frontend
# docker compose -f docker-compose.registry.yml --env-file deploy.registry.env up -d

View File

@@ -86,6 +86,7 @@ Workflow file: **`.gitea/workflows/registry-build-deploy.yml`**.
- **Gitea Actions** enabled for the repository.
- A **self-hosted runner** (with Docker) registered to Gitea — the workflow uses `runs-on: self-hosted`.
- **Windows runners:** the workflow uses **PowerShell** (not Bash). Giteas runner was failing with `execvpe(/bin/bash) failed` when Bash was routed through WSL without a real `/bin/bash`. If your runner is **Linux**, switch `.gitea/workflows/registry-build-deploy.yml` to `defaults.run.shell: bash` and use Bash syntax instead.
- **Repository → Actions → Variables** (examples):
- `REGISTRY_HOST` — e.g. `178.131.50.201:3000`