Merge pull request #24 from MobilityDB/develop

Add the workshop data to the docker image

README.md

@@ -19,19 +19,11 @@ You can generate the workshop documentation from the sources. Go to `/docs` dire
     ```bash
     dbtoepub -o mobilitydb-workshop.epub mobilitydb-workshop.xml
     ```
-In addition, pre-generated versions of them are available.
+In addition, pregenerated versions of them are available for both the master and develop branches.
 
-Master branch:
-
-*  In HTML format: https://mobilitydb.github.io/MobilityDB-workshop/master/html/index.html
-*  In PDF format: https://mobilitydb.github.io/MobilityDB-workshop/master/mobilitydb-workshop.pdf
-*  In EPUB format: https://mobilitydb.github.io/MobilityDB-workshop/master/mobilitydb-workshop.epub
-
-Develop branch:
-
-*  In HTML format: https://mobilitydb.github.io/MobilityDB-workshop/develop/html/index.html
-*  In PDF format: https://mobilitydb.github.io/MobilityDB-workshop/develop/mobilitydb-workshop.pdf
-*  In EPUB format: https://mobilitydb.github.io/MobilityDB-workshop/develop/mobilitydb-workshop.epub
+*   HTML: [master](https://mobilitydb.github.io/MobilityDB-workshop/master/html/index.html), [develop](https://mobilitydb.github.io/MobilityDB-workshop/develop/html/index.html)
+*   PDF: [master](https://mobilitydb.github.io/MobilityDB-workshop/master/mobilitydb-manual.pdf), [develop](https://mobilitydb.github.io/MobilityDB-workshop/develop/mobilitydb-manual.pdf)
+*   EPUB: [master](https://mobilitydb.github.io/MobilityDB-workshop/master/mobilitydb-manual.epub), [develop](https://mobilitydb.github.io/MobilityDB-workshop/develop/mobilitydb-manual.epub)
 
 ## How the Repo is Organized
 - `/data`: raw data files used for some workshops

docker/Dockerfile

@@ -23,6 +23,7 @@ RUN apt-get update \
     libproj-dev \
     g++ \
     wget \
+    unzip \
     autoconf \
     autotools-dev \
     libgeos-dev \
@@ -37,20 +38,23 @@ RUN apt-get update \
   && rm -rf /var/lib/apt/lists/*
 
 # Install MobilityDB
-RUN wget -O MobilityDB.tar.gz "https://github.com/MobilityDB/MobilityDB/archive/v1.0.tar.gz" \
- && mkdir -p /usr/local/src/MobilityDB \
- && tar \
-        --extract \
-        --file MobilityDB.tar.gz \
-        --directory /usr/local/src/MobilityDB \
-        --strip-components 1 \
- && rm MobilityDB.tar.gz
-RUN mkdir /usr/local/src/MobilityDB/build
-RUN cd /usr/local/src/MobilityDB/build && \
+RUN git clone https://github.com/MobilityDB/MobilityDB.git -b develop /usr/local/src/MobilityDB && \
+    mkdir -p /usr/local/src/MobilityDB/build && \
+    cd /usr/local/src/MobilityDB/build && \
     cmake .. && \
     make -j$(nproc) && \
     make install
 
+# Workshop Data
+RUN mkdir /Workshop
+RUN cd /Workshop && \
+    wget https://raw.githubusercontent.com/MobilityDB/MobilityDB-workshop/master/data/gtfs_data.zip && \
+    wget https://raw.githubusercontent.com/MobilityDB/MobilityDB-workshop/master/data/ais_data.zip && \
+    unzip gtfs_data.zip -d gtfs_data && \
+    unzip ais_data.zip -d ais_data && \   
+    rm -f ais_data.zip gtfs_data.zip
+
 RUN rm /docker-entrypoint-initdb.d/10_postgis.sh
 COPY ./docker/initdb-mobilitydb.sh /docker-entrypoint-initdb.d/mobilitydb.sh
 RUN chmod +x /docker-entrypoint-initdb.d/mobilitydb.sh
+RUN chmod a+r /Workshop/*