From e41a3725b5fe956ab4ad05175f7808d3916ad067 Mon Sep 17 00:00:00 2001 From: Dario Del Piano Date: Wed, 10 Jul 2019 15:05:59 +0100 Subject: [PATCH] build scripts tested and few fixes included --- service/docker/Dockerfile-scidash | 12 ++++++------ service/docker/build_database.sh | 8 ++++---- service/docker/build_scidash.sh | 8 ++++---- service/docker/build_virgo.sh | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/service/docker/Dockerfile-scidash b/service/docker/Dockerfile-scidash index 3179759f..575c2a46 100644 --- a/service/docker/Dockerfile-scidash +++ b/service/docker/Dockerfile-scidash @@ -1,4 +1,4 @@ -FROM metacell/scidash_virgo:r2.0.0 +FROM metacell/scidash_geppetto:latest USER root @@ -42,11 +42,11 @@ RUN ls -la RUN npm run build-dev-noTest WORKDIR $APP_DIR/scidash -RUN rm -rf .git &&\ - rm -rf static/org.geppetto.frontend/.git &&\ - rm -rf static/org.geppetto.frontend/extension/geppetto-scidash/.git &&\ - rm -rf sciunit/.git &&\ - rm -rf neuronunit/.git +#RUN rm -rf .git &&\ +# rm -rf static/org.geppetto.frontend/.git &&\ +# rm -rf static/org.geppetto.frontend/extension/geppetto-scidash/.git &&\ +# rm -rf sciunit/.git &&\ +# rm -rf neuronunit/.git RUN chown -R developer ./ RUN cp ./service/dotenv/scidash_env .env diff --git a/service/docker/build_database.sh b/service/docker/build_database.sh index 8478a351..cd6191c4 100755 --- a/service/docker/build_database.sh +++ b/service/docker/build_database.sh @@ -2,13 +2,13 @@ echo "We are going to build the scidash Database, be carefull since" echo " this can overwrite the existing container if another one is already running" while true; do - read -p "Do you wish to install to continue?" yn + read -p "Do you wish to install to continue? [y/n] > " yn case $yn in - [Yy]* ) read -p "Please type the tag you want to use for this build (default will use the latest and overwrite this)" tag; + [Yy]* ) read -p "Please type the tag you want to use for this build (default will use the latest and overwrite this). [latest/user_input] > " tag; if [[ -z "$tag" ]]; then - docker build -f Dockerfile-postgres -t metacell/scidash_db:latest + docker build --no-cache -f Dockerfile-postgres -t metacell/scidash_db:latest . else - docker build -f Dockerfile-postgres -t metacell/scidash_db:$tag + docker build --no-chace -f Dockerfile-postgres -t metacell/scidash_db:$tag . fi break;; [Nn]* ) exit;; diff --git a/service/docker/build_scidash.sh b/service/docker/build_scidash.sh index 1f808746..d54db7dc 100755 --- a/service/docker/build_scidash.sh +++ b/service/docker/build_scidash.sh @@ -2,13 +2,13 @@ echo "We are going to build the scidash image, be carefull since this" echo "can overwrite the existing image if another one is already running" while true; do - read -p "Do you wish to install to continue?" yn + read -p "Do you wish to install to continue? [y/n] > " yn case $yn in - [Yy]* ) read -p "Please type the tag you want to use for this build (default will use the latest and overwrite this)" tag; + [Yy]* ) read -p "Please type the tag you want to use for this build (default will use the latest and overwrite this). [latest/user_input] >" tag; if [[ -z "$tag" ]]; then - docker build -f Dockerfile-scidash -t metacell/scidash:latest + docker build --no-cache -f Dockerfile-scidash -t metacell/scidash:latest . else - docker build -f Dockerfile-scidash -t metacell/scidash:$tag + docker build --no-cache -f Dockerfile-scidash -t metacell/scidash:$tag . fi break;; [Nn]* ) exit;; diff --git a/service/docker/build_virgo.sh b/service/docker/build_virgo.sh index 75023b0a..d26ccb70 100755 --- a/service/docker/build_virgo.sh +++ b/service/docker/build_virgo.sh @@ -2,13 +2,13 @@ echo "We are going to build the Geppetto\'s Virgo, be carefull since this" echo "can overwrite the existing image if another one is already built" while true; do - read -p "Do you wish to install to continue?" yn + read -p "Do you wish to install to continue? [y/n] > " yn case $yn in - [Yy]* ) read -p "Please type the tag you want to use for this build (default will use the latest and overwrite this)" tag; + [Yy]* ) read -p "Please type the tag you want to use for this build (default will use the latest and overwrite this). [default/user_input] > " tag; if [[ -z "$tag" ]]; then - docker build -f Dockerfile-virgo -t metacell/scidash_geppetto:latest + docker build --no-cache -f Dockerfile-virgo -t metacell/scidash_geppetto:latest . else - docker build -f Dockerfile-virgo -t metacell/scidash_geppetto:$tag + docker build --no-cache -f Dockerfile-virgo -t metacell/scidash_geppetto:$tag . fi break;; [Nn]* ) exit;;