From 5a61c134f34cc3387d2831fc87bd3c425d76b249 Mon Sep 17 00:00:00 2001 From: Nazariy Hazdun Date: Fri, 17 Aug 2018 14:24:48 +0300 Subject: [PATCH 1/3] Add Weaver-athenapdf --- weaver/conf/sample.env | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 weaver/conf/sample.env diff --git a/weaver/conf/sample.env b/weaver/conf/sample.env new file mode 100644 index 00000000..ccb48de5 --- /dev/null +++ b/weaver/conf/sample.env @@ -0,0 +1,19 @@ +GIN_MODE=debug + +# Weaver +WEAVER_AUTH_KEY=arachnys-weaver +WEAVER_ATHENA_CMD=athenapdf -S +WEAVER_MAX_WORKERS=10 +WEAVER_MAX_CONVERSION_QUEUE=50 +WEAVER_WORKER_TIMEOUT=90 +WEAVER_CONVERSION_FALLBACK=false + +# CloudConvert +# API key can be found: https://cloudconvert.com/user/profile +# CLOUDCONVERT_API=https://api.cloudconvert.com +# CLOUDCONVERT_KEY= + +# Monitoring +# STATSD_ADDRESS= +# STATSD_PREFIX= +# SENTRY_DSN= \ No newline at end of file From 006946ce6a8c48110efe4236b4bb5e1353d266e7 Mon Sep 17 00:00:00 2001 From: Nazariy Hazdun Date: Fri, 17 Aug 2018 14:31:38 +0300 Subject: [PATCH 2/3] Add Weaver-athenapdf --- docker-compose.yml | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e1a6f18c..276ea89e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -685,7 +685,7 @@ services: networks: - frontend - backend - + ### Solr ################################################ solr: build: @@ -730,15 +730,15 @@ services: context: ./gitlab environment: GITLAB_OMNIBUS_CONFIG: | - external_url '${GITLAB_DOMAIN_NAME}' - redis['enable'] = false - nginx['listen_https'] = false - nginx['listen_port'] = 80 - postgresql['enable'] = false - gitlab_rails['trusted_proxies'] = ['caddy','nginx','apache2'] - gitlab_rails['redis_host'] = 'redis' + external_url '${GITLAB_DOMAIN_NAME}' + redis['enable'] = false + nginx['listen_https'] = false + nginx['listen_port'] = 80 + postgresql['enable'] = false + gitlab_rails['trusted_proxies'] = ['caddy','nginx','apache2'] + gitlab_rails['redis_host'] = 'redis' gitlab_rails['redis_database'] = 8 - gitlab_rails['db_host'] = 'postgres' + gitlab_rails['db_host'] = 'postgres' gitlab_rails['db_username'] = 'laradock_gitlab' gitlab_rails['db_password'] = 'laradock_gitlab' gitlab_rails['db_database'] = 'laradock_gitlab' @@ -765,7 +765,7 @@ services: - ${DATA_PATH_HOST}/gitlab/runner:/etc/gitlab-runner - /var/run/docker.sock:/var/run/docker.sock:rw restart: always - + ### JupyterHub ######################################### jupyterhub: build: @@ -876,7 +876,7 @@ services: - backend depends_on: - mongo - + ### Metabase ################################################# metabase: image: metabase/metabase:latest @@ -889,3 +889,14 @@ services: networks: - backend +### Weaver (Athena PDF) ################################################ + weaver: + image: arachnysdocker/athenapdf-service + ports: + - "8080:8080" + env_file: + - ./weaver/conf/sample.env + networks: + - backend + depends_on: + - workspace \ No newline at end of file From d178613e660cd11aac2d529ee6c4523b236f9b03 Mon Sep 17 00:00:00 2001 From: Nazariy Hazdun Date: Fri, 17 Aug 2018 14:33:24 +0300 Subject: [PATCH 3/3] code style fix --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 276ea89e..ad5f2363 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -889,7 +889,7 @@ services: networks: - backend -### Weaver (Athena PDF) ################################################ +### Weaver (Athena PDF) ################################################# weaver: image: arachnysdocker/athenapdf-service ports: