Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/functional.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ jobs:
- name: Make binary executable
run: chmod +x bin/orchestrator

- name: Build orchestrator runtime image
working-directory: tests/functional
run: docker build -t orchestrator-runtime:latest -f orchestrator-runtime.Dockerfile .

- name: Start test infrastructure (MySQL + ProxySQL)
working-directory: tests/functional
env:
Expand Down Expand Up @@ -186,6 +190,10 @@ jobs:
- name: Make binary executable
run: chmod +x bin/orchestrator

- name: Build orchestrator runtime image
working-directory: tests/functional
run: docker build -t orchestrator-runtime:latest -f orchestrator-runtime.Dockerfile .

- name: Start PostgreSQL containers
working-directory: tests/functional
env:
Expand Down Expand Up @@ -307,6 +315,10 @@ jobs:
- name: Make binary executable
run: chmod +x bin/orchestrator

- name: Build orchestrator runtime image
working-directory: tests/functional
run: docker build -t orchestrator-runtime:latest -f orchestrator-runtime.Dockerfile .

- name: Start MySQL infrastructure
working-directory: tests/functional
run: |
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ jobs:
path: bin/orchestrator

lint:
# only-new-issues needs a PR base; on push/schedule every pre-existing issue
# is reported as "new", so only run where the diff-vs-base comparison works.
if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'

runs-on: ubuntu-latest

Expand Down
15 changes: 5 additions & 10 deletions tests/functional/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,14 @@ services:
- pgstandby1

orchestrator:
image: ubuntu:24.04
image: orchestrator-runtime:latest
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

To improve the local development experience, consider adding a build section to the orchestrator service. This allows docker-compose up to automatically build the orchestrator-runtime image using the provided Dockerfile if it doesn't exist locally, rather than failing with an image not found error. Since other services in this file share the same image name, defining the build context once here is sufficient for a full stack startup.

    build:
      context: .
      dockerfile: orchestrator-runtime.Dockerfile
    image: orchestrator-runtime:latest

hostname: orchestrator
volumes:
- ../../bin/orchestrator:/usr/local/bin/orchestrator:ro
- ../../resources:/orchestrator/resources:ro
- ./orchestrator-test.conf.json:/orchestrator/orchestrator.conf.json:ro
command: >
bash -c "
apt-get update -qq && apt-get install -y -qq curl sqlite3 > /dev/null 2>&1 &&
rm -f /tmp/orchestrator-test.sqlite3 &&
cd /orchestrator &&
orchestrator -config orchestrator.conf.json http
Expand All @@ -175,15 +174,14 @@ services:
- orchestrator

orchestrator-pg:
image: ubuntu:24.04
image: orchestrator-runtime:latest
hostname: orchestrator-pg
volumes:
- ../../bin/orchestrator:/usr/local/bin/orchestrator:ro
- ../../resources:/orchestrator/resources:ro
- ./orchestrator-pg-test.conf.json:/orchestrator/orchestrator.conf.json:ro
command: >
bash -c "
apt-get update -qq && apt-get install -y -qq curl sqlite3 > /dev/null 2>&1 &&
rm -f /tmp/orchestrator-pg-test.sqlite3 &&
cd /orchestrator &&
orchestrator -config orchestrator.conf.json http
Expand All @@ -206,15 +204,14 @@ services:
- orchestrator-pg

orchestrator-raft1:
image: ubuntu:24.04
image: orchestrator-runtime:latest
hostname: orchestrator-raft1
volumes:
- ../../bin/orchestrator:/usr/local/bin/orchestrator:ro
- ../../resources:/orchestrator/resources:ro
- ./orchestrator-raft1.conf.json:/orchestrator/orchestrator.conf.json:ro
command: >
bash -c "
apt-get update -qq && apt-get install -y -qq curl sqlite3 > /dev/null 2>&1 &&
mkdir -p /tmp/raft1 &&
cd /orchestrator &&
orchestrator -config orchestrator.conf.json http
Expand All @@ -231,15 +228,14 @@ services:
- orchestrator-raft1

orchestrator-raft2:
image: ubuntu:24.04
image: orchestrator-runtime:latest
hostname: orchestrator-raft2
volumes:
- ../../bin/orchestrator:/usr/local/bin/orchestrator:ro
- ../../resources:/orchestrator/resources:ro
- ./orchestrator-raft2.conf.json:/orchestrator/orchestrator.conf.json:ro
command: >
bash -c "
apt-get update -qq && apt-get install -y -qq curl sqlite3 > /dev/null 2>&1 &&
mkdir -p /tmp/raft2 &&
cd /orchestrator &&
orchestrator -config orchestrator.conf.json http
Expand All @@ -256,15 +252,14 @@ services:
- orchestrator-raft2

orchestrator-raft3:
image: ubuntu:24.04
image: orchestrator-runtime:latest
hostname: orchestrator-raft3
volumes:
- ../../bin/orchestrator:/usr/local/bin/orchestrator:ro
- ../../resources:/orchestrator/resources:ro
- ./orchestrator-raft3.conf.json:/orchestrator/orchestrator.conf.json:ro
command: >
bash -c "
apt-get update -qq && apt-get install -y -qq curl sqlite3 > /dev/null 2>&1 &&
mkdir -p /tmp/raft3 &&
cd /orchestrator &&
orchestrator -config orchestrator.conf.json http
Expand Down
5 changes: 5 additions & 0 deletions tests/functional/orchestrator-runtime.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM ubuntu:24.04

RUN apt-get update \
&& apt-get install -y --no-install-recommends curl sqlite3 ca-certificates \
&& rm -rf /var/lib/apt/lists/*
Loading