Skip to content

Commit

Permalink
prepare next_release
Browse files Browse the repository at this point in the history
  • Loading branch information
geektortoise committed Aug 31, 2018
1 parent 03e7ed4 commit 4fdc003
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 14 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
23-08-2018 : v1.2. New bootstrap architecture. The installation procedure has changed :
- Running the init.sh script after filling the configuration file is mandatory;
- Also, postgres has been updated, you need to backup databases, clean containers, delete postgres volumes then restart and restore data. You can do it by running the scripts in the utils folder.
19-09-2017 : v1.1.
26-04-2017 : Change MODELS_PATH by it's parent, ALGO_PATH.
31-08-2016 : rewrite all Dockerfile image and put them on DockerHub. Data_containers are now volumes. You need to backup databases, clean all containers than restore data into the new volumes as explained in documentation.
08-04-2016 : add kmeans extension to postgres. postgis_data is affected. You need to backup databases, clean all containers than restore data into the new containers.
Expand Down
28 changes: 14 additions & 14 deletions start_deploy.sh.sample
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

docker create --name memcached \
--restart=unless-stopped \
cytomine/memcached:v1.1.1 > /dev/null
cytomine/memcached:v1.1.2 > /dev/null

docker cp $PWD/configs/memcached/memcached.conf memcached:/etc/memcached.conf
docker start memcached
Expand All @@ -28,7 +28,7 @@ docker create --name rabbitmq \
-p 5672:5672 -p 15672:15672 \
-e RABBITMQ_PASS=$RABBITMQ_PASS \
--restart=unless-stopped \
cytomine/rabbitmq:v1.1.1 > /dev/null
cytomine/rabbitmq:v1.1.2 > /dev/null

docker start rabbitmq

Expand All @@ -37,13 +37,13 @@ docker volume create --name postgis_data > /dev/null
# create database docker
docker run -d -m 8g --name postgresql -v postgis_data:/var/lib/postgresql \
--restart=unless-stopped \
cytomine/postgis:v1.1.1 > /dev/null
cytomine/postgis:v2.0.0 > /dev/null

docker volume create --name mongodb_data > /dev/null
# create mongodb docker
docker run -d --name mongodb -v mongodb_data:/data/db \
--restart=unless-stopped \
cytomine/mongodb:v1.1.1 > /dev/null
cytomine/mongodb:v1.1.2 > /dev/null

if [ $BACKUP_BOOL = true ]
then
Expand All @@ -58,7 +58,7 @@ then
-e DATABASE='docker' \
-e USER='docker' \
-e PASSWD='docker' \
cytomine/backup:v1.1 > /dev/null
cytomine/backup:v1.1.2 > /dev/null
fi

if [ $BACKUP_BOOL = true ]
Expand All @@ -70,7 +70,7 @@ then
-e SENDER_EMAIL_SMTP_HOST=$SENDER_EMAIL_SMTP_HOST \
-e SENDER_EMAIL_SMTP_PORT=$SENDER_EMAIL_SMTP_PORT \
-e RECEIVER_EMAIL=$RECEIVER_EMAIL \
cytomine/backup:v1.1 > /dev/null
cytomine/backup:v1.1.2 > /dev/null
fi

docker create --name retrieval \
Expand All @@ -79,7 +79,7 @@ docker create --name retrieval \
-e RETRIEVAL_ENGINE=$RETRIEVAL_ENGINE \
-e RETRIEVAL_PASSWD=$RETRIEVAL_PASSWD \
--restart=unless-stopped \
cytomine/retrieval:v1.1.1 > /dev/null
cytomine/retrieval:v1.1.2 > /dev/null

docker cp $PWD/hosts/retrieval/addHosts.sh retrieval:/tmp/addHosts.sh
docker start retrieval
Expand All @@ -90,7 +90,7 @@ docker create --name iipOff \
-v $IMS_STORAGE_PATH:$IMS_STORAGE_PATH \
--privileged -e NB_IIP_PROCESS=$NB_IIP_PROCESS \
--restart=unless-stopped \
cytomine/iipofficial:v1.1.1 > /dev/null
cytomine/iipofficial:v1.2.0 > /dev/null

docker cp $PWD/configs/iipOff/nginx.conf.sample iipOff:/tmp/nginx.conf.sample
docker start iipOff
Expand All @@ -101,7 +101,7 @@ docker create --name iipCyto \
-v $IMS_STORAGE_PATH:$IMS_STORAGE_PATH \
--privileged -e NB_IIP_PROCESS=$NB_IIP_PROCESS \
--restart=unless-stopped \
cytomine/iipcyto:v1.1.1 > /dev/null
cytomine/iipcyto:v1.2.0 > /dev/null

docker cp $PWD/configs/iipCyto/nginx.conf.sample iipCyto:/tmp/nginx.conf.sample
docker start iipCyto
Expand All @@ -111,7 +111,7 @@ docker create --name bioformat \
-v $IMS_STORAGE_PATH:$IMS_STORAGE_PATH \
-e BIOFORMAT_PORT=$BIOFORMAT_PORT \
--restart=unless-stopped \
cytomine/bioformat:v1.1.1 > /dev/null
cytomine/bioformat:v1.1.2 > /dev/null

docker start bioformat

Expand All @@ -122,7 +122,7 @@ docker create --name ims \
-v $IMS_STORAGE_PATH:$IMS_STORAGE_PATH \
-v $IMS_BUFFER_PATH:/tmp/uploaded \
--restart=unless-stopped \
cytomine/ims:v1.1.1 > /dev/null
cytomine/ims:v1.2.0 > /dev/null

docker cp $PWD/configs/ims/imageserverconfig.properties ims:/usr/share/tomcat7/.grails/imageserverconfig.properties
docker cp $PWD/hosts/ims/addHosts.sh ims:/tmp/addHosts.sh
Expand All @@ -135,7 +135,7 @@ docker create --name core \
--link rabbitmq:rabbitmq \
-v /etc/localtime:/etc/localtime \
--restart=unless-stopped \
cytomine/core:v1.1.1 > /dev/null
cytomine/core:v1.2.0 > /dev/null

docker cp $PWD/configs/core/cytomineconfig.groovy core:/usr/share/tomcat7/.grails/cytomineconfig.groovy
docker cp $PWD/hosts/core/addHosts.sh core:/tmp/addHosts.sh
Expand All @@ -145,7 +145,7 @@ docker start core
docker create --name iris \
-v iris_data:/var/lib/tomcat7/db \
--restart=unless-stopped \
cytomine/iris:v1.1.1 > /dev/null
cytomine/iris:v1.1.2 > /dev/null

docker cp $PWD/configs/iris/iris-config.groovy iris:/usr/share/tomcat7/.grails/iris-config.groovy
docker cp $PWD/configs/iris/iris-production-config.groovy iris:/usr/share/tomcat7/.grails/iris-production-config.groovy
Expand All @@ -163,7 +163,7 @@ docker create --name nginx \
-v $IMS_BUFFER_PATH:/tmp/uploaded \
-p 80:80 \
--restart=unless-stopped \
cytomine/nginx:v1.1.1 > /dev/null
cytomine/nginx:v1.2.0 > /dev/null

docker cp $PWD/configs/nginx/nginx.conf nginx:/usr/local/nginx/conf/nginx.conf
docker start nginx
Expand Down

0 comments on commit 4fdc003

Please sign in to comment.