Skip to content

Commit bb2cf09

Browse files
committed
Try switching from script.
1 parent b4b83f6 commit bb2cf09

File tree

1 file changed

+11
-21
lines changed

1 file changed

+11
-21
lines changed

deploy/tasks/buildah-oci-ta.yaml

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -503,31 +503,21 @@ spec:
503503
declare IMAGE
504504
505505
if [ "$use_domain_proxy" == "true" ]; then
506-
# Without expansion
507-
cat >> /app/build-script.sh << 'EOF'
508-
#!/bin/sh
509-
ip link set lo up
510-
/app/domain-proxy-client-runner &
511-
client_pid=$!
512-
EOF
513-
514-
# With expansion
515-
cat >> /app/build-script.sh << EOF
516-
buildah build $VOLUME_MOUNTS ${BUILDAH_ARGS[@]} ${LABELS[@]} --tls-verify=$TLSVERIFY --no-cache --ulimit nofile=4096:4096 -f "$dockerfile_copy" -t $IMAGE .
517-
EOF
518-
519-
# Without expansion
520-
cat >> /app/build-script.sh << 'EOF'
521-
set +e
522-
kill $client_pid
523-
wait $client_pid
524-
set -e
525-
EOF
506+
ip link set lo up
507+
/app/domain-proxy-client-runner &
508+
client_pid=$!
509+
510+
buildah build $VOLUME_MOUNTS ${BUILDAH_ARGS[@]} ${LABELS[@]} --tls-verify=$TLSVERIFY --no-cache --ulimit nofile=4096:4096 -f "$dockerfile_copy" -t $IMAGE .
511+
512+
set +e
513+
kill $client_pid
514+
wait $client_pid
515+
set -e
526516
527517
cat /app/build-script.sh
528518
chmod +x /app/build-script.sh
529519
530-
/app/build-script.sh &
520+
/app/build-script.sh
531521
532522
set +e
533523
kill $server_pid

0 commit comments

Comments
 (0)