Skip to content
Open
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
11 changes: 8 additions & 3 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Integration Test
run-name: "Integration Test (${{ inputs.fmsgd_ref }})"

on:
push:
branches: [main]
pull_request:
branches: [main]
workflow_dispatch:
Expand All @@ -23,16 +25,19 @@ on:
required: false
default: 'main'

permissions:
contents: read

jobs:
integration-test:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v7

- uses: actions/setup-go@v5
- uses: actions/setup-go@v7
with:
go-version: "stable"
go-version: "1.27.x"

- name: Select component refs
id: refs
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[![Integration Test](https://github.com/markmnl/fmsg-docker/actions/workflows/integration-test.yml/badge.svg)](https://github.com/markmnl/fmsg-docker/actions/workflows/integration-test.yml)
[![Integration Test](https://github.com/markmnl/fmsg-docker/actions/workflows/integration-test.yml/badge.svg?branch=main)](https://github.com/markmnl/fmsg-docker/actions/workflows/integration-test.yml?query=branch%3Amain)
[![Go 1.27+](https://img.shields.io/badge/Go-1.27%2B-00ADD8?logo=go&logoColor=white)](https://go.dev/dl/)

# fmsg-docker

Expand Down Expand Up @@ -137,7 +138,7 @@ The compose stack uses Docker named volumes:

End-to-end tests that spin up two full stacks (`hairpin.local` and `example.com`) on a shared Docker network and exchange messages between them using [fmsg-cli](https://github.com/markmnl/fmsg-cli). Test 008 drives [fmsg-mcp-claude](https://github.com/markmnl/fmsg-mcp-claude) over stdio and test 014 drives [fmsg-mcp](https://github.com/markmnl/fmsg-mcp) over Streamable HTTP (`FMSG_MCP_NPM_SPEC` picks the version, default `@markmnl/fmsg-mcp@latest`). The test runner enables fmsg-webapi API-key auth, creates delegated API keys for the test actors during setup, and passes them to fmsg-cli with `FMSG_API_KEY`.

**Prerequisites:** Docker, docker compose, Go 1.24+, curl, jq, Node.js 22+ (test 014 runs the published `@markmnl/fmsg-mcp` with `npx`).
**Prerequisites:** Docker, docker compose, Go 1.27+, curl, jq, Node.js 22+ (test 014 runs the published `@markmnl/fmsg-mcp` with `npx`).

```bash
# Run tests (starts stacks fresh)
Expand Down
2 changes: 1 addition & 1 deletion docker/fmsg-webapi/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.25 AS builder
FROM golang:1.27 AS builder

ARG FMSG_WEBAPI_REF=main
ARG CACHEBUST
Expand Down
2 changes: 1 addition & 1 deletion docker/fmsgd/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.25 AS builder
FROM golang:1.27 AS builder

ARG FMSGD_REF=main
ARG CACHEBUST
Expand Down
2 changes: 1 addition & 1 deletion docker/fmsgid/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.25 AS builder
FROM golang:1.27 AS builder

ARG FMSGID_REF=main
ARG CACHEBUST
Expand Down
8 changes: 4 additions & 4 deletions test/run-tests-podman.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# =============================================================
# Run the fmsg integration tests using podman instead of docker.
#
# Prerequisites: podman, podman-compose (or docker-compose) go (1.24+), curl
# Prerequisites: podman, podman-compose (or docker-compose) go (1.27+), curl
#
# This shims a `docker` executable onto PATH that execs podman, then
# delegates straight to run-tests.sh so the two runners stay in sync.
Expand All @@ -29,8 +29,8 @@
# podman-compose also names containers "<project>_<service>_<index>"
# (underscores) whereas docker compose v2 names them
# "<project>-<service>-<index>" (hyphens). run-tests.sh hardcodes the
# docker-compose-v2-style names for `docker exec` targets, so the shim
# rewrites those to podman-compose's naming for that subcommand only.
# docker-compose-v2-style names for `docker exec` and `docker logs` targets,
# so the shim rewrites those to podman-compose's naming for both subcommands.
#
# Usage: same as run-tests.sh, e.g.
# ./test/run-tests-podman.sh
Expand Down Expand Up @@ -117,7 +117,7 @@ cat > "$SHIM_DIR/docker" <<EOF
set -euo pipefail

args=("\$@")
if [ "\${1:-}" = "exec" ]; then
if [ "\${1:-}" = "exec" ] || [ "\${1:-}" = "logs" ]; then
for i in "\${!args[@]}"; do
if [[ "\${args[\$i]}" != -* ]] && [ "\$i" != "0" ]; then
name="\${args[\$i]}"
Expand Down
4 changes: 2 additions & 2 deletions test/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# =============================================================
# Run the fmsg integration tests.
#
# Prerequisites: docker, docker compose, go (1.24+), curl
# Prerequisites: docker, docker compose, go (1.27+), curl
#
# Usage:
# ./test/run-tests.sh # run tests (start stacks fresh)
Expand Down Expand Up @@ -252,7 +252,7 @@ if [ "$SKIP_START" != "true" ]; then
echo "==> Ensuring public base images are available..."
# Fully-qualified names: podman's short-name resolution wants a TTY prompt
# when an alias is missing, which kills non-interactive runs.
for image in docker.io/library/debian:bookworm-slim docker.io/library/golang:1.25 docker.io/library/postgres:18-alpine docker.io/certbot/certbot:latest; do
for image in docker.io/library/debian:bookworm-slim docker.io/library/golang:1.27 docker.io/library/postgres:18-alpine docker.io/certbot/certbot:latest; do
if ! docker image inspect "$image" >/dev/null 2>&1; then
docker pull "$image"
fi
Expand Down
Loading