Skip to content

Commit

Permalink
Merge 360a128 into fba02b0
Browse files Browse the repository at this point in the history
  • Loading branch information
jvarho authored Feb 7, 2021
2 parents fba02b0 + 360a128 commit 1f35d83
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: python

sudo: required
python:
- "3.8"

branches:
only:
Expand All @@ -17,5 +18,4 @@ script:
- docker run -v ${PWD}:/app jvarho/pylibscrypt

after_success:
- sed -i "s@/app@$TRAVIS_BUILD_DIR@g" .coverage
- coveralls
8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
FROM ubuntu:18.04
RUN apt-get update && apt-get install -y python python-pip libscrypt0 libsodium23 python-openssl libssl-dev
RUN apt-get install -y python3.6 python3-pip libpython3.6-dev
RUN python -m pip install coverage hypothesis scrypt
RUN python3.6 -m pip install coverage hypothesis scrypt
FROM ubuntu:20.04
RUN apt-get update && apt-get install -y python3 python3-pip libpython3-dev libscrypt0 libsodium23 python-openssl libssl-dev
RUN python3 -m pip install coverage hypothesis scrypt
WORKDIR /app
CMD ["./run_docker.sh"]

0 comments on commit 1f35d83

Please sign in to comment.