From 7b3e01961b997709dcc8d95e0c203058d6dd8ac3 Mon Sep 17 00:00:00 2001 From: Maxime Schoemans Date: Thu, 5 Oct 2023 11:21:38 +0200 Subject: [PATCH 1/8] Update README --- README.md | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 297f206..5bb573e 100644 --- a/README.md +++ b/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 From a6f8043465073ebf11f3318fc39e2ec716c15a17 Mon Sep 17 00:00:00 2001 From: mbakli Date: Sun, 8 Oct 2023 10:35:52 +0200 Subject: [PATCH 2/8] Added Prerequisites: wget & unzip --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index d4c2364..fa7a3e9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -23,6 +23,7 @@ RUN apt-get update \ libproj-dev \ g++ \ wget \ + unzip \ autoconf \ autotools-dev \ libgeos-dev \ From 4b3638d32ffed474d6b499a13c4de6d02b94e9db Mon Sep 17 00:00:00 2001 From: mbakli Date: Sun, 8 Oct 2023 10:43:21 +0200 Subject: [PATCH 3/8] Added the GTFS data --- docker/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index fa7a3e9..5825184 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -52,6 +52,12 @@ RUN cd /usr/local/src/MobilityDB/build && \ make -j$(nproc) && \ make install +# Workshop Data +RUN mkdir /workshop +RUN cd /workshop && \ + wget https://github.com/MobilityDB/MobilityDB-workshop/blob/master/data/gtfs_data.zip && \ + unzip gtfs_data.zip -d gtfs_data + 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 From b67ee4e7c507165218e2409c16b15abe8ca9cdc7 Mon Sep 17 00:00:00 2001 From: mbakli Date: Sun, 8 Oct 2023 10:48:39 +0200 Subject: [PATCH 4/8] Fixed the github link for the GTFS data --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 5825184..a5a0a01 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -55,7 +55,7 @@ RUN cd /usr/local/src/MobilityDB/build && \ # Workshop Data RUN mkdir /workshop RUN cd /workshop && \ - wget https://github.com/MobilityDB/MobilityDB-workshop/blob/master/data/gtfs_data.zip && \ + wget https://raw.githubusercontent.com/MobilityDB/MobilityDB-workshop/master/data/gtfs_data.zip && \ unzip gtfs_data.zip -d gtfs_data RUN rm /docker-entrypoint-initdb.d/10_postgis.sh From ee27027a57473fb4e18a0161ddf62f314365361c Mon Sep 17 00:00:00 2001 From: mbakli Date: Sun, 8 Oct 2023 11:01:19 +0200 Subject: [PATCH 5/8] Added the AIS data --- docker/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index a5a0a01..d7a5782 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -56,7 +56,10 @@ RUN cd /usr/local/src/MobilityDB/build && \ RUN mkdir /workshop RUN cd /workshop && \ wget https://raw.githubusercontent.com/MobilityDB/MobilityDB-workshop/master/data/gtfs_data.zip && \ - unzip gtfs_data.zip -d gtfs_data + 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 From 1abd943c809ff937df423e540c2ca8b15cc0d77d Mon Sep 17 00:00:00 2001 From: mbakli Date: Sun, 8 Oct 2023 11:15:07 +0200 Subject: [PATCH 6/8] Fixed permissions --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index d7a5782..930c974 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -64,3 +64,4 @@ RUN cd /workshop && \ 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/* From ef03a898aa300af4a6c28ebf15653f3d1e585c4c Mon Sep 17 00:00:00 2001 From: mbakli Date: Sun, 8 Oct 2023 13:02:04 +0200 Subject: [PATCH 7/8] Pulled the development branch instead of 1.0 --- docker/Dockerfile | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 930c974..e11d4c5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -38,23 +38,16 @@ 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 && \ +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 && \ From b10b2b0df422e39f430a8c924247c7c152bef7d5 Mon Sep 17 00:00:00 2001 From: mbakli Date: Sun, 8 Oct 2023 13:32:08 +0200 Subject: [PATCH 8/8] Fixed permissions --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index e11d4c5..edcabd5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -57,4 +57,4 @@ RUN cd /Workshop && \ 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/* +RUN chmod a+r /Workshop/*