From d62572944e995650409cb2950088fee033e64d01 Mon Sep 17 00:00:00 2001 From: Matteo Cantarelli Date: Wed, 16 Jan 2019 23:20:30 +0000 Subject: [PATCH 1/6] Update Dockerfile --- utilities/docker/livegeppetto/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/livegeppetto/Dockerfile b/utilities/docker/livegeppetto/Dockerfile index 7c24248c..c5939b9a 100644 --- a/utilities/docker/livegeppetto/Dockerfile +++ b/utilities/docker/livegeppetto/Dockerfile @@ -1,7 +1,7 @@ FROM java:8 MAINTAINER Stephen Larson "slarson@openworm.org" -ARG mainBranch=development +ARG mainBranch=master ENV mainBranch=${mainBranch} RUN echo "USE GIT BRANCH ------------ $mainBranch"; From e1da59185421f883e23e0dbb435da18aa1a30149 Mon Sep 17 00:00:00 2001 From: Matteo Cantarelli Date: Fri, 18 Jan 2019 11:55:50 +0000 Subject: [PATCH 2/6] Update year in License --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 80f65a0b..95f56f56 100644 --- a/LICENSE +++ b/LICENSE @@ -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 From d06b27710704fd01c2a23f1e1c0f1ccb96d8541c Mon Sep 17 00:00:00 2001 From: Matteo Cantarelli Date: Fri, 18 Jan 2019 12:08:53 +0000 Subject: [PATCH 3/6] Update Dockerfile --- utilities/docker/livegeppetto/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/docker/livegeppetto/Dockerfile b/utilities/docker/livegeppetto/Dockerfile index c5939b9a..3c0f4ced 100644 --- a/utilities/docker/livegeppetto/Dockerfile +++ b/utilities/docker/livegeppetto/Dockerfile @@ -58,7 +58,7 @@ RUN mvn --version #GET GEPPETTO SOURCES USER root -RUN mkdir -p workspace && cd workspace && git clone -b update-virgo http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout $mainBranch +RUN mkdir -p workspace && cd workspace && git clone -b master http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout $mainBranch RUN chmod -R 777 workspace USER developer From 9a2e7c7a7e21db30a4cd5aa5d16608afb0428a8c Mon Sep 17 00:00:00 2001 From: Matteo Cantarelli Date: Fri, 18 Jan 2019 13:55:31 +0000 Subject: [PATCH 4/6] Update Dockerfile --- 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 1cf9ee06..a69bc474 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -55,7 +55,7 @@ RUN mvn --version #GET GEPPETTO SOURCES USER root -RUN mkdir -p workspace && cd workspace && git clone -b update-virgo http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout update-virgo +RUN mkdir -p workspace && cd workspace && git clone -b master http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout update-virgo RUN chmod -R 777 workspace USER developer From 2d8f384710d05f1b93c7b0c1d16ef830979a86f4 Mon Sep 17 00:00:00 2001 From: Matteo Cantarelli Date: Fri, 18 Jan 2019 13:55:49 +0000 Subject: [PATCH 5/6] Update Dockerfile --- 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 58b5ea51..0ab10e49 100644 --- a/utilities/docker/geppetto-persistence/Dockerfile +++ b/utilities/docker/geppetto-persistence/Dockerfile @@ -61,7 +61,7 @@ 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 update-virgo +RUN mkdir -p workspace && cd workspace && git clone http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout master RUN chmod -R 777 workspace USER developer From 03a09cef8f82089dc39fabac1f577e64659618c9 Mon Sep 17 00:00:00 2001 From: Matteo Cantarelli Date: Fri, 18 Jan 2019 14:16:57 +0000 Subject: [PATCH 6/6] Update Dockerfile --- 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 a69bc474..afa411d5 100644 --- a/utilities/docker/geppetto/Dockerfile +++ b/utilities/docker/geppetto/Dockerfile @@ -55,7 +55,7 @@ RUN mvn --version #GET GEPPETTO SOURCES USER root -RUN mkdir -p workspace && cd workspace && git clone -b master http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout update-virgo +RUN mkdir -p workspace && cd workspace && git clone -b master http://github.com/openworm/org.geppetto && cd org.geppetto && git checkout master RUN chmod -R 777 workspace USER developer