From 1b96c582a7bebeb7ca6d35e6274abe3194af5b08 Mon Sep 17 00:00:00 2001
From: Nick Sweeting <git@sweeting.me>
Date: Tue, 28 Jul 2020 07:18:10 -0400
Subject: [PATCH] fix lint and improve docker-compose instructions

---
 .github/workflows/test.yml | 14 +++++++++++---
 README.md                  | 14 +++++++++++---
 archivebox/logging_util.py |  1 -
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1b05fa5a..36903f42 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -66,7 +66,7 @@ jobs:
 
       - name: Test built package with pytest
         run: |
-          ./.venv/bin/python -m pipenv run pytest -s
+          ./.venv/bin/python -m pytest -s
 
   docker-test:
     runs-on: ubuntu-latest
@@ -111,5 +111,13 @@ jobs:
 
       - name: Curl to Django app
         run: |
-          sleep 10
-          curl --silent --location 'http://127.0.0.1:8000' | grep 'https://github.com/pirate/ArchiveBox/wiki'
+          sleep 8
+          curl --silent --location 'http://127.0.0.1:8000' | grep 'ArchiveBox Admin'
+          docker-compose run archivebox config --set PUBLIC_INDEX=True
+          docker-compose run archivebox add 'http://example.com/#test_docker' --index-only
+          docker-compose stop archivebox
+          docker-compose up -d
+          sleep 8
+          curl --silent --location 'http://127.0.0.1:8000' | grep 'Add Links'
+          curl --silent --location 'http://127.0.0.1:8000' | grep 'http://example.com/#test_docker'
+          docker-compose down
diff --git a/README.md b/README.md
index 18590cf8..e7e4a5ee 100644
--- a/README.md
+++ b/README.md
@@ -70,12 +70,20 @@ To get started, you can [install them manually](https://github.com/pirate/Archiv
 ```bash
 # Docker
 mkdir data && cd data
-docker run -v $PWD:/data archivebox init
-docker run -v $PWD:/data archivebox add 'https://example.com'
-docker run -v $PWD:/data -p 8000 archivebox server
+docker run -v $PWD:/data nikisweeting:archivebox init
+docker run -v $PWD:/data nikisweeting:archivebox add 'https://example.com'
+docker run -v $PWD:/data -p 8000 nikisweeting:archivebox server
 open https://127.0.0.1:8000
 ```
 
+```bash
+# Docker Compose
+# Download https://github.com/pirate/ArchiveBox/tree/master/docker-compose.yml
+docker-compose run archivebox init
+docker-compose run archivebox add 'https://example.com'
+docker-compose up
+```
+
 ```bash
 # Bare Metal
 # Use apt on Ubuntu/Debian, brew on mac, or pkg on BSD
diff --git a/archivebox/logging_util.py b/archivebox/logging_util.py
index 6ea64daa..c44f87f1 100644
--- a/archivebox/logging_util.py
+++ b/archivebox/logging_util.py
@@ -20,7 +20,6 @@ from .config import (
     PYTHON_ENCODING,
     ANSI,
     IS_TTY,
-    SHOW_PROGRESS,
     TERM_WIDTH,
     OUTPUT_DIR,
     SOURCES_DIR_NAME,