Commit 0534bf05 authored by Alexandre Delanoë's avatar Alexandre Delanoë

Merge remote-tracking branch 'origin/dev-456-istex-tls-fix' into dev

parents e9301e4e 9ad77ad6
...@@ -16,7 +16,7 @@ fi ...@@ -16,7 +16,7 @@ fi
# with the `sha256sum` result calculated on the `cabal.project` and # with the `sha256sum` result calculated on the `cabal.project` and
# `cabal.project.freeze`. This ensures the files stay deterministic so that CI # `cabal.project.freeze`. This ensures the files stay deterministic so that CI
# cache can kick in. # cache can kick in.
expected_cabal_project_hash="37352ca36ca5e69d9945da11439be4c3909297b338242855fa588dffdf1ba02b" expected_cabal_project_hash="0ce011cd483078936fe3385b3e0c90231774fd2ac05bfb9f4c646345a0208d66"
expected_cabal_project_freeze_hash="cd52143d3a9d285360b59c6371d3e258552c1bc115bd612024db3de1f7593ff7" expected_cabal_project_freeze_hash="cd52143d3a9d285360b59c6371d3e258552c1bc115bd612024db3de1f7593ff7"
......
...@@ -72,7 +72,7 @@ source-repository-package ...@@ -72,7 +72,7 @@ source-repository-package
source-repository-package source-repository-package
type: git type: git
location: https://gitlab.iscpif.fr/gargantext/crawlers/istex.git location: https://gitlab.iscpif.fr/gargantext/crawlers/istex.git
tag: 521ca54f1502b13f629eff2223aaf5007e6d52ec tag: 894482ef97eadce6b1c13ebced1edfe394b5be5e
source-repository-package source-repository-package
type: git type: git
......
version: '3' version: '3'
services: services:
caddy: # caddy:
image: caddy:alpine # image: caddy:alpine
ports: # ports:
- 8108:8108 # - 8108:8108
volumes: # volumes:
- ./Caddyfile:/etc/caddy/Caddyfile:ro # - ./Caddyfile:/etc/caddy/Caddyfile:ro
- ../../purescript-gargantext:/srv/purescript-gargantext:ro # - ../../purescript-gargantext:/srv/purescript-gargantext:ro
#postgres11: #postgres11:
# #image: 'postgres:latest' # #image: 'postgres:latest'
......
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
git: "https://gitlab.iscpif.fr/gargantext/crawlers/isidore.git" git: "https://gitlab.iscpif.fr/gargantext/crawlers/isidore.git"
subdirs: subdirs:
- . - .
- commit: 521ca54f1502b13f629eff2223aaf5007e6d52ec - commit: 894482ef97eadce6b1c13ebced1edfe394b5be5e
git: "https://gitlab.iscpif.fr/gargantext/crawlers/istex.git" git: "https://gitlab.iscpif.fr/gargantext/crawlers/istex.git"
subdirs: subdirs:
- . - .
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment