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
2 changes: 0 additions & 2 deletions Dockerfile.builder → Dockerfile.buildroot
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docs/TESTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/`.
Expand Down
2 changes: 1 addition & 1 deletion hack/builder-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down