Skip to content

Commit

Permalink
Working.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdaniel-GIS
jdaniel-GIS committed Aug 22, 2016
1 parent 66b4bae commit 9435536
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 17 deletions.
84 changes: 67 additions & 17 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,48 +1,98 @@
# DOCKER-VERSION 1.3.1
# VERSION 0.1
FROM phusion/baseimage:0.9.12
# Build a version of Ubuntu 14.04 with all necessary runtime files for
# geospatial system.
FROM ubuntu:14.04
MAINTAINER John Daniel <[email protected]>

ENV OSM_CARTO_VERSION 2.24.0
RUN apt-get update
RUN apt-get install -y curl libxml2 libtool
RUN apt-get install -y locales && rm -rf /var/lib/apt/lists/* \
&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8

ENV OSM_CARTO_VERSION 2.42.0
ENV OSM_BRIGHT_VERSION master
ENV MOD_TILE_VERSION master
ENV PARALLEL_BUILD 4

RUN touch /etc/inittab
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -q autoconf libtool libmapnik-dev apache2-dev curl unzip gdal-bin mapnik-utils node-carto node-millstone apache2 wget runit sudo

RUN apt-get update
RUN apt-get install -y autoconf libmapnik-dev apache2-dev unzip gdal-bin mapnik-utils node-carto node-millstone apache2 wget runit sudo
RUN cd /tmp && wget https://github.com/gravitystorm/openstreetmap-carto/archive/v$OSM_CARTO_VERSION.tar.gz && tar -xzf v$OSM_CARTO_VERSION.tar.gz
RUN mkdir /usr/share/mapnik && mv /tmp/openstreetmap-carto-$OSM_CARTO_VERSION /usr/share/mapnik/
RUN cd /usr/share/mapnik/openstreetmap-carto-$OSM_CARTO_VERSION/ && ./get-shapefiles.sh && cp project.mml project.mml.orig
# Delete zip files
RUN find /usr/share/mapnik/openstreetmap-carto-$OSM_CARTO_VERSION/data \( -type f -iname "*.zip" -o -iname "*.tgz" \) -delete

RUN cd /tmp && wget https://github.com/mapbox/osm-bright/archive/$OSM_BRIGHT_VERSION.tar.gz && tar -xzf $OSM_BRIGHT_VERSION.tar.gz && rm $OSM_BRIGHT_VERSION.tar.gz
RUN mv /tmp/osm-bright-$OSM_BRIGHT_VERSION /usr/share/mapnik
# Create symlink for shapefiles
RUN ln -s /usr/share/mapnik/openstreetmap-carto-$OSM_CARTO_VERSION/data /usr/share/mapnik/osm-bright-$OSM_BRIGHT_VERSION/shp

RUN cd /tmp && wget https://github.com/openstreetmap/mod_tile/archive/$MOD_TILE_VERSION.tar.gz && tar -xzf $MOD_TILE_VERSION.tar.gz && rm $MOD_TILE_VERSION.tar.gz
RUN cd /tmp/mod_tile-$MOD_TILE_VERSION/ && ./autogen.sh && ./configure && make -j $PARALLEL_BUILD && make install && make install-mod_tile

RUN mkdir -p /var/lib/mod_tile && chown www-data:www-data /var/lib/mod_tile
RUN mkdir -p /var/run/renderd && chown www-data:www-data /var/run/renderd

RUN mkdir -p /etc/service/renderd && mkdir -p /etc/service/apache2
RUN mkdir -p /etc/service/apache2
COPY ./apache2/run /etc/service/apache2/run
COPY ./renderd/run /etc/service/renderd/run
RUN chown root:root /etc/service/renderd/run /etc/service/apache2/run
RUN chmod u+x /etc/service/renderd/run /etc/service/apache2/run

COPY ./tile.load /etc/apache2/mods-available/tile.load
COPY ./apache2/000-default.conf /etc/apache2/sites-enabled/000-default.conf
RUN ln -s /etc/apache2/mods-available/tile.load /etc/apache2/mods-enabled/
RUN chown root:root /etc/service/apache2/run
RUN chmod u+x /etc/service/apache2/run

RUN mkdir -p /var/run/renderd && chown www-data:www-data /var/run/renderd
COPY ./renderd/renderd.conf /usr/local/etc/renderd.conf
RUN mkdir -p /etc/service/renderd
COPY ./renderd/run /etc/service/renderd/run
RUN chown root:root /etc/service/renderd/run
RUN chmod u+x /etc/service/renderd/run

COPY runit_bootstrap /usr/sbin/runit_bootstrap
RUN chmod 755 /usr/sbin/runit_bootstrap

RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

EXPOSE 80
ENTRYPOINT ["/usr/sbin/runit_bootstrap"]
CMD ["/usr/sbin/runit_bootstrap"]





#RUN chown root:root /etc/service/renderd/run /etc/service/apache2/run
#RUN chmod u+x /etc/service/renderd/run /etc/service/apache2/run

#RUN touch /etc/inittab
#RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -q autoconf libtool libmapnik-dev apache2-dev curl unzip gdal-bin mapnik-utils node-carto node-millstone apache2 wget runit sudo

#RUN cd /tmp && wget https://github.com/gravitystorm/openstreetmap-carto/archive/v$OSM_CARTO_VERSION.tar.gz && tar -xzf v$OSM_CARTO_VERSION.tar.gz
#RUN mkdir /usr/share/mapnik && mv /tmp/openstreetmap-carto-$OSM_CARTO_VERSION /usr/share/mapnik/
#RUN cd /usr/share/mapnik/openstreetmap-carto-$OSM_CARTO_VERSION/ && ./get-shapefiles.sh && cp project.mml project.mml.orig
# Delete zip files
#RUN find /usr/share/mapnik/openstreetmap-carto-$OSM_CARTO_VERSION/data \( -type f -iname "*.zip" -o -iname "*.tgz" \) -delete

#RUN cd /tmp && wget https://github.com/mapbox/osm-bright/archive/$OSM_BRIGHT_VERSION.tar.gz && tar -xzf $OSM_BRIGHT_VERSION.tar.gz && rm $OSM_BRIGHT_VERSION.tar.gz
#RUN mv /tmp/osm-bright-$OSM_BRIGHT_VERSION /usr/share/mapnik
# Create symlink for shapefiles
#RUN ln -s /usr/share/mapnik/openstreetmap-carto-$OSM_CARTO_VERSION/data /usr/share/mapnik/osm-bright-$OSM_BRIGHT_VERSION/shp

#RUN cd /tmp && wget https://github.com/openstreetmap/mod_tile/archive/$MOD_TILE_VERSION.tar.gz && tar -xzf $MOD_TILE_VERSION.tar.gz && rm $MOD_TILE_VERSION.tar.gz
#RUN cd /tmp/mod_tile-$MOD_TILE_VERSION/ && ./autogen.sh && ./configure && make -j $PARALLEL_BUILD && make install && make install-mod_tile

#RUN mkdir -p /var/lib/mod_tile && chown www-data:www-data /var/lib/mod_tile
#RUN mkdir -p /var/run/renderd && chown www-data:www-data /var/run/renderd

#RUN mkdir -p /etc/service/renderd && mkdir -p /etc/service/apache2
#COPY ./apache2/run /etc/service/apache2/run
#COPY ./renderd/run /etc/service/renderd/run
#RUN chown root:root /etc/service/renderd/run /etc/service/apache2/run
#RUN chmod u+x /etc/service/renderd/run /etc/service/apache2/run

#COPY ./tile.load /etc/apache2/mods-available/tile.load
#COPY ./apache2/000-default.conf /etc/apache2/sites-enabled/000-default.conf
#RUN ln -s /etc/apache2/mods-available/tile.load /etc/apache2/mods-enabled/
#COPY ./renderd/renderd.conf /usr/local/etc/renderd.conf

#COPY runit_bootstrap /usr/sbin/runit_bootstrap
#RUN chmod 755 /usr/sbin/runit_bootstrap

#RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

#EXPOSE 80
#ENTRYPOINT ["/usr/sbin/runit_bootstrap"]
3 changes: 3 additions & 0 deletions renderd/run
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash
exec 2>&1
mkdir -p /var/lib/mod_tile && chown www-data:www-data /var/lib/mod_tile
source /etc/envvars
sed -i -e "s/{{OSM_CARTO_XML_DIR}}/\/usr\/share\/mapnik\/openstreetmap-carto-$OSM_CARTO_VERSION\/style.xml/" \
-e "s/{{PLUGINS_DIR}}/\/usr\/lib\/mapnik\/2.2\/input\//" \
Expand All @@ -16,6 +17,7 @@ sed -i "s/\"dbname\": \"gis\"/\"host\": \"$PG_PORT_5432_TCP_ADDR\",\n \
\"port\": \"$PG_PORT_5432_TCP_PORT\",\n \
\"user\": \"$PG_ENV_OSM_USER\",\n \
\"dbname\":\"$PG_ENV_OSM_DB\"/" project.mml
sed -i -e "s/ne_10m_populated_places/ne_110m_admin_0_boundary_lines_land/g" project.mml
carto project.mml > style.xml

# osm-bright setup
Expand All @@ -30,6 +32,7 @@ sed -i -e "s|^config\[\"path\"\].*|config\[\"path\"\] = \"$(pwd)\"|" \

./make.py
cd OSMBright
sed -i -e "s/ne_10m_populated_places/ne_110m_admin_0_boundary_lines_land/g" project.mml
millstone project.mml > project.local.mml
carto project.local.mml > style.xml

Expand Down

0 comments on commit 9435536

Please sign in to comment.