diff options
| author | Christoph Kluenter <ckluente@thoughtworks.com> | 2014-12-16 16:02:04 +0100 |
|---|---|---|
| committer | Christoph Kluenter <ckluente@thoughtworks.com> | 2014-12-16 16:02:04 +0100 |
| commit | 6999194e507e3f311530d2b90508e106dd1b7fa8 (patch) | |
| tree | 2688983d0a505936f23e0827d552ab2e11773ca5 /provisioning | |
| parent | 1f54059cf3661a8df6b484806270790b5ccfe396 (diff) | |
merge fixes from dispatcher/Docker file
it seems that these changes help with #191
Diffstat (limited to 'provisioning')
| -rw-r--r-- | provisioning/Dockerfile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/provisioning/Dockerfile b/provisioning/Dockerfile index def6a610..49ff5400 100644 --- a/provisioning/Dockerfile +++ b/provisioning/Dockerfile @@ -15,7 +15,6 @@ # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see <http://www.gnu.org/licenses/>. -# builds the pixelated-user-agent using the debian packages FROM debian:testing @@ -37,12 +36,15 @@ RUN apt-key adv --keyserver pool.sks-keyservers.net --recv-key 1E34A1828E207901 RUN apt-get update -y --force-yes # Install pip for taskthread dependency (no backport yet) -RUN apt-get install python-pip +RUN apt-get install python-pip python-all-dev libssl-dev RUN pip install taskthread RUN apt-get install -y --force-yes --allow-unauthenticated soledad-client=0.6.1~509f76c soledad-common=0.6.1~509f76c # Install Pixelated User Agent RUN apt-get install -y --force-yes pixelated-user-agent -EXPOSE 4567 +# reinstall pysqlcipher from pip +RUN rm -rf /usr/lib/python2.7/dist-packages/pysqlcipher* +RUN pip install pysqlcipher +EXPOSE 4567 |