Skip to content

Commit 405d106

Browse files
committed
ci: Change dockerino to install all dependencies
1 parent 773ec55 commit 405d106

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

Jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ pipeline {
5959
steps {
6060
script {
6161
sh 'pip install --user -r docker/dev/requirements.dev.txt'
62+
sh 'pip install --user -r docker/requirements.txt'
6263
sh 'flake8 mdbackup'
6364
sh 'flake8 tests'
6465
sh 'coverage run --source=mdbackup --branch -m xmlrunner discover -s tests -p \'*tests*.py\' -o tests/.report'

docker/dev/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
FROM python:3.7-alpine
22

3-
COPY ./docker/dev/requirements.dev.txt /requirements.txt
4-
RUN pip install -r requirements.txt
3+
COPY ./docker/dev/requirements.dev.txt /r1.txt
4+
COPY ./docker/requirements.txt /r2.txt
5+
RUN pip install -r r1.txt && pip install -r r2.txt

docker/dev/requirements.dev.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@ flake8-import-order
33
pep8-naming
44
flake8-commas
55
coverage
6-
unittest-xml-reporting
7-
pyyaml
8-
xattr
6+
unittest-xml-reporting

docker/requirements.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
python-magic==0.4.15
2-
boto3==1.9.183
3-
b2sdk==0.1.8
2+
boto3==1.9.248
3+
b2sdk==1.0.0
44
PyDrive==1.3.1
5-
pyyaml==5.1.1
65
paramiko==2.6.0
76
requests==2.22.0
8-
urllib3==1.25.3
7+
urllib3==1.25.6
8+
pyyaml==5.1.2
9+
xattr==0.9.6

0 commit comments

Comments
 (0)