From 820998d78f3758ce76be627c89d8ab8745df77cf Mon Sep 17 00:00:00 2001 From: Phillip Moore Date: Thu, 5 Mar 2026 13:53:21 -0500 Subject: [PATCH] =?UTF-8?q?chore:=20container-first=20validation=20?= =?UTF-8?q?=E2=80=94=20remove=20fallback=20docker=20run=20blocks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove fallback docker run blocks from dev scripts. Require docker-test on PATH. Closes #252 Co-Authored-By: Claude Opus 4.6 --- scripts/dev/audit.sh | 20 +++++--------------- scripts/dev/lint.sh | 20 +++++--------------- scripts/dev/test.sh | 20 +++++--------------- scripts/dev/typecheck.sh | 20 +++++--------------- 4 files changed, 20 insertions(+), 60 deletions(-) diff --git a/scripts/dev/audit.sh b/scripts/dev/audit.sh index 557c0da..dff89f3 100755 --- a/scripts/dev/audit.sh +++ b/scripts/dev/audit.sh @@ -4,19 +4,9 @@ set -euo pipefail export DOCKER_DEV_IMAGE="${DOCKER_DEV_IMAGE:-dev-java:21}" export DOCKER_TEST_CMD="${DOCKER_TEST_CMD:-./mvnw dependency:tree -B -q && ./mvnw org.codehaus.mojo:license-maven-plugin:2.7.0:add-third-party -Dlicense.excludedScopes=test -Dlicense.failIfWarning=true '-Dlicense.includedLicenses=Apache-2.0|Apache 2.0|The Apache License, Version 2.0|MIT License|BSD-2-Clause|BSD-3-Clause|ISC|MPL-2.0|GPL-3.0-or-later' -B}" -if command -v docker-test >/dev/null 2>&1; then - exec docker-test +if ! command -v docker-test >/dev/null 2>&1; then + echo "ERROR: docker-test not found on PATH." >&2 + echo "Set up standard-tooling: export PATH=../standard-tooling/scripts/bin:\$PATH" >&2 + exit 1 fi - -# Fallback: run docker directly if docker-test is not on PATH. -repo_root="$(cd "$(dirname "$0")/../.." && pwd)" - -echo "Image: ${DOCKER_DEV_IMAGE}" -echo "Command: ${DOCKER_TEST_CMD}" -echo "---" - -exec docker run --rm \ - -v "${repo_root}:/workspace" \ - -w /workspace \ - "${DOCKER_DEV_IMAGE}" \ - bash -c "${DOCKER_TEST_CMD}" +exec docker-test diff --git a/scripts/dev/lint.sh b/scripts/dev/lint.sh index ddf4d46..ff4e20c 100755 --- a/scripts/dev/lint.sh +++ b/scripts/dev/lint.sh @@ -4,19 +4,9 @@ set -euo pipefail export DOCKER_DEV_IMAGE="${DOCKER_DEV_IMAGE:-dev-java:21}" export DOCKER_TEST_CMD="${DOCKER_TEST_CMD:-./mvnw spotless:check checkstyle:check -B}" -if command -v docker-test >/dev/null 2>&1; then - exec docker-test +if ! command -v docker-test >/dev/null 2>&1; then + echo "ERROR: docker-test not found on PATH." >&2 + echo "Set up standard-tooling: export PATH=../standard-tooling/scripts/bin:\$PATH" >&2 + exit 1 fi - -# Fallback: run docker directly if docker-test is not on PATH. -repo_root="$(cd "$(dirname "$0")/../.." && pwd)" - -echo "Image: ${DOCKER_DEV_IMAGE}" -echo "Command: ${DOCKER_TEST_CMD}" -echo "---" - -exec docker run --rm \ - -v "${repo_root}:/workspace" \ - -w /workspace \ - "${DOCKER_DEV_IMAGE}" \ - bash -c "${DOCKER_TEST_CMD}" +exec docker-test diff --git a/scripts/dev/test.sh b/scripts/dev/test.sh index 7f7a791..17585ed 100755 --- a/scripts/dev/test.sh +++ b/scripts/dev/test.sh @@ -4,19 +4,9 @@ set -euo pipefail export DOCKER_DEV_IMAGE="${DOCKER_DEV_IMAGE:-dev-java:21}" export DOCKER_TEST_CMD="${DOCKER_TEST_CMD:-./mvnw verify -B}" -if command -v docker-test >/dev/null 2>&1; then - exec docker-test +if ! command -v docker-test >/dev/null 2>&1; then + echo "ERROR: docker-test not found on PATH." >&2 + echo "Set up standard-tooling: export PATH=../standard-tooling/scripts/bin:\$PATH" >&2 + exit 1 fi - -# Fallback: run docker directly if docker-test is not on PATH. -repo_root="$(cd "$(dirname "$0")/../.." && pwd)" - -echo "Image: ${DOCKER_DEV_IMAGE}" -echo "Command: ${DOCKER_TEST_CMD}" -echo "---" - -exec docker run --rm \ - -v "${repo_root}:/workspace" \ - -w /workspace \ - "${DOCKER_DEV_IMAGE}" \ - bash -c "${DOCKER_TEST_CMD}" +exec docker-test diff --git a/scripts/dev/typecheck.sh b/scripts/dev/typecheck.sh index a087dd2..068875c 100755 --- a/scripts/dev/typecheck.sh +++ b/scripts/dev/typecheck.sh @@ -4,19 +4,9 @@ set -euo pipefail export DOCKER_DEV_IMAGE="${DOCKER_DEV_IMAGE:-dev-java:21}" export DOCKER_TEST_CMD="${DOCKER_TEST_CMD:-./mvnw compile -B}" -if command -v docker-test >/dev/null 2>&1; then - exec docker-test +if ! command -v docker-test >/dev/null 2>&1; then + echo "ERROR: docker-test not found on PATH." >&2 + echo "Set up standard-tooling: export PATH=../standard-tooling/scripts/bin:\$PATH" >&2 + exit 1 fi - -# Fallback: run docker directly if docker-test is not on PATH. -repo_root="$(cd "$(dirname "$0")/../.." && pwd)" - -echo "Image: ${DOCKER_DEV_IMAGE}" -echo "Command: ${DOCKER_TEST_CMD}" -echo "---" - -exec docker run --rm \ - -v "${repo_root}:/workspace" \ - -w /workspace \ - "${DOCKER_DEV_IMAGE}" \ - bash -c "${DOCKER_TEST_CMD}" +exec docker-test