push the wget for schema/data to Docker

Author: meihuisu

Diff for: Dockerfile-postgis

@@ -7,6 +7,10 @@ WORKDIR /app
 
 COPY . /app
 
+RUN cd /app/schema/data && \
+    wget https://files.scec.org/s3fs-public/projects/cfm/seismicity/cfm-v7.0-seismicity-data.tar.gz &&\
+    tar zxvf cfm-v7.0-seismicity-data.tar.gz
+
 RUN mkdir /home/postgres
 RUN chown postgres /home/postgres
 RUN su postgres -c /app/doc/run-as-postgres

Diff for: Dockerfile-web

@@ -6,7 +6,11 @@ COPY . /app
 
 RUN yum install -y httpd && \
     amazon-linux-extras install -y php7.2 && \
-    yum install -y php php-pgsql 
+    yum install -y php php-pgsql wget tar 
+
+#RUN cd /app/web/cfm_data && \
+#    wget https://files.scec.org/s3fs-public/projects/cfm/seismicity/cfm-v7.0-seismicity-utm.tar.gz &&\
+#    tar zxvf cfm-v7.0-seismicity-utm.tar.gz
 
 COPY ./doc/cfm.conf /etc/httpd/conf.d/
 COPY ./custom-php.ini /etc/php.d/custom-php.ini

Diff for: load_seismicity.sh

@@ -1,22 +1,15 @@
 #/bin/bash
 
-#mkdir -p seismicity
-#cd seismicity
-#wget https://files.scec.org/s3fs-public/projects/cfm/seismicity/cfm-v7.0-seismicity-cache.tar.gz
-#tar xvf cfm-v7.0-seismicity-cache.tar.gz
-#cd ..
-#mv seismicity web/data
-
 mkdir -p cfm_data
 cd cfm_data
 wget https://files.scec.org/s3fs-public/projects/cfm/seismicity/cfm-v7.0-seismicity-utm.tar.gz
 tar xvf cfm-v7.0-seismicity-utm.tar.gz
 cd ..
 mv cfm_data web
 
-mkdir -p schema_data
-cd schema_data
-wget https://files.scec.org/s3fs-public/projects/cfm/seismicity/cfm-v7.0-seismicity-data.tar.gz
-tar xvf cfm-v7.0-seismicity-data.tar.gz
-cd ..
-mv schema_data/* schema/data
+#mkdir -p schema_data
+#cd schema_data
+#wget https://files.scec.org/s3fs-public/projects/cfm/seismicity/cfm-v7.0-seismicity-data.tar.gz
+#tar xvf cfm-v7.0-seismicity-data.tar.gz
+#cd ..
+#mv schema_data/* schema/data

Diff for: run_connect

@@ -1,5 +1,5 @@
 
-pid=`docker ps | grep cfm_web_db | cut -f 1 -d ' '`
+pid=`docker ps | grep cfm_web_web | cut -f 1 -d ' '`
 
 docker container exec -it $pid /bin/bash