Skip to content

Commit c23b30f

Browse files
correct
1 parent 2536a9b commit c23b30f

File tree

1 file changed

+13
-16
lines changed

1 file changed

+13
-16
lines changed

Dockerfile.redhat

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -359,14 +359,13 @@ ARG JOBS=16
359359
#RUN bazel build --jobs $JOBS ${CAPI_FLAGS} //src:ovms_shared
360360

361361
RUN mkdir -p /tmp/bazel-output && \
362-
bash -c '\
363-
set -euo pipefail && \
364-
bazel --output_base=/tmp/bazel-output \
365-
build --jobs=$JOBS ${CAPI_FLAGS} //src:ovms_shared && \
366-
LIB_PATH=$(find /tmp/bazel-output -name libovms_shared.so | head -n1) && \
367-
echo "Found built file: $LIB_PATH" && \
368-
mkdir -p /ovms_release/lib && \
369-
cp -v "$LIB_PATH" /ovms_release/lib/'
362+
bazel --output_base=/tmp/bazel-output \
363+
build --jobs=$JOBS ${CAPI_FLAGS} //src:ovms_shared && \
364+
find /tmp/bazel-output -name libovms_shared.so && \
365+
LIB_PATH=$(find /tmp/bazel-output -name libovms_shared.so | head -n1) && \
366+
echo "Found built file: $LIB_PATH" && \
367+
mkdir -p /ovms_release/lib && \
368+
cp -v "$LIB_PATH" /ovms_release/lib/
370369

371370
# C api app with bazel
372371
# hadolint ignore=DL3059
@@ -383,14 +382,12 @@ RUN bazel build --jobs=$JOBS ${CAPI_FLAGS} //src:capi_benchmark && \
383382
find $(bazel info bazel-bin)/src -type f -name capi_benchmark
384383

385384
RUN mkdir -p /tmp/bazel-output && \
386-
bash -c '\
387-
set -euo pipefail && \
388-
bazel --output_base=/tmp/bazel-output \
389-
build --jobs=$JOBS ${CAPI_FLAGS} //src:capi_benchmark && \
390-
CAPI_BIN=$(find /tmp/bazel-output -type f -name capi_benchmark | head -n1) && \
391-
echo "Found built capi_benchmark: $CAPI_BIN" && \
392-
chmod +x "$CAPI_BIN" && \
393-
"$CAPI_BIN" --niter 2 --nstreams 1 --servable_name "dummy"'
385+
bazel --output_base=/tmp/bazel-output \
386+
build --jobs=$JOBS ${CAPI_FLAGS} //src:capi_benchmark && \
387+
CAPI_BIN=$(find /tmp/bazel-output -type f -name capi_benchmark | head -n1) && \
388+
echo "Found built capi_benchmark: $CAPI_BIN" && \
389+
chmod +x "$CAPI_BIN" && \
390+
"$CAPI_BIN" --niter 2 --nstreams 1 --servable_name "dummy"
394391

395392
# C-api C/C++ app with gcc
396393
COPY MakefileCapi /ovms/

0 commit comments

Comments
 (0)