From bfa1fc161897cd47c4fa6928fdb3eb996d9e79d9 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Thu, 5 Nov 2020 22:34:33 +0000 Subject: [PATCH] Dockerfile: build with chrome deb directly instead of copying binaries from chrome image bump to 0.1.1 --- .dockerignore | 1 + Dockerfile | 8 ++++---- docker-compose.yml | 2 +- package.json | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.dockerignore b/.dockerignore index e1d45cf5..cbb28a2c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,3 @@ output/ node_modules/ +crawls/ diff --git a/Dockerfile b/Dockerfile index f1466627..d7b1a881 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,9 +18,10 @@ RUN pip install git+https://github.com/webrecorder/pywb@patch-work RUN pip install uwsgi 'gevent>=20.9.0' -COPY --from=chrome /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/ -COPY --from=chrome /lib/x86_64-linux-gnu/libdbus* /lib/x86_64-linux-gnu/ -COPY --from=chrome /opt/google/chrome/ /opt/google/chrome/ +COPY --from=chrome /tmp/*.deb /deb/ +COPY --from=chrome /app/libpepflashplayer.so /app/libpepflashplayer.so +RUN dpkg -i /deb/*.deb; apt-get update; apt-get install -fqqy && \ + rm -rf /var/lib/opts/lists/* WORKDIR /app @@ -33,7 +34,6 @@ ADD uwsgi.ini /app/ ADD *.js /app/ RUN ln -s /app/main.js /usr/bin/crawl -RUN ln -s /opt/google/chrome/google-chrome /usr/bin/google-chrome WORKDIR /crawls diff --git a/docker-compose.yml b/docker-compose.yml index 3ffacd8b..e72e5aee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.5' services: crawler: - image: webrecorder/browsertrix-crawler:0.1.0 + image: webrecorder/browsertrix-crawler:0.1.1 build: context: ./ diff --git a/package.json b/package.json index 92e88cdc..73fe327f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "browsertrix-crawler", - "version": "0.1.0", + "version": "0.1.1", "main": "browsertrix-crawler", "repository": "https://github.com/webrecorder/browsertrix-crawler", "author": "Ilya Kreymer , Webrecorder Software",