From 3ba4fb351e39302581d7852ca30c8b4e33d00b1b Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 18 Dec 2018 11:24:22 +0100 Subject: [PATCH] Embed GeoIP database into Docker Image instead of downloading it each time Closes #42 Signed-off-by: Thomas Citharel --- .gitlab-ci.yml | 3 +-- docker/tests/Dockerfile | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7d7d0690..554b8cfd5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ variables: POSTGRES_USER: postgres POSTGRES_PASSWORD: "" POSTGRES_HOST: postgres - GEOLITE_CITIES_PATH: "/builds/tcit/mobilizon/priv/data/GeoLite2-City.mmdb" + GEOLITE_CITIES_PATH: "/usr/share/GeoIP/GeoLite2-City.mmdb" cache: paths: @@ -28,7 +28,6 @@ before_script: - mix deps.get - MIX_ENV=test mix ecto.create - MIX_ENV=test mix ecto.migrate - - curl http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz --output GeoLite2-City.tar.gz -s && tar zxf GeoLite2-City.tar.gz && mv GeoLite2-City_*/GeoLite2-City.mmdb priv/data/GeoLite2-City.mmdb mix: script: diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index cab195811..1b9e8b950 100644 --- a/docker/tests/Dockerfile +++ b/docker/tests/Dockerfile @@ -2,4 +2,5 @@ FROM elixir:latest RUN apt-get update -yq && apt-get install -yq build-essential inotify-tools postgresql-client git curl gnupg RUN curl -sL https://deb.nodesource.com/setup_8.x | bash && apt-get install nodejs -yq -RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ No newline at end of file +RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +RUN curl http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz --output GeoLite2-City.tar.gz -s && tar zxf GeoLite2-City.tar.gz && mkdir -p /usr/share/GeoIP && mv GeoLite2-City_*/GeoLite2-City.mmdb /usr/share/GeoIP/GeoLite2-City.mmdb \ No newline at end of file