mirrors/ichnaea
1
0
Fork 0
mirror of https://github.com/mozilla/ichnaea.git synced 2025-12-05 01:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include datamaps/libmaxminddb tarfiles in the Git repo.

Browse Source
This commit is contained in:
Hanno Schlichting
2017-06-23 14:01:32 +02:00
parent b17b8f3aed
commit 17fc8feb5f
6 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Dockerfile
View File

@@ -44,6 +44,7 @@ RUN apt-get update && apt-get -y install \
# Install dependencies. # Install dependencies.
COPY ./docker.make /app/ COPY ./docker.make /app/
COPY ./vendor /app/vendor/
RUN make -f docker.make build_deps RUN make -f docker.make build_deps
# Install Python libraries. # Install Python libraries.

5
data/README.rst Normal file
View File

@@ -0,0 +1,5 @@
Data Files
==========
These data files come from the natural earth project and were downloaded
from https://github.com/nvkelso/natural-earth-vector/tree/master/50m_cultural.

30
docker.make
View File

@@ -6,13 +6,15 @@ PYTHON = $(BIN)/python
INSTALL = $(BIN)/pip install --no-cache-dir \ INSTALL = $(BIN)/pip install --no-cache-dir \
--disable-pip-version-check --require-hashes --disable-pip-version-check --require-hashes
DATAMAPS_DOWNLOAD = https://github.com/ericfischer/datamaps/archive VENDOR = $(HERE)/vendor
DATAMAPS_COMMIT = 76e620adabbedabd6866b23b30c145b53bae751e DATAMAPS_COMMIT = 76e620adabbedabd6866b23b30c145b53bae751e
DATAMAPS_NAME = datamaps-$(DATAMAPS_COMMIT) DATAMAPS_NAME = datamaps-$(DATAMAPS_COMMIT)
DATAMAPS_DIR = $(VENDOR)/$(DATAMAPS_NAME)
LIBMAXMIND_DOWNLOAD = https://github.com/maxmind/libmaxminddb/releases/download
LIBMAXMIND_VERSION = 1.2.1 LIBMAXMIND_VERSION = 1.2.1
LIBMAXMIND_NAME = libmaxminddb-$(LIBMAXMIND_VERSION) LIBMAXMIND_NAME = libmaxminddb-$(LIBMAXMIND_VERSION)
LIBMAXMIND_DIR = $(VENDOR)/$(LIBMAXMIND_NAME)
TESTS ?= ichnaea TESTS ?= ichnaea
ifeq ($(TESTS), ichnaea) ifeq ($(TESTS), ichnaea)
@@ -29,23 +31,19 @@ all:
@echo "No default make step." @echo "No default make step."
build_datamaps: build_datamaps:
wget -q $(DATAMAPS_DOWNLOAD)/$(DATAMAPS_COMMIT).tar.gz cd $(VENDOR); tar zxf $(DATAMAPS_NAME).tar.gz
tar zxf $(DATAMAPS_COMMIT).tar.gz cd $(DATAMAPS_DIR); make -s all
rm -f $(DATAMAPS_COMMIT).tar.gz cp $(DATAMAPS_DIR)/encode /usr/local/bin/
cd $(DATAMAPS_NAME); make -s all cp $(DATAMAPS_DIR)/enumerate /usr/local/bin/
cp $(DATAMAPS_NAME)/encode /usr/local/bin/ cp $(DATAMAPS_DIR)/merge /usr/local/bin/
cp $(DATAMAPS_NAME)/enumerate /usr/local/bin/ cp $(DATAMAPS_DIR)/render /usr/local/bin/
cp $(DATAMAPS_NAME)/merge /usr/local/bin/ rm -rf $(DATAMAPS_DIR)
cp $(DATAMAPS_NAME)/render /usr/local/bin/
rm -rf $(HERE)/$(DATAMAPS_NAME)
build_libmaxmind: build_libmaxmind:
wget -q $(LIBMAXMIND_DOWNLOAD)/$(LIBMAXMIND_VERSION)/$(LIBMAXMIND_NAME).tar.gz cd $(VENDOR); tar xzf $(LIBMAXMIND_NAME).tar.gz
tar xzf $(LIBMAXMIND_NAME).tar.gz cd $(LIBMAXMIND_DIR); ./configure && make -s && make install
rm -f $(LIBMAXMIND_NAME).tar.gz
cd $(LIBMAXMIND_NAME); ./configure && make -s && make install
ldconfig ldconfig
rm -rf $(HERE)/$(LIBMAXMIND_NAME)/ rm -rf $(LIBMAXMIND_DIR)
build_deps: build_datamaps build_libmaxmind build_deps: build_datamaps build_libmaxmind

9
vendor/README.rst vendored Normal file
View File

@@ -0,0 +1,9 @@
Vendor
======
These tarballs where downloaded from::
wget -q -O datamaps-76e620adabbedabd6866b23b30c145b53bae751e.tar.gz \
https://github.com/ericfischer/datamaps/archive/76e620adabbedabd6866b23b30c145b53bae751e.tar.gz
wget -q https://github.com/maxmind/libmaxminddb/releases/download/1.2.1/libmaxminddb-1.2.1.tar.gz

BIN
vendor/datamaps-76e620adabbedabd6866b23b30c145b53bae751e.tar.gz vendored Normal file
View File

Binary file not shown.

BIN
vendor/libmaxminddb-1.2.1.tar.gz vendored Normal file
View File

Binary file not shown.