From b6eedaefb42afbe785ca1988538a92649cecf26d Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Mon, 3 Apr 2017 15:16:13 +0000 Subject: [PATCH] Revert "[WIP] Add ceph binaries" This reverts commit 430781b33f2a43826a767e3a080ccd03a413ed69. Change-Id: I02c47410cbfed712a40f39ca185838866f6710f5 --- debian/Dockerfile | 9 +-------- ubuntu/Dockerfile | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/debian/Dockerfile b/debian/Dockerfile index 9d2995d..ccb0be0 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -10,15 +10,8 @@ ARG GIT_REF_REPO=https://git.openstack.org/openstack/${PROJECT} ARG SCRIPTS=https://github.com/yaodu/common/archive/0.1.2.tar.gz RUN set -x \ - && echo 'deb http://download.ceph.com/debian-jewel/ jessie main' > /etc/apt/sources.list.d/ceph.list \ - && apt-key adv --fetch-keys 'http://download.ceph.com/keys/release.asc' \ && apt-get update \ - && apt-get install -y --no-install-recommends \ - ca-certificates \ - ceph-common \ - curl \ - python \ - python-rbd \ + && apt-get install -y --no-install-recommends python ca-certificates curl \ && curl -sSL $SCRIPTS | tar xz -C /tmp/ --strip-components=2 \ && /tmp/download.sh $DOCKER_REPO $DOCKER_TAG $WHEELS \ && /tmp/install.sh $PROJECT $GIT_REPO $GIT_REF_REPO $GIT_REF \ diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile index b3a933e..0629e82 100644 --- a/ubuntu/Dockerfile +++ b/ubuntu/Dockerfile @@ -10,15 +10,8 @@ ARG GIT_REF_REPO=https://git.openstack.org/openstack/${PROJECT} ARG SCRIPTS=https://github.com/yaodu/common/archive/0.1.2.tar.gz RUN set -x \ - && echo 'deb http://download.ceph.com/debian-jewel/ xenial main' > /etc/apt/sources.list.d/ceph.list \ - && apt-key adv --fetch-keys 'http://download.ceph.com/keys/release.asc' \ && apt-get update \ - && apt-get install -y --no-install-recommends \ - ca-certificates \ - ceph-common \ - curl \ - python \ - python-rbd \ + && apt-get install -y --no-install-recommends python ca-certificates curl \ && curl -sSL $SCRIPTS | tar xz -C /tmp/ --strip-components=2 \ && /tmp/download.sh $DOCKER_REPO $DOCKER_TAG $WHEELS \ && /tmp/install.sh $PROJECT $GIT_REPO $GIT_REF_REPO $GIT_REF \