This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/master by this push:
new 8584e11 Don't download and cache the project dependencies in the
docker image.
8584e11 is described below
commit 8584e1125c43d51f1cf2237b80fcd0f454733bc0
Author: Mick Semb Wever <[email protected]>
AuthorDate: Sun Jun 7 00:13:34 2020 +0200
Don't download and cache the project dependencies in the docker image.
The branch|tag|sha of the cassandra clone is unknown until docker run time,
and branches and tags can change.
---
docker/build-debs.sh | 3 +++
docker/build-rpms.sh | 3 +++
docker/buster-image.docker | 1 -
docker/centos7-image.docker | 1 -
docker/jessie-image.docker | 1 -
5 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/docker/build-debs.sh b/docker/build-debs.sh
index 9524c17..26e5f77 100755
--- a/docker/build-debs.sh
+++ b/docker/build-debs.sh
@@ -112,6 +112,9 @@ else
echo "Cassandra will be built with Java 8"
fi
+java -version
+javac -version
+
# Install build dependencies and build package
echo "y" | sudo mk-build-deps --install
dpkg-buildpackage -rfakeroot -uc -us
diff --git a/docker/build-rpms.sh b/docker/build-rpms.sh
index 1d96509..adae844 100755
--- a/docker/build-rpms.sh
+++ b/docker/build-rpms.sh
@@ -89,6 +89,9 @@ else
echo "Cassandra will be built with Java 8"
fi
+java -version
+javac -version
+
# javadoc target is broken in docker without this mkdir
mkdir -p ./build/javadoc
# Artifact will only be used internally for build process and won't be found
with snapshot suffix
diff --git a/docker/buster-image.docker b/docker/buster-image.docker
index 08106ab..04fbc13 100644
--- a/docker/buster-image.docker
+++ b/docker/buster-image.docker
@@ -37,6 +37,5 @@ USER build
ARG CASSANDRA_GIT_URL=https://gitbox.apache.org/repos/asf/cassandra.git
RUN git clone ${CASSANDRA_GIT_URL} ${CASSANDRA_DIR}
WORKDIR ${CASSANDRA_DIR}
-RUN ant maven-ant-tasks-retrieve-build
COPY build-debs.sh $BUILD_HOME/
diff --git a/docker/centos7-image.docker b/docker/centos7-image.docker
index 01a2a2f..7116449 100644
--- a/docker/centos7-image.docker
+++ b/docker/centos7-image.docker
@@ -56,6 +56,5 @@ RUN mkdir -p
$RPM_BUILD_DIR/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
ARG CASSANDRA_GIT_URL=https://gitbox.apache.org/repos/asf/cassandra.git
RUN git clone ${CASSANDRA_GIT_URL} ${CASSANDRA_DIR}
WORKDIR $CASSANDRA_DIR
-RUN ant maven-ant-tasks-retrieve-build
COPY build-rpms.sh $BUILD_HOME/
diff --git a/docker/jessie-image.docker b/docker/jessie-image.docker
index af96bc5..1f92425 100644
--- a/docker/jessie-image.docker
+++ b/docker/jessie-image.docker
@@ -38,6 +38,5 @@ USER build
ARG CASSANDRA_GIT_URL=https://gitbox.apache.org/repos/asf/cassandra.git
RUN git clone ${CASSANDRA_GIT_URL} ${CASSANDRA_DIR}
WORKDIR ${CASSANDRA_DIR}
-RUN ant maven-ant-tasks-retrieve-build
COPY build-debs.sh $BUILD_HOME/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
