diff --git a/Dockerfile.builder b/Dockerfile.buildroot similarity index 99% rename from Dockerfile.builder rename to Dockerfile.buildroot index 423dda8d..f482df61 100644 --- a/Dockerfile.builder +++ b/Dockerfile.buildroot @@ -23,5 +23,3 @@ RUN dnf install -y \ nss atk at-spi2-atk cups-libs libdrm libXcomposite libXdamage libXrandr \ mesa-libgbm pango alsa-lib libxkbcommon \ && dnf clean all - -USER 1001 diff --git a/docs/TESTING.md b/docs/TESTING.md index 14cf3503..c50c0e09 100644 --- a/docs/TESTING.md +++ b/docs/TESTING.md @@ -295,7 +295,7 @@ E2e tests also run in CI via Prow/ci-operator against an ephemeral OCP cluster o | File | Purpose | |------|---------| -| `Dockerfile.builder` | Builder image (Go 1.26 + Node 22 + Yarn 4 + Helm for the `src` container) | +| `Dockerfile.buildroot` | Builder image (Go 1.26 + Node 22 + Yarn 4 + Helm for the `src` container) | | `hack/test-prow-e2e.sh` | Prow e2e test entrypoint (reads cluster credentials, deploys plugin, runs tests) | The ci-operator job config lives in the `openshift/release` repo at `ci-operator/config/openshift/faas-console-plugin/`. diff --git a/hack/builder-run.sh b/hack/builder-run.sh index 77a7f4f8..03a74717 100755 --- a/hack/builder-run.sh +++ b/hack/builder-run.sh @@ -25,7 +25,7 @@ BUILDER_IMAGE="${BUILDER_IMAGE:-localhost/faas-console-plugin-builder:latest}" CONTAINER_CMD=podman log::step "Building builder image" -if ! $CONTAINER_CMD build -f Dockerfile.builder -t "$BUILDER_IMAGE" . >/dev/null; then +if ! $CONTAINER_CMD build -f Dockerfile.buildroot -t "$BUILDER_IMAGE" . >/dev/null; then log::error "Failed to build builder image" exit 1 fi