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
commit 9ffe201ce0d33dd544c85030c2261883ac73aadc Author: mck <[email protected]> AuthorDate: Thu May 25 17:37:56 2023 +0200 Debian packaging source should exclude git subdirectory, bullseye sources reduced, add docker unsecured for git cloning patch by Mick Semb Wever; reviewed by Brandon Williams for CASSANDRA-18552 --- build-scripts/cassandra-deb-packaging.sh | 6 +++--- build-scripts/cassandra-rpm-packaging.sh | 4 ++-- docker/build-debs.sh | 2 +- docker/bullseye-image.docker | 7 ++----- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/build-scripts/cassandra-deb-packaging.sh b/build-scripts/cassandra-deb-packaging.sh index 4ecf884..59a0418 100755 --- a/build-scripts/cassandra-deb-packaging.sh +++ b/build-scripts/cassandra-deb-packaging.sh @@ -19,7 +19,7 @@ java_version=$2 # variables, with defaults [ "x${deb_dir}" != "x" ] || deb_dir="`pwd`" [ "x${cassandra_builds_dir}" != "x" ] || cassandra_builds_dir="`pwd`" -[ "x${CASSANDRA_GIT_URL}" != "x" ] || CASSANDRA_GIT_URL="https://gitbox.apache.org/repos/asf/cassandra.git"; +[ "x${CASSANDRA_GIT_URL}" != "x" ] || CASSANDRA_GIT_URL="https://github.com/apache/cassandra.git"; [ "x${java_version}" != "x" ] || java_version="8" # pre-conditions @@ -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 --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 --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 # Run build script through docker (specify branch, tag, or sha) -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} +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} popd diff --git a/build-scripts/cassandra-rpm-packaging.sh b/build-scripts/cassandra-rpm-packaging.sh index 3ed2255..2dec6ed 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 --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 --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 # Run build script through docker (specify branch, tag, or sha) -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} +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} popd diff --git a/docker/build-debs.sh b/docker/build-debs.sh index 474bfb2..a438050 100755 --- a/docker/build-debs.sh +++ b/docker/build-debs.sh @@ -136,7 +136,7 @@ set -e until ( echo "y" | sudo mk-build-deps --install ) ; do echo "mk-build-deps failed… trying again after 10s… " ; sleep 10 ; done # build package -dpkg-buildpackage -rfakeroot -uc -us +dpkg-buildpackage -rfakeroot -uc -us --source-option=--tar-ignore=.git # Copy created artifacts to dist dir mapped to docker host directory (must have proper permissions) cp ../cassandra[-_]* $DEB_DIST_DIR diff --git a/docker/bullseye-image.docker b/docker/bullseye-image.docker index 6e0c342..728b107 100644 --- a/docker/bullseye-image.docker +++ b/docker/bullseye-image.docker @@ -26,16 +26,13 @@ RUN echo 'Acquire::ftp::Timeout "60";' >> /etc/apt/apt.conf.d/80proxy.conf RUN until apt-get update && apt-get -y install ant build-essential curl devscripts git python2 sudo ; \ do echo "apt failed… trying again in 10s… " ; sleep 10 ; done -RUN echo 'deb http://deb.debian.org/debian bullseye main' >> /etc/apt/sources.list \ - && echo 'deb http://deb.debian.org/debian sid main' >> /etc/apt/sources.list +RUN echo 'deb http://deb.debian.org/debian sid main' >> /etc/apt/sources.list RUN until apt-get update \ && apt-get install -y --no-install-recommends openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk ; \ do echo "apt failed… trying again in 10s… " ; sleep 10 ; done -RUN sed -i '$d' /etc/apt/sources.list \ - && apt-get update \ - && update-java-alternatives --set java-1.8.0-openjdk-$(dpkg --print-architecture) +RUN update-java-alternatives --set java-1.8.0-openjdk-$(dpkg --print-architecture) # dh-python is incompatible with python-is-python2, so we'll link it ourselves RUN ln -s /usr/bin/python2 /usr/bin/python --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
