Skip to content

Commit b3a72a6

Browse files
committed
fix version conflict, add curl to image
1 parent 877f521 commit b3a72a6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y curl python2.7-minimal python-pip pytho
1010
curl -fSL 'https://bootstrap.pypa.io/get-pip.py' | python2 && \
1111
pip install --no-cache-dir -r /usr/src/redshirt/requirements.txt && \
1212
AUTO_ADDED_PACKAGES=`apt-mark showauto` && apt-get remove --purge -y $AUTO_ADDED_PACKAGES && \
13-
apt-get install -y python2.7-minimal taskd gnutls-bin && \
13+
apt-get install -y python2.7-minimal taskd gnutls-bin curl && \
1414
rm -rf /var/lib/apt/lists/*
1515

1616
COPY . /usr/src/redshirt/

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ mock==2.0.0
55
pbr==1.10.0
66
psutil==4.3.0
77
six==1.10.0
8-
packaging==16.7
8+
packaging
99
requests==2.10.0

0 commit comments

Comments
 (0)