Skip to content

Commit

Permalink
xenial ss: remove psycopg dependency
Browse files Browse the repository at this point in the history
Related to #62
  • Loading branch information
scollazo authored and sevein committed Nov 17, 2017
1 parent 69cb4ab commit 3f2fcb9
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion debs/trusty/archivematica-storage-service/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ RUN apt-get update && \
RUN wget -O /tmp/pip.py https://bootstrap.pypa.io/get-pip.py && python /tmp/pip.py

# Dependencies are also obtained in the debian build script, this speeds up the process of building packages
RUN apt-get update && apt-get install -y libffi-dev libssl-dev libxslt-dev dh-virtualenv python-dev dh-systemd libmysqlclient-dev postgresql-server-dev-9.5
RUN apt-get update && apt-get install -y libffi-dev libssl-dev libxslt-dev dh-virtualenv python-dev dh-systemd libmysqlclient-dev

2 changes: 1 addition & 1 deletion debs/xenial/archivematica-storage-service/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ubuntu:xenial

RUN apt-get update && \
apt-get install -y dpkg-dev git build-essential wget debhelper \
devscripts equivs
devscripts equivs quilt

RUN wget -O /tmp/pip.py https://bootstrap.pypa.io/get-pip.py && python /tmp/pip.py

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Build-Depends:
libxml2-dev,
libxslt-dev,
python-dev,
postgresql-server-dev-9.5,
rng-tools,
dh-virtualenv (>= 0.8),
dh-systemd,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Index: archivematica-storage-service/requirements/production.txt
===================================================================
--- archivematica-storage-service.orig/requirements/production.txt
+++ archivematica-storage-service/requirements/production.txt
@@ -6,4 +6,3 @@
# in all cases (i.e. test.txt doesn't need them, but local and production do)
dj-database-url==0.4.2
mysqlclient==1.3.8
-psycopg2==2.7.1
\ No newline at end of file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
remove-psycopg-requirement.diff

0 comments on commit 3f2fcb9

Please sign in to comment.