Skip to content

Commit 22d5954

Browse files
committed
base-image: Remove virtualenv installed using pip
Remove triple installations of pip. Pip tool is installed once using tdnf and other two times using pip, so rely only on the one installed using tdnf. Signed-off-by: Suraj Deshmukh <suraj.deshmukh@microsoft.com>
1 parent 14218b1 commit 22d5954

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

linux/base.Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# base.Dockerfile contains components which are large and change less frequently.
2-
# tools.Dockerfile contains the smaller, more frequently-updated components.
1+
# base.Dockerfile contains components which are large and change less frequently.
2+
# tools.Dockerfile contains the smaller, more frequently-updated components.
33

44
# Within Azure, the image layers
55
# built from this file are cached in a number of locations to speed up container startup time. A manual
@@ -171,7 +171,6 @@ RUN pip3 install --upgrade sfctl \
171171
# Install Blobxfer and Batch-Shipyard in isolated virtualenvs
172172
COPY ./linux/blobxfer /usr/local/bin
173173
RUN chmod 755 /usr/local/bin/blobxfer \
174-
&& pip3 install virtualenv \
175174
&& cd /opt \
176175
&& virtualenv -p python3 blobxfer \
177176
&& /bin/bash -c "source blobxfer/bin/activate && pip3 install blobxfer && deactivate"
@@ -196,7 +195,6 @@ RUN curl -fSsL `curl -fSsL https://api.github.com/repos/Azure/batch-shipyard/rel
196195
# # BEGIN: Install Ansible in isolated Virtual Environment
197196
COPY ./linux/ansible/ansible* /usr/local/bin/
198197
RUN chmod 755 /usr/local/bin/ansible* \
199-
&& pip3 install virtualenv \
200198
&& cd /opt \
201199
&& virtualenv -p python3 ansible \
202200
&& /bin/bash -c "source ansible/bin/activate && pip3 install ansible && pip3 install pywinrm\>\=0\.2\.2 && deactivate" \

0 commit comments

Comments
 (0)