From 31682afc40fa24bf084f555d4d9410befeb5f717 Mon Sep 17 00:00:00 2001 From: Jarry Shaw Date: Sat, 20 Jan 2024 10:38:16 -0500 Subject: [PATCH] bugfix for docker compose yaml format --- demo/deploy/docker-compose.yml | 26 ++++++++++++++------------ docker-compose.debug.yml | 30 ++++++++++++++++-------------- docker-compose.yml | 26 ++++++++++++++------------ 3 files changed, 44 insertions(+), 38 deletions(-) diff --git a/demo/deploy/docker-compose.yml b/demo/deploy/docker-compose.yml index 35d0d98d..120d5a02 100644 --- a/demo/deploy/docker-compose.yml +++ b/demo/deploy/docker-compose.yml @@ -99,12 +99,13 @@ services: # time to wait for selenium SE_WAIT: 5 # extract link pattern - LINK_WHITE_LIST: '[ - ".*?\\.onion", - ".*?\\.i2p", "127\\.0\\.0\\.1:7657", "localhost:7657", "127\\.0\\.0\\.1:7658", "localhost:7658", - "127\\.0\\.0\\.1:43110", "localhost:43110", - "127\\.0\\.0\\.1:8888", "localhost:8888" - ]' + LINK_WHITE_LIST: | + [ + ".*?\\.onion", + ".*?\\.i2p", "127\\.0\\.0\\.1:7657", "localhost:7657", "127\\.0\\.0\\.1:7658", "localhost:7658", + "127\\.0\\.0\\.1:43110", "localhost:43110", + "127\\.0\\.0\\.1:8888", "localhost:8888" + ] # link black list LINK_BLACK_LIST: '[ "(.*\\.)?facebookcorewwwi\\.onion", "(.*\\.)?nytimes3xbfgragh\\.onion" ]' # link fallback flag @@ -226,12 +227,13 @@ services: # time to wait for selenium SE_WAIT: 5 # extract link pattern - LINK_WHITE_LIST: '[ - ".*?\\.onion", - ".*?\\.i2p", "127\\.0\\.0\\.1:7657", "localhost:7657", "127\\.0\\.0\\.1:7658", "localhost:7658", - "127\\.0\\.0\\.1:43110", "localhost:43110", - "127\\.0\\.0\\.1:8888", "localhost:8888" - ]' + LINK_WHITE_LIST: | + [ + ".*?\\.onion", + ".*?\\.i2p", "127\\.0\\.0\\.1:7657", "localhost:7657", "127\\.0\\.0\\.1:7658", "localhost:7658", + "127\\.0\\.0\\.1:43110", "localhost:43110", + "127\\.0\\.0\\.1:8888", "localhost:8888" + ] # link black list LINK_BLACK_LIST: '[ "(.*\\.)?facebookcorewwwi\\.onion", "(.*\\.)?nytimes3xbfgragh\\.onion" ]' # link fallback flag diff --git a/docker-compose.debug.yml b/docker-compose.debug.yml index 0de9dea6..94571d79 100644 --- a/docker-compose.debug.yml +++ b/docker-compose.debug.yml @@ -116,13 +116,14 @@ services: # time to wait for selenium SE_WAIT: 60 # extract link pattern - LINK_WHITE_LIST: '[ - "(?!(.*\\.)?facebookcorewwwi).*\\.onion", - "(?!(.*\\.)?nytimes3xbfgragh).*\\.onion", - ".*?\\.i2p", - "127\\.0\\.0\\.1:43110", "localhost:43110", - "127\\.0\\.0\\.1:8888", "localhost:8888" - ]' + LINK_WHITE_LIST: | + [ + "(?!(.*\\.)?facebookcorewwwi).*\\.onion", + "(?!(.*\\.)?nytimes3xbfgragh).*\\.onion", + ".*?\\.i2p", + "127\\.0\\.0\\.1:43110", "localhost:43110", + "127\\.0\\.0\\.1:8888", "localhost:8888" + ] # link black list LINK_BLACK_LIST: '[ "(.*\\.)?facebookcorewwwi\\.onion", "(.*\\.)?nytimes3xbfgragh\\.onion" ]' # link fallback flag @@ -252,13 +253,14 @@ services: # time to wait for selenium SE_WAIT: 60 # extract link pattern - LINK_WHITE_LIST: '[ - "(?!(.*\\.)?facebookcorewwwi).*\\.onion", - "(?!(.*\\.)?nytimes3xbfgragh).*\\.onion", - ".*?\\.i2p", - "127\\.0\\.0\\.1:43110", "localhost:43110", - "127\\.0\\.0\\.1:8888", "localhost:8888" - ]' + LINK_WHITE_LIST: | + [ + "(?!(.*\\.)?facebookcorewwwi).*\\.onion", + "(?!(.*\\.)?nytimes3xbfgragh).*\\.onion", + ".*?\\.i2p", + "127\\.0\\.0\\.1:43110", "localhost:43110", + "127\\.0\\.0\\.1:8888", "localhost:8888" + ] # link black list LINK_BLACK_LIST: '[ "(.*\\.)?facebookcorewwwi\\.onion", "(.*\\.)?nytimes3xbfgragh\\.onion" ]' # link fallback flag diff --git a/docker-compose.yml b/docker-compose.yml index d57ff709..484a6998 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -104,12 +104,13 @@ services: # time to wait for selenium SE_WAIT: 5 # extract link pattern - LINK_WHITE_LIST: '[ - ".*?\\.onion", - ".*?\\.i2p", "127\\.0\\.0\\.1:7657", "localhost:7657", "127\\.0\\.0\\.1:7658", "localhost:7658", - "127\\.0\\.0\\.1:43110", "localhost:43110", - "127\\.0\\.0\\.1:8888", "localhost:8888" - ]' + LINK_WHITE_LIST: | + [ + ".*?\\.onion", + ".*?\\.i2p", "127\\.0\\.0\\.1:7657", "localhost:7657", "127\\.0\\.0\\.1:7658", "localhost:7658", + "127\\.0\\.0\\.1:43110", "localhost:43110", + "127\\.0\\.0\\.1:8888", "localhost:8888" + ] # link black list LINK_BLACK_LIST: '[ "(.*\\.)?facebookcorewwwi\\.onion", "(.*\\.)?nytimes3xbfgragh\\.onion" ]' # link fallback flag @@ -231,12 +232,13 @@ services: # time to wait for selenium SE_WAIT: 5 # extract link pattern - LINK_WHITE_LIST: '[ - ".*?\\.onion", - ".*?\\.i2p", "127\\.0\\.0\\.1:7657", "localhost:7657", "127\\.0\\.0\\.1:7658", "localhost:7658", - "127\\.0\\.0\\.1:43110", "localhost:43110", - "127\\.0\\.0\\.1:8888", "localhost:8888" - ]' + LINK_WHITE_LIST: | + [ + ".*?\\.onion", + ".*?\\.i2p", "127\\.0\\.0\\.1:7657", "localhost:7657", "127\\.0\\.0\\.1:7658", "localhost:7658", + "127\\.0\\.0\\.1:43110", "localhost:43110", + "127\\.0\\.0\\.1:8888", "localhost:8888" + ] # link black list LINK_BLACK_LIST: '[ "(.*\\.)?facebookcorewwwi\\.onion", "(.*\\.)?nytimes3xbfgragh\\.onion" ]' # link fallback flag