Skip to content

Commit e952ee3

Browse files
authored
Merge pull request #2 from T-Systems-MMS/pip_version
force pip3 usage
2 parents 022b0e9 + 29f77a6 commit e952ee3

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Dockerfile.template

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ WORKDIR /root/download
4646
RUN if [ -n "${ANSIBLE_VERSION}" ] && [ "${ANSIBLE_VERSION}" != "latest" ]; then ANSIBLE="ansible==${ANSIBLE_VERSION}";fi && \
4747
if [ "${ANSIBLE_VERSION}" == "latest" ]; then ANSIBLE="ansible";fi && \
4848
test -n "${ANSIBLE_VERSION}" && \
49-
pip install --no-cache-dir ${ANSIBLE} || :
49+
pip3 install --no-cache-dir ${ANSIBLE} || :
5050

5151
## docker
5252
RUN if [ -n "${DOCKER_VERSION}" ] && [ "${DOCKER_VERSION}" != "latest" ]; then DOCKER="docker-ce-${DOCKER_VERSION} docker-ce-cli-${DOCKER_VERSION}";fi && \
@@ -61,7 +61,7 @@ RUN if [ -n "${DOCKER_VERSION}" ] && [ "${DOCKER_VERSION}" != "latest" ]; then D
6161
RUN if [ -n "${NOMAD_VERSION}" ] && [ "${NOMAD_VERSION}" != "latest" ]; then NOMAD="NOMAD==${NOMAD_VERSION}";fi && \
6262
if [ "${NOMAD_VERSION}" == "latest" ]; then NOMAD="NOMAD";fi && \
6363
test -n "${NOMAD_VERSION}" && \
64-
pip install --no-cache-dir ${NOMAD} || :
64+
pip3 install --no-cache-dir ${NOMAD} || :
6565

6666
## kubectl
6767
RUN if [ -n "${KUBECTL_VERSION}" ] && [ "${KUBECTL_VERSION}" != "latest" ]; then KUBECTL="kubectl-${KUBECTL_VERSION}";fi && \
@@ -101,13 +101,13 @@ RUN if [ -n "${TERRAFORM_VERSION}" ] && [ "${TERRAFORM_VERSION}" != "latest" ];
101101
RUN if [ -n "${AZ_CLI_VERSION}" ] && [ "${AZ_CLI_VERSION}" != "latest" ]; then AZ_CLI="azure-cli==${AZ_CLI_VERSION}";fi && \
102102
if [ "${AZ_CLI_VERSION}" == "latest" ]; then AZ_CLI="azure-cli";fi && \
103103
test -n "${AZ_CLI_VERSION}" && \
104-
pip install --no-cache-dir ${AZ_CLI} || :
104+
pip3 install --no-cache-dir ${AZ_CLI} || :
105105

106106
## aws_cli
107107
RUN if [ -n "${AWS_CLI_VERSION}" ] && [ "${AWS_CLI_VERSION}" != "latest" ]; then AWS_CLI="awscli==${AWS_CLI_VERSION}";fi && \
108108
if [ "${AWS_CLI_VERSION}" == "latest" ]; then AWS_CLI="awscli";fi && \
109109
test -n "${AWS_CLI_VERSION}" && \
110-
pip install --no-cache-dir ${AWS_CLI} || :
110+
pip3 install --no-cache-dir ${AWS_CLI} || :
111111

112112
## gcloud
113113
RUN if [ -n "${GCLOUD_VERSION}" ] && [ "${GCLOUD_VERSION}" != "latest" ]; then GCLOUD="google-cloud-sdk-${GCLOUD_VERSION}";fi && \
@@ -136,7 +136,7 @@ WORKDIR ${WORKDIR}
136136
## pip
137137
COPY ${PIP_REQUIREMENT} /tmp/pip_requirement
138138
RUN test -n "${PIP_REQUIREMENT}" && \
139-
pip install --no-cache-dir -r /tmp/pip_requirement || :
139+
pip3 install --no-cache-dir -r /tmp/pip_requirement || :
140140

141141
## ansible-galaxy
142142
COPY ${ANSIBLE_REQUIREMENTS} /tmp/ansible_requirements

0 commit comments

Comments
 (0)