[CEPH] Update the Ceph repo and key to be arguements
Change-Id: Iee93e5a4d542b69bf6ebfbc82920b132a2af7778
This commit is contained in:
parent
8bcecac7c3
commit
bfa78bf03f
|
@ -4,12 +4,15 @@ FROM ${FROM}
|
|||
ARG KUBE_VERSION=v1.10.3
|
||||
ARG CEPH_RELEASE=mimic
|
||||
|
||||
ADD https://download.ceph.com/keys/release.asc /etc/apt/ceph-release.asc
|
||||
ARG CEPH_REPO=http://download.ceph.com/debian-${CEPH_RELEASE}/
|
||||
ARG CEPH_KEY=http://download.ceph.com/keys/release.asc
|
||||
|
||||
ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
|
||||
RUN set -ex ;\
|
||||
export DEBIAN_FRONTEND=noninteractive ;\
|
||||
apt-key add /etc/apt/ceph-release.asc ;\
|
||||
rm -f /etc/apt/ceph-release.asc ;\
|
||||
echo deb http://download.ceph.com/debian-${CEPH_RELEASE}/ xenial main | tee /etc/apt/sources.list.d/ceph.list ;\
|
||||
apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key ;\
|
||||
rm -f /etc/apt/ceph-${CEPH_RELEASE}.key ;\
|
||||
echo deb ${CEPH_REPO} xenial main | tee /etc/apt/sources.list.d/ceph.list ;\
|
||||
TMP_DIR=$(mktemp --directory) ;\
|
||||
cd ${TMP_DIR} ;\
|
||||
apt-get update ;\
|
||||
|
|
|
@ -7,12 +7,15 @@ ARG CEPH_RELEASE=mimic
|
|||
ARG ETCDCTL_VERSION=3.2.18
|
||||
ARG CONFD_VERSION=0.16.0
|
||||
|
||||
ADD https://download.ceph.com/keys/release.asc /etc/apt/ceph-release.asc
|
||||
ARG CEPH_REPO=http://download.ceph.com/debian-${CEPH_RELEASE}/
|
||||
ARG CEPH_KEY=http://download.ceph.com/keys/release.asc
|
||||
|
||||
ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
|
||||
RUN set -ex ;\
|
||||
export DEBIAN_FRONTEND=noninteractive ;\
|
||||
apt-key add /etc/apt/ceph-release.asc ;\
|
||||
rm -f /etc/apt/ceph-release.asc ;\
|
||||
echo "deb http://download.ceph.com/debian-${CEPH_RELEASE}/ xenial main" | tee /etc/apt/sources.list.d/ceph.list ;\
|
||||
apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key ;\
|
||||
rm -f /etc/apt/ceph-${CEPH_RELEASE}.key ;\
|
||||
echo "deb ${CEPH_REPO} xenial main" | tee /etc/apt/sources.list.d/ceph.list ;\
|
||||
TMP_DIR=$(mktemp --directory) ;\
|
||||
cd ${TMP_DIR} ;\
|
||||
apt-get update ;\
|
||||
|
|
|
@ -4,14 +4,17 @@ FROM ${FROM}
|
|||
ARG CEPH_RELEASE=mimic
|
||||
ARG KUBE_VERSION=1.12.2
|
||||
|
||||
ARG CEPH_REPO=http://download.ceph.com/debian-${CEPH_RELEASE}/
|
||||
ARG CEPH_KEY=http://download.ceph.com/keys/release.asc
|
||||
|
||||
RUN set -xe \
|
||||
&& export DEBIAN_FRONTEND=noninteractive \
|
||||
&& sed -i '/nobody/d' /etc/passwd \
|
||||
&& echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd \
|
||||
&& apt-get update && apt-get dist-upgrade -y \
|
||||
&& apt-get install -y wget curl apt-transport-https ca-certificates gnupg\
|
||||
&& wget -q -O- 'https://download.ceph.com/keys/release.asc' | apt-key add - \
|
||||
&& echo deb https://download.ceph.com/debian-${CEPH_RELEASE}/ xenial main | tee /etc/apt/sources.list.d/ceph.list \
|
||||
&& wget -q -O- ${CEPH_KEY} | apt-key add - \
|
||||
&& echo "deb ${CEPH_REPO} xenial main" | tee /etc/apt/sources.list.d/ceph.list \
|
||||
&& apt-get update && apt-get install -y bash python-oslo.rootwrap moreutils vim sudo screen ceph ceph-common python-rbd radosgw hexedit jq s3cmd rsyslog rsync xz-utils iperf \
|
||||
&& apt-get remove --purge -y wget apt-transport-https && apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* \
|
||||
&& TMP_DIR=$(mktemp --directory) \
|
||||
|
|
|
@ -7,12 +7,15 @@ ARG PROJECT=nova
|
|||
ARG UID=42424
|
||||
ARG GID=42424
|
||||
|
||||
ADD https://download.ceph.com/keys/release.asc /etc/apt/ceph-release.asc
|
||||
ARG CEPH_REPO=http://download.ceph.com/debian-${CEPH_RELEASE}/
|
||||
ARG CEPH_KEY=http://download.ceph.com/keys/release.asc
|
||||
|
||||
ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
|
||||
RUN set -ex ;\
|
||||
export DEBIAN_FRONTEND=noninteractive ;\
|
||||
apt-key add /etc/apt/ceph-release.asc ;\
|
||||
rm -f /etc/apt/ceph-release.asc ;\
|
||||
echo "deb http://download.ceph.com/debian-${CEPH_RELEASE}/ xenial main" | tee /etc/apt/sources.list.d/ceph.list ;\
|
||||
apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key ;\
|
||||
rm -f /etc/apt/ceph-${CEPH_RELEASE}.key ;\
|
||||
echo "deb ${CEPH_REPO} xenial main" | tee /etc/apt/sources.list.d/ceph.list ;\
|
||||
apt-get update ;\
|
||||
apt-get upgrade -y ;\
|
||||
apt-get install --no-install-recommends -y \
|
||||
|
|
Loading…
Reference in New Issue