From 51c0052a4f1e20c9a3f426faebcf337f046b9d28 Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Fri, 16 Dec 2022 15:23:01 +0000
Subject: [PATCH] removing commented lines
---
configs/docker/build/Dockerfile | 10 ----------
.../coordinator/configs/config_EastAfrica_fc_live.json | 2 +-
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/configs/docker/build/Dockerfile b/configs/docker/build/Dockerfile
index 8bb8a7f..696ba0b 100644
--- a/configs/docker/build/Dockerfile
+++ b/configs/docker/build/Dockerfile
@@ -8,7 +8,6 @@ RUN mkdir -p /storage/app/EWS_prod/regions/EastAfrica/workspace
RUN mkdir -p /storage/app/EWS_prod/regions/SouthAsia/workspace
#copy resources in
-#COPY ./installRPackages.txt /home
COPY ./conda-env-py3EWS-withbuilds.yml .
#install system packages
@@ -17,15 +16,6 @@ RUN echo "alias e='emacs -nw $1'" >> ~/.bashrc;
#sets the timezone to London
RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
-#build R
-#RUN wget --quiet https://cran.r-project.org/src/base/R-3/R-3.5.1.tar.gz -O /usr/local/R-3.5.1.tar.gz
-#RUN tar -zxvf /usr/local/R-3.5.1.tar.gz -C /usr/local/
-#RUN mv /usr/local/R-3.5.1 /usr/local/R
-#RUN cd /usr/local/R/;./configure --with-readline=no --with-x=no;make
-
-#install R packages
-#RUN /usr/local/R/bin/Rscript installRPackages.txt;
-
# Install miniconda
ENV CONDA_DIR /storage/app/miniconda3
RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh
diff --git a/tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json b/tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json
index 581f1ac..02fabc8 100644
--- a/tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json
+++ b/tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json
@@ -7,7 +7,7 @@
"WorkspacePath" : "set_in_the_code",
"ResourcesPath" : "../test_data/test_deployment/regions/EastAfrica/resources/",
"ServerPath" : "OVERRIDDEN",
- "ServerName" : "ewsmanager@willow.csx.cam.ac.uk",
+ "ServerName" : "OVERRIDDEN, set to empty string in tests",
"ServerKey" : "not used, set to empty string in tests",
"Survey" : {
"ProcessPreJob" : "process_pre_job_survey",
--
GitLab