-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #568 from openworm/development
Release 0.3.7
- Loading branch information
Showing
7 changed files
with
159 additions
and
103 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?><templates><template autoinsert="false" context="filecomment_context" deleted="false" description="Comment for created Java files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment">/******************************************************************************* | ||
| * The MIT License (MIT) | ||
| * | ||
| * Copyright (c) 2011 - 2015 OpenWorm. | ||
| * http://openworm.org | ||
| * | ||
| * All rights reserved. This program and the accompanying materials | ||
| * are made available under the terms of the MIT License | ||
| * which accompanies this distribution, and is available at | ||
| * http://opensource.org/licenses/MIT | ||
| * | ||
| * Contributors: | ||
| * OpenWorm - http://openworm.org/people.html | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. | ||
| * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||
| * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR | ||
| * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE | ||
| * USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| *******************************************************************************/</template></templates> | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?><templates><template autoinsert="false" context="filecomment_context" deleted="false" description="Comment for created Java files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment"></template></templates> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,21 @@ | ||
| FROM java:7 | ||
| MAINTAINER Stephen Larson "[email protected]" | ||
|
|
||
| RUN apt-get update && apt-get install -y sudo | ||
| ARG aKey | ||
| ENV aKey=${aKey} | ||
| ARG sKey | ||
| ENV sKey=${sKey} | ||
| ARG persistenceBranch=development | ||
| ENV persistenceBranch=${persistenceBranch} | ||
| ARG frontendBranch=development | ||
| ENV frontendBranch=${frontendBranch} | ||
| RUN echo "$frontendBranch"; | ||
| RUN echo "$persistenceBranch"; | ||
|
|
||
| RUN apt-get update && apt-get install -qq -y sudo | ||
|
|
||
| # Install maven | ||
| RUN apt-get update | ||
|
|
||
| RUN useradd -ms /bin/bash developer | ||
|
|
||
|
|
@@ -17,9 +31,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 -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 - | ||
|
|
@@ -28,6 +52,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 | ||
|
|
@@ -37,11 +63,15 @@ 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 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 && mvn --quiet install; | ||
| RUN cd workspace && git clone https://github.com/openworm/org.geppetto.core.git && cd org.geppetto.core && git checkout development && mvn --quiet install; | ||
| RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.neuroml.git && cd org.geppetto.model.neuroml && git checkout development && mvn --quiet install; | ||
| RUN cd workspace && git clone https://github.com/openworm/org.geppetto.model.swc.git && cd org.geppetto.model.swc && git checkout development && mvn --quiet install; | ||
| RUN cd workspace && git clone https://github.com/openworm/org.geppetto.simulation.git && cd org.geppetto.simulation && git checkout development && mvn --quiet install; | ||
| RUN cd workspace && git clone https://github.com/openworm/org.geppetto.frontend.git && cd org.geppetto.frontend && git checkout $frontendBranch && mvn --quiet install; | ||
| RUN cd workspace && git clone https://github.com/openworm/org.geppetto.persistence.git && cd org.geppetto.persistence && git checkout $persistenceBranch && mvn --quiet install; | ||
|
|
||
| RUN cd workspace/org.geppetto && mvn install | ||
| #END GET GEPPETTO SOURCES | ||
|
|
||
| #INSTALL MYSQL | ||
|
|
@@ -52,7 +82,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/* | ||
|
|
||
|
|
@@ -77,13 +107,16 @@ 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 | ||
|
|
||
|
|
||
| #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 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,72 @@ | ||
| FROM java:7 | ||
| MAINTAINER Stephen Larson "[email protected]" | ||
|
|
||
| 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 | ||
|
|
||
| #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 java:7 | ||
| MAINTAINER Stephen Larson "[email protected]" | ||
|
|
||
| ARG frontendBranch=development | ||
| ENV frontendBranch=${frontendBranch} | ||
| RUN echo "$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"] |