Skip to content

Commit b4b83f6

Browse files
committed
Try running build with proxy and without unshare.
1 parent 3b62f0a commit b4b83f6

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

deploy/tasks/buildah-oci-ta.yaml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -393,18 +393,6 @@ spec:
393393
BUILDAH_ARGS=()
394394
use_domain_proxy=false
395395
396-
# cat >> /app/capture-netstat.sh << EOF
397-
# #!/bin/bash
398-
# while true; do
399-
# date >> /app/netstat-output.txt
400-
# netstat -n >> /app/netstat-output.txt
401-
# echo "--------------------------------------" >> /app/netstat-output.txt
402-
# done
403-
# EOF
404-
405-
# chmod +x /app/capture-netstat.sh
406-
# nohup /app/capture-netstat.sh &
407-
408396
if [ "${HERMETIC}" == "true" ]; then
409397
BUILDAH_ARGS+=("--pull=never")
410398
UNSHARE_ARGS="--net"
@@ -539,8 +527,7 @@ spec:
539527
cat /app/build-script.sh
540528
chmod +x /app/build-script.sh
541529
542-
/app/build-script.sh
543-
# unshare -Uf $UNSHARE_ARGS --keep-caps -r --map-users 1,1,65536 --map-groups 1,1,65536 -w ${SOURCE_CODE_DIR}/$CONTEXT -- /app/build-script.sh
530+
/app/build-script.sh &
544531
545532
set +e
546533
kill $server_pid
@@ -556,8 +543,6 @@ spec:
556543
-f "$dockerfile_copy" -t "$IMAGE" .
557544
fi
558545
559-
# cat /app/netstat-output.txt
560-
561546
container=$(buildah from --pull-never "$IMAGE")
562547
buildah mount $container | tee /shared/container_path
563548
# delete symlinks - they may point outside the container rootfs, messing with SBOM scanners

0 commit comments

Comments
 (0)