From 20e1287c3f35a9586e2c284aff8ccfd19dc7f1b5 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Fri, 23 Jun 2017 16:44:16 -0700 Subject: [PATCH 01/99] installs maven --- utilities/docker/geppetto-persistence/Dockerfile | 4 ++++ utilities/docker/geppetto/Dockerfile | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 98b0fa37..2efbc42d 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -3,6 +3,10 @@ MAINTAINER Stephen Larson "slarson@openworm.org" RUN apt-get update && apt-get install -y sudo +# Install maven +RUN apt-get update +RUN apt-get install -y maven + RUN useradd -ms /bin/bash developer RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index 1dabadb2..e4c7702b 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -3,6 +3,10 @@ MAINTAINER Stephen Larson "slarson@openworm.org" RUN apt-get update && apt-get install -y sudo +# Install maven +RUN apt-get update +RUN apt-get install -y maven + RUN useradd -ms /bin/bash developer RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ From 196318c6ea69c0087096c030a179af037156f2a3 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sat, 24 Jun 2017 17:15:33 -0700 Subject: [PATCH 02/99] test mvn verson --- utilities/docker/geppetto/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index e4c7702b..f34d9dde 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -7,6 +7,8 @@ RUN apt-get update && apt-get install -y sudo RUN apt-get update RUN apt-get install -y maven +mvn -v + RUN useradd -ms /bin/bash developer RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ From b2fe4783dc9a367ad13468783efdaadf7390c5eb Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sat, 24 Jun 2017 17:36:02 -0700 Subject: [PATCH 03/99] test --- utilities/docker/geppetto/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index f34d9dde..e4c7702b 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -7,8 +7,6 @@ RUN apt-get update && apt-get install -y sudo RUN apt-get update RUN apt-get install -y maven -mvn -v - RUN useradd -ms /bin/bash developer RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ From 06a1fa6bf217a79df22bdb90814a28b6b9cbf5d3 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sat, 24 Jun 2017 18:21:48 -0700 Subject: [PATCH 04/99] test --- utilities/docker/geppetto/Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index e4c7702b..6f79eac9 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -1,12 +1,10 @@ FROM java:7 +FROM maven:3.2-jdk-7-onbuild + MAINTAINER Stephen Larson "slarson@openworm.org" RUN apt-get update && apt-get install -y sudo -# Install maven -RUN apt-get update -RUN apt-get install -y maven - RUN useradd -ms /bin/bash developer RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ From a8fc6d5136ff096ec78dce833eac96b2c0c4ecc1 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sat, 24 Jun 2017 18:41:50 -0700 Subject: [PATCH 05/99] remove most all for test --- utilities/docker/geppetto/Dockerfile | 51 +++------------------------- 1 file changed, 4 insertions(+), 47 deletions(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index 6f79eac9..48068ed9 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -1,51 +1,8 @@ FROM java:7 -FROM maven:3.2-jdk-7-onbuild -MAINTAINER Stephen Larson "slarson@openworm.org" +# Install maven +RUN apt-get update +RUN apt-get install -y maven -RUN apt-get update && apt-get install -y sudo +RUN mvn --version -RUN useradd -ms /bin/bash developer - -RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ - echo "developer:x:1000:1000:Developer,,,:/home/developer:/bin/bash" >> /etc/passwd && \ - echo "developer:x:1000:" >> /etc/group && \ - echo "developer ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/developer && \ - chmod 0440 /etc/sudoers.d/developer && \ - chown developer:developer -R /home/developer && \ - chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo - -USER developer -ENV HOME /home/developer -WORKDIR /home/developer - -#VIRGO INSTALL -USER root -RUN apt-get update && apt-get install -y curl bsdtar maven -USER developer -RUN mkdir -p /home/developer/virgo -RUN curl -L 'http://www.eclipse.org/downloads/download.php?file=/virgo/release/VP/3.6.4.RELEASE/virgo-tomcat-server-3.6.4.RELEASE.zip&mirror_id=580&r=1' | bsdtar --strip-components 1 -C /home/developer/virgo -xzf - -RUN chmod u+x /home/developer/virgo/bin/*.sh -ENV SERVER_HOME /home/developer/virgo -#VOLUME /home/developer/virgo -#END VIRGO INSTALL - -#GET GEPPETTO SOURCES -USER root -RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development -RUN chmod -R 777 workspace -USER developer -RUN cd workspace/org.geppetto/utilities/source_setup && yes n | python setup.py && python gitall.py pull \ - && python gitall.py reset && python gitall.py checkout development && cd ../../../.. && sudo chmod -R 777 workspace \ - && cd workspace/org.geppetto && mvn install -#END GET GEPPETTO SOURCES - -RUN mkdir -p geppetto/ - -#COPY entrypoint.sh geppetto/ -#COPY check_update.sh geppetto/ -#RUN sudo chmod +x geppetto/*.sh - -RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py - -CMD /home/developer/virgo/bin/startup.sh From 38bae80d7591096004b210099d14f2c324d7295a Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sat, 24 Jun 2017 18:47:44 -0700 Subject: [PATCH 06/99] test --- utilities/docker/geppetto/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index 48068ed9..b16ae653 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -2,7 +2,7 @@ FROM java:7 # Install maven RUN apt-get update -RUN apt-get install -y maven +RUN apt-get --only-upgrade install maven RUN mvn --version From 0309bee29798a98870c650bb878b5a53964c2734 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 25 Jun 2017 17:11:20 -0700 Subject: [PATCH 07/99] test --- utilities/docker/geppetto/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index b16ae653..7260ed80 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -1,8 +1,4 @@ FROM java:7 -# Install maven -RUN apt-get update -RUN apt-get --only-upgrade install maven - RUN mvn --version From 37d5ace904b674671177715c90258b80e0680323 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 25 Jun 2017 17:17:20 -0700 Subject: [PATCH 08/99] test update maven --- utilities/docker/geppetto/Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index 7260ed80..d42dd77e 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -1,4 +1,12 @@ FROM java:7 +# Install maven +RUN apt-get update + +sudo apt-get install gdebi +wget http://ppa.launchpad.net/natecarlson/maven3/ubuntu/pool/main/m/maven3/maven3_3.2.1-0~ppa1_all.deb +sudo gdebi maven3_3.2.1-0~ppa1_all.deb +sudo ln -s /usr/share/maven3/bin/mvn /usr/bin/maven + RUN mvn --version From 06a1b416e61fc6cdf3c268c47b625a861cafdaf9 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 25 Jun 2017 17:21:21 -0700 Subject: [PATCH 09/99] test --- utilities/docker/geppetto/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index d42dd77e..100645d5 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -3,10 +3,10 @@ FROM java:7 # Install maven RUN apt-get update -sudo apt-get install gdebi -wget http://ppa.launchpad.net/natecarlson/maven3/ubuntu/pool/main/m/maven3/maven3_3.2.1-0~ppa1_all.deb -sudo gdebi maven3_3.2.1-0~ppa1_all.deb -sudo ln -s /usr/share/maven3/bin/mvn /usr/bin/maven +RUN sudo apt-get install gdebi +RUN wget http://ppa.launchpad.net/natecarlson/maven3/ubuntu/pool/main/m/maven3/maven3_3.2.1-0~ppa1_all.deb +RUN sudo gdebi maven3_3.2.1-0~ppa1_all.deb +RUN sudo ln -s /usr/share/maven3/bin/mvn /usr/bin/maven RUN mvn --version From a33829cc26998c4d2fe7fb00c8a95d1e9e737d2f Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 25 Jun 2017 17:26:02 -0700 Subject: [PATCH 10/99] more test changes --- utilities/docker/geppetto/Dockerfile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index 100645d5..ca1105a3 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -1,7 +1,17 @@ FROM java:7 +MAINTAINER Stephen Larson "slarson@openworm.org" -# Install maven -RUN apt-get update +RUN apt-get update && apt-get install -y sudo + +RUN useradd -ms /bin/bash developer + +RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ + echo "developer:x:1000:1000:Developer,,,:/home/developer:/bin/bash" >> /etc/passwd && \ + echo "developer:x:1000:" >> /etc/group && \ + echo "developer ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/developer && \ + chmod 0440 /etc/sudoers.d/developer && \ + chown developer:developer -R /home/developer && \ + chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo RUN sudo apt-get install gdebi RUN wget http://ppa.launchpad.net/natecarlson/maven3/ubuntu/pool/main/m/maven3/maven3_3.2.1-0~ppa1_all.deb @@ -9,4 +19,3 @@ RUN sudo gdebi maven3_3.2.1-0~ppa1_all.deb RUN sudo ln -s /usr/share/maven3/bin/mvn /usr/bin/maven RUN mvn --version - From 301bc256a54367835555bc9203c21fe214fcbefb Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 25 Jun 2017 17:30:36 -0700 Subject: [PATCH 11/99] test --- utilities/docker/geppetto/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index ca1105a3..a9403d0b 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -13,7 +13,7 @@ RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ chown developer:developer -R /home/developer && \ chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo -RUN sudo apt-get install gdebi +RUN sudo apt-get install -y gdebi RUN wget http://ppa.launchpad.net/natecarlson/maven3/ubuntu/pool/main/m/maven3/maven3_3.2.1-0~ppa1_all.deb RUN sudo gdebi maven3_3.2.1-0~ppa1_all.deb RUN sudo ln -s /usr/share/maven3/bin/mvn /usr/bin/maven From 9908b54432baadc755b084aff7f8a66585b219a9 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 25 Jun 2017 17:44:52 -0700 Subject: [PATCH 12/99] force install --- utilities/docker/geppetto/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index a9403d0b..ff58f219 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -15,7 +15,7 @@ RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ RUN sudo apt-get install -y gdebi RUN wget http://ppa.launchpad.net/natecarlson/maven3/ubuntu/pool/main/m/maven3/maven3_3.2.1-0~ppa1_all.deb -RUN sudo gdebi maven3_3.2.1-0~ppa1_all.deb +RUN sudo -y gdebi maven3_3.2.1-0~ppa1_all.deb RUN sudo ln -s /usr/share/maven3/bin/mvn /usr/bin/maven RUN mvn --version From d26ebba63a20e63118f1fa5caacf684de9b1f9e9 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 25 Jun 2017 17:45:16 -0700 Subject: [PATCH 13/99] format --- utilities/docker/geppetto/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index ff58f219..1e3cb3cd 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -15,7 +15,7 @@ RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ RUN sudo apt-get install -y gdebi RUN wget http://ppa.launchpad.net/natecarlson/maven3/ubuntu/pool/main/m/maven3/maven3_3.2.1-0~ppa1_all.deb -RUN sudo -y gdebi maven3_3.2.1-0~ppa1_all.deb +RUN sudo gdebi -y maven3_3.2.1-0~ppa1_all.deb RUN sudo ln -s /usr/share/maven3/bin/mvn /usr/bin/maven RUN mvn --version From 65137a2971183f14bead1221c06d191df41a4cec Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 25 Jun 2017 17:48:12 -0700 Subject: [PATCH 14/99] use dpkg for install --- utilities/docker/geppetto/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index 1e3cb3cd..e279d472 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -15,7 +15,7 @@ RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ RUN sudo apt-get install -y gdebi RUN wget http://ppa.launchpad.net/natecarlson/maven3/ubuntu/pool/main/m/maven3/maven3_3.2.1-0~ppa1_all.deb -RUN sudo gdebi -y maven3_3.2.1-0~ppa1_all.deb +RUN sudo dpkg -i maven3_3.2.1-0~ppa1_all.deb RUN sudo ln -s /usr/share/maven3/bin/mvn /usr/bin/maven RUN mvn --version From 9b04fea0b567b37420b9cfa87cb9f32555cb4983 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 25 Jun 2017 17:52:27 -0700 Subject: [PATCH 15/99] attempst to set maven path --- utilities/docker/geppetto/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index e279d472..6df56ba4 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -18,4 +18,9 @@ RUN wget http://ppa.launchpad.net/natecarlson/maven3/ubuntu/pool/main/m/maven3/m RUN sudo dpkg -i maven3_3.2.1-0~ppa1_all.deb RUN sudo ln -s /usr/share/maven3/bin/mvn /usr/bin/maven +RUN M2_HOME=/usr/share/maven3 + && export M2_HOME + && M2=$M2_HOME/bin + && export M2 + RUN mvn --version From b76939fea8a5ccfcfe715b505fba821b04212373 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 25 Jun 2017 17:54:41 -0700 Subject: [PATCH 16/99] syntax --- utilities/docker/geppetto/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index 6df56ba4..b46af0a1 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -18,9 +18,9 @@ RUN wget http://ppa.launchpad.net/natecarlson/maven3/ubuntu/pool/main/m/maven3/m RUN sudo dpkg -i maven3_3.2.1-0~ppa1_all.deb RUN sudo ln -s /usr/share/maven3/bin/mvn /usr/bin/maven -RUN M2_HOME=/usr/share/maven3 - && export M2_HOME - && M2=$M2_HOME/bin - && export M2 +RUN M2_HOME=/usr/share/maven3 \ + export M2_HOME && \ + M2=$M2_HOME/bin && \ + export M2 RUN mvn --version From 7c75ed3341fdfaea6e0345894c53415c65d38694 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 25 Jun 2017 17:59:20 -0700 Subject: [PATCH 17/99] syntax test --- utilities/docker/geppetto/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index b46af0a1..4c10fe1b 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -18,9 +18,9 @@ RUN wget http://ppa.launchpad.net/natecarlson/maven3/ubuntu/pool/main/m/maven3/m RUN sudo dpkg -i maven3_3.2.1-0~ppa1_all.deb RUN sudo ln -s /usr/share/maven3/bin/mvn /usr/bin/maven -RUN M2_HOME=/usr/share/maven3 \ - export M2_HOME && \ - M2=$M2_HOME/bin && \ - export M2 +RUN M2_HOME=/usr/share/maven3 +RUN export M2_HOME +RUN M2=$M2_HOME/bin +RUN export M2 RUN mvn --version From d9788759b7b6073e4102e0d8fc1d318ae1b444a6 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Mon, 26 Jun 2017 10:10:42 -0700 Subject: [PATCH 18/99] testing installing a maven version above 3.1 --- utilities/docker/geppetto/Dockerfile | 54 +++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index 4c10fe1b..3c228c99 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -13,14 +13,52 @@ RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ chown developer:developer -R /home/developer && \ chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo -RUN sudo apt-get install -y gdebi -RUN wget http://ppa.launchpad.net/natecarlson/maven3/ubuntu/pool/main/m/maven3/maven3_3.2.1-0~ppa1_all.deb -RUN sudo dpkg -i maven3_3.2.1-0~ppa1_all.deb -RUN sudo ln -s /usr/share/maven3/bin/mvn /usr/bin/maven +USER developer +ENV HOME /home/developer +WORKDIR /home/developer -RUN M2_HOME=/usr/share/maven3 -RUN export M2_HOME -RUN M2=$M2_HOME/bin -RUN export M2 +# get maven 3.2.2 +RUN wget --no-verbose -O /tmp/apache-maven-3.2.2.tar.gz http://archive.apache.org/dist/maven/maven-3/3.2.2/binaries/apache-maven-3.2.2-bin.tar.gz +# verify checksum +RUN echo "87e5cc81bc4ab9b83986b3e77e6b3095 /tmp/apache-maven-3.2.2.tar.gz" | md5sum -c + +# install maven +RUN tar xzf /tmp/apache-maven-3.2.2.tar.gz -C /opt/ +RUN ln -s /opt/apache-maven-3.2.2 /opt/maven +RUN ln -s /opt/maven/bin/mvn /usr/local/bin +RUN rm -f /tmp/apache-maven-3.2.2.tar.gz +ENV MAVEN_HOME /opt/maven +RUN echo $PATH RUN mvn --version + +#VIRGO INSTALL +USER root +RUN apt-get update && apt-get install -y curl bsdtar maven +USER developer +RUN mkdir -p /home/developer/virgo +RUN curl -L 'http://www.eclipse.org/downloads/download.php?file=/virgo/release/VP/3.6.4.RELEASE/virgo-tomcat-server-3.6.4.RELEASE.zip&mirror_id=580&r=1' | bsdtar --strip-components 1 -C /home/developer/virgo -xzf - +RUN chmod u+x /home/developer/virgo/bin/*.sh +ENV SERVER_HOME /home/developer/virgo +#VOLUME /home/developer/virgo +#END VIRGO INSTALL + +#GET GEPPETTO SOURCES +USER root +RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development +RUN chmod -R 777 workspace +USER developer +RUN cd workspace/org.geppetto/utilities/source_setup && yes n | python setup.py && python gitall.py pull \ + && python gitall.py reset && python gitall.py checkout development && cd ../../../.. && sudo chmod -R 777 workspace \ + && cd workspace/org.geppetto && mvn install +#END GET GEPPETTO SOURCES + +RUN mkdir -p geppetto/ + +#COPY entrypoint.sh geppetto/ +#COPY check_update.sh geppetto/ +#RUN sudo chmod +x geppetto/*.sh + +RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py + +CMD /home/developer/virgo/bin/startup.sh From 6762d2234fd21d097e0eef47aee76df5bbae5871 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Mon, 26 Jun 2017 10:57:28 -0700 Subject: [PATCH 19/99] install maven 3.5 --- utilities/docker/geppetto/Dockerfile | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index 3c228c99..8d78fc77 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -17,19 +17,18 @@ USER developer ENV HOME /home/developer WORKDIR /home/developer -# get maven 3.2.2 -RUN wget --no-verbose -O /tmp/apache-maven-3.2.2.tar.gz http://archive.apache.org/dist/maven/maven-3/3.2.2/binaries/apache-maven-3.2.2-bin.tar.gz +# get maven 3.5.0 +RUN sudo wget --no-verbose -O /tmp/apache-maven-3.5.0-bin.tar.gz http://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz # verify checksum -RUN echo "87e5cc81bc4ab9b83986b3e77e6b3095 /tmp/apache-maven-3.2.2.tar.gz" | md5sum -c +RUN echo "87e5cc81bc4ab9b83986b3e77e6b3095 /tmp/apache-maven-3.5.0-bin.tar.gz" | md5sum -c # install maven -RUN tar xzf /tmp/apache-maven-3.2.2.tar.gz -C /opt/ -RUN ln -s /opt/apache-maven-3.2.2 /opt/maven -RUN ln -s /opt/maven/bin/mvn /usr/local/bin -RUN rm -f /tmp/apache-maven-3.2.2.tar.gz +RUN sudo tar xzf /tmp/apache-maven-3.5.0-bin.tar.gz -C /opt/ +RUN sudo ln -s /opt/apache-maven-3.5.0-bin.tar.gz /opt/maven +RUN sudo ln -s /opt/maven/bin/mvn /usr/local/bin +RUN sudo rm -f /tmp/apache-maven-3.5.0-bin.tar.gz ENV MAVEN_HOME /opt/maven -RUN echo $PATH RUN mvn --version #VIRGO INSTALL @@ -61,4 +60,4 @@ RUN mkdir -p geppetto/ RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py -CMD /home/developer/virgo/bin/startup.sh +CMD /home/developer/virgo/bin/startup.sh \ No newline at end of file From 6df04bdb99cc6938d4e913b519330e48b6f3c6a2 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Mon, 26 Jun 2017 11:45:25 -0700 Subject: [PATCH 20/99] fixing commnand syntax glitches for maven download --- .../docker/geppetto-persistence/Dockerfile | 12 ++ utilities/docker/geppetto/Dockerfile | 122 +++++++++--------- 2 files changed, 72 insertions(+), 62 deletions(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 2efbc42d..6c5f48ab 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -21,6 +21,16 @@ USER developer ENV HOME /home/developer WORKDIR /home/developer +# get maven 3.5.0 +RUN sudo wget --no-verbose -O /tmp/apache-maven-3.5.0-bin.tar.gz http://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz + +# install maven +RUN sudo tar xzf /tmp/apache-maven-3.5.0-bin.tar.gz -C /opt/ +RUN sudo ln -s /opt/apache-maven-3.5.0 /opt/maven +RUN sudo ln -s /opt/maven/bin/mvn /usr/local/bin +RUN sudo rm -f /tmp/apache-maven-3.5.0-bin.tar.gz +ENV MAVEN_HOME /opt/maven + #VIRGO INSTALL USER root RUN apt-get update && apt-get install -y curl bsdtar maven @@ -32,6 +42,8 @@ ENV SERVER_HOME /home/developer/virgo #VOLUME /home/developer/virgo #END VIRGO INSTALL +RUN mvn --version + #GET GEPPETTO SOURCES USER root RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index 8d78fc77..f3dec959 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -1,63 +1,61 @@ -FROM java:7 -MAINTAINER Stephen Larson "slarson@openworm.org" - -RUN apt-get update && apt-get install -y sudo - -RUN useradd -ms /bin/bash developer - -RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ - echo "developer:x:1000:1000:Developer,,,:/home/developer:/bin/bash" >> /etc/passwd && \ - echo "developer:x:1000:" >> /etc/group && \ - echo "developer ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/developer && \ - chmod 0440 /etc/sudoers.d/developer && \ - chown developer:developer -R /home/developer && \ - chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo - -USER developer -ENV HOME /home/developer -WORKDIR /home/developer - -# get maven 3.5.0 -RUN sudo wget --no-verbose -O /tmp/apache-maven-3.5.0-bin.tar.gz http://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz - -# verify checksum -RUN echo "87e5cc81bc4ab9b83986b3e77e6b3095 /tmp/apache-maven-3.5.0-bin.tar.gz" | md5sum -c - -# install maven -RUN sudo tar xzf /tmp/apache-maven-3.5.0-bin.tar.gz -C /opt/ -RUN sudo ln -s /opt/apache-maven-3.5.0-bin.tar.gz /opt/maven -RUN sudo ln -s /opt/maven/bin/mvn /usr/local/bin -RUN sudo rm -f /tmp/apache-maven-3.5.0-bin.tar.gz -ENV MAVEN_HOME /opt/maven -RUN mvn --version - -#VIRGO INSTALL -USER root -RUN apt-get update && apt-get install -y curl bsdtar maven -USER developer -RUN mkdir -p /home/developer/virgo -RUN curl -L 'http://www.eclipse.org/downloads/download.php?file=/virgo/release/VP/3.6.4.RELEASE/virgo-tomcat-server-3.6.4.RELEASE.zip&mirror_id=580&r=1' | bsdtar --strip-components 1 -C /home/developer/virgo -xzf - -RUN chmod u+x /home/developer/virgo/bin/*.sh -ENV SERVER_HOME /home/developer/virgo -#VOLUME /home/developer/virgo -#END VIRGO INSTALL - -#GET GEPPETTO SOURCES -USER root -RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development -RUN chmod -R 777 workspace -USER developer -RUN cd workspace/org.geppetto/utilities/source_setup && yes n | python setup.py && python gitall.py pull \ - && python gitall.py reset && python gitall.py checkout development && cd ../../../.. && sudo chmod -R 777 workspace \ - && cd workspace/org.geppetto && mvn install -#END GET GEPPETTO SOURCES - -RUN mkdir -p geppetto/ - -#COPY entrypoint.sh geppetto/ -#COPY check_update.sh geppetto/ -#RUN sudo chmod +x geppetto/*.sh - -RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py - +FROM java:7 +MAINTAINER Stephen Larson "slarson@openworm.org" + +RUN apt-get update && apt-get install -y sudo + +RUN useradd -ms /bin/bash developer + +RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ + echo "developer:x:1000:1000:Developer,,,:/home/developer:/bin/bash" >> /etc/passwd && \ + echo "developer:x:1000:" >> /etc/group && \ + echo "developer ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/developer && \ + chmod 0440 /etc/sudoers.d/developer && \ + chown developer:developer -R /home/developer && \ + chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo + +USER developer +ENV HOME /home/developer +WORKDIR /home/developer + +# get maven 3.5.0 +RUN sudo wget --no-verbose -O /tmp/apache-maven-3.5.0-bin.tar.gz http://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz + +# install maven +RUN sudo tar xzf /tmp/apache-maven-3.5.0-bin.tar.gz -C /opt/ +RUN sudo ln -s /opt/apache-maven-3.5.0 /opt/maven +RUN sudo ln -s /opt/maven/bin/mvn /usr/local/bin +RUN sudo rm -f /tmp/apache-maven-3.5.0-bin.tar.gz +ENV MAVEN_HOME /opt/maven + +#VIRGO INSTALL +USER root +RUN apt-get update && apt-get install -y curl bsdtar +USER developer +RUN mkdir -p /home/developer/virgo +RUN curl -L 'http://www.eclipse.org/downloads/download.php?file=/virgo/release/VP/3.6.4.RELEASE/virgo-tomcat-server-3.6.4.RELEASE.zip&mirror_id=580&r=1' | bsdtar --strip-components 1 -C /home/developer/virgo -xzf - +RUN chmod u+x /home/developer/virgo/bin/*.sh +ENV SERVER_HOME /home/developer/virgo +#VOLUME /home/developer/virgo +#END VIRGO INSTALL + +RUN mvn --version + +#GET GEPPETTO SOURCES +USER root +RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development +RUN chmod -R 777 workspace +USER developer +RUN cd workspace/org.geppetto/utilities/source_setup && yes n | python setup.py && python gitall.py pull \ + && python gitall.py reset && python gitall.py checkout development && cd ../../../.. && sudo chmod -R 777 workspace \ + && cd workspace/org.geppetto && mvn install +#END GET GEPPETTO SOURCES + +RUN mkdir -p geppetto/ + +#COPY entrypoint.sh geppetto/ +#COPY check_update.sh geppetto/ +#RUN sudo chmod +x geppetto/*.sh + +RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py + CMD /home/developer/virgo/bin/startup.sh \ No newline at end of file From 63f63a86699b07163e7c6c4e94f300f445b9a085 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Mon, 26 Jun 2017 11:46:04 -0700 Subject: [PATCH 21/99] remove extra maven install --- utilities/docker/geppetto-persistence/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 6c5f48ab..eb0d4834 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -33,7 +33,7 @@ ENV MAVEN_HOME /opt/maven #VIRGO INSTALL USER root -RUN apt-get update && apt-get install -y curl bsdtar maven +RUN apt-get update && apt-get install -y curl bsdtar USER developer RUN mkdir -p /home/developer/virgo RUN curl -L 'http://www.eclipse.org/downloads/download.php?file=/virgo/release/VP/3.6.4.RELEASE/virgo-tomcat-server-3.6.4.RELEASE.zip&mirror_id=580&r=1' | bsdtar --strip-components 1 -C /home/developer/virgo -xzf - From 9e3cf8e27dd43b70d988ed61637414ccabe7b57d Mon Sep 17 00:00:00 2001 From: jrmartin Date: Mon, 26 Jun 2017 13:51:55 -0700 Subject: [PATCH 22/99] add --quiet to mvn install to reduce amount of output to logs --- utilities/docker/geppetto-persistence/Dockerfile | 4 ++-- utilities/docker/geppetto/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index eb0d4834..d78d899d 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -57,7 +57,7 @@ RUN cd workspace/org.geppetto/utilities/source_setup && yes n | python setup.py && python gitall.py reset && python gitall.py checkout development RUN sudo chmod -R 777 workspace -RUN cd workspace/org.geppetto && mvn install +RUN cd workspace/org.geppetto && mvn install --quiet #END GET GEPPETTO SOURCES #INSTALL MYSQL @@ -93,7 +93,7 @@ RUN service mysql start && mysql -uroot < /home/developer/geppetto/init.sql #END SETUP MYSQL INITIAL DATA USER developer -RUN cd /home/developer/workspace/org.geppetto.persistence && mvn install && mvn install +RUN cd /home/developer/workspace/org.geppetto.persistence && mvn install --quiet && mvn install --quiet RUN sudo service mysql start && cd /home/developer/workspace/org.geppetto.persistence && mvn exec:java -Dexec.mainClass="org.geppetto.persistence.util.DBTestData" -Dexec.classpathScope=runtime diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index f3dec959..1ef0cf58 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -47,7 +47,7 @@ RUN chmod -R 777 workspace USER developer RUN cd workspace/org.geppetto/utilities/source_setup && yes n | python setup.py && python gitall.py pull \ && python gitall.py reset && python gitall.py checkout development && cd ../../../.. && sudo chmod -R 777 workspace \ - && cd workspace/org.geppetto && mvn install + && cd workspace/org.geppetto && mvn install --quiet #END GET GEPPETTO SOURCES RUN mkdir -p geppetto/ From f46766004976b8363d92d75e3e8b0658d0dd15d1 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 5 Jul 2017 10:02:31 -0700 Subject: [PATCH 23/99] update docker fle --- utilities/docker/geppetto/Dockerfile | 32 ++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index 1ef0cf58..dbe21fd2 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -1,7 +1,7 @@ FROM java:7 MAINTAINER Stephen Larson "slarson@openworm.org" -RUN apt-get update && apt-get install -y sudo +RUN apt-get update && apt-get install -y sudo xvfb RUN useradd -ms /bin/bash developer @@ -26,10 +26,11 @@ RUN sudo ln -s /opt/apache-maven-3.5.0 /opt/maven RUN sudo ln -s /opt/maven/bin/mvn /usr/local/bin RUN sudo rm -f /tmp/apache-maven-3.5.0-bin.tar.gz ENV MAVEN_HOME /opt/maven +RUN mvn --version #VIRGO INSTALL USER root -RUN apt-get update && apt-get install -y curl bsdtar +RUN apt-get update && apt-get install -y curl bsdtar locate USER developer RUN mkdir -p /home/developer/virgo RUN curl -L 'http://www.eclipse.org/downloads/download.php?file=/virgo/release/VP/3.6.4.RELEASE/virgo-tomcat-server-3.6.4.RELEASE.zip&mirror_id=580&r=1' | bsdtar --strip-components 1 -C /home/developer/virgo -xzf - @@ -47,7 +48,7 @@ RUN chmod -R 777 workspace USER developer RUN cd workspace/org.geppetto/utilities/source_setup && yes n | python setup.py && python gitall.py pull \ && python gitall.py reset && python gitall.py checkout development && cd ../../../.. && sudo chmod -R 777 workspace \ - && cd workspace/org.geppetto && mvn install --quiet + && cd workspace/org.geppetto && mvn install #END GET GEPPETTO SOURCES RUN mkdir -p geppetto/ @@ -58,4 +59,27 @@ RUN mkdir -p geppetto/ RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py -CMD /home/developer/virgo/bin/startup.sh \ No newline at end of file +CMD /home/developer/virgo/bin/startup.sh + +# install node and npm plus update firefox +RUN sudo apt-get install -y nodejs npm +RUN sudo apt-get install -y nodejs-legacy +RUN sudo apt-get install -y xvfb libxrender-dev libasound2 libdbus-glib-1-2 libgtk2.0-0 bzip2 +RUN cd /usr/local && sudo wget --no-verbose -O /tmp/firefox-50.0.tar.bz2 http://ftp.mozilla.org/pub/firefox/releases/50.0/linux-x86_64/en-US/firefox-50.0.tar.bz2 +RUN sudo tar xvjf /tmp/firefox-50.0.tar.bz2 +RUN cd ~ && sudo ln -s firefox-50.0.tar.bz2 + +# install casperjs needed libraries +RUN sudo npm install --silent -g phantomjs +RUN sudo npm install --silent -g casperjs + +# set up dir for running caspers tests +RUN sudo curl -k -O https://download.slimerjs.org/releases/0.10.3/slimerjs-0.10.3.tar.bz2 +RUN sudo pwd && tar -xjpvf slimerjs-0.10.3.tar.bz2 +RUN sudo rm slimerjs-0.10.3.tar.bz2 +WORKDIR /home/developer/workspace/org.geppetto.frontend/src/main/webapp/js/pages/tests/casperjs +RUN casperjs --version +RUN sudo apt-get install -y libgtk-3-dev +ENV SLIMERJSLAUNCHER /home/developer/firefox/firefox +ENV SLIMERJS_EXECUTABLE /home/developer/slimerjs-0.10.3/slimerjs +RUN xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs \ No newline at end of file From 85fda9f01a985bdd659ad3fa6c4351bb86ef69fd Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 5 Jul 2017 19:50:21 -0700 Subject: [PATCH 24/99] test --- utilities/docker/geppetto/Dockerfile | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index dbe21fd2..4a6b3282 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -59,27 +59,4 @@ RUN mkdir -p geppetto/ RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py -CMD /home/developer/virgo/bin/startup.sh - -# install node and npm plus update firefox -RUN sudo apt-get install -y nodejs npm -RUN sudo apt-get install -y nodejs-legacy -RUN sudo apt-get install -y xvfb libxrender-dev libasound2 libdbus-glib-1-2 libgtk2.0-0 bzip2 -RUN cd /usr/local && sudo wget --no-verbose -O /tmp/firefox-50.0.tar.bz2 http://ftp.mozilla.org/pub/firefox/releases/50.0/linux-x86_64/en-US/firefox-50.0.tar.bz2 -RUN sudo tar xvjf /tmp/firefox-50.0.tar.bz2 -RUN cd ~ && sudo ln -s firefox-50.0.tar.bz2 - -# install casperjs needed libraries -RUN sudo npm install --silent -g phantomjs -RUN sudo npm install --silent -g casperjs - -# set up dir for running caspers tests -RUN sudo curl -k -O https://download.slimerjs.org/releases/0.10.3/slimerjs-0.10.3.tar.bz2 -RUN sudo pwd && tar -xjpvf slimerjs-0.10.3.tar.bz2 -RUN sudo rm slimerjs-0.10.3.tar.bz2 -WORKDIR /home/developer/workspace/org.geppetto.frontend/src/main/webapp/js/pages/tests/casperjs -RUN casperjs --version -RUN sudo apt-get install -y libgtk-3-dev -ENV SLIMERJSLAUNCHER /home/developer/firefox/firefox -ENV SLIMERJS_EXECUTABLE /home/developer/slimerjs-0.10.3/slimerjs -RUN xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs \ No newline at end of file +CMD /home/developer/virgo/bin/startup.sh \ No newline at end of file From 2c7abfa07a2924d50976bff824bef9289669618b Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 5 Jul 2017 21:07:52 -0700 Subject: [PATCH 25/99] expose port 8080 --- utilities/docker/geppetto/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index 4a6b3282..f009a264 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -48,7 +48,7 @@ RUN chmod -R 777 workspace USER developer RUN cd workspace/org.geppetto/utilities/source_setup && yes n | python setup.py && python gitall.py pull \ && python gitall.py reset && python gitall.py checkout development && cd ../../../.. && sudo chmod -R 777 workspace \ - && cd workspace/org.geppetto && mvn install + && cd workspace/org.geppetto && mvn --quiet install #END GET GEPPETTO SOURCES RUN mkdir -p geppetto/ @@ -59,4 +59,5 @@ RUN mkdir -p geppetto/ RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py -CMD /home/developer/virgo/bin/startup.sh \ No newline at end of file +EXPOSE 8080 +CMD su /home/developer/virgo/bin/startup.sh \ No newline at end of file From 509baa4076b5d5bc1a49fbd3dc7dd7b09d39a4fa Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 5 Jul 2017 21:08:59 -0700 Subject: [PATCH 26/99] resolve localhost from within Java --- utilities/docker/geppetto/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index f009a264..c2b6a476 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -60,4 +60,5 @@ RUN mkdir -p geppetto/ RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py EXPOSE 8080 +RUN sed -i "s/^127.0.0.1/127.0.0.1 $(hostname) /" /etc/hosts CMD su /home/developer/virgo/bin/startup.sh \ No newline at end of file From 0af2f0d5dd1fef0a649a3b72d32f4b4c2951f464 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 5 Jul 2017 21:33:40 -0700 Subject: [PATCH 27/99] test --- utilities/docker/geppetto/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index c2b6a476..2d2ac215 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -60,5 +60,5 @@ RUN mkdir -p geppetto/ RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py EXPOSE 8080 -RUN sed -i "s/^127.0.0.1/127.0.0.1 $(hostname) /" /etc/hosts +RUN sudo sed -i "s/^127.0.0.1/127.0.0.1 $(hostname) /" /etc/hosts CMD su /home/developer/virgo/bin/startup.sh \ No newline at end of file From 1c415de74fc45136fda7f0b14ed01d66532f220c Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 5 Jul 2017 22:21:39 -0700 Subject: [PATCH 28/99] test --- utilities/docker/geppetto/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index 2d2ac215..ec196f73 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -61,4 +61,4 @@ RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python u EXPOSE 8080 RUN sudo sed -i "s/^127.0.0.1/127.0.0.1 $(hostname) /" /etc/hosts -CMD su /home/developer/virgo/bin/startup.sh \ No newline at end of file +CMD ["/home/developer/virgo/bin/startup.sh"] \ No newline at end of file From b0bf485dd2a320b6f7ffa1bb354ca4ae7438f94d Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 07:17:17 -0700 Subject: [PATCH 29/99] test --- utilities/docker/geppetto/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index ec196f73..fe3887a4 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -60,5 +60,4 @@ RUN mkdir -p geppetto/ RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py EXPOSE 8080 -RUN sudo sed -i "s/^127.0.0.1/127.0.0.1 $(hostname) /" /etc/hosts CMD ["/home/developer/virgo/bin/startup.sh"] \ No newline at end of file From 573ab5ddd3c7da9e26ce81fab925aa68c4bcfeee Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 09:04:42 -0700 Subject: [PATCH 30/99] add casper docker files --- utilities/docker/geppetto-casperjs/Dockerfile | 34 +++++++++++++++++++ .../geppetto-persistence-casperjs/Dockerfile | 34 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 utilities/docker/geppetto-casperjs/Dockerfile create mode 100644 utilities/docker/geppetto-persistence-casperjs/Dockerfile diff --git a/utilities/docker/geppetto-casperjs/Dockerfile b/utilities/docker/geppetto-casperjs/Dockerfile new file mode 100644 index 00000000..5dfb916d --- /dev/null +++ b/utilities/docker/geppetto-casperjs/Dockerfile @@ -0,0 +1,34 @@ +FROM java:7 +MAINTAINER Stephen Larson "slarson@openworm.org" + +RUN apt-get update && apt-get install -y sudo xvfb + +# install node and npm plus update firefox +RUN sudo apt-get install -y nodejs npm +RUN sudo apt-get install -y nodejs-legacy +RUN sudo apt-get install -y xvfb libxrender-dev libasound2 libdbus-glib-1-2 libgtk2.0-0 bzip2 +RUN cd /usr/local && sudo wget --no-verbose -O /tmp/firefox-50.0.tar.bz2 http://ftp.mozilla.org/pub/firefox/releases/50.0/linux-x86_64/en-US/firefox-50.0.tar.bz2 +RUN sudo tar xvjf /tmp/firefox-50.0.tar.bz2 +RUN cd ~ && sudo ln -s firefox-50.0.tar.bz2 + +# install casperjs needed libraries +RUN sudo npm install --silent -g phantomjs +RUN sudo npm install --silent -g casperjs + +# set up dir for running caspers tests +RUN sudo curl -k -O https://download.slimerjs.org/releases/0.10.3/slimerjs-0.10.3.tar.bz2 +RUN sudo pwd && tar -xjpvf slimerjs-0.10.3.tar.bz2 +RUN sudo rm slimerjs-0.10.3.tar.bz2 +WORKDIR /home/developer/workspace/org.geppetto.frontend/src/main/webapp/js/pages/tests/casperjs +RUN casperjs --version +RUN sudo apt-get install -y libgtk-3-dev lshw +ENV SLIMERJSLAUNCHER /home/developer/firefox/firefox +ENV SLIMERJS_EXECUTABLE /home/developer/slimerjs-0.10.3/slimerjs +ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ + +RUN sudo apt install -y net-tools + +RUN sudo echo $(netstat -nr | grep '^0\.0\.0\.0' | awk '{print $2}') dockerhost >> sudo /etc/hosts +RUN sudo curl -L 'http://localhost:8080' +RUN sudo curl -L 'http://127.0.0.1:8080' +RUN xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs --debug=yes \ No newline at end of file diff --git a/utilities/docker/geppetto-persistence-casperjs/Dockerfile b/utilities/docker/geppetto-persistence-casperjs/Dockerfile new file mode 100644 index 00000000..5dfb916d --- /dev/null +++ b/utilities/docker/geppetto-persistence-casperjs/Dockerfile @@ -0,0 +1,34 @@ +FROM java:7 +MAINTAINER Stephen Larson "slarson@openworm.org" + +RUN apt-get update && apt-get install -y sudo xvfb + +# install node and npm plus update firefox +RUN sudo apt-get install -y nodejs npm +RUN sudo apt-get install -y nodejs-legacy +RUN sudo apt-get install -y xvfb libxrender-dev libasound2 libdbus-glib-1-2 libgtk2.0-0 bzip2 +RUN cd /usr/local && sudo wget --no-verbose -O /tmp/firefox-50.0.tar.bz2 http://ftp.mozilla.org/pub/firefox/releases/50.0/linux-x86_64/en-US/firefox-50.0.tar.bz2 +RUN sudo tar xvjf /tmp/firefox-50.0.tar.bz2 +RUN cd ~ && sudo ln -s firefox-50.0.tar.bz2 + +# install casperjs needed libraries +RUN sudo npm install --silent -g phantomjs +RUN sudo npm install --silent -g casperjs + +# set up dir for running caspers tests +RUN sudo curl -k -O https://download.slimerjs.org/releases/0.10.3/slimerjs-0.10.3.tar.bz2 +RUN sudo pwd && tar -xjpvf slimerjs-0.10.3.tar.bz2 +RUN sudo rm slimerjs-0.10.3.tar.bz2 +WORKDIR /home/developer/workspace/org.geppetto.frontend/src/main/webapp/js/pages/tests/casperjs +RUN casperjs --version +RUN sudo apt-get install -y libgtk-3-dev lshw +ENV SLIMERJSLAUNCHER /home/developer/firefox/firefox +ENV SLIMERJS_EXECUTABLE /home/developer/slimerjs-0.10.3/slimerjs +ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ + +RUN sudo apt install -y net-tools + +RUN sudo echo $(netstat -nr | grep '^0\.0\.0\.0' | awk '{print $2}') dockerhost >> sudo /etc/hosts +RUN sudo curl -L 'http://localhost:8080' +RUN sudo curl -L 'http://127.0.0.1:8080' +RUN xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs --debug=yes \ No newline at end of file From aa4e329a379c7bfaed0dae932936a71f56ebb671 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 09:12:14 -0700 Subject: [PATCH 31/99] test --- utilities/docker/geppetto/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index fe3887a4..327abcad 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -60,4 +60,4 @@ RUN mkdir -p geppetto/ RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py EXPOSE 8080 -CMD ["/home/developer/virgo/bin/startup.sh"] \ No newline at end of file +CMD ["/home/developer/virgo/bin/startup.sh &"] \ No newline at end of file From 285c155bbf90cd3bd67e010428c582ec4b385ae9 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 09:16:42 -0700 Subject: [PATCH 32/99] revert --- utilities/docker/geppetto/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index 327abcad..fe3887a4 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -60,4 +60,4 @@ RUN mkdir -p geppetto/ RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py EXPOSE 8080 -CMD ["/home/developer/virgo/bin/startup.sh &"] \ No newline at end of file +CMD ["/home/developer/virgo/bin/startup.sh"] \ No newline at end of file From 1d7ddc61679d8c0425210596c35c9f2ab1901cd2 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 09:56:08 -0700 Subject: [PATCH 33/99] test --- utilities/docker/geppetto-casperjs/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/utilities/docker/geppetto-casperjs/Dockerfile b/utilities/docker/geppetto-casperjs/Dockerfile index 5dfb916d..ef1cd480 100644 --- a/utilities/docker/geppetto-casperjs/Dockerfile +++ b/utilities/docker/geppetto-casperjs/Dockerfile @@ -29,6 +29,4 @@ ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ RUN sudo apt install -y net-tools RUN sudo echo $(netstat -nr | grep '^0\.0\.0\.0' | awk '{print $2}') dockerhost >> sudo /etc/hosts -RUN sudo curl -L 'http://localhost:8080' -RUN sudo curl -L 'http://127.0.0.1:8080' RUN xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs --debug=yes \ No newline at end of file From 456563cb103443ee01f80347dddea1bc8bf6af9d Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 10:21:07 -0700 Subject: [PATCH 34/99] add snippet --- utilities/docker/geppetto-casperjs/test_geppetto_server.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 utilities/docker/geppetto-casperjs/test_geppetto_server.sh diff --git a/utilities/docker/geppetto-casperjs/test_geppetto_server.sh b/utilities/docker/geppetto-casperjs/test_geppetto_server.sh new file mode 100644 index 00000000..ee3d5bc0 --- /dev/null +++ b/utilities/docker/geppetto-casperjs/test_geppetto_server.sh @@ -0,0 +1,7 @@ +#!/bin/sh +while ! curl http://192.168.99.100:8080/org.geppetto.frontend +do + echo "$(date) - still trying" + sleep 1 +done +echo "$(date) - connected successfully" From 95421264b314d0ccc777ccf25ef932e54457ed79 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 12:32:09 -0700 Subject: [PATCH 35/99] test --- utilities/docker/geppetto-casperjs/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/utilities/docker/geppetto-casperjs/Dockerfile b/utilities/docker/geppetto-casperjs/Dockerfile index ef1cd480..c805bbd8 100644 --- a/utilities/docker/geppetto-casperjs/Dockerfile +++ b/utilities/docker/geppetto-casperjs/Dockerfile @@ -25,6 +25,7 @@ RUN sudo apt-get install -y libgtk-3-dev lshw ENV SLIMERJSLAUNCHER /home/developer/firefox/firefox ENV SLIMERJS_EXECUTABLE /home/developer/slimerjs-0.10.3/slimerjs ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ +RUN slimerjs --version RUN sudo apt install -y net-tools From a8a624e4e7bb012c4a77d1fd58289a335784c4bc Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 12:36:43 -0700 Subject: [PATCH 36/99] test --- utilities/docker/geppetto-casperjs/Dockerfile | 5 +++-- utilities/docker/geppetto-persistence-casperjs/Dockerfile | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utilities/docker/geppetto-casperjs/Dockerfile b/utilities/docker/geppetto-casperjs/Dockerfile index c805bbd8..f6734660 100644 --- a/utilities/docker/geppetto-casperjs/Dockerfile +++ b/utilities/docker/geppetto-casperjs/Dockerfile @@ -1,5 +1,4 @@ FROM java:7 -MAINTAINER Stephen Larson "slarson@openworm.org" RUN apt-get update && apt-get install -y sudo xvfb @@ -25,8 +24,10 @@ RUN sudo apt-get install -y libgtk-3-dev lshw ENV SLIMERJSLAUNCHER /home/developer/firefox/firefox ENV SLIMERJS_EXECUTABLE /home/developer/slimerjs-0.10.3/slimerjs ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ +RUN /home/developer/firefox/firefox --version RUN slimerjs --version - +RUN cd /home/developer +RUN ls RUN sudo apt install -y net-tools RUN sudo echo $(netstat -nr | grep '^0\.0\.0\.0' | awk '{print $2}') dockerhost >> sudo /etc/hosts diff --git a/utilities/docker/geppetto-persistence-casperjs/Dockerfile b/utilities/docker/geppetto-persistence-casperjs/Dockerfile index 5dfb916d..66fc3f93 100644 --- a/utilities/docker/geppetto-persistence-casperjs/Dockerfile +++ b/utilities/docker/geppetto-persistence-casperjs/Dockerfile @@ -1,5 +1,4 @@ FROM java:7 -MAINTAINER Stephen Larson "slarson@openworm.org" RUN apt-get update && apt-get install -y sudo xvfb From 5c88c4f92fceb9ed44587292bbe1d08732bb3054 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 13:04:52 -0700 Subject: [PATCH 37/99] test --- utilities/docker/geppetto-casperjs/Dockerfile | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/utilities/docker/geppetto-casperjs/Dockerfile b/utilities/docker/geppetto-casperjs/Dockerfile index f6734660..08b22ef9 100644 --- a/utilities/docker/geppetto-casperjs/Dockerfile +++ b/utilities/docker/geppetto-casperjs/Dockerfile @@ -2,6 +2,23 @@ FROM java:7 RUN apt-get update && apt-get install -y sudo xvfb +RUN cd /home/developer +RUN ls + +RUN useradd -ms /bin/bash developer + +RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ + echo "developer:x:1000:1000:Developer,,,:/home/developer:/bin/bash" >> /etc/passwd && \ + echo "developer:x:1000:" >> /etc/group && \ + echo "developer ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/developer && \ + chmod 0440 /etc/sudoers.d/developer && \ + chown developer:developer -R /home/developer && \ + chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo + +USER developer +ENV HOME /home/developer +WORKDIR /home/developer + # install node and npm plus update firefox RUN sudo apt-get install -y nodejs npm RUN sudo apt-get install -y nodejs-legacy @@ -24,10 +41,6 @@ RUN sudo apt-get install -y libgtk-3-dev lshw ENV SLIMERJSLAUNCHER /home/developer/firefox/firefox ENV SLIMERJS_EXECUTABLE /home/developer/slimerjs-0.10.3/slimerjs ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ -RUN /home/developer/firefox/firefox --version -RUN slimerjs --version -RUN cd /home/developer -RUN ls RUN sudo apt install -y net-tools RUN sudo echo $(netstat -nr | grep '^0\.0\.0\.0' | awk '{print $2}') dockerhost >> sudo /etc/hosts From 14c7dc69a8c2c2fb9e3a3fa8e60f7ed258eabdcb Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 13:25:32 -0700 Subject: [PATCH 38/99] test --- .travis.yml | 18 ++++++++++++++++++ utilities/docker/geppetto-casperjs/Dockerfile | 3 --- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..9879276e --- /dev/null +++ b/.travis.yml @@ -0,0 +1,18 @@ +language: java +env: + global: + secure: dn0FPQ5IG4M/3kdwnyI78ElQ308Vc3QnKAvkWfwMFb8QxDqxQdnTo7AV1qTMtbLrDNkeEWIgi4nc7jmXNtvGTwOfhAULVh6606Qs5B+ezTdwzajbbFMI8SKQx/pnTojOMu8dx7V4lMoR/YWcojR0VC1IWVC62TGbSB1k5BDGgH0= + +install: +- npm install --silent -g phantomjs npm install --silent -g casperjs npm install --silent -g slimerjs + +sudo: required + +services: + - docker + +script: + - docker build -t="geppetto" https://github.com/openworm/org.geppetto.git#docker-casperjs:utilities/docker/geppetto/ + - docker run -t -dit --name=geppetto_container -p 8080:8080 geppetto + - docker build https://github.com/openworm/org.geppetto.git#docker-casperjs:utilities/docker/geppetto-casperjs/ + - docker stop $(docker ps -a -q) \ No newline at end of file diff --git a/utilities/docker/geppetto-casperjs/Dockerfile b/utilities/docker/geppetto-casperjs/Dockerfile index 08b22ef9..50f7a0fe 100644 --- a/utilities/docker/geppetto-casperjs/Dockerfile +++ b/utilities/docker/geppetto-casperjs/Dockerfile @@ -2,9 +2,6 @@ FROM java:7 RUN apt-get update && apt-get install -y sudo xvfb -RUN cd /home/developer -RUN ls - RUN useradd -ms /bin/bash developer RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ From 3381f77bd4cbc3d002e1ab8534e618e2c9639264 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 13:48:08 -0700 Subject: [PATCH 39/99] test --- utilities/docker/geppetto-casperjs/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/utilities/docker/geppetto-casperjs/Dockerfile b/utilities/docker/geppetto-casperjs/Dockerfile index 50f7a0fe..78f9dcb2 100644 --- a/utilities/docker/geppetto-casperjs/Dockerfile +++ b/utilities/docker/geppetto-casperjs/Dockerfile @@ -40,5 +40,7 @@ ENV SLIMERJS_EXECUTABLE /home/developer/slimerjs-0.10.3/slimerjs ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ RUN sudo apt install -y net-tools -RUN sudo echo $(netstat -nr | grep '^0\.0\.0\.0' | awk '{print $2}') dockerhost >> sudo /etc/hosts -RUN xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs --debug=yes \ No newline at end of file +RUN xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs --debug=yes + +RUN /home/developer/firefox/firefox --version +RUN slimerjs --version \ No newline at end of file From a54867743d0d5ea0690504aa8233c78ffd731b1e Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 14:09:16 -0700 Subject: [PATCH 40/99] test --- utilities/docker/geppetto-casperjs/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utilities/docker/geppetto-casperjs/Dockerfile b/utilities/docker/geppetto-casperjs/Dockerfile index 78f9dcb2..59347235 100644 --- a/utilities/docker/geppetto-casperjs/Dockerfile +++ b/utilities/docker/geppetto-casperjs/Dockerfile @@ -39,8 +39,8 @@ ENV SLIMERJSLAUNCHER /home/developer/firefox/firefox ENV SLIMERJS_EXECUTABLE /home/developer/slimerjs-0.10.3/slimerjs ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ RUN sudo apt install -y net-tools - -RUN xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs --debug=yes - +RUN ls RUN /home/developer/firefox/firefox --version -RUN slimerjs --version \ No newline at end of file +RUN slimerjs --version + +RUN xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs --debug=yes \ No newline at end of file From cc3a1357017ec06784215965afaf4e6fba0f2e1c Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 19:45:19 -0700 Subject: [PATCH 41/99] test --- utilities/docker/geppetto-casperjs/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/utilities/docker/geppetto-casperjs/Dockerfile b/utilities/docker/geppetto-casperjs/Dockerfile index 59347235..f4f4d73d 100644 --- a/utilities/docker/geppetto-casperjs/Dockerfile +++ b/utilities/docker/geppetto-casperjs/Dockerfile @@ -39,8 +39,7 @@ ENV SLIMERJSLAUNCHER /home/developer/firefox/firefox ENV SLIMERJS_EXECUTABLE /home/developer/slimerjs-0.10.3/slimerjs ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ RUN sudo apt install -y net-tools -RUN ls -RUN /home/developer/firefox/firefox --version +RUN pwd RUN slimerjs --version RUN xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs --debug=yes \ No newline at end of file From a13c2f5d6889efd31a9d33304a4a6728c169d711 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 19:46:17 -0700 Subject: [PATCH 42/99] test --- utilities/docker/geppetto-casperjs/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/utilities/docker/geppetto-casperjs/Dockerfile b/utilities/docker/geppetto-casperjs/Dockerfile index f4f4d73d..69057843 100644 --- a/utilities/docker/geppetto-casperjs/Dockerfile +++ b/utilities/docker/geppetto-casperjs/Dockerfile @@ -40,6 +40,5 @@ ENV SLIMERJS_EXECUTABLE /home/developer/slimerjs-0.10.3/slimerjs ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ RUN sudo apt install -y net-tools RUN pwd -RUN slimerjs --version RUN xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs --debug=yes \ No newline at end of file From ad1e952cad85163dd1ea76044e73701b8bfa8910 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 19:47:37 -0700 Subject: [PATCH 43/99] test --- utilities/docker/geppetto-casperjs/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto-casperjs/Dockerfile b/utilities/docker/geppetto-casperjs/Dockerfile index 69057843..e529f9bc 100644 --- a/utilities/docker/geppetto-casperjs/Dockerfile +++ b/utilities/docker/geppetto-casperjs/Dockerfile @@ -39,6 +39,6 @@ ENV SLIMERJSLAUNCHER /home/developer/firefox/firefox ENV SLIMERJS_EXECUTABLE /home/developer/slimerjs-0.10.3/slimerjs ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ RUN sudo apt install -y net-tools -RUN pwd +RUN ls -l RUN xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs --debug=yes \ No newline at end of file From 258ea2a16d1f443162bbb000c69906114d036170 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 19:48:45 -0700 Subject: [PATCH 44/99] test --- utilities/docker/geppetto-casperjs/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/utilities/docker/geppetto-casperjs/Dockerfile b/utilities/docker/geppetto-casperjs/Dockerfile index e529f9bc..d438f2e7 100644 --- a/utilities/docker/geppetto-casperjs/Dockerfile +++ b/utilities/docker/geppetto-casperjs/Dockerfile @@ -39,6 +39,7 @@ ENV SLIMERJSLAUNCHER /home/developer/firefox/firefox ENV SLIMERJS_EXECUTABLE /home/developer/slimerjs-0.10.3/slimerjs ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ RUN sudo apt install -y net-tools +RUN cd /home/developer/slimerjs-0.10.3 RUN ls -l RUN xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs --debug=yes \ No newline at end of file From 159e4342d0e5936c98af92c5a84331426a6795f9 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 20:49:49 -0700 Subject: [PATCH 45/99] test --- utilities/docker/geppetto-casperjs/Dockerfile | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/utilities/docker/geppetto-casperjs/Dockerfile b/utilities/docker/geppetto-casperjs/Dockerfile index d438f2e7..3ca505c8 100644 --- a/utilities/docker/geppetto-casperjs/Dockerfile +++ b/utilities/docker/geppetto-casperjs/Dockerfile @@ -2,20 +2,6 @@ FROM java:7 RUN apt-get update && apt-get install -y sudo xvfb -RUN useradd -ms /bin/bash developer - -RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ - echo "developer:x:1000:1000:Developer,,,:/home/developer:/bin/bash" >> /etc/passwd && \ - echo "developer:x:1000:" >> /etc/group && \ - echo "developer ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/developer && \ - chmod 0440 /etc/sudoers.d/developer && \ - chown developer:developer -R /home/developer && \ - chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo - -USER developer -ENV HOME /home/developer -WORKDIR /home/developer - # install node and npm plus update firefox RUN sudo apt-get install -y nodejs npm RUN sudo apt-get install -y nodejs-legacy @@ -39,7 +25,6 @@ ENV SLIMERJSLAUNCHER /home/developer/firefox/firefox ENV SLIMERJS_EXECUTABLE /home/developer/slimerjs-0.10.3/slimerjs ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ RUN sudo apt install -y net-tools -RUN cd /home/developer/slimerjs-0.10.3 -RUN ls -l +RUN cd /home/developer/slimerjs-0.10.3 && ls RUN xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs --debug=yes \ No newline at end of file From b48b0c13c3f78c9a5e43a0fcfc0b1d741394a2e5 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 21:39:57 -0700 Subject: [PATCH 46/99] test --- utilities/docker/geppetto/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index fe3887a4..bc2ca42f 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -5,12 +5,11 @@ RUN apt-get update && apt-get install -y sudo xvfb RUN useradd -ms /bin/bash developer -RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ +RUN mkdir -p /etc/sudoers.d \ echo "developer:x:1000:1000:Developer,,,:/home/developer:/bin/bash" >> /etc/passwd && \ echo "developer:x:1000:" >> /etc/group && \ echo "developer ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/developer && \ chmod 0440 /etc/sudoers.d/developer && \ - chown developer:developer -R /home/developer && \ chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo USER developer From 6a603642174cc99460565e31fdd61f3f957af1d9 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 6 Jul 2017 23:01:05 -0700 Subject: [PATCH 47/99] test --- utilities/docker/geppetto/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index bc2ca42f..fe3887a4 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -5,11 +5,12 @@ RUN apt-get update && apt-get install -y sudo xvfb RUN useradd -ms /bin/bash developer -RUN mkdir -p /etc/sudoers.d \ +RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ echo "developer:x:1000:1000:Developer,,,:/home/developer:/bin/bash" >> /etc/passwd && \ echo "developer:x:1000:" >> /etc/group && \ echo "developer ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/developer && \ chmod 0440 /etc/sudoers.d/developer && \ + chown developer:developer -R /home/developer && \ chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo USER developer From 91ac781bc7126684b120b291f4bdf1d9be52fad0 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Fri, 7 Jul 2017 19:32:22 -0700 Subject: [PATCH 48/99] test --- utilities/docker/geppetto-casperjs/Dockerfile | 4 ++-- utilities/docker/geppetto-persistence-casperjs/Dockerfile | 7 ++----- utilities/docker/geppetto-persistence/Dockerfile | 3 ++- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/utilities/docker/geppetto-casperjs/Dockerfile b/utilities/docker/geppetto-casperjs/Dockerfile index 3ca505c8..a225b934 100644 --- a/utilities/docker/geppetto-casperjs/Dockerfile +++ b/utilities/docker/geppetto-casperjs/Dockerfile @@ -25,6 +25,6 @@ ENV SLIMERJSLAUNCHER /home/developer/firefox/firefox ENV SLIMERJS_EXECUTABLE /home/developer/slimerjs-0.10.3/slimerjs ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ RUN sudo apt install -y net-tools -RUN cd /home/developer/slimerjs-0.10.3 && ls +RUN cd /home && ls -RUN xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs --debug=yes \ No newline at end of file +CMD xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs --debug=yes \ No newline at end of file diff --git a/utilities/docker/geppetto-persistence-casperjs/Dockerfile b/utilities/docker/geppetto-persistence-casperjs/Dockerfile index 66fc3f93..a225b934 100644 --- a/utilities/docker/geppetto-persistence-casperjs/Dockerfile +++ b/utilities/docker/geppetto-persistence-casperjs/Dockerfile @@ -24,10 +24,7 @@ RUN sudo apt-get install -y libgtk-3-dev lshw ENV SLIMERJSLAUNCHER /home/developer/firefox/firefox ENV SLIMERJS_EXECUTABLE /home/developer/slimerjs-0.10.3/slimerjs ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ - RUN sudo apt install -y net-tools +RUN cd /home && ls -RUN sudo echo $(netstat -nr | grep '^0\.0\.0\.0' | awk '{print $2}') dockerhost >> sudo /etc/hosts -RUN sudo curl -L 'http://localhost:8080' -RUN sudo curl -L 'http://127.0.0.1:8080' -RUN xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs --debug=yes \ No newline at end of file +CMD xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs --debug=yes \ No newline at end of file diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index d78d899d..3b7e7324 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -102,4 +102,5 @@ RUN sudo service mysql start && cd /home/developer/workspace/org.geppetto.persis RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py -CMD sudo service mysql start && /home/developer/virgo/bin/startup.sh +EXPOSE 8080 +CMD ["/home/developer/virgo/bin/startup.sh"] \ No newline at end of file From fd8dff8e86d6e34f0eff989bb702e51b88c7dfdd Mon Sep 17 00:00:00 2001 From: jrmartin Date: Tue, 11 Jul 2017 07:43:24 -0700 Subject: [PATCH 49/99] remove files from testing --- .travis.yml | 18 ----------- utilities/docker/geppetto-casperjs/Dockerfile | 30 ------------------- .../geppetto-casperjs/test_geppetto_server.sh | 7 ----- .../geppetto-persistence-casperjs/Dockerfile | 30 ------------------- 4 files changed, 85 deletions(-) delete mode 100644 .travis.yml delete mode 100644 utilities/docker/geppetto-casperjs/Dockerfile delete mode 100644 utilities/docker/geppetto-casperjs/test_geppetto_server.sh delete mode 100644 utilities/docker/geppetto-persistence-casperjs/Dockerfile diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 9879276e..00000000 --- a/.travis.yml +++ /dev/null @@ -1,18 +0,0 @@ -language: java -env: - global: - secure: dn0FPQ5IG4M/3kdwnyI78ElQ308Vc3QnKAvkWfwMFb8QxDqxQdnTo7AV1qTMtbLrDNkeEWIgi4nc7jmXNtvGTwOfhAULVh6606Qs5B+ezTdwzajbbFMI8SKQx/pnTojOMu8dx7V4lMoR/YWcojR0VC1IWVC62TGbSB1k5BDGgH0= - -install: -- npm install --silent -g phantomjs npm install --silent -g casperjs npm install --silent -g slimerjs - -sudo: required - -services: - - docker - -script: - - docker build -t="geppetto" https://github.com/openworm/org.geppetto.git#docker-casperjs:utilities/docker/geppetto/ - - docker run -t -dit --name=geppetto_container -p 8080:8080 geppetto - - docker build https://github.com/openworm/org.geppetto.git#docker-casperjs:utilities/docker/geppetto-casperjs/ - - docker stop $(docker ps -a -q) \ No newline at end of file diff --git a/utilities/docker/geppetto-casperjs/Dockerfile b/utilities/docker/geppetto-casperjs/Dockerfile deleted file mode 100644 index a225b934..00000000 --- a/utilities/docker/geppetto-casperjs/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM java:7 - -RUN apt-get update && apt-get install -y sudo xvfb - -# install node and npm plus update firefox -RUN sudo apt-get install -y nodejs npm -RUN sudo apt-get install -y nodejs-legacy -RUN sudo apt-get install -y xvfb libxrender-dev libasound2 libdbus-glib-1-2 libgtk2.0-0 bzip2 -RUN cd /usr/local && sudo wget --no-verbose -O /tmp/firefox-50.0.tar.bz2 http://ftp.mozilla.org/pub/firefox/releases/50.0/linux-x86_64/en-US/firefox-50.0.tar.bz2 -RUN sudo tar xvjf /tmp/firefox-50.0.tar.bz2 -RUN cd ~ && sudo ln -s firefox-50.0.tar.bz2 - -# install casperjs needed libraries -RUN sudo npm install --silent -g phantomjs -RUN sudo npm install --silent -g casperjs - -# set up dir for running caspers tests -RUN sudo curl -k -O https://download.slimerjs.org/releases/0.10.3/slimerjs-0.10.3.tar.bz2 -RUN sudo pwd && tar -xjpvf slimerjs-0.10.3.tar.bz2 -RUN sudo rm slimerjs-0.10.3.tar.bz2 -WORKDIR /home/developer/workspace/org.geppetto.frontend/src/main/webapp/js/pages/tests/casperjs -RUN casperjs --version -RUN sudo apt-get install -y libgtk-3-dev lshw -ENV SLIMERJSLAUNCHER /home/developer/firefox/firefox -ENV SLIMERJS_EXECUTABLE /home/developer/slimerjs-0.10.3/slimerjs -ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ -RUN sudo apt install -y net-tools -RUN cd /home && ls - -CMD xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs --debug=yes \ No newline at end of file diff --git a/utilities/docker/geppetto-casperjs/test_geppetto_server.sh b/utilities/docker/geppetto-casperjs/test_geppetto_server.sh deleted file mode 100644 index ee3d5bc0..00000000 --- a/utilities/docker/geppetto-casperjs/test_geppetto_server.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -while ! curl http://192.168.99.100:8080/org.geppetto.frontend -do - echo "$(date) - still trying" - sleep 1 -done -echo "$(date) - connected successfully" diff --git a/utilities/docker/geppetto-persistence-casperjs/Dockerfile b/utilities/docker/geppetto-persistence-casperjs/Dockerfile deleted file mode 100644 index a225b934..00000000 --- a/utilities/docker/geppetto-persistence-casperjs/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM java:7 - -RUN apt-get update && apt-get install -y sudo xvfb - -# install node and npm plus update firefox -RUN sudo apt-get install -y nodejs npm -RUN sudo apt-get install -y nodejs-legacy -RUN sudo apt-get install -y xvfb libxrender-dev libasound2 libdbus-glib-1-2 libgtk2.0-0 bzip2 -RUN cd /usr/local && sudo wget --no-verbose -O /tmp/firefox-50.0.tar.bz2 http://ftp.mozilla.org/pub/firefox/releases/50.0/linux-x86_64/en-US/firefox-50.0.tar.bz2 -RUN sudo tar xvjf /tmp/firefox-50.0.tar.bz2 -RUN cd ~ && sudo ln -s firefox-50.0.tar.bz2 - -# install casperjs needed libraries -RUN sudo npm install --silent -g phantomjs -RUN sudo npm install --silent -g casperjs - -# set up dir for running caspers tests -RUN sudo curl -k -O https://download.slimerjs.org/releases/0.10.3/slimerjs-0.10.3.tar.bz2 -RUN sudo pwd && tar -xjpvf slimerjs-0.10.3.tar.bz2 -RUN sudo rm slimerjs-0.10.3.tar.bz2 -WORKDIR /home/developer/workspace/org.geppetto.frontend/src/main/webapp/js/pages/tests/casperjs -RUN casperjs --version -RUN sudo apt-get install -y libgtk-3-dev lshw -ENV SLIMERJSLAUNCHER /home/developer/firefox/firefox -ENV SLIMERJS_EXECUTABLE /home/developer/slimerjs-0.10.3/slimerjs -ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ -RUN sudo apt install -y net-tools -RUN cd /home && ls - -CMD xvfb-run -a casperjs test --includes=CoreTestsUtility.js CoreTests.js --engine=slimerjs --debug=yes \ No newline at end of file From 3336c8e92f64fcc972f25d4f5cde148638f4f650 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 12 Jul 2017 07:26:09 -0700 Subject: [PATCH 50/99] revert for test --- .../docker/geppetto-persistence/Dockerfile | 25 +++---------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 3b7e7324..98b0fa37 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -3,10 +3,6 @@ MAINTAINER Stephen Larson "slarson@openworm.org" RUN apt-get update && apt-get install -y sudo -# Install maven -RUN apt-get update -RUN apt-get install -y maven - RUN useradd -ms /bin/bash developer RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ @@ -21,19 +17,9 @@ USER developer ENV HOME /home/developer WORKDIR /home/developer -# get maven 3.5.0 -RUN sudo wget --no-verbose -O /tmp/apache-maven-3.5.0-bin.tar.gz http://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz - -# install maven -RUN sudo tar xzf /tmp/apache-maven-3.5.0-bin.tar.gz -C /opt/ -RUN sudo ln -s /opt/apache-maven-3.5.0 /opt/maven -RUN sudo ln -s /opt/maven/bin/mvn /usr/local/bin -RUN sudo rm -f /tmp/apache-maven-3.5.0-bin.tar.gz -ENV MAVEN_HOME /opt/maven - #VIRGO INSTALL USER root -RUN apt-get update && apt-get install -y curl bsdtar +RUN apt-get update && apt-get install -y curl bsdtar maven USER developer RUN mkdir -p /home/developer/virgo RUN curl -L 'http://www.eclipse.org/downloads/download.php?file=/virgo/release/VP/3.6.4.RELEASE/virgo-tomcat-server-3.6.4.RELEASE.zip&mirror_id=580&r=1' | bsdtar --strip-components 1 -C /home/developer/virgo -xzf - @@ -42,8 +28,6 @@ ENV SERVER_HOME /home/developer/virgo #VOLUME /home/developer/virgo #END VIRGO INSTALL -RUN mvn --version - #GET GEPPETTO SOURCES USER root RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development @@ -57,7 +41,7 @@ RUN cd workspace/org.geppetto/utilities/source_setup && yes n | python setup.py && python gitall.py reset && python gitall.py checkout development RUN sudo chmod -R 777 workspace -RUN cd workspace/org.geppetto && mvn install --quiet +RUN cd workspace/org.geppetto && mvn install #END GET GEPPETTO SOURCES #INSTALL MYSQL @@ -93,7 +77,7 @@ RUN service mysql start && mysql -uroot < /home/developer/geppetto/init.sql #END SETUP MYSQL INITIAL DATA USER developer -RUN cd /home/developer/workspace/org.geppetto.persistence && mvn install --quiet && mvn install --quiet +RUN cd /home/developer/workspace/org.geppetto.persistence && mvn install && mvn install RUN sudo service mysql start && cd /home/developer/workspace/org.geppetto.persistence && mvn exec:java -Dexec.mainClass="org.geppetto.persistence.util.DBTestData" -Dexec.classpathScope=runtime @@ -102,5 +86,4 @@ RUN sudo service mysql start && cd /home/developer/workspace/org.geppetto.persis RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py -EXPOSE 8080 -CMD ["/home/developer/virgo/bin/startup.sh"] \ No newline at end of file +CMD sudo service mysql start && /home/developer/virgo/bin/startup.sh From 4beb5fbc4abdc87f3d2905b4f0de5f1a2f0d2466 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 12 Jul 2017 07:27:34 -0700 Subject: [PATCH 51/99] test --- .../docker/geppetto-persistence/Dockerfile | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 98b0fa37..79332d6b 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -3,6 +3,10 @@ MAINTAINER Stephen Larson "slarson@openworm.org" RUN apt-get update && apt-get install -y sudo +# Install maven +RUN apt-get update +RUN apt-get install -y maven + RUN useradd -ms /bin/bash developer RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ @@ -17,9 +21,19 @@ USER developer ENV HOME /home/developer WORKDIR /home/developer +# get maven 3.5.0 +RUN sudo wget --no-verbose -O /tmp/apache-maven-3.5.0-bin.tar.gz http://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz + +# install maven +RUN sudo tar xzf /tmp/apache-maven-3.5.0-bin.tar.gz -C /opt/ +RUN sudo ln -s /opt/apache-maven-3.5.0 /opt/maven +RUN sudo ln -s /opt/maven/bin/mvn /usr/local/bin +RUN sudo rm -f /tmp/apache-maven-3.5.0-bin.tar.gz +ENV MAVEN_HOME /opt/maven + #VIRGO INSTALL USER root -RUN apt-get update && apt-get install -y curl bsdtar maven +RUN apt-get update && apt-get install -y curl bsdtar USER developer RUN mkdir -p /home/developer/virgo RUN curl -L 'http://www.eclipse.org/downloads/download.php?file=/virgo/release/VP/3.6.4.RELEASE/virgo-tomcat-server-3.6.4.RELEASE.zip&mirror_id=580&r=1' | bsdtar --strip-components 1 -C /home/developer/virgo -xzf - @@ -28,6 +42,8 @@ ENV SERVER_HOME /home/developer/virgo #VOLUME /home/developer/virgo #END VIRGO INSTALL +RUN mvn --version + #GET GEPPETTO SOURCES USER root RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development @@ -41,7 +57,7 @@ RUN cd workspace/org.geppetto/utilities/source_setup && yes n | python setup.py && python gitall.py reset && python gitall.py checkout development RUN sudo chmod -R 777 workspace -RUN cd workspace/org.geppetto && mvn install +RUN cd workspace/org.geppetto && mvn install --quiet #END GET GEPPETTO SOURCES #INSTALL MYSQL @@ -77,7 +93,7 @@ RUN service mysql start && mysql -uroot < /home/developer/geppetto/init.sql #END SETUP MYSQL INITIAL DATA USER developer -RUN cd /home/developer/workspace/org.geppetto.persistence && mvn install && mvn install +RUN cd /home/developer/workspace/org.geppetto.persistence && mvn install --quiet && mvn install --quiet RUN sudo service mysql start && cd /home/developer/workspace/org.geppetto.persistence && mvn exec:java -Dexec.mainClass="org.geppetto.persistence.util.DBTestData" -Dexec.classpathScope=runtime @@ -86,4 +102,5 @@ RUN sudo service mysql start && cd /home/developer/workspace/org.geppetto.persis RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py +EXPOSE 8080 CMD sudo service mysql start && /home/developer/virgo/bin/startup.sh From 0e24316b63275436a6108b850765acf162be472a Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 12 Jul 2017 17:18:34 -0700 Subject: [PATCH 52/99] clean --- utilities/docker/geppetto-persistence/Dockerfile | 7 +++---- utilities/docker/geppetto/Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 79332d6b..faf5ccba 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -1,11 +1,10 @@ FROM java:7 MAINTAINER Stephen Larson "slarson@openworm.org" -RUN apt-get update && apt-get install -y sudo +RUN apt-get update && apt-get install -qq -y sudo # Install maven RUN apt-get update -RUN apt-get install -y maven RUN useradd -ms /bin/bash developer @@ -33,7 +32,7 @@ ENV MAVEN_HOME /opt/maven #VIRGO INSTALL USER root -RUN apt-get update && apt-get install -y curl bsdtar +RUN apt-get update && apt-get install -y -qq curl bsdtar USER developer RUN mkdir -p /home/developer/virgo RUN curl -L 'http://www.eclipse.org/downloads/download.php?file=/virgo/release/VP/3.6.4.RELEASE/virgo-tomcat-server-3.6.4.RELEASE.zip&mirror_id=580&r=1' | bsdtar --strip-components 1 -C /home/developer/virgo -xzf - @@ -68,7 +67,7 @@ ENV MYSQL_USER=mysql \ MYSQL_LOG_DIR=/var/log/mysql RUN apt-get update \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y mysql-server \ && rm -rf ${MYSQL_DATA_DIR} \ && rm -rf /var/lib/apt/lists/* diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index fe3887a4..c44028f9 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -1,7 +1,7 @@ FROM java:7 MAINTAINER Stephen Larson "slarson@openworm.org" -RUN apt-get update && apt-get install -y sudo xvfb +RUN apt-get update && apt-get install -qq -y sudo xvfb RUN useradd -ms /bin/bash developer @@ -18,7 +18,7 @@ ENV HOME /home/developer WORKDIR /home/developer # get maven 3.5.0 -RUN sudo wget --no-verbose -O /tmp/apache-maven-3.5.0-bin.tar.gz http://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz +RUN sudo wget -q --no-verbose -O /tmp/apache-maven-3.5.0-bin.tar.gz http://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz # install maven RUN sudo tar xzf /tmp/apache-maven-3.5.0-bin.tar.gz -C /opt/ @@ -30,7 +30,7 @@ RUN mvn --version #VIRGO INSTALL USER root -RUN apt-get update && apt-get install -y curl bsdtar locate +RUN apt-get update && apt-get install -qq -y curl bsdtar locate USER developer RUN mkdir -p /home/developer/virgo RUN curl -L 'http://www.eclipse.org/downloads/download.php?file=/virgo/release/VP/3.6.4.RELEASE/virgo-tomcat-server-3.6.4.RELEASE.zip&mirror_id=580&r=1' | bsdtar --strip-components 1 -C /home/developer/virgo -xzf - From ba04e8d8c66491201722c8a5ce9d625e3138d1b6 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Tue, 18 Jul 2017 19:46:58 -0700 Subject: [PATCH 53/99] test --- utilities/docker/geppetto-persistence/init.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto-persistence/init.sql b/utilities/docker/geppetto-persistence/init.sql index b8844dd2..572c8b5a 100644 --- a/utilities/docker/geppetto-persistence/init.sql +++ b/utilities/docker/geppetto-persistence/init.sql @@ -1,4 +1,4 @@ create database geppetto; create user 'user_name' identified by 'password'; -grant all privileges on geppetto.* to 'user_name'@'%' identified by 'password'; +grant all privileges on geppetto.* to 'geppetto_persistence_container'@'%' identified by 'password'; flush privileges; From bd5c216a457c4c3c1ad2b90a6dc22a3c5dd46e12 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Tue, 18 Jul 2017 20:05:13 -0700 Subject: [PATCH 54/99] test --- utilities/docker/geppetto-persistence/init.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto-persistence/init.sql b/utilities/docker/geppetto-persistence/init.sql index 572c8b5a..c2a348e8 100644 --- a/utilities/docker/geppetto-persistence/init.sql +++ b/utilities/docker/geppetto-persistence/init.sql @@ -1,4 +1,4 @@ create database geppetto; create user 'user_name' identified by 'password'; -grant all privileges on geppetto.* to 'geppetto_persistence_container'@'%' identified by 'password'; +grant all privileges on geppetto.* to 'guest1'@'%' identified by 'password'; flush privileges; From e6fc91966206dd34f9a7775be16d735a82a48264 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Tue, 18 Jul 2017 20:24:14 -0700 Subject: [PATCH 55/99] test --- utilities/docker/geppetto-persistence/init.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto-persistence/init.sql b/utilities/docker/geppetto-persistence/init.sql index c2a348e8..b8844dd2 100644 --- a/utilities/docker/geppetto-persistence/init.sql +++ b/utilities/docker/geppetto-persistence/init.sql @@ -1,4 +1,4 @@ create database geppetto; create user 'user_name' identified by 'password'; -grant all privileges on geppetto.* to 'guest1'@'%' identified by 'password'; +grant all privileges on geppetto.* to 'user_name'@'%' identified by 'password'; flush privileges; From 0f17c3105e501881df6ae92d18e72a6331c74316 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 19 Jul 2017 14:30:49 -0700 Subject: [PATCH 56/99] test --- utilities/docker/geppetto-persistence/Dockerfile | 6 ++++++ utilities/docker/geppetto-persistence/aws.credentials | 0 2 files changed, 6 insertions(+) create mode 100644 utilities/docker/geppetto-persistence/aws.credentials diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index faf5ccba..17d46098 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -80,6 +80,7 @@ USER developer RUN mkdir -p geppetto/ COPY db.properties geppetto/ COPY init.sql geppetto/ +COPY aws.credentials geppetto/ #COPY entrypoint.sh geppetto/ #RUN sudo chmod +x geppetto/entrypoint.sh #END SETUP MYSQL CONFIG @@ -101,5 +102,10 @@ RUN sudo service mysql start && cd /home/developer/workspace/org.geppetto.persis RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py +RUN sudo echo "accessKey=${aKey}" >> /home/developer/geppetto/aws.credentials +RUN sudo echo "secretKey=${sKey}" >> /home/developer/geppetto/aws.credentials + +RUN sudo tail /home/developer/geppetto/aws.credentials + EXPOSE 8080 CMD sudo service mysql start && /home/developer/virgo/bin/startup.sh diff --git a/utilities/docker/geppetto-persistence/aws.credentials b/utilities/docker/geppetto-persistence/aws.credentials new file mode 100644 index 00000000..e69de29b From 4dca3c87f06d2a78b06c09f52fa5408a26779691 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 19 Jul 2017 15:31:13 -0700 Subject: [PATCH 57/99] test --- utilities/docker/geppetto-persistence/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 17d46098..6253244f 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -102,6 +102,7 @@ RUN sudo service mysql start && cd /home/developer/workspace/org.geppetto.persis RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py +RUN chmod u+x /home/developer/geppetto/aws.credentials RUN sudo echo "accessKey=${aKey}" >> /home/developer/geppetto/aws.credentials RUN sudo echo "secretKey=${sKey}" >> /home/developer/geppetto/aws.credentials From 0f0397491f6b8463c4bae165b6ae2d374d381f4a Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 19 Jul 2017 15:34:08 -0700 Subject: [PATCH 58/99] test --- utilities/docker/geppetto-persistence/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 6253244f..ee689542 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -102,7 +102,7 @@ RUN sudo service mysql start && cd /home/developer/workspace/org.geppetto.persis RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py -RUN chmod u+x /home/developer/geppetto/aws.credentials +RUN sudo chmod u+x /home/developer/geppetto/aws.credentials RUN sudo echo "accessKey=${aKey}" >> /home/developer/geppetto/aws.credentials RUN sudo echo "secretKey=${sKey}" >> /home/developer/geppetto/aws.credentials From bead36620ba30386efdea4a841c828916e711159 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 19 Jul 2017 16:03:31 -0700 Subject: [PATCH 59/99] test --- utilities/docker/geppetto-persistence/Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index ee689542..6e0052cc 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -80,7 +80,6 @@ USER developer RUN mkdir -p geppetto/ COPY db.properties geppetto/ COPY init.sql geppetto/ -COPY aws.credentials geppetto/ #COPY entrypoint.sh geppetto/ #RUN sudo chmod +x geppetto/entrypoint.sh #END SETUP MYSQL CONFIG @@ -102,9 +101,8 @@ RUN sudo service mysql start && cd /home/developer/workspace/org.geppetto.persis RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py -RUN sudo chmod u+x /home/developer/geppetto/aws.credentials -RUN sudo echo "accessKey=${aKey}" >> /home/developer/geppetto/aws.credentials -RUN sudo echo "secretKey=${sKey}" >> /home/developer/geppetto/aws.credentials +RUN sudo bash -c 'echo "accessKey=${aKey}" >> /home/developer/geppetto/aws.credentials' +RUN sudo bash -c 'echo "secretKey=${sKey}" >> /home/developer/geppetto/aws.credentials' RUN sudo tail /home/developer/geppetto/aws.credentials From e2871ca3705c8e9ca1fc9b006e3ce68ca43f91a8 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 19 Jul 2017 16:40:14 -0700 Subject: [PATCH 60/99] test --- utilities/docker/geppetto-persistence/Dockerfile | 8 ++++++++ utilities/docker/geppetto-persistence/aws.credentials | 0 2 files changed, 8 insertions(+) delete mode 100644 utilities/docker/geppetto-persistence/aws.credentials diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 6e0052cc..090bb441 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -1,6 +1,11 @@ FROM java:7 MAINTAINER Stephen Larson "slarson@openworm.org" +ARG aKey=local +ENV aKey ${aKey} +ARG sKey=local +ENV sKey ${sKey} + RUN apt-get update && apt-get install -qq -y sudo # Install maven @@ -101,6 +106,9 @@ RUN sudo service mysql start && cd /home/developer/workspace/org.geppetto.persis RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py +RUN echo $aKey +RUN echo $sKey + RUN sudo bash -c 'echo "accessKey=${aKey}" >> /home/developer/geppetto/aws.credentials' RUN sudo bash -c 'echo "secretKey=${sKey}" >> /home/developer/geppetto/aws.credentials' diff --git a/utilities/docker/geppetto-persistence/aws.credentials b/utilities/docker/geppetto-persistence/aws.credentials deleted file mode 100644 index e69de29b..00000000 From cd9120417f1ae2ad22d7cc1f8a235d0d0fc59b85 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 19 Jul 2017 17:06:49 -0700 Subject: [PATCH 61/99] test --- utilities/docker/geppetto-persistence/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 090bb441..58de3e66 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -109,8 +109,8 @@ RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python u RUN echo $aKey RUN echo $sKey -RUN sudo bash -c 'echo "accessKey=${aKey}" >> /home/developer/geppetto/aws.credentials' -RUN sudo bash -c 'echo "secretKey=${sKey}" >> /home/developer/geppetto/aws.credentials' +RUN sudo bash -c 'echo "accessKey=$aKey" >> /home/developer/geppetto/aws.credentials' +RUN sudo bash -c 'echo "secretKey=$sKey" >> /home/developer/geppetto/aws.credentials' RUN sudo tail /home/developer/geppetto/aws.credentials From 15db521175cc6f76d4802a57cef4ac0c506345a8 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 19 Jul 2017 17:43:24 -0700 Subject: [PATCH 62/99] test --- utilities/docker/geppetto-persistence/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 58de3e66..d594bd11 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -1,10 +1,10 @@ FROM java:7 MAINTAINER Stephen Larson "slarson@openworm.org" -ARG aKey=local -ENV aKey ${aKey} -ARG sKey=local -ENV sKey ${sKey} +ARG aaKey=local +ENV aaKey ${aKey} +ARG ssKey=local +ENV ssKey ${sKey} RUN apt-get update && apt-get install -qq -y sudo @@ -106,11 +106,11 @@ RUN sudo service mysql start && cd /home/developer/workspace/org.geppetto.persis RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py -RUN echo $aKey -RUN echo $sKey +RUN echo $aaKey +RUN echo $ssKey -RUN sudo bash -c 'echo "accessKey=$aKey" >> /home/developer/geppetto/aws.credentials' -RUN sudo bash -c 'echo "secretKey=$sKey" >> /home/developer/geppetto/aws.credentials' +RUN sudo bash -c 'echo "accessKey=$aaKey" >> /home/developer/geppetto/aws.credentials' +RUN sudo bash -c 'echo "secretKey=$ssKey" >> /home/developer/geppetto/aws.credentials' RUN sudo tail /home/developer/geppetto/aws.credentials From 818867c0c47c78495346282aa0ba3b9ca631633a Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 19 Jul 2017 19:09:46 -0700 Subject: [PATCH 63/99] test --- utilities/docker/geppetto-persistence/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index d594bd11..45ec2684 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -1,9 +1,9 @@ FROM java:7 MAINTAINER Stephen Larson "slarson@openworm.org" -ARG aaKey=local +ARG aaKey ENV aaKey ${aKey} -ARG ssKey=local +ARG ssKey ENV ssKey ${sKey} RUN apt-get update && apt-get install -qq -y sudo From dc3e2e9668b342bc8b4a9828c4bc285991bc2e5e Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 19 Jul 2017 21:48:38 -0700 Subject: [PATCH 64/99] test --- .../docker/geppetto-persistence/Dockerfile | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 45ec2684..78a0d5c4 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -1,13 +1,18 @@ FROM java:7 MAINTAINER Stephen Larson "slarson@openworm.org" -ARG aaKey -ENV aaKey ${aKey} -ARG ssKey -ENV ssKey ${sKey} +ARG aKey +ENV aKey=${aKey} +ARG sKey +ENV sKey=${sKey} RUN apt-get update && apt-get install -qq -y sudo +RUN sudo echo "accessKey=$aKey" > /etc/aws.credentials +RUN sudo echo "secretKey=$sKey" > /etc/aws.credentials + +RUN sudo tail /etc/aws.credentials + # Install maven RUN apt-get update @@ -106,12 +111,7 @@ RUN sudo service mysql start && cd /home/developer/workspace/org.geppetto.persis RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py -RUN echo $aaKey -RUN echo $ssKey - -RUN sudo bash -c 'echo "accessKey=$aaKey" >> /home/developer/geppetto/aws.credentials' -RUN sudo bash -c 'echo "secretKey=$ssKey" >> /home/developer/geppetto/aws.credentials' - +COPY /etc/aws.credentials /home/developer/geppetto RUN sudo tail /home/developer/geppetto/aws.credentials EXPOSE 8080 From 5262360a11baa43a96469660e67fc5cda26446b7 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 19 Jul 2017 21:52:30 -0700 Subject: [PATCH 65/99] test --- utilities/docker/geppetto-persistence/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 78a0d5c4..1bd8a73b 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -9,7 +9,7 @@ ENV sKey=${sKey} RUN apt-get update && apt-get install -qq -y sudo RUN sudo echo "accessKey=$aKey" > /etc/aws.credentials -RUN sudo echo "secretKey=$sKey" > /etc/aws.credentials +RUN sudo echo "secretKey=$sKey" >> /etc/aws.credentials RUN sudo tail /etc/aws.credentials From 844bb89102074e52145c5ed786bd782a1a8eaa92 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 19 Jul 2017 22:16:51 -0700 Subject: [PATCH 66/99] test --- utilities/docker/geppetto-persistence/Dockerfile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 1bd8a73b..f4f05c3c 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -8,11 +8,6 @@ ENV sKey=${sKey} RUN apt-get update && apt-get install -qq -y sudo -RUN sudo echo "accessKey=$aKey" > /etc/aws.credentials -RUN sudo echo "secretKey=$sKey" >> /etc/aws.credentials - -RUN sudo tail /etc/aws.credentials - # Install maven RUN apt-get update @@ -106,12 +101,12 @@ RUN cd /home/developer/workspace/org.geppetto.persistence && mvn install --quiet RUN sudo service mysql start && cd /home/developer/workspace/org.geppetto.persistence && mvn exec:java -Dexec.mainClass="org.geppetto.persistence.util.DBTestData" -Dexec.classpathScope=runtime - #END INSTALL MYSQL RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py -COPY /etc/aws.credentials /home/developer/geppetto +RUN sudo echo "accessKey=$aKey" > /home/developer/geppetto/aws.credentials +RUN sudo echo "secretKey=$sKey" >> /home/developer/geppetto/aws.credentials RUN sudo tail /home/developer/geppetto/aws.credentials EXPOSE 8080 From 044802fd76e6b138b7ad02267b8d44f2eaea0944 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 23 Jul 2017 16:13:57 -0700 Subject: [PATCH 67/99] test new Dockerfile --- .../docker/geppetto-persistence/Dockerfile | 1 - .../Dockerfile | 71 +++++++++++++++++++ 2 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 utilities/docker/geppetto-specific-frontend-branch/Dockerfile diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index f4f05c3c..c6d91773 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -107,7 +107,6 @@ RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python u RUN sudo echo "accessKey=$aKey" > /home/developer/geppetto/aws.credentials RUN sudo echo "secretKey=$sKey" >> /home/developer/geppetto/aws.credentials -RUN sudo tail /home/developer/geppetto/aws.credentials EXPOSE 8080 CMD sudo service mysql start && /home/developer/virgo/bin/startup.sh diff --git a/utilities/docker/geppetto-specific-frontend-branch/Dockerfile b/utilities/docker/geppetto-specific-frontend-branch/Dockerfile new file mode 100644 index 00000000..2d63e9f1 --- /dev/null +++ b/utilities/docker/geppetto-specific-frontend-branch/Dockerfile @@ -0,0 +1,71 @@ +FROM java:7 +MAINTAINER Stephen Larson "slarson@openworm.org" + +ARG frontendBranch +ENV frontendBranch=${frontendBranch} + +RUN apt-get update && apt-get install -qq -y sudo xvfb + +RUN useradd -ms /bin/bash developer + +RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ + echo "developer:x:1000:1000:Developer,,,:/home/developer:/bin/bash" >> /etc/passwd && \ + echo "developer:x:1000:" >> /etc/group && \ + echo "developer ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/developer && \ + chmod 0440 /etc/sudoers.d/developer && \ + chown developer:developer -R /home/developer && \ + chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo + +USER developer +ENV HOME /home/developer +WORKDIR /home/developer + +# get maven 3.5.0 +RUN sudo wget -q --no-verbose -O /tmp/apache-maven-3.5.0-bin.tar.gz http://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz + +# install maven +RUN sudo tar xzf /tmp/apache-maven-3.5.0-bin.tar.gz -C /opt/ +RUN sudo ln -s /opt/apache-maven-3.5.0 /opt/maven +RUN sudo ln -s /opt/maven/bin/mvn /usr/local/bin +RUN sudo rm -f /tmp/apache-maven-3.5.0-bin.tar.gz +ENV MAVEN_HOME /opt/maven +RUN mvn --version + +#VIRGO INSTALL +USER root +RUN apt-get update && apt-get install -qq -y curl bsdtar locate +USER developer +RUN mkdir -p /home/developer/virgo +RUN curl -L 'http://www.eclipse.org/downloads/download.php?file=/virgo/release/VP/3.6.4.RELEASE/virgo-tomcat-server-3.6.4.RELEASE.zip&mirror_id=580&r=1' | bsdtar --strip-components 1 -C /home/developer/virgo -xzf - +RUN chmod u+x /home/developer/virgo/bin/*.sh +ENV SERVER_HOME /home/developer/virgo +#VOLUME /home/developer/virgo +#END VIRGO INSTALL + +RUN mvn --version + +#GET GEPPETTO SOURCES +USER root +RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development +RUN chmod -R 777 workspace +USER developer +RUN git clone https://github.com/openworm/org.geppetto.model.git --quiet -b development +RUN git clone https://github.com/openworm/org.geppetto.core.git --quiet -b development +RUN git clone https://github.com/openworm/org.geppetto.model.neuroml.git --quiet -b development +RUN git clone https://github.com/openworm/org.geppetto.simulation.git --quiet -b development +RUN git clone https://github.com/openworm/org.geppetto.frontend.git --quiet -b $frontendBranch + +RUN sudo chmod -R 777 workspace \ + && cd workspace/org.geppetto && mvn --quiet install +#END GET GEPPETTO SOURCES + +RUN mkdir -p geppetto/ + +#COPY entrypoint.sh geppetto/ +#COPY check_update.sh geppetto/ +#RUN sudo chmod +x geppetto/*.sh + +RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py + +EXPOSE 8080 +CMD ["/home/developer/virgo/bin/startup.sh"] \ No newline at end of file From 830927b9302a52a5abde36fac464d20e9d56c355 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 23 Jul 2017 16:52:17 -0700 Subject: [PATCH 68/99] test --- utilities/docker/geppetto-specific-frontend-branch/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/utilities/docker/geppetto-specific-frontend-branch/Dockerfile b/utilities/docker/geppetto-specific-frontend-branch/Dockerfile index 2d63e9f1..a924ebae 100644 --- a/utilities/docker/geppetto-specific-frontend-branch/Dockerfile +++ b/utilities/docker/geppetto-specific-frontend-branch/Dockerfile @@ -49,6 +49,7 @@ USER root RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development RUN chmod -R 777 workspace USER developer +RUN cd .. RUN git clone https://github.com/openworm/org.geppetto.model.git --quiet -b development RUN git clone https://github.com/openworm/org.geppetto.core.git --quiet -b development RUN git clone https://github.com/openworm/org.geppetto.model.neuroml.git --quiet -b development From 7dbb8d2ca6d004231e035d4f947e60cdafea4dc7 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 23 Jul 2017 17:00:41 -0700 Subject: [PATCH 69/99] test --- utilities/docker/geppetto-specific-frontend-branch/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utilities/docker/geppetto-specific-frontend-branch/Dockerfile b/utilities/docker/geppetto-specific-frontend-branch/Dockerfile index a924ebae..4543cc25 100644 --- a/utilities/docker/geppetto-specific-frontend-branch/Dockerfile +++ b/utilities/docker/geppetto-specific-frontend-branch/Dockerfile @@ -55,6 +55,8 @@ RUN git clone https://github.com/openworm/org.geppetto.core.git --quiet -b devel RUN git clone https://github.com/openworm/org.geppetto.model.neuroml.git --quiet -b development RUN git clone https://github.com/openworm/org.geppetto.simulation.git --quiet -b development RUN git clone https://github.com/openworm/org.geppetto.frontend.git --quiet -b $frontendBranch +RUN ls +RUN sudo pwd RUN sudo chmod -R 777 workspace \ && cd workspace/org.geppetto && mvn --quiet install From e0aab0bdeb68d3894d483c1b007e2944d359d4d5 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 23 Jul 2017 17:05:13 -0700 Subject: [PATCH 70/99] test --- utilities/docker/geppetto-specific-frontend-branch/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/utilities/docker/geppetto-specific-frontend-branch/Dockerfile b/utilities/docker/geppetto-specific-frontend-branch/Dockerfile index 4543cc25..8231337d 100644 --- a/utilities/docker/geppetto-specific-frontend-branch/Dockerfile +++ b/utilities/docker/geppetto-specific-frontend-branch/Dockerfile @@ -49,7 +49,6 @@ USER root RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development RUN chmod -R 777 workspace USER developer -RUN cd .. RUN git clone https://github.com/openworm/org.geppetto.model.git --quiet -b development RUN git clone https://github.com/openworm/org.geppetto.core.git --quiet -b development RUN git clone https://github.com/openworm/org.geppetto.model.neuroml.git --quiet -b development From 5d5ca58194a9598c2d8df808474e11c780fba4dc Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 23 Jul 2017 17:20:08 -0700 Subject: [PATCH 71/99] test --- .../docker/geppetto-specific-frontend-branch/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utilities/docker/geppetto-specific-frontend-branch/Dockerfile b/utilities/docker/geppetto-specific-frontend-branch/Dockerfile index 8231337d..e46b3901 100644 --- a/utilities/docker/geppetto-specific-frontend-branch/Dockerfile +++ b/utilities/docker/geppetto-specific-frontend-branch/Dockerfile @@ -47,8 +47,8 @@ RUN mvn --version #GET GEPPETTO SOURCES USER root RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development -RUN chmod -R 777 workspace -USER developer +RUN ls +RUN sudo pwd RUN git clone https://github.com/openworm/org.geppetto.model.git --quiet -b development RUN git clone https://github.com/openworm/org.geppetto.core.git --quiet -b development RUN git clone https://github.com/openworm/org.geppetto.model.neuroml.git --quiet -b development @@ -56,7 +56,7 @@ RUN git clone https://github.com/openworm/org.geppetto.simulation.git --quiet -b RUN git clone https://github.com/openworm/org.geppetto.frontend.git --quiet -b $frontendBranch RUN ls RUN sudo pwd - +USER developer RUN sudo chmod -R 777 workspace \ && cd workspace/org.geppetto && mvn --quiet install #END GET GEPPETTO SOURCES From c508906d628e1d7b71a77a5acb4b615f67910d32 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 23 Jul 2017 17:27:34 -0700 Subject: [PATCH 72/99] test --- utilities/docker/geppetto-specific-frontend-branch/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto-specific-frontend-branch/Dockerfile b/utilities/docker/geppetto-specific-frontend-branch/Dockerfile index e46b3901..82ab37ed 100644 --- a/utilities/docker/geppetto-specific-frontend-branch/Dockerfile +++ b/utilities/docker/geppetto-specific-frontend-branch/Dockerfile @@ -48,7 +48,7 @@ RUN mvn --version USER root RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development RUN ls -RUN sudo pwd +RUN cd workspace RUN git clone https://github.com/openworm/org.geppetto.model.git --quiet -b development RUN git clone https://github.com/openworm/org.geppetto.core.git --quiet -b development RUN git clone https://github.com/openworm/org.geppetto.model.neuroml.git --quiet -b development From 0bc0ef874f9f2a5e729cac55dd44e758562d481f Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 23 Jul 2017 17:33:13 -0700 Subject: [PATCH 73/99] test --- .../docker/geppetto-specific-frontend-branch/Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/utilities/docker/geppetto-specific-frontend-branch/Dockerfile b/utilities/docker/geppetto-specific-frontend-branch/Dockerfile index 82ab37ed..b67641f7 100644 --- a/utilities/docker/geppetto-specific-frontend-branch/Dockerfile +++ b/utilities/docker/geppetto-specific-frontend-branch/Dockerfile @@ -48,11 +48,10 @@ RUN mvn --version USER root RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development RUN ls -RUN cd workspace -RUN git clone https://github.com/openworm/org.geppetto.model.git --quiet -b development -RUN git clone https://github.com/openworm/org.geppetto.core.git --quiet -b development -RUN git clone https://github.com/openworm/org.geppetto.model.neuroml.git --quiet -b development -RUN git clone https://github.com/openworm/org.geppetto.simulation.git --quiet -b development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.git && cd org.geppetto.model && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.core.git && cd org.geppetto.core && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.neuroml.git && cd org.geppetto.model.neuroml && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.simulation.git && cd org.geppetto.simulation && git checkout development RUN git clone https://github.com/openworm/org.geppetto.frontend.git --quiet -b $frontendBranch RUN ls RUN sudo pwd From e04e3cbc4e8415f610996d8f888c8cfa78b3834c Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 23 Jul 2017 17:40:23 -0700 Subject: [PATCH 74/99] test --- .../docker/geppetto-specific-frontend-branch/Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/utilities/docker/geppetto-specific-frontend-branch/Dockerfile b/utilities/docker/geppetto-specific-frontend-branch/Dockerfile index b67641f7..56104afb 100644 --- a/utilities/docker/geppetto-specific-frontend-branch/Dockerfile +++ b/utilities/docker/geppetto-specific-frontend-branch/Dockerfile @@ -47,14 +47,11 @@ RUN mvn --version #GET GEPPETTO SOURCES USER root RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development -RUN ls RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.git && cd org.geppetto.model && git checkout development RUN cd workspace && git clone https://github.com/openworm/org.geppetto.core.git && cd org.geppetto.core && git checkout development RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.neuroml.git && cd org.geppetto.model.neuroml && git checkout development RUN cd workspace && git clone https://github.com/openworm/org.geppetto.simulation.git && cd org.geppetto.simulation && git checkout development -RUN git clone https://github.com/openworm/org.geppetto.frontend.git --quiet -b $frontendBranch -RUN ls -RUN sudo pwd +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.frontend.git && cd org.geppetto.frontend && git checkout $frontendBranch USER developer RUN sudo chmod -R 777 workspace \ && cd workspace/org.geppetto && mvn --quiet install From f272ec9ae75ce902188c87eb731fbd5184fcfc21 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 23 Jul 2017 18:14:26 -0700 Subject: [PATCH 75/99] test frontend dockerfiles --- .../Dockerfile | 4 +- .../geppetto-persistence-frontend/Dockerfile | 120 ++++++++++++++++++ .../geppetto-persistence-frontend/config.json | 75 +++++++++++ .../db.properties | 4 + .../geppetto.plan | 28 ++++ .../geppetto-persistence-frontend/init.sql | 4 + .../geppetto-persistence-frontend/login.sh | 1 + .../geppetto-persistence-frontend/logs.sh | 1 + .../geppetto-persistence-frontend/rebuild.sh | 1 + .../geppetto-persistence-frontend/run.sh | 6 + .../geppetto-persistence-frontend/stop.sh | 2 + 11 files changed, 245 insertions(+), 1 deletion(-) rename utilities/docker/{geppetto-specific-frontend-branch => geppetto-frontend}/Dockerfile (96%) create mode 100644 utilities/docker/geppetto-persistence-frontend/Dockerfile create mode 100644 utilities/docker/geppetto-persistence-frontend/config.json create mode 100644 utilities/docker/geppetto-persistence-frontend/db.properties create mode 100644 utilities/docker/geppetto-persistence-frontend/geppetto.plan create mode 100644 utilities/docker/geppetto-persistence-frontend/init.sql create mode 100644 utilities/docker/geppetto-persistence-frontend/login.sh create mode 100644 utilities/docker/geppetto-persistence-frontend/logs.sh create mode 100644 utilities/docker/geppetto-persistence-frontend/rebuild.sh create mode 100644 utilities/docker/geppetto-persistence-frontend/run.sh create mode 100644 utilities/docker/geppetto-persistence-frontend/stop.sh diff --git a/utilities/docker/geppetto-specific-frontend-branch/Dockerfile b/utilities/docker/geppetto-frontend/Dockerfile similarity index 96% rename from utilities/docker/geppetto-specific-frontend-branch/Dockerfile rename to utilities/docker/geppetto-frontend/Dockerfile index 56104afb..e47d6c83 100644 --- a/utilities/docker/geppetto-specific-frontend-branch/Dockerfile +++ b/utilities/docker/geppetto-frontend/Dockerfile @@ -47,12 +47,14 @@ RUN mvn --version #GET GEPPETTO SOURCES USER root RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development +RUN chmod -R 777 workspace +USER developer + RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.git && cd org.geppetto.model && git checkout development RUN cd workspace && git clone https://github.com/openworm/org.geppetto.core.git && cd org.geppetto.core && git checkout development RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.neuroml.git && cd org.geppetto.model.neuroml && git checkout development RUN cd workspace && git clone https://github.com/openworm/org.geppetto.simulation.git && cd org.geppetto.simulation && git checkout development RUN cd workspace && git clone https://github.com/openworm/org.geppetto.frontend.git && cd org.geppetto.frontend && git checkout $frontendBranch -USER developer RUN sudo chmod -R 777 workspace \ && cd workspace/org.geppetto && mvn --quiet install #END GET GEPPETTO SOURCES diff --git a/utilities/docker/geppetto-persistence-frontend/Dockerfile b/utilities/docker/geppetto-persistence-frontend/Dockerfile new file mode 100644 index 00000000..8c6b4303 --- /dev/null +++ b/utilities/docker/geppetto-persistence-frontend/Dockerfile @@ -0,0 +1,120 @@ +FROM java:7 +MAINTAINER Stephen Larson "slarson@openworm.org" + +ARG aKey +ENV aKey=${aKey} +ARG sKey +ENV sKey=${sKey} +ARG frontendBranch +ENV frontendBranch=${frontendBranch} + +RUN apt-get update && apt-get install -qq -y sudo + +# Install maven +RUN apt-get update + +RUN useradd -ms /bin/bash developer + +RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ + echo "developer:x:1000:1000:Developer,,,:/home/developer:/bin/bash" >> /etc/passwd && \ + echo "developer:x:1000:" >> /etc/group && \ + echo "developer ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/developer && \ + chmod 0440 /etc/sudoers.d/developer && \ + chown developer:developer -R /home/developer && \ + chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo + +USER developer +ENV HOME /home/developer +WORKDIR /home/developer + +# get maven 3.5.0 +RUN sudo wget --no-verbose -O /tmp/apache-maven-3.5.0-bin.tar.gz http://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz + +# install maven +RUN sudo tar xzf /tmp/apache-maven-3.5.0-bin.tar.gz -C /opt/ +RUN sudo ln -s /opt/apache-maven-3.5.0 /opt/maven +RUN sudo ln -s /opt/maven/bin/mvn /usr/local/bin +RUN sudo rm -f /tmp/apache-maven-3.5.0-bin.tar.gz +ENV MAVEN_HOME /opt/maven + +#VIRGO INSTALL +USER root +RUN apt-get update && apt-get install -y -qq curl bsdtar +USER developer +RUN mkdir -p /home/developer/virgo +RUN curl -L 'http://www.eclipse.org/downloads/download.php?file=/virgo/release/VP/3.6.4.RELEASE/virgo-tomcat-server-3.6.4.RELEASE.zip&mirror_id=580&r=1' | bsdtar --strip-components 1 -C /home/developer/virgo -xzf - +RUN chmod u+x /home/developer/virgo/bin/*.sh +ENV SERVER_HOME /home/developer/virgo +#VOLUME /home/developer/virgo +#END VIRGO INSTALL + +RUN mvn --version + +#GET GEPPETTO SOURCES +USER root +RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development +RUN chmod -R 777 workspace +USER developer + +COPY config.json workspace/org.geppetto/utilities/source_setup/ +COPY geppetto.plan workspace/org.geppetto/ + +RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.git && cd org.geppetto.model && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.core.git && cd org.geppetto.core && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.neuroml.git && cd org.geppetto.model.neuroml && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.simulation.git && cd org.geppetto.simulation && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.frontend.git && cd org.geppetto.frontend && git checkout $frontendBranch +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.persistence.git && cd org.geppetto.persistence && git checkout development + +RUN sudo chmod -R 777 workspace + +RUN cd workspace/org.geppetto && mvn install --quiet +#END GET GEPPETTO SOURCES + +#INSTALL MYSQL +USER root +ENV MYSQL_USER=mysql \ + MYSQL_DATA_DIR=/var/lib/mysql \ + MYSQL_RUN_DIR=/run/mysqld \ + MYSQL_LOG_DIR=/var/log/mysql + +RUN apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y mysql-server \ + && rm -rf ${MYSQL_DATA_DIR} \ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir -p ${MYSQL_DATA_DIR} && mkdir -p ${MYSQL_RUN_DIR} && \ + mkdir -p ${MYSQL_LOG_DIR} + +USER developer + +#SETUP MYSQL CONFIG +RUN mkdir -p geppetto/ +COPY db.properties geppetto/ +COPY init.sql geppetto/ +#COPY entrypoint.sh geppetto/ +#RUN sudo chmod +x geppetto/entrypoint.sh +#END SETUP MYSQL CONFIG + +#SETUP MYSQL INITIAL DATA +USER root +RUN mysql_install_db --user=mysql >/dev/null 2>&1 +RUN sed 's/password = .*/password = /g' -i /etc/mysql/debian.cnf +RUN service mysql start && mysql -uroot < /home/developer/geppetto/init.sql +#END SETUP MYSQL INITIAL DATA + +USER developer +RUN cd /home/developer/workspace/org.geppetto.persistence && mvn install --quiet && mvn install --quiet + +RUN sudo service mysql start && cd /home/developer/workspace/org.geppetto.persistence && mvn exec:java -Dexec.mainClass="org.geppetto.persistence.util.DBTestData" -Dexec.classpathScope=runtime + +#END INSTALL MYSQL + +RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py + +RUN sudo echo "accessKey=$aKey" > /home/developer/geppetto/aws.credentials +RUN sudo echo "secretKey=$sKey" >> /home/developer/geppetto/aws.credentials + +EXPOSE 8080 +CMD sudo service mysql start && /home/developer/virgo/bin/startup.sh diff --git a/utilities/docker/geppetto-persistence-frontend/config.json b/utilities/docker/geppetto-persistence-frontend/config.json new file mode 100644 index 00000000..fa5b7c0e --- /dev/null +++ b/utilities/docker/geppetto-persistence-frontend/config.json @@ -0,0 +1,75 @@ +{ + "sourcesdir":"..//..//..//", + "repos":[ + { + "name":"org.geppetto.core", + "url":"https://github.com/openworm/org.geppetto.core.git", + "auto_install":"yes" + }, + { + "name":"org.geppetto.model", + "url":"https://github.com/openworm/org.geppetto.model.git", + "auto_install":"yes" + }, + { + "name":"org.geppetto.model.neuroml", + "url":"https://github.com/openworm/org.geppetto.model.neuroml.git", + "auto_install":"yes" + }, + { + "name":"org.geppetto.simulation", + "url":"https://github.com/openworm/org.geppetto.simulation.git", + "auto_install":"yes" + }, + { + "name":"org.geppetto.frontend", + "url":"https://github.com/openworm/org.geppetto.frontend.git", + "auto_install":"yes" + }, + { + "name":"org.geppetto.model.swc", + "url":"https://github.com/openworm/org.geppetto.model.swc", + "auto_install":"yes" + }, + { + "name":"org.geppetto.model.nwb", + "url":"https://github.com/openworm/org.geppetto.model.nwb", + "auto_install":"no" + }, + { + "name":"org.geppetto.persistence", + "url":"https://github.com/openworm/org.geppetto.persistence.git", + "auto_install":"yes" + }, + { + "name":"org.geppetto.simulator.external", + "url":"https://github.com/openworm/org.geppetto.simulator.external.git", + "auto_install":"no" + }, + { + "name":"org.geppetto.solver.sph", + "url":"https://github.com/openworm/org.geppetto.solver.sph.git", + "auto_install":"no" + }, + { + "name":"org.geppetto.model.sph", + "url":"https://github.com/openworm/org.geppetto.model.sph.git", + "auto_install":"no" + }, + { + "name":"org.geppetto.simulator.sph", + "url":"https://github.com/openworm/org.geppetto.simulator.sph.git", + "auto_install":"no" + }, + { + "name":"org.geppetto.simulator.jlems", + "url":"https://github.com/openworm/org.geppetto.simulator.jlems.git", + "auto_install":"no" + }, + { + "name":"org.geppetto.testbackend", + "url":"https://github.com/openworm/org.geppetto.testbackend.git", + "auto_install":"no" + } + ] +} diff --git a/utilities/docker/geppetto-persistence-frontend/db.properties b/utilities/docker/geppetto-persistence-frontend/db.properties new file mode 100644 index 00000000..f75d1a29 --- /dev/null +++ b/utilities/docker/geppetto-persistence-frontend/db.properties @@ -0,0 +1,4 @@ +javax.jdo.option.ConnectionURL=jdbc:mysql://localhost/geppetto +javax.jdo.option.ConnectionDriverName=com.mysql.jdbc.Driver +javax.jdo.option.ConnectionUserName=user_name +javax.jdo.option.ConnectionPassword=password diff --git a/utilities/docker/geppetto-persistence-frontend/geppetto.plan b/utilities/docker/geppetto-persistence-frontend/geppetto.plan new file mode 100644 index 00000000..87ae0ed4 --- /dev/null +++ b/utilities/docker/geppetto-persistence-frontend/geppetto.plan @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + diff --git a/utilities/docker/geppetto-persistence-frontend/init.sql b/utilities/docker/geppetto-persistence-frontend/init.sql new file mode 100644 index 00000000..b8844dd2 --- /dev/null +++ b/utilities/docker/geppetto-persistence-frontend/init.sql @@ -0,0 +1,4 @@ +create database geppetto; +create user 'user_name' identified by 'password'; +grant all privileges on geppetto.* to 'user_name'@'%' identified by 'password'; +flush privileges; diff --git a/utilities/docker/geppetto-persistence-frontend/login.sh b/utilities/docker/geppetto-persistence-frontend/login.sh new file mode 100644 index 00000000..a5b69f68 --- /dev/null +++ b/utilities/docker/geppetto-persistence-frontend/login.sh @@ -0,0 +1 @@ +sudo docker exec -ti geppetto bash diff --git a/utilities/docker/geppetto-persistence-frontend/logs.sh b/utilities/docker/geppetto-persistence-frontend/logs.sh new file mode 100644 index 00000000..9e2944b3 --- /dev/null +++ b/utilities/docker/geppetto-persistence-frontend/logs.sh @@ -0,0 +1 @@ +sudo docker logs -f geppetto diff --git a/utilities/docker/geppetto-persistence-frontend/rebuild.sh b/utilities/docker/geppetto-persistence-frontend/rebuild.sh new file mode 100644 index 00000000..ac06a1bb --- /dev/null +++ b/utilities/docker/geppetto-persistence-frontend/rebuild.sh @@ -0,0 +1 @@ +sudo docker build --rm=true --force-rm -t slarson/geppetto:persistence . diff --git a/utilities/docker/geppetto-persistence-frontend/run.sh b/utilities/docker/geppetto-persistence-frontend/run.sh new file mode 100644 index 00000000..faba8b1c --- /dev/null +++ b/utilities/docker/geppetto-persistence-frontend/run.sh @@ -0,0 +1,6 @@ +#!/bin/bash +if [ -n "$1" ]; then +sudo docker run -d --name geppetto --publish=8080:8080 -e BRANCH=$1 slarson/geppetto:persistence +else +sudo docker run -d --name geppetto --publish=8080:8080 slarson/geppetto:persistence +fi diff --git a/utilities/docker/geppetto-persistence-frontend/stop.sh b/utilities/docker/geppetto-persistence-frontend/stop.sh new file mode 100644 index 00000000..61b9a342 --- /dev/null +++ b/utilities/docker/geppetto-persistence-frontend/stop.sh @@ -0,0 +1,2 @@ +sudo docker stop geppetto +sudo docker rm geppetto From e46a52b24cd8eee2ae48689fab4f8a10e48a1e88 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 23 Jul 2017 20:04:12 -0700 Subject: [PATCH 76/99] test --- utilities/docker/geppetto-persistence-frontend/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/utilities/docker/geppetto-persistence-frontend/Dockerfile b/utilities/docker/geppetto-persistence-frontend/Dockerfile index 8c6b4303..1a555b63 100644 --- a/utilities/docker/geppetto-persistence-frontend/Dockerfile +++ b/utilities/docker/geppetto-persistence-frontend/Dockerfile @@ -59,7 +59,6 @@ USER developer COPY config.json workspace/org.geppetto/utilities/source_setup/ COPY geppetto.plan workspace/org.geppetto/ -RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.git && cd org.geppetto.model && git checkout development RUN cd workspace && git clone https://github.com/openworm/org.geppetto.core.git && cd org.geppetto.core && git checkout development RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.neuroml.git && cd org.geppetto.model.neuroml && git checkout development From 1567c4fcc612581bf4c171e0d9a302226ad09287 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 2 Aug 2017 15:15:15 -0700 Subject: [PATCH 77/99] test --- utilities/docker/geppetto/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index c44028f9..bd146754 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -48,7 +48,7 @@ RUN chmod -R 777 workspace USER developer RUN cd workspace/org.geppetto/utilities/source_setup && yes n | python setup.py && python gitall.py pull \ && python gitall.py reset && python gitall.py checkout development && cd ../../../.. && sudo chmod -R 777 workspace \ - && cd workspace/org.geppetto && mvn --quiet install + && cd workspace/org.geppetto && mvn install #END GET GEPPETTO SOURCES RUN mkdir -p geppetto/ From 1fd4adc3b53115994e6c976f615bd8f3e417cf5a Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 2 Aug 2017 18:35:12 -0700 Subject: [PATCH 78/99] test --- utilities/docker/geppetto-frontend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto-frontend/Dockerfile b/utilities/docker/geppetto-frontend/Dockerfile index e47d6c83..b8913299 100644 --- a/utilities/docker/geppetto-frontend/Dockerfile +++ b/utilities/docker/geppetto-frontend/Dockerfile @@ -56,7 +56,7 @@ RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.neu RUN cd workspace && git clone https://github.com/openworm/org.geppetto.simulation.git && cd org.geppetto.simulation && git checkout development RUN cd workspace && git clone https://github.com/openworm/org.geppetto.frontend.git && cd org.geppetto.frontend && git checkout $frontendBranch RUN sudo chmod -R 777 workspace \ - && cd workspace/org.geppetto && mvn --quiet install + && cd workspace/org.geppetto && mvn install #END GET GEPPETTO SOURCES RUN mkdir -p geppetto/ From 74f649ca51829fc5d1f01a4ed20c89ca378c619b Mon Sep 17 00:00:00 2001 From: jrmartin Date: Wed, 2 Aug 2017 21:08:14 -0700 Subject: [PATCH 79/99] test --- utilities/docker/geppetto-frontend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto-frontend/Dockerfile b/utilities/docker/geppetto-frontend/Dockerfile index b8913299..e47d6c83 100644 --- a/utilities/docker/geppetto-frontend/Dockerfile +++ b/utilities/docker/geppetto-frontend/Dockerfile @@ -56,7 +56,7 @@ RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.neu RUN cd workspace && git clone https://github.com/openworm/org.geppetto.simulation.git && cd org.geppetto.simulation && git checkout development RUN cd workspace && git clone https://github.com/openworm/org.geppetto.frontend.git && cd org.geppetto.frontend && git checkout $frontendBranch RUN sudo chmod -R 777 workspace \ - && cd workspace/org.geppetto && mvn install + && cd workspace/org.geppetto && mvn --quiet install #END GET GEPPETTO SOURCES RUN mkdir -p geppetto/ From 9144cc339afc8602849b1ac0a3a0f8db66d12b4b Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 3 Aug 2017 16:15:11 -0700 Subject: [PATCH 80/99] test --- utilities/docker/geppetto/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index bd146754..c44028f9 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -48,7 +48,7 @@ RUN chmod -R 777 workspace USER developer RUN cd workspace/org.geppetto/utilities/source_setup && yes n | python setup.py && python gitall.py pull \ && python gitall.py reset && python gitall.py checkout development && cd ../../../.. && sudo chmod -R 777 workspace \ - && cd workspace/org.geppetto && mvn install + && cd workspace/org.geppetto && mvn --quiet install #END GET GEPPETTO SOURCES RUN mkdir -p geppetto/ From 90b046465d49786034811824fe3b07e9cf233dfb Mon Sep 17 00:00:00 2001 From: jrmartin Date: Fri, 4 Aug 2017 19:16:49 -0700 Subject: [PATCH 81/99] test persistence specific dockerfile --- utilities/docker/geppetto-persistence-frontend/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utilities/docker/geppetto-persistence-frontend/Dockerfile b/utilities/docker/geppetto-persistence-frontend/Dockerfile index 1a555b63..64789b84 100644 --- a/utilities/docker/geppetto-persistence-frontend/Dockerfile +++ b/utilities/docker/geppetto-persistence-frontend/Dockerfile @@ -5,8 +5,8 @@ ARG aKey ENV aKey=${aKey} ARG sKey ENV sKey=${sKey} -ARG frontendBranch -ENV frontendBranch=${frontendBranch} +ARG persistenceBranch +ENV persistenceBranch=${persistenceBranch} RUN apt-get update && apt-get install -qq -y sudo @@ -63,8 +63,8 @@ RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.git RUN cd workspace && git clone https://github.com/openworm/org.geppetto.core.git && cd org.geppetto.core && git checkout development RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.neuroml.git && cd org.geppetto.model.neuroml && git checkout development RUN cd workspace && git clone https://github.com/openworm/org.geppetto.simulation.git && cd org.geppetto.simulation && git checkout development -RUN cd workspace && git clone https://github.com/openworm/org.geppetto.frontend.git && cd org.geppetto.frontend && git checkout $frontendBranch -RUN cd workspace && git clone https://github.com/openworm/org.geppetto.persistence.git && cd org.geppetto.persistence && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.frontend.git && cd org.geppetto.frontend && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.persistence.git && cd org.geppetto.persistence && git checkout $persistenceBranch RUN sudo chmod -R 777 workspace From ef72114a6b666bc3b035095bd6343d95857487ba Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sat, 5 Aug 2017 14:36:54 -0700 Subject: [PATCH 82/99] test --- .../docker/geppetto-persistence/Dockerfile | 18 ++++++++++++++---- .../docker/geppetto-persistence/geppetto.plan | 14 +++++++------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index c6d91773..7ee3bed3 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -5,6 +5,11 @@ ARG aKey ENV aKey=${aKey} ARG sKey ENV sKey=${sKey} +ARG persistenceBranch +ENV persistenceBranch=${persistenceBranch} + +RUN if ["$persistenceBranch" == null]; then $persistenceBranch = "development"; fi; +RUN echo "$persistenceBranch"; RUN apt-get update && apt-get install -qq -y sudo @@ -57,11 +62,16 @@ USER developer COPY config.json workspace/org.geppetto/utilities/source_setup/ COPY geppetto.plan workspace/org.geppetto/ -RUN cd workspace/org.geppetto/utilities/source_setup && yes n | python setup.py && python gitall.py pull \ - && python gitall.py reset && python gitall.py checkout development -RUN sudo chmod -R 777 workspace +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.git && cd org.geppetto.model && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.core.git && cd org.geppetto.core && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.neuroml.git && cd org.geppetto.model.neuroml && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.swc.git && cd org.geppetto.model.swc && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.simulation.git && cd org.geppetto.simulation && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.frontend.git && cd org.geppetto.frontend && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.persistence.git && cd org.geppetto.persistence && git checkout $persistenceBranch -RUN cd workspace/org.geppetto && mvn install --quiet +RUN sudo chmod -R 777 workspace \ + && cd workspace/org.geppetto && mvn --quiet install #END GET GEPPETTO SOURCES #INSTALL MYSQL diff --git a/utilities/docker/geppetto-persistence/geppetto.plan b/utilities/docker/geppetto-persistence/geppetto.plan index 87ae0ed4..2b2234dc 100644 --- a/utilities/docker/geppetto-persistence/geppetto.plan +++ b/utilities/docker/geppetto-persistence/geppetto.plan @@ -7,13 +7,13 @@ http://www.springsource.org/schema/dm-server/plan/springsource-dm-server-plan.xsd"> - - - - - - - + + + + + + + - - - - - - diff --git a/utilities/docker/geppetto-persistence-frontend/init.sql b/utilities/docker/geppetto-persistence-frontend/init.sql deleted file mode 100644 index b8844dd2..00000000 --- a/utilities/docker/geppetto-persistence-frontend/init.sql +++ /dev/null @@ -1,4 +0,0 @@ -create database geppetto; -create user 'user_name' identified by 'password'; -grant all privileges on geppetto.* to 'user_name'@'%' identified by 'password'; -flush privileges; diff --git a/utilities/docker/geppetto-persistence-frontend/login.sh b/utilities/docker/geppetto-persistence-frontend/login.sh deleted file mode 100644 index a5b69f68..00000000 --- a/utilities/docker/geppetto-persistence-frontend/login.sh +++ /dev/null @@ -1 +0,0 @@ -sudo docker exec -ti geppetto bash diff --git a/utilities/docker/geppetto-persistence-frontend/logs.sh b/utilities/docker/geppetto-persistence-frontend/logs.sh deleted file mode 100644 index 9e2944b3..00000000 --- a/utilities/docker/geppetto-persistence-frontend/logs.sh +++ /dev/null @@ -1 +0,0 @@ -sudo docker logs -f geppetto diff --git a/utilities/docker/geppetto-persistence-frontend/rebuild.sh b/utilities/docker/geppetto-persistence-frontend/rebuild.sh deleted file mode 100644 index ac06a1bb..00000000 --- a/utilities/docker/geppetto-persistence-frontend/rebuild.sh +++ /dev/null @@ -1 +0,0 @@ -sudo docker build --rm=true --force-rm -t slarson/geppetto:persistence . diff --git a/utilities/docker/geppetto-persistence-frontend/run.sh b/utilities/docker/geppetto-persistence-frontend/run.sh deleted file mode 100644 index faba8b1c..00000000 --- a/utilities/docker/geppetto-persistence-frontend/run.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -if [ -n "$1" ]; then -sudo docker run -d --name geppetto --publish=8080:8080 -e BRANCH=$1 slarson/geppetto:persistence -else -sudo docker run -d --name geppetto --publish=8080:8080 slarson/geppetto:persistence -fi diff --git a/utilities/docker/geppetto-persistence-frontend/stop.sh b/utilities/docker/geppetto-persistence-frontend/stop.sh deleted file mode 100644 index 61b9a342..00000000 --- a/utilities/docker/geppetto-persistence-frontend/stop.sh +++ /dev/null @@ -1,2 +0,0 @@ -sudo docker stop geppetto -sudo docker rm geppetto diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index c44028f9..d6cb2187 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -1,6 +1,12 @@ FROM java:7 MAINTAINER Stephen Larson "slarson@openworm.org" +ARG frontendBranch +ENV frontendBranch=${frontendBranch} +RUN echo "$frontendBranch"; +RUN if ["$frontendBranch" == null]; then $frontendBranch = "development"; fi; +RUN echo "$frontendBranch"; + RUN apt-get update && apt-get install -qq -y sudo xvfb RUN useradd -ms /bin/bash developer @@ -46,8 +52,13 @@ USER root RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development RUN chmod -R 777 workspace USER developer -RUN cd workspace/org.geppetto/utilities/source_setup && yes n | python setup.py && python gitall.py pull \ - && python gitall.py reset && python gitall.py checkout development && cd ../../../.. && sudo chmod -R 777 workspace \ + +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.git && cd org.geppetto.model && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.core.git && cd org.geppetto.core && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.neuroml.git && cd org.geppetto.model.neuroml && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.simulation.git && cd org.geppetto.simulation && git checkout development +RUN cd workspace && git clone https://github.com/openworm/org.geppetto.frontend.git && cd org.geppetto.frontend && git checkout $frontendBranch +RUN sudo chmod -R 777 workspace \ && cd workspace/org.geppetto && mvn --quiet install #END GET GEPPETTO SOURCES From 606076f77a8ca6b407b65843e5bf2b91063dac8c Mon Sep 17 00:00:00 2001 From: jrmartin Date: Sun, 6 Aug 2017 14:51:59 -0700 Subject: [PATCH 86/99] remove geppetto-frontend docker --- utilities/docker/geppetto-frontend/Dockerfile | 71 ------------------- 1 file changed, 71 deletions(-) delete mode 100644 utilities/docker/geppetto-frontend/Dockerfile diff --git a/utilities/docker/geppetto-frontend/Dockerfile b/utilities/docker/geppetto-frontend/Dockerfile deleted file mode 100644 index e47d6c83..00000000 --- a/utilities/docker/geppetto-frontend/Dockerfile +++ /dev/null @@ -1,71 +0,0 @@ -FROM java:7 -MAINTAINER Stephen Larson "slarson@openworm.org" - -ARG frontendBranch -ENV frontendBranch=${frontendBranch} - -RUN apt-get update && apt-get install -qq -y sudo xvfb - -RUN useradd -ms /bin/bash developer - -RUN mkdir -p /home/developer && mkdir -p /etc/sudoers.d \ - echo "developer:x:1000:1000:Developer,,,:/home/developer:/bin/bash" >> /etc/passwd && \ - echo "developer:x:1000:" >> /etc/group && \ - echo "developer ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/developer && \ - chmod 0440 /etc/sudoers.d/developer && \ - chown developer:developer -R /home/developer && \ - chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo - -USER developer -ENV HOME /home/developer -WORKDIR /home/developer - -# get maven 3.5.0 -RUN sudo wget -q --no-verbose -O /tmp/apache-maven-3.5.0-bin.tar.gz http://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz - -# install maven -RUN sudo tar xzf /tmp/apache-maven-3.5.0-bin.tar.gz -C /opt/ -RUN sudo ln -s /opt/apache-maven-3.5.0 /opt/maven -RUN sudo ln -s /opt/maven/bin/mvn /usr/local/bin -RUN sudo rm -f /tmp/apache-maven-3.5.0-bin.tar.gz -ENV MAVEN_HOME /opt/maven -RUN mvn --version - -#VIRGO INSTALL -USER root -RUN apt-get update && apt-get install -qq -y curl bsdtar locate -USER developer -RUN mkdir -p /home/developer/virgo -RUN curl -L 'http://www.eclipse.org/downloads/download.php?file=/virgo/release/VP/3.6.4.RELEASE/virgo-tomcat-server-3.6.4.RELEASE.zip&mirror_id=580&r=1' | bsdtar --strip-components 1 -C /home/developer/virgo -xzf - -RUN chmod u+x /home/developer/virgo/bin/*.sh -ENV SERVER_HOME /home/developer/virgo -#VOLUME /home/developer/virgo -#END VIRGO INSTALL - -RUN mvn --version - -#GET GEPPETTO SOURCES -USER root -RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout development -RUN chmod -R 777 workspace -USER developer - -RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.git && cd org.geppetto.model && git checkout development -RUN cd workspace && git clone https://github.com/openworm/org.geppetto.core.git && cd org.geppetto.core && git checkout development -RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.neuroml.git && cd org.geppetto.model.neuroml && git checkout development -RUN cd workspace && git clone https://github.com/openworm/org.geppetto.simulation.git && cd org.geppetto.simulation && git checkout development -RUN cd workspace && git clone https://github.com/openworm/org.geppetto.frontend.git && cd org.geppetto.frontend && git checkout $frontendBranch -RUN sudo chmod -R 777 workspace \ - && cd workspace/org.geppetto && mvn --quiet install -#END GET GEPPETTO SOURCES - -RUN mkdir -p geppetto/ - -#COPY entrypoint.sh geppetto/ -#COPY check_update.sh geppetto/ -#RUN sudo chmod +x geppetto/*.sh - -RUN cd /home/developer/workspace/org.geppetto/utilities/source_setup && python update_server.py - -EXPOSE 8080 -CMD ["/home/developer/virgo/bin/startup.sh"] \ No newline at end of file From 701c63c3585f3ea94ad94c7e986a24b2132248f4 Mon Sep 17 00:00:00 2001 From: Matteo Cantarelli Date: Mon, 7 Aug 2017 15:41:47 +0100 Subject: [PATCH 87/99] Release 0.3.7 --- geppetto.plan | 10 +++++----- pom.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/geppetto.plan b/geppetto.plan index a2a0a90b..9a3336be 100644 --- a/geppetto.plan +++ b/geppetto.plan @@ -7,11 +7,11 @@ http://www.springsource.org/schema/dm-server/plan/springsource-dm-server-plan.xsd"> - - - - - + + + + + diff --git a/pom.xml b/pom.xml index 27e7f4c5..b2f30792 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.geppetto org.geppetto Geppetto - 0.3.6 + 0.3.7 pom ../org.geppetto.model From e51ae54c40b81547930aa1f92c0181724c67395c Mon Sep 17 00:00:00 2001 From: jrmartin Date: Mon, 7 Aug 2017 15:38:45 -0700 Subject: [PATCH 88/99] test env --- utilities/docker/geppetto-persistence/Dockerfile | 4 ++-- utilities/docker/geppetto/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 2683f683..3c8ddfb6 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -10,10 +10,10 @@ ENV persistenceBranch=${persistenceBranch} ARG frontendBranch ENV frontendBranch=${frontendBranch} RUN echo "$frontendBranch"; -RUN if ["$frontendBranch" == null]; then $frontendBranch = "development"; fi; +RUN if ["$frontendBranch" == null]||["$frontendBranch" == ""]; then $frontendBranch = "development"; fi; RUN echo "$frontendBranch"; RUN echo "$persistenceBranch"; -RUN if ["$persistenceBranch" == null]; then $persistenceBranch = "development"; fi; +RUN if ["$persistenceBranch" == null]||["$frontendBranch" == ""]; then $persistenceBranch = "development"; fi; RUN echo "$persistenceBranch"; RUN apt-get update && apt-get install -qq -y sudo diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index d6cb2187..d7e76738 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Stephen Larson "slarson@openworm.org" ARG frontendBranch ENV frontendBranch=${frontendBranch} RUN echo "$frontendBranch"; -RUN if ["$frontendBranch" == null]; then $frontendBranch = "development"; fi; +RUN if ["$frontendBranch" == null]||["$frontendBranch" == ""]; then $frontendBranch = "development"; fi; RUN echo "$frontendBranch"; RUN apt-get update && apt-get install -qq -y sudo xvfb From e9dac0676600fcd7d9af96822dec770eef2b8277 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Mon, 7 Aug 2017 15:46:20 -0700 Subject: [PATCH 89/99] test --- utilities/docker/geppetto-persistence/Dockerfile | 4 ++-- utilities/docker/geppetto/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 3c8ddfb6..80842343 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -10,10 +10,10 @@ ENV persistenceBranch=${persistenceBranch} ARG frontendBranch ENV frontendBranch=${frontendBranch} RUN echo "$frontendBranch"; -RUN if ["$frontendBranch" == null]||["$frontendBranch" == ""]; then $frontendBranch = "development"; fi; +RUN if [-z "$frontendBranch"]; then $frontendBranch = "development"; fi; RUN echo "$frontendBranch"; RUN echo "$persistenceBranch"; -RUN if ["$persistenceBranch" == null]||["$frontendBranch" == ""]; then $persistenceBranch = "development"; fi; +RUN if [-z "$persistenceBranch"]; then $persistenceBranch = "development"; fi; RUN echo "$persistenceBranch"; RUN apt-get update && apt-get install -qq -y sudo diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index d7e76738..6b80a73e 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Stephen Larson "slarson@openworm.org" ARG frontendBranch ENV frontendBranch=${frontendBranch} RUN echo "$frontendBranch"; -RUN if ["$frontendBranch" == null]||["$frontendBranch" == ""]; then $frontendBranch = "development"; fi; +RUN if [-z "$frontendBranch"]; then $frontendBranch = "development"; fi; RUN echo "$frontendBranch"; RUN apt-get update && apt-get install -qq -y sudo xvfb From 1d83d5aa8ea39a6ffa9c67877a0fd0c644483fbc Mon Sep 17 00:00:00 2001 From: jrmartin Date: Mon, 7 Aug 2017 15:52:16 -0700 Subject: [PATCH 90/99] remove conflicting if statements --- utilities/docker/geppetto-persistence/Dockerfile | 4 ---- utilities/docker/geppetto/Dockerfile | 2 -- 2 files changed, 6 deletions(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 80842343..3607718b 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -10,10 +10,6 @@ ENV persistenceBranch=${persistenceBranch} ARG frontendBranch ENV frontendBranch=${frontendBranch} RUN echo "$frontendBranch"; -RUN if [-z "$frontendBranch"]; then $frontendBranch = "development"; fi; -RUN echo "$frontendBranch"; -RUN echo "$persistenceBranch"; -RUN if [-z "$persistenceBranch"]; then $persistenceBranch = "development"; fi; RUN echo "$persistenceBranch"; RUN apt-get update && apt-get install -qq -y sudo diff --git a/utilities/docker/geppetto/Dockerfile b/utilities/docker/geppetto/Dockerfile index 6b80a73e..1f527340 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -4,8 +4,6 @@ MAINTAINER Stephen Larson "slarson@openworm.org" ARG frontendBranch ENV frontendBranch=${frontendBranch} RUN echo "$frontendBranch"; -RUN if [-z "$frontendBranch"]; then $frontendBranch = "development"; fi; -RUN echo "$frontendBranch"; RUN apt-get update && apt-get install -qq -y sudo xvfb From b2a0755ca1b7912939d2edec49b52f0b32da6f34 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Tue, 8 Aug 2017 10:34:10 -0700 Subject: [PATCH 91/99] test --- utilities/docker/geppetto-persistence/Dockerfile | 2 +- utilities/docker/geppetto-persistence/geppetto.plan | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/utilities/docker/geppetto-persistence/Dockerfile b/utilities/docker/geppetto-persistence/Dockerfile index 3607718b..1ea3973b 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -72,7 +72,7 @@ RUN cd workspace && git clone https://github.com/openworm/org.geppetto.frontend. RUN cd workspace && git clone https://github.com/openworm/org.geppetto.persistence.git && cd org.geppetto.persistence && git checkout $persistenceBranch RUN sudo chmod -R 777 workspace \ - && cd workspace/org.geppetto && mvn --quiet install + && cd workspace/org.geppetto && mvn install #END GET GEPPETTO SOURCES #INSTALL MYSQL diff --git a/utilities/docker/geppetto-persistence/geppetto.plan b/utilities/docker/geppetto-persistence/geppetto.plan index 2b2234dc..536f30b4 100644 --- a/utilities/docker/geppetto-persistence/geppetto.plan +++ b/utilities/docker/geppetto-persistence/geppetto.plan @@ -7,13 +7,13 @@ http://www.springsource.org/schema/dm-server/plan/springsource-dm-server-plan.xsd"> - - - - + + + + - - + +