From 09c74340122522fd4f77c89e94a59c9d152bbfa6 Mon Sep 17 00:00:00 2001 From: Asone Date: Wed, 15 Aug 2018 14:39:39 +0200 Subject: [PATCH] feature: add wikidata container --- Makefile | 4 +++- _provisioning/wikidata-api/Dockerfile | 27 +++++++++++++++++++++++++++ docker-compose.yml | 10 ++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 _provisioning/wikidata-api/Dockerfile diff --git a/Makefile b/Makefile index d2f413d..a8958cb 100644 --- a/Makefile +++ b/Makefile @@ -3,4 +3,6 @@ an-data-fetcher : an-pics-fetcher : docker-compose run assemblee cargo run -p tricoteuses_api_assemblee_photos_fetcher -- -c Config.toml -v hatvp-data-fetcher: - docker-compose run hatvp cargo run -p tricoteuses_api_hatvp_fetcher -- -c Config.toml -v \ No newline at end of file + docker-compose run hatvp cargo run -p tricoteuses_api_hatvp_fetcher -- -c Config.toml -v +wikidata-data-fetcher: + docker-compose run wikidata cargo run -p tricoteuses_api_wikidata_fetcher -- -c Config.toml -v diff --git a/_provisioning/wikidata-api/Dockerfile b/_provisioning/wikidata-api/Dockerfile new file mode 100644 index 0000000..93364e7 --- /dev/null +++ b/_provisioning/wikidata-api/Dockerfile @@ -0,0 +1,27 @@ +FROM rustlang/rust:nightly + +LABEL AUTHOR="Nelson Herbin " +LABEL NAME=tricoteuses-wikidata-api +LABEL VERSION=1 + +RUN apt-get update && \ +apt-get install -y unzip + +ENV JQ_VERSION='1.5' + +RUN wget --no-check-certificate https://raw.githubusercontent.com/stedolan/jq/master/sig/jq-release.key -O /tmp/jq-release.key && \ + wget --no-check-certificate https://raw.githubusercontent.com/stedolan/jq/master/sig/v${JQ_VERSION}/jq-linux64.asc -O /tmp/jq-linux64.asc && \ + wget --no-check-certificate https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 -O /tmp/jq-linux64 && \ + gpg --import /tmp/jq-release.key && \ + gpg --verify /tmp/jq-linux64.asc /tmp/jq-linux64 && \ + cp /tmp/jq-linux64 /usr/bin/jq && \ + chmod +x /usr/bin/jq && \ + rm -f /tmp/jq-release.key && \ + rm -f /tmp/jq-linux64.asc && \ + rm -f /tmp/jq-linux64 + +RUN git clone https://framagit.org/tricoteuses/tricoteuses-api-wikidata.git + +WORKDIR tricoteuses-api-wikidata + +EXPOSE 8003 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 451b13b..4886c55 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -73,6 +73,16 @@ services: - ./_data:/hatvp-data/ ports: - 8002:8002 + wikidata: + build: + context: ./_provisioning/wikidata-api + environment: + - ROCKET_ENV=staging + command: cargo run -p tricoteuses_api_wikidata -- -c Config.toml -v + volumes: + - ./_data:/wikidata-data/ + ports: + - 8003:8003 volumes: pgdata: