Use the system Docker socket in backend CI (#321)
## Summary - Keep untrusted PRs on ephemeral Ubuntu runners and trusted pushes on the local backend pool. - Force Docker-dependent jobs to the working system socket instead of the unavailable default rootless context. - Preserve the fail-closed Docker access check and never chmod the socket. ## Evidence - Exact master run 29942048689 failed before tests because plain Docker commands resolved to `/run/user/1000/docker.sock`. - Backend listener processes already have docker-group membership; `/var/run/docker.sock` is root:docker 0660. - `DOCKER_HOST=unix:///var/run/docker.sock docker version` succeeds locally with server 29.3.1. - Workflow YAML parse and `git diff --check` pass. Exact-master Required CI and Release Manager gate success remain mandatory after merge.
This commit is contained in:
@@ -19,14 +19,14 @@ concurrency:
|
|||||||
jobs:
|
jobs:
|
||||||
php:
|
php:
|
||||||
name: PHP ${{ matrix.suite }} (required)
|
name: PHP ${{ matrix.suite }} (required)
|
||||||
# Pull requests are untrusted and must use an ephemeral GitHub-hosted runner.
|
# Pull requests are untrusted and use ephemeral runners; trusted pushes use the local pool.
|
||||||
# Trusted branch pushes may use the local backend pool for throughput.
|
|
||||||
runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-24.04' || 'backend' }}
|
runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-24.04' || 'backend' }}
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
suite: [unit, integration, api, legacy]
|
suite: [unit, integration, api, legacy]
|
||||||
env:
|
env:
|
||||||
|
DOCKER_HOST: unix:///var/run/docker.sock
|
||||||
COMPOSE_PROJECT_NAME: php-${{ github.run_id }}-${{ github.job }}-${{ matrix.suite }}-${{ github.run_attempt }}
|
COMPOSE_PROJECT_NAME: php-${{ github.run_id }}-${{ github.job }}-${{ matrix.suite }}-${{ github.run_attempt }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
@@ -116,6 +116,8 @@ jobs:
|
|||||||
edge-broker:
|
edge-broker:
|
||||||
name: Edge Broker (required)
|
name: Edge Broker (required)
|
||||||
runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-24.04' || 'backend' }}
|
runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-24.04' || 'backend' }}
|
||||||
|
env:
|
||||||
|
DOCKER_HOST: unix:///var/run/docker.sock
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
@@ -159,6 +161,7 @@ jobs:
|
|||||||
name: Edge Gateway Backend (required)
|
name: Edge Gateway Backend (required)
|
||||||
runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-24.04' || 'backend' }}
|
runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-24.04' || 'backend' }}
|
||||||
env:
|
env:
|
||||||
|
DOCKER_HOST: unix:///var/run/docker.sock
|
||||||
COMPOSE_FILE: docker-compose.yml:.github/docker-compose.ci.yml
|
COMPOSE_FILE: docker-compose.yml:.github/docker-compose.ci.yml
|
||||||
COMPOSE_PROJECT_NAME: edge-gateway-backend-${{ github.run_id }}-${{ github.run_attempt }}
|
COMPOSE_PROJECT_NAME: edge-gateway-backend-${{ github.run_id }}-${{ github.run_attempt }}
|
||||||
COMPOSE_PROFILES: dev
|
COMPOSE_PROFILES: dev
|
||||||
|
|||||||
Reference in New Issue
Block a user