Skip to content

Commit 7f61a25

Browse files
committed
Revert "Another attempt to remediate user namespace issues with ubuntu24 runners (#2010)"
This reverts commit 5dc122a. Signed-off-by: Dom Del Nano <ddelnano@gmail.com>
1 parent 5dc122a commit 7f61a25

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.github/workflows/cli_release.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ jobs:
5959
export TAG_NAME="${REF#*/tags/}"
6060
mkdir -p "artifacts/"
6161
export ARTIFACTS_DIR="$(realpath artifacts/)"
62-
sysctl -w kernel.unprivileged_userns_clone=1
6362
./ci/save_version_info.sh
6463
./ci/cli_build_release.sh
6564
- name: Upload Github Artifacts

ci/cli_build_release.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ bazel run -c opt --config=stamp //src/pixie_cli:push_px_image
5353

5454
if [[ ! "$release_tag" == *"-"* ]]; then
5555
# Create rpm package.
56+
57+
# podman package depends on golang-github-containers-common, which
58+
# provides the following seccomp profile.
5659
podman run -i --rm \
60+
--security-opt seccomp=/usr/share/containers/seccomp.json \
5761
-v "${binary_dir}:/src/" \
5862
-v "$(pwd):/image" \
5963
docker.io/cdrx/fpm-fedora:24 \
@@ -69,6 +73,7 @@ if [[ ! "$release_tag" == *"-"* ]]; then
6973

7074
# Create deb package.
7175
podman run -i --rm \
76+
--security-opt seccomp=/usr/share/containers/seccomp.json \
7277
-v "${binary_dir}:/src/" \
7378
-v "$(pwd):/image" \
7479
docker.io/cdrx/fpm-ubuntu:18.04 \

0 commit comments

Comments
 (0)