diff --git a/backfiller/Dockerfile b/backfiller/Dockerfile index 808ceb3..de300f7 100644 --- a/backfiller/Dockerfile +++ b/backfiller/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.7 # dependencies needed for compiling c extensions # also busybox-extras for telnet for easier use of backdoor -RUN apk --update add py2-pip gcc python-dev musl-dev busybox-extras +RUN apk --update add py2-pip gcc python-dev musl-dev busybox-extras postgresql-dev postgresql-libs # Install common lib first as it changes less COPY common /tmp/common diff --git a/backfiller/backfiller/main.py b/backfiller/backfiller/main.py index 5d1f533..b2134c1 100644 --- a/backfiller/backfiller/main.py +++ b/backfiller/backfiller/main.py @@ -254,7 +254,7 @@ class BackfillerManager(object): if self.node_database is not None: self.logger.info('Fetching list of nodes from {}'.format( urlparse.urlparse(self.node_database).hostname)) - conn = self.db_manager.query() + conn = self.db_manager.get_conn() results = database.query(conn, """ SELECT name, url, backfill_from FROM nodes""") diff --git a/backfiller/setup.py b/backfiller/setup.py index d8fceba..3d5d7d2 100644 --- a/backfiller/setup.py +++ b/backfiller/setup.py @@ -7,6 +7,8 @@ setup( install_requires = [ "argh", "gevent", + "psycogreen", + "psycopg2", "python-dateutil", "requests", "wubloader-common", diff --git a/thrimshim/setup.py b/thrimshim/setup.py index 7bd0fa1..947530a 100644 --- a/thrimshim/setup.py +++ b/thrimshim/setup.py @@ -10,7 +10,6 @@ setup( "gevent", "psycogreen", "psycopg2", - "python-dateutil", "wubloader-common", ], )