Skip to content
Permalink
Browse files

Merge branch 'master' into development

  • Loading branch information...
tarelli committed May 14, 2019
2 parents 371a840 + 03a09ce commit b00b39ad9d9010612281a7a1c4d561d26decd9dd
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright © 2011, 2017 Geppetto authors
Copyright © 2011, 2019 Geppetto authors
http://geppetto.org

All rights reserved. This program and the accompanying materials
@@ -6,9 +6,9 @@ ENV aKey=${aKey}
ARG sKey
ENV sKey=${sKey}

ARG targetBranch=development
ARG originBranch=development
ARG defaultBranch=development
ARG targetBranch=master
ARG originBranch=master
ARG defaultBranch=master
RUN /bin/echo -e "\e[1;35mORIGIN BRANCH ------------ $originBranch\e[0m" &&\
/bin/echo -e "\e[1;35mTARGET BRANCH ------------ $targetBranch\e[0m" &&\
/bin/echo -e "\e[1;35mDEFAULT BRANCH ------------ $defaultBranch\e[0m"
@@ -2,9 +2,9 @@ FROM metacell/java-virgo-maven:development

LABEL maintainer="Facundo Rodriguez <facundo@metacell.us>"

ARG targetBranch=development
ARG originBranch=development
ARG defaultBranch=development
ARG targetBranch=master
ARG originBranch=master
ARG defaultBranch=master

RUN /bin/echo -e "\e[1;35mORIGIN BRANCH ------------ $originBranch\e[0m" &&\
/bin/echo -e "\e[1;35mTARGET BRANCH ------------ $targetBranch\e[0m" &&\
@@ -59,5 +59,6 @@ WORKDIR $HOME
RUN mkdir rm $SERVER_HOME/./repository/usr
RUN cd $HOME/workspace/org.geppetto/utilities/source_setup && python update_server.py


EXPOSE 8080
CMD [ "/bin/bash", "-c", "$SERVER_HOME/bin/startup.sh" ]
@@ -2,9 +2,9 @@ FROM metacell/java-virgo-maven:development

LABEL maintainer="Facundo Rodriguez <facundo@metacell.us>"

ARG targetBranch=development
ARG originBranch=development
ARG defaultBranch=development
ARG targetBranch=master
ARG originBranch=master
ARG defaultBranch=master

RUN /bin/echo -e "\e[1;35mORIGIN BRANCH ------------ $originBranch\e[0m" &&\
/bin/echo -e "\e[1;35mTARGET BRANCH ------------ $targetBranch\e[0m" &&\

0 comments on commit b00b39a

Please sign in to comment.
You can’t perform that action at this time.