From 7cd8ec6f89923397ffc5ba450085cae3621fff43 Mon Sep 17 00:00:00 2001
From: Ben Bangert <ben@groovie.org>
Date: Thu, 17 Mar 2016 17:38:34 -0700
Subject: [PATCH] fix: fix dockerfile for automated builds

Dockerfile and Makefile were both broken. This fixes the Dockerfile
and uses the latest PyPy 5.0 for building the container.

Closes #414
---
 .dockerignore         |  1 +
 Dockerfile            | 14 ++++++--------
 Makefile              |  4 ++--
 requirements.txt      |  2 +-
 test-requirements.txt |  2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index b968e710..1cdfa929 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -17,6 +17,7 @@ html_coverage
 site-packages/*
 lib-python/*
 bin/*
+ddb
 include/*
 lib_pypy/*
 pypy
diff --git a/Dockerfile b/Dockerfile
index ea59ea81..3c5803bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,13 +3,10 @@
 # VERSION    0.1
 
 # Extend base debian
-FROM stackbrew/debian:wheezy
+FROM stackbrew/debian:sid
 
 MAINTAINER Ben Bangert <bbangert@mozilla.com>
 
-# It's nice to have some newer packages
-RUN echo "deb http://ftp.debian.org/debian sid main" >> /etc/apt/sources.list
-
 RUN mkdir -p /home/autopush
 ADD . /home/autopush/
 
@@ -17,12 +14,13 @@ WORKDIR /home/autopush
 
 RUN \
     apt-get update; \
-    apt-get install -y -qq make curl wget bzip2 libexpat1-dev gcc libssl-dev libffi-dev; \
+    apt-get install -y -qq make curl wget bzip2 libexpat1-dev gcc git-core libssl1.0.0 libssl-dev libffi-dev; \
     make clean; \
-    tar xjvf pypy-2.5.1-linux64.tar.bz2; \
-    mv pypy-2.5.1-linux64 pypy; \
+    wget https://bitbucket.org/pypy/pypy/downloads/pypy-5.0.0-linux64.tar.bz2; \
+    tar xjvf pypy-5.0.0-linux64.tar.bz2; \
+    mv pypy-5.0.0-linux64 pypy; \
     make; \
-    apt-get remove -y -qq make curl wget bzip2 libexpat1-dev gcc libssl-dev libffi-dev; \
+    apt-get remove -y -qq make curl wget bzip2 libexpat1-dev gcc git-core libssl1.0.0 libssl-dev libffi-dev; \
     apt-get install -y -qq libexpat1 libssl1.0.0 libffi6; \
     apt-get autoremove -y -qq; \
     apt-get clean -y
diff --git a/Makefile b/Makefile
index 6e1a67c5..56f37af4 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@ SHELL := /bin/sh
 APPNAME = autopush
 DEPS =
 HERE = $(shell pwd)
-PTYPE=python
-BIN = $(HERE)/bin
+PTYPE=pypy
+BIN = $(HERE)/pypy/bin
 VIRTUALENV = virtualenv
 TESTS = $(APPNAME)/tests
 PYTHON = $(BIN)/$(PTYPE)
diff --git a/requirements.txt b/requirements.txt
index dc6682e9..9cbc7d0a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ autobahn[twisted]==0.13.0
 boto==2.38.0
 cffi==1.1.2
 characteristic==14.3.0
-cryptography==0.9.1
+cryptography==1.2.3
 cyclone==1.1
 datadog==0.5.0
 decorator==4.0.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 9d33e7d4..0fb0ebb2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -16,7 +16,7 @@ autobahn[twisted]==0.13.0
 boto==2.38.0
 #cffi==1.1.2
 characteristic==14.3.0
-cryptography==0.9.1
+cryptography==1.2.3
 cyclone==1.1
 datadog==0.5.0
 decorator==4.0.0