Просмотр исходного кода

Merge pull request #7357 from smarterclayton/fix_dockerfile

Temporarily fix Dockerfile until we can find a replacement package
Clayton Coleman 7 лет назад
Родитель
Сommit
93aa67cc1e
1 измененных файлов с 3 добавлено и 4 удалено
  1. 3 4
      images/installer/Dockerfile

+ 3 - 4
images/installer/Dockerfile

@@ -10,12 +10,11 @@ COPY images/installer/origin-extra-root /
 # install ansible and deps
 RUN INSTALL_PKGS="python-lxml python-dns pyOpenSSL python2-cryptography openssl java-1.8.0-openjdk-headless python2-passlib httpd-tools openssh-clients origin-clients" \
  && yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS \
- && EPEL_PKGS="ansible python2-boto python2-boto3 python2-crypto google-cloud-sdk-183.0.0 which" \
+ && EPEL_PKGS="ansible python2-boto python2-boto3 python2-crypto google-cloud-sdk-183.0.0 which python2-pip.noarch" \
  && yum install -y epel-release \
  && yum install -y --setopt=tsflags=nodocs $EPEL_PKGS \
- && EPEL_TESTING_PKGS="python2-libcloud" \
- && yum install -y --enablerepo=epel-testing --setopt=tsflags=nodocs $EPEL_TESTING_PKGS \
- && rpm -V $INSTALL_PKGS $EPEL_PKGS $EPEL_TESTING_PKGS \
+ && rpm -V $INSTALL_PKGS $EPEL_PKGS \
+ && pip install apache-libcloud~=2.2.1 \
  && yum clean all
 
 LABEL name="openshift/origin-ansible" \