x
/
loci-glance
Code Issues Proposed changes

Merge "Revert "[WIP] Add ceph binaries""

This commit is contained in:
Jenkins 2017-04-03 15:28:03 +00:00 committed by Gerrit Code Review
parent 0cd68954f8 b6eedaefb4
commit 1b85a6dc59
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/Dockerfile vendored
View File

@ -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 \

9
ubuntu/Dockerfile
View File

@ -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 \