From dfef21a814f3271e38a00f2ed9711d94cb9ce02f Mon Sep 17 00:00:00 2001 From: Mike Kusold Date: Tue, 5 Apr 2022 20:42:29 -0600 Subject: [PATCH 1/2] Update pywb entrypoint wb-manager first needs you to init the collection. If you attempt to init a collection that already exists, it exits with a `2`. Also, `wayback --proxy` requires an argument, so I remove the proxy argument. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 6e05f302..644bef9a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -106,7 +106,7 @@ services: # pywb: # image: webrecorder/pywb:latest - # entrypoint: /bin/sh 'wb-manager add default /archivebox/archive/*/warc/*.warc.gz; wayback --proxy;' + # entrypoint: /bin/sh '(wb-manager init default || test $? -eq 2) && wb-manager add default /archivebox/archive/*/warc/*.warc.gz; wayback;' # environment: # - INIT_COLLECTION=archivebox # ports: From 4febbacef6bc9b8903a6afa3b6b531e44124fb90 Mon Sep 17 00:00:00 2001 From: Mike Kusold Date: Tue, 5 Apr 2022 20:58:40 -0600 Subject: [PATCH 2/2] Fix entrypoint docker-compose requires `$$` for env vars that are supposed to be executed inside the container. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 644bef9a..66462310 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -106,7 +106,7 @@ services: # pywb: # image: webrecorder/pywb:latest - # entrypoint: /bin/sh '(wb-manager init default || test $? -eq 2) && wb-manager add default /archivebox/archive/*/warc/*.warc.gz; wayback;' + # entrypoint: /bin/sh -c '(wb-manager init default || test $$? -eq 2) && wb-manager add default /archivebox/archive/*/warc/*.warc.gz; wayback;' # environment: # - INIT_COLLECTION=archivebox # ports: