This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/trunk by this push:
new 68ac010 ninja-fix – `--security-opt seccomp=unconfined` not supported
on cassandra-arm agents
68ac010 is described below
commit 68ac01038d28e9e534d50d04c970bfca706515d2
Author: Mick Semb Wever <[email protected]>
AuthorDate: Fri May 26 23:30:07 2023 +0200
ninja-fix – `--security-opt seccomp=unconfined` not supported on
cassandra-arm agents
---
build-scripts/cassandra-deb-packaging.sh | 4 ++--
build-scripts/cassandra-rpm-packaging.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/build-scripts/cassandra-deb-packaging.sh
b/build-scripts/cassandra-deb-packaging.sh
index 59a0418..b73b10e 100755
--- a/build-scripts/cassandra-deb-packaging.sh
+++ b/build-scripts/cassandra-deb-packaging.sh
@@ -35,10 +35,10 @@ docker image prune --all --force --filter
label=org.cassandra.buildenv=bullseye
pushd $cassandra_builds_dir
# Create build images containing the build tool-chain, Java and an Apache
Cassandra git working directory, with retry
-until docker build --security-opt seccomp=unconfined --build-arg
CASSANDRA_GIT_URL=$CASSANDRA_GIT_URL --build-arg UID_ARG=`id -u` --build-arg
GID_ARG=`id -g` -t cassandra-artifacts-bullseye:${sha} -f
docker/bullseye-image.docker docker/ ; do echo "docker build failed… trying
again in 10s… " ; sleep 10 ; done
+until docker build --build-arg CASSANDRA_GIT_URL=$CASSANDRA_GIT_URL
--build-arg UID_ARG=`id -u` --build-arg GID_ARG=`id -g` -t
cassandra-artifacts-bullseye:${sha} -f docker/bullseye-image.docker docker/ ;
do echo "docker build failed… trying again in 10s… " ; sleep 10 ; done
# Run build script through docker (specify branch, tag, or sha)
-docker run --security-opt seccomp=unconfined --rm -v "${deb_dir}":/dist -v
~/.m2/repository/:/home/build/.m2/repository/
cassandra-artifacts-bullseye:${sha} /home/build/build-debs.sh ${sha}
${java_version}
+docker run --rm -v "${deb_dir}":/dist -v
~/.m2/repository/:/home/build/.m2/repository/
cassandra-artifacts-bullseye:${sha} /home/build/build-debs.sh ${sha}
${java_version}
popd
diff --git a/build-scripts/cassandra-rpm-packaging.sh
b/build-scripts/cassandra-rpm-packaging.sh
index 2dec6ed..3ed2255 100755
--- a/build-scripts/cassandra-rpm-packaging.sh
+++ b/build-scripts/cassandra-rpm-packaging.sh
@@ -46,9 +46,9 @@ docker image prune --all --force --filter
label=org.cassandra.buildenv=${dist_na
pushd $cassandra_builds_dir
# Create build images containing the build tool-chain, Java and an Apache
Cassandra git working directory, with retry
-until docker build --security-opt seccomp=unconfined --build-arg
CASSANDRA_GIT_URL=$CASSANDRA_GIT_URL --build-arg UID_ARG=`id -u` --build-arg
GID_ARG=`id -g` -t cassandra-artifacts-${dist_name}:${sha} -f
docker/${dist_name}-image.docker docker/ ; do echo "docker build failed…
trying again in 10s… " ; sleep 10 ; done
+until docker build --build-arg CASSANDRA_GIT_URL=$CASSANDRA_GIT_URL
--build-arg UID_ARG=`id -u` --build-arg GID_ARG=`id -g` -t
cassandra-artifacts-${dist_name}:${sha} -f docker/${dist_name}-image.docker
docker/ ; do echo "docker build failed… trying again in 10s… " ; sleep 10 ;
done
# Run build script through docker (specify branch, tag, or sha)
-docker run --security-opt seccomp=unconfined --rm -v "${rpm_dir}":/dist -v
~/.m2/repository/:/home/build/.m2/repository/
cassandra-artifacts-${dist_name}:${sha} /home/build/build-rpms.sh ${sha}
${java_version} ${rpm_dist}
+docker run --rm -v "${rpm_dir}":/dist -v
~/.m2/repository/:/home/build/.m2/repository/
cassandra-artifacts-${dist_name}:${sha} /home/build/build-rpms.sh ${sha}
${java_version} ${rpm_dist}
popd
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
