From 61e2698ceb7e5b9144baeb82283108215f4acdf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20=C5=A0korpil?= Date: Fri, 11 Nov 2022 21:22:11 +0100 Subject: [PATCH] Created fedistore app --- build/.gitignore | 1 + docker-compose.dev.yml | 9 +++++++++ docker-compose.traefik.yml | 7 +++++++ docker-compose.yml | 19 +++++++++++++++++-- 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/build/.gitignore b/build/.gitignore index 164db09..094287c 100644 --- a/build/.gitignore +++ b/build/.gitignore @@ -1,2 +1,3 @@ fedisearch fedicrawl +fedistore diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 2f8eb6a..ae388da 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -6,6 +6,15 @@ services: ports: - 9200:9200 + fedisearch-storage: + image: skorpil/fedistore:dev + build: + target: dev + ports: + - 4000:3000 + volumes: + - ./build/fedistore/application:/srv + fedisearch-crawler: image: skorpil/fedicrawl:dev build: diff --git a/docker-compose.traefik.yml b/docker-compose.traefik.yml index 095d52e..12623a7 100644 --- a/docker-compose.traefik.yml +++ b/docker-compose.traefik.yml @@ -1,5 +1,12 @@ version: "3.9" services: + fedisearch-storage: + networks: + proxy: + labels: + - "traefik.enable=true" + - "traefik.http.routers.fedisearch-searcher.rule=Host(`${FEDISEARCH_DOMAIN}`)&Path(`/api/graphql`)" + - "traefik.http.services.fedisearch-searcher.loadbalancer.server.port=4000" fedisearch-searcher: networks: proxy: diff --git a/docker-compose.yml b/docker-compose.yml index 9226a1f..0705d72 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,21 @@ x-logging: max-size: "1M" max-file: "10" services: + fedisearch-storage: + image: skorpil/fedistore:latest + build: + context: ./build/fedistore + target: prod + volumes: + - ./build/fedistore/application:/srv + environment: + - 'ELASTIC_URL=http://elastic:9200' + - 'ELASTIC_PASSWORD=${FEDISEARCH_ELASTIC_PASSWORD}' + networks: + fedisearch: + logging: *default-logging + depends_on: + - fedisearch-elasticsearch fedisearch-crawler: image: skorpil/fedicrawl:latest restart: always @@ -26,7 +41,7 @@ services: fedisearch: logging: *default-logging depends_on: - - fedisearch-elasticsearch + - fedisearch-storage fedisearch-searcher: image: skorpil/fedisearch:latest @@ -45,7 +60,7 @@ services: fedisearch: logging: *default-logging depends_on: - - fedisearch-elasticsearch + - fedisearch-storage fedisearch-elasticsearch: image: elasticsearch:8.4.1 environment: