From 5b5a602c8a8753dfe2bd18187083ed00580f58d0 Mon Sep 17 00:00:00 2001 From: Raman Gupta Date: Sat, 2 Mar 2019 11:58:20 -0500 Subject: [PATCH 1/8] test skipping Puppeteer's Chromium download --- Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile b/Dockerfile index 2540aeca..ddb96399 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,11 @@ RUN apt-get update && apt-get install -y wget --no-install-recommends \ ADD https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64 /usr/local/bin/dumb-init RUN chmod +x /usr/local/bin/dumb-init +# Uncomment to skip the chromium download when installing puppeteer. If you do, +# you'll need to launch puppeteer with: +# browser.launch({executablePath: 'google-chrome-unstable'}) +ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true + # Install puppeteer so it's available in the container. RUN npm i puppeteer From 99e462218529951bf04fbb9ff4c2be483fd31c92 Mon Sep 17 00:00:00 2001 From: Raman Gupta Date: Sat, 2 Mar 2019 12:36:03 -0500 Subject: [PATCH 2/8] Remove redundant linking since repo includes link --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ddb96399..d55c7ea1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,7 +50,7 @@ RUN git clone https://github.com/pirate/ArchiveBox /home/pptruser/app \ && chown -R pptruser:pptruser /data \ && ln -s /data /home/pptruser/app/archivebox/output \ && ln -s /home/pptruser/app/bin/* /bin/ \ - && ln -s /home/pptruser/app/bin/archive /bin/archivebox \ +# && ln -s /home/pptruser/app/bin/archive /bin/archivebox \ && chown -R pptruser:pptruser /home/pptruser/app/archivebox # && pip3 install -r /home/pptruser/app/archivebox/requirements.txt From 8d48b4f8dfe5ba6946c4e4df208b0a90ee240e8b Mon Sep 17 00:00:00 2001 From: Raman Gupta Date: Sat, 2 Mar 2019 13:25:52 -0500 Subject: [PATCH 3/8] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d55c7ea1..48a9ecfa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,7 +50,7 @@ RUN git clone https://github.com/pirate/ArchiveBox /home/pptruser/app \ && chown -R pptruser:pptruser /data \ && ln -s /data /home/pptruser/app/archivebox/output \ && ln -s /home/pptruser/app/bin/* /bin/ \ -# && ln -s /home/pptruser/app/bin/archive /bin/archivebox \ + # && ln -s /home/pptruser/app/bin/archive /bin/archivebox \ && chown -R pptruser:pptruser /home/pptruser/app/archivebox # && pip3 install -r /home/pptruser/app/archivebox/requirements.txt From 3c934c2708f9561620277d180830ef90dac57b28 Mon Sep 17 00:00:00 2001 From: Raman Gupta Date: Sat, 2 Mar 2019 13:32:48 -0500 Subject: [PATCH 4/8] Changed CMD point to reference proper target --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 48a9ecfa..77a11975 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,4 +69,4 @@ USER pptruser WORKDIR /home/pptruser/app ENTRYPOINT ["dumb-init", "--"] -CMD ["/bin/archive"] +CMD ["/bin/archivebox"] From 4917147447e97651d88acdf1ad26f6dd533238ef Mon Sep 17 00:00:00 2001 From: Raman Gupta Date: Sat, 2 Mar 2019 13:35:23 -0500 Subject: [PATCH 5/8] Changed command to reference proper target --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 631ebcf7..196aeec7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: - SHOW_PROGRESS=False volumes: - ./data:/data - command: bash -c 'echo "https://github.com/pirate/ArchiveBox" | /bin/archive; tail -f /dev/null' + command: bash -c 'echo "https://github.com/pirate/ArchiveBox" | /bin/archivebox; tail -f /dev/null' nginx: image: 'nginx' From 5a55b9540e1843e9b2a793e4f18cf653d3729bc5 Mon Sep 17 00:00:00 2001 From: Raman Gupta Date: Sun, 3 Mar 2019 16:36:31 -0500 Subject: [PATCH 6/8] Updated symlink to correct src and target --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 77a11975..f241a5dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,7 +50,7 @@ RUN git clone https://github.com/pirate/ArchiveBox /home/pptruser/app \ && chown -R pptruser:pptruser /data \ && ln -s /data /home/pptruser/app/archivebox/output \ && ln -s /home/pptruser/app/bin/* /bin/ \ - # && ln -s /home/pptruser/app/bin/archive /bin/archivebox \ + && ln -s /home/pptruser/app/bin/archivebox /bin/archive \ && chown -R pptruser:pptruser /home/pptruser/app/archivebox # && pip3 install -r /home/pptruser/app/archivebox/requirements.txt From 5417aba1caec051bfa445f89891b95f4f7c5a434 Mon Sep 17 00:00:00 2001 From: Raman Gupta Date: Sun, 3 Mar 2019 16:37:13 -0500 Subject: [PATCH 7/8] Updated CMD --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f241a5dc..d5683cad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,4 +69,4 @@ USER pptruser WORKDIR /home/pptruser/app ENTRYPOINT ["dumb-init", "--"] -CMD ["/bin/archivebox"] +CMD ["/bin/archive"] From 5bd927fd66ac9f5cc08dc66a49a2e987817a4b77 Mon Sep 17 00:00:00 2001 From: Raman Gupta Date: Sun, 3 Mar 2019 16:38:48 -0500 Subject: [PATCH 8/8] Updated command --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 196aeec7..631ebcf7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,7 @@ services: - SHOW_PROGRESS=False volumes: - ./data:/data - command: bash -c 'echo "https://github.com/pirate/ArchiveBox" | /bin/archivebox; tail -f /dev/null' + command: bash -c 'echo "https://github.com/pirate/ArchiveBox" | /bin/archive; tail -f /dev/null' nginx: image: 'nginx'