diff --git a/configs/docker/build/Dockerfile b/configs/docker/build/Dockerfile index afe99538465374fe4dca42962276917f833a9d0b..8bb8a7f0a2d2eab27e8c2618d0470064f49312cc 100644 --- a/configs/docker/build/Dockerfile +++ b/configs/docker/build/Dockerfile @@ -38,6 +38,3 @@ RUN conda env create --file conda-env-py3EWS-withbuilds.yml --prefix /storage/ap #tidy RUN rm -v ~/miniconda.sh conda-env-py3EWS-withbuilds.yml; - -FROM base_image as runner -CMD ["echo", "hello world"] \ No newline at end of file diff --git a/configs/docker/build/RunnerDockerfile b/configs/docker/build/RunnerDockerfile deleted file mode 100644 index 171dd3c1499ac053508c8f445947684aca87d7f7..0000000000000000000000000000000000000000 --- a/configs/docker/build/RunnerDockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM ews_coordinator:latest - -ENTRYPOINT ["/storage/app/EWS_prod/code/coordinator/run_Processor.sh"] -#CMD ["-p" "-c", "--noupload", "-s"] \ No newline at end of file diff --git a/configs/docker/build/installRPackages.txt b/configs/docker/build/installRPackages.txt deleted file mode 100644 index ba942c3369449dad237de07177e62c5c2c841ede..0000000000000000000000000000000000000000 --- a/configs/docker/build/installRPackages.txt +++ /dev/null @@ -1,11 +0,0 @@ -install.packages("devtools", repos='http://cran.us.r-project.org') -install.packages("dplyr", repos='http://cran.us.r-project.org') -require(devtools) -install_version("readr", version="1.1.1", repos="http://cran.us.r-project.org") -install_version("rprojroot", version="1.3-2", repos="http://cran.us.r-project.org") -install_version("raster", version="2.6-7", repos="http://cran.us.r-project.org") -install_version("lubridate", version="1.7.4", repos="http://cran.us.r-project.org") -install_version("magrittr", version="1.5", repos="http://cran.us.r-project.org") -install_version("rgdal", version="1.3-3", repos="http://cran.us.r-project.org") -install_version("tidyr", version="0.8.1", repos="http://cran.us.r-project.org") -install_version("rgeos", version="0.3-28", repos="http://cran.us.r-project.org") diff --git a/configs/docker/run/launchDockerRunnerIaas.sh b/configs/docker/run/launchDockerRunnerIaas.sh index 63d8ad9f7990d54063dbb6f4c3c39815841cb091..65597aa6625cc902f11c1deb1b945d77396906c2 100755 --- a/configs/docker/run/launchDockerRunnerIaas.sh +++ b/configs/docker/run/launchDockerRunnerIaas.sh @@ -1,56 +1,11 @@ #!/bin/bash set -e -upload='--noupload' # default -rundate=$(date '+%Y%m%d') # default today - -SHORT=p:,c:,s:,h -LONG=component:,config:,rundate::,help -OPTS=$(getopt -a -n weather --options $SHORT --longoptions $LONG -- "$@") - -eval set -- "$OPTS" - -while : -do - case "$1" in - -p | --component ) - component="$2" - shift 2 - ;; - -c | --config ) - config="$2" - shift 2 - ;; - -s | --rundate ) - rundate="$2" - shift 2 - ;; - -h | --help) - "This is a weather script" - exit 2 - ;; - --) - shift; - break - ;; - *) - echo "Unexpected option: $1" - ;; - esac -done - -printf "component: %s\nconfig: %s\nrundate: %s\nupload: %s\n" $component $config $rundate $upload - -function run_depo_plotting() { - docker run -it -v "/media/scratch/lb584_scratch/projects/ews_aws/ews_3/code:/storage/app/EWS_prod/code" \ - -v "/media/scratch/lb584_scratch/projects/ews_aws/ews_3/regions:/storage/app/EWS_prod/regions" \ - -v "/media/scratch/lb584_scratch/projects/ews_aws/ews_3/envs/credentials:/storage/app/EWS_prod/envs/credentials" \ - -w "/storage/app/EWS_prod/code" \ - ews_coordinator_runner \ - -p $component \ - -c $config \ - -s $rundate \ - $upload -} - -run_depo_plotting +docker run -dt -v "/media/scratch/lb584_scratch/projects/ews_aws/ews_3/code:/storage/app/EWS_prod/code" \ + -v "/media/scratch/lb584_scratch/projects/ews_aws/ews_3/regions:/storage/app/EWS_prod/regions" \ + -v "/media/scratch/lb584_scratch/projects/ews_aws/ews_3/envs/credentials:/storage/app/EWS_prod/envs/credentials" \ + -w "/storage/app/EWS_prod/code" \ + --name ews_runner \ + ews_coordinator + +echo "launched" diff --git a/configs/docker/run/runDockerEWS.sh b/configs/docker/run/runDockerEWS.sh new file mode 100755 index 0000000000000000000000000000000000000000..bc8e0d765d0dfa976e1bc8fe741bf2a9340d20ee --- /dev/null +++ b/configs/docker/run/runDockerEWS.sh @@ -0,0 +1,54 @@ +#!/bin/bash +set -e + +upload='--noupload' # default +rundate=$(date '+%Y%m%d') # default today + +SHORT=p:,c:,s:,h +LONG=component:,config:,rundate::,help +OPTS=$(getopt -a -n weather --options $SHORT --longoptions $LONG -- "$@") + +eval set -- "$OPTS" + +while : +do + case "$1" in + -p | --component ) + component="$2" + shift 2 + ;; + -c | --config ) + config="$2" + shift 2 + ;; + -s | --rundate ) + rundate="$2" + shift 2 + ;; + -h | --help) + "This is a weather script" + exit 2 + ;; + --) + shift; + break + ;; + *) + echo "Unexpected option: $1" + ;; + esac +done + +printf "component: %s\nconfig: %s\nrundate: %s\nupload: %s\n" $component $config $rundate $upload + +function run_coordinator() { + docker exec -it \ + ews_runner \ + /storage/app/EWS_prod/code/coordinator/run_Processor.sh \ + -p $component \ + -c $config \ + -s $rundate \ + $upload +} + +run_coordinator