Skip to content

Commit

Permalink
updated Dockerfile to use pythin3, switched to vendored python-jose u…
Browse files Browse the repository at this point in the history
…ntil merging mpdavis/python-jose#93
  • Loading branch information
beebeeep committed Jun 25, 2018
1 parent 53f4cc9 commit 775b479
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
@@ -0,0 +1,3 @@
[submodule "vendor/python-jose"]
path = vendor/python-jose
url = git@github.com:beebeeep/python-jose
3 changes: 3 additions & 0 deletions CHANGELOG.md
Expand Up @@ -2,6 +2,9 @@
* Migrated to python3, removed some libs poorly supported
* Fixed distro settings update via api/v1/distro/create

## [Version 0.7.25](https://github.com/beebeeep/cacus/tree/v0.7.25) (2017-12-13)
* Do not reindex repo while applying retention policy

## [Version 0.7.24](https://github.com/beebeeep/cacus/tree/v0.7.24) (2017-10-06)
* Fixed auth issue in api/v1/distro/show
* Option to remove distro quota
Expand Down
10 changes: 6 additions & 4 deletions Dockerfile
@@ -1,14 +1,16 @@
FROM python:2.7
FROM python:3

COPY setup.py /tmp/cacus/setup.py
COPY cacus /tmp/cacus/cacus
COPY vendor /tmp/cacus/vendor
COPY contrib /tmp/cacus/contrib
COPY plugins /tmp/cacus/plugins

ENV PYTHONPATH="/usr/lib/python2.7/dist-packages"
#ENV PYTHONPATH="/usr/lib/python2.7/dist-packages"
# python-apt in PyPi seems to be abandoned
RUN apt-get update && apt-get -y install python-apt gnupg
RUN pip --no-cache-dir list
#RUN apt-get update && apt-get -y install python-apt gnupg
#RUN pip --no-cache-dir list
RUN cd /tmp/cacus/vendor/python-jose && python setup.py install
RUN cd /tmp/cacus && python setup.py install
RUN mkdir -p /opt/cacus/plugins

Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Expand Up @@ -5,6 +5,12 @@ cacus (0.8.1) unstable; urgency=medium

-- Cacus maintainer entity <cacus@miga.me.uk> Wed, 15 Nov 2017 21:50:58 +0000

cacus (0.7.25) unstable; urgency=medium

* Do not reindex repo while applying retention policy

-- Cacus maintainer entity <cacus@miga.me.uk> Wed, 13 Dec 2017 11:07:40

cacus (0.7.24) unstable; urgency=medium

* Fixed auth issue in api/v1/distro/show
Expand Down
1 change: 1 addition & 0 deletions vendor/python-jose
Submodule python-jose added at 0b6347

0 comments on commit 775b479

Please sign in to comment.