From 634d4e9bb3000f019f24cc613a6660fea7ddc2fb Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 2 Oct 2017 23:35:02 +0200 Subject: [pkg] update the dockerfile --- pkg/docker_bundle/Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/docker_bundle/Dockerfile b/pkg/docker_bundle/Dockerfile index 41635cb8..5c3797d3 100644 --- a/pkg/docker_bundle/Dockerfile +++ b/pkg/docker_bundle/Dockerfile @@ -1,10 +1,8 @@ -# Thiis is *almost* a copy of the file that's used for building the bundle docker image. +# This is *almost* a copy of the file that's used for building the bundle docker image. # The copy that the CI uses is in tests/docker/Dockerfile # It has diverged from the original, but it's because I don't want the clutter -# of all the nodejs and friends inside a container for bundling. - -# TODO consider converging the two copies! +# of all the nodejs and friends inside a container for bundling -- kali. FROM ubuntu:16.04 @@ -16,5 +14,5 @@ RUN apt update && apt upgrade -y # Install bitmask-dev build deps RUN apt install -y git build-essential python-virtualenv libpython-dev \ libsqlcipher-dev libssl-dev libffi-dev python-pyqt5 python-pyqt5.qtwebkit \ - libusb-0.1-4 patchelf + libusb-0.1-4 patchelf wget -- cgit v1.2.3