This is an automated email from the ASF dual-hosted git repository. imaxon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push: new 739acc1 [NO ISSUE] Make asterix-docker work again 739acc1 is described below commit 739acc1d1bff0d8107b2bbf990a2d859a3cae795 Author: Ian Maxon <ima...@apache.org> AuthorDate: Wed Aug 21 14:44:09 2019 -0700 [NO ISSUE] Make asterix-docker work again Change-Id: I6fef4413e43e683238b46dc735c075ec02ac9e92 Reviewed-on: https://asterix-gerrit.ics.uci.edu/3529 Contrib: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Michael Blow <mb...@apache.org> --- asterixdb/asterix-docker/docker/Dockerfile | 6 +++--- asterixdb/asterix-docker/docker/supervisord.conf | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/asterixdb/asterix-docker/docker/Dockerfile b/asterixdb/asterix-docker/docker/Dockerfile index 58c2c1a..8fa3ab4 100644 --- a/asterixdb/asterix-docker/docker/Dockerfile +++ b/asterixdb/asterix-docker/docker/Dockerfile @@ -22,12 +22,12 @@ MAINTAINER AsterixDB Team RUN echo 'LANG="en_US.UTF-8"' > /etc/sysconfig/i18n ;echo 'ZONE="America/Los_Angeles"' > /etc/sysconfig/clock ;cp -a /usr/share/zoneinfo/America/Los_Angeles /etc/localtime RUN echo "include_only=.us" >> /etc/yum/pluginconf.d/fastestmirror.conf RUN yum -y update -RUN yum install -y unzip java-1.8.0-openjdk openssh-server openssh-clients python-setuptools wget curl +RUN yum install -y unzip java-11-openjdk-headless python-setuptools wget curl RUN easy_install supervisor RUN mkdir /asterixdb COPY asterix-server*.zip . RUN unzip asterix-server*.zip -d /asterixdb/ -COPY asterix-configuration.xml /asterixdb/bin/asterix-configuration.xml +RUN mv /asterixdb/apache*/* /asterixdb/ COPY supervisord.conf /etc/supervisord.conf COPY twu.adm /asterixdb/twu.adm COPY twm.adm /asterixdb/twm.adm @@ -35,7 +35,7 @@ COPY fbu.adm /asterixdb/fbu.adm COPY fbm.adm /asterixdb/fbm.adm WORKDIR /asterixdb/bin -ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0 +ENV JAVA_HOME /usr/lib/jvm/jre ENV JAVA_OPTS -Xmx1536m EXPOSE 19001 19002 8888 19003 50031 diff --git a/asterixdb/asterix-docker/docker/supervisord.conf b/asterixdb/asterix-docker/docker/supervisord.conf index b6ce1e0..20f1797 100644 --- a/asterixdb/asterix-docker/docker/supervisord.conf +++ b/asterixdb/asterix-docker/docker/supervisord.conf @@ -18,22 +18,22 @@ [supervisord] nodaemon=true -[program:asterixcc] -command=/asterixdb/bin/asterixcc -address localhost -client-listen-address localhost +[program:asterixnc1] +command=/asterixdb/bin/asterixncservice -logdir - -config-file "/asterixdb/opt/local/conf/blue.conf" stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 -[program:asterixnc1] -command=/asterixdb/bin/asterixnc -node-id nc1 -cluster-address localhost -iodevices /asterixdb/nc1 -address localhost -data-listen-address localhost -result-listen-address localhost +[program:asterixnc2] +command=/asterixdb/bin/asterixncservice -logdir - stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 -[program:asterixnc2] -command=/asterixdb/bin/asterixnc -node-id nc2 -cluster-address localhost -iodevices /asterixdb/nc2 -address localhost -data-listen-address localhost -result-listen-address localhost +[program:asterixcc] +command=/asterixdb/bin/asterixcc -config-file "/asterixdb/opt/local/conf/cc.conf" stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr