From 02267e06f88fe2c16e9466a2a68917a51a4cf59b Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Tue, 2 Aug 2022 12:17:55 +0100
Subject: [PATCH] more Docker updates
---
configs/docker/build/Dockerfile | 8 ++++----
configs/docker/build/installRPackages.txt | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/configs/docker/build/Dockerfile b/configs/docker/build/Dockerfile
index 7f5e481..5bff3d1 100644
--- a/configs/docker/build/Dockerfile
+++ b/configs/docker/build/Dockerfile
@@ -4,15 +4,15 @@ FROM ubuntu:18.04
#create dirs
WORKDIR /home
RUN mkdir /home/code
-RUN mkdir -p /storage/app/EWS/Ethiopia/Workspace
-RUN mkdir -p /storage/app/EWS/SouthAsia/Workspace
+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
-RUN apt-get update;apt-get install --assume-yes wget emacs gdal-bin libgdal-dev build-essential gfortran zlib1g zlib1g-dev libbz2-dev apt-utils liblzma-dev libpcre++-dev libcurl4-openssl-dev default-jre lib32readline7 lib32readline6-dev openssh-server;
+RUN apt-get update;apt-get install --assume-yes wget emacs gdal-bin libgdal-dev build-essential gfortran zlib1g zlib1g-dev libbz2-dev apt-utils liblzma-dev libpcre++-dev libcurl4-openssl-dev default-jre lib32readline7 lib32readline6-dev openssh-server libfribidi-dev libfontconfig1-dev;
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
@@ -34,7 +34,7 @@ RUN /bin/bash ~/miniconda.sh -b -p $CONDA_DIR
ENV PATH=$CONDA_DIR/bin:$PATH
#build the conda env(s)
-RUN conda env create --file conda-env-py3EWS-withbuilds.yml --prefix /storage/app/EWS/envs/conda/py3EWS
+RUN conda env create --file conda-env-py3EWS-withbuilds.yml --prefix /storage/app/EWS_prod/envs/conda/py3EWS
#tidy
RUN rm -v ~/miniconda.sh conda-env-py3EWS-withbuilds.yml;
\ No newline at end of file
diff --git a/configs/docker/build/installRPackages.txt b/configs/docker/build/installRPackages.txt
index 1a85b24..ba942c3 100644
--- a/configs/docker/build/installRPackages.txt
+++ b/configs/docker/build/installRPackages.txt
@@ -1,4 +1,5 @@
-install.packages(c("devtools", "dplyr"), repos='http://cran.us.r-project.org')
+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")
--
GitLab