[GitHub] [cassandra-builds] mshuler commented on a change in pull request #9: CASSANDRA-14712 - Cassandra 4.0 packaging support

2019-03-27 Thread GitBox
mshuler commented on a change in pull request #9: CASSANDRA-14712 - Cassandra 
4.0 packaging support
URL: https://github.com/apache/cassandra-builds/pull/9#discussion_r269569842
 
 

 ##
 File path: docker/stretch-image.docker
 ##
 @@ -1,32 +1,34 @@
-FROM debian:jessie-backports
+FROM debian:stretch-backports
 
 ENV DEB_DIST_DIR=/dist
 ENV BUILD_HOME=/home/build
 ENV CASSANDRA_DIR=$BUILD_HOME/cassandra
+ENV ANT_VERSION=1.10.5
 
-LABEL org.cassandra.buildenv=jessie
+LABEL org.cassandra.buildenv=stretch
 
 VOLUME ${DEB_DIST_DIR}
 
 # install deps
 RUN apt-get update && apt-get -y install \
-   ant \
build-essential \
curl \
devscripts \
git \
sudo
 
-RUN apt-get -y -t jessie-backports --no-install-recommends install \
-   openjdk-7-jdk \
-   openjdk-8-jdk
+RUN apt-get -y -t stretch-backports --no-install-recommends install \
+   openjdk-8-jdk \
+   openjdk-11-jdk
 
-RUN apt-get -y -t jessie-backports install \
+RUN apt-get -y -t stretch-backports install \
python-sphinx \
python-sphinx-rtd-theme
 
 RUN update-java-alternatives --set java-1.8.0-openjdk-amd64
 
+RUN mkdir -p /opt && curl 
http://www-eu.apache.org/dist/ant/binaries/apache-ant-$ANT_VERSION-bin.tar.gz | 
tar xz -C /opt && mv /opt/apache-ant-$ANT_VERSION /opt/ant && ln -s 
/opt/ant/bin/ant /usr/local/bin/ant
 
 Review comment:
   why again?


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

-
To unsubscribe, e-mail: dev-unsubscr...@cassandra.apache.org
For additional commands, e-mail: dev-h...@cassandra.apache.org



[GitHub] [cassandra-builds] mshuler commented on a change in pull request #9: CASSANDRA-14712 - Cassandra 4.0 packaging support

2019-03-27 Thread GitBox
mshuler commented on a change in pull request #9: CASSANDRA-14712 - Cassandra 
4.0 packaging support
URL: https://github.com/apache/cassandra-builds/pull/9#discussion_r269569635
 
 

 ##
 File path: docker/centos7-image.docker
 ##
 @@ -4,26 +4,27 @@ ENV BUILD_HOME=/home/build
 ENV RPM_BUILD_DIR=$BUILD_HOME/rpmbuild
 ENV RPM_DIST_DIR=/dist
 ENV CASSANDRA_DIR=$BUILD_HOME/cassandra
+ENV ANT_VERSION=1.10.5
 
 LABEL org.cassandra.buildenv=centos
 
 VOLUME ${RPM_DIST_DIR}
 
 # install deps
 RUN yum -y install \
-   ant \
-   ant-junit \
epel-release \
git \
-   java-1.7.0-openjdk-devel \
java-1.8.0-openjdk-devel \
+   java-11-openjdk-devel \
make \
rpm-build \
sudo
 
 # via epel-releases
 RUN yum -y install python2-pip
 
+RUN mkdir -p /opt && curl 
http://www-eu.apache.org/dist/ant/binaries/apache-ant-$ANT_VERSION-bin.tar.gz | 
tar xz -C /opt && mv /opt/apache-ant-$ANT_VERSION /opt/ant && ln -s 
/opt/ant/bin/ant /usr/local/bin/ant
 
 Review comment:
   why?


This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

-
To unsubscribe, e-mail: dev-unsubscr...@cassandra.apache.org
For additional commands, e-mail: dev-h...@cassandra.apache.org