Merge "This PS installs apt-transport-https ca-certificates packages before adding ceph repo. Without this Jenkins is having issues building images"
This commit is contained in:
commit
576c4e6f78
|
@ -4,12 +4,15 @@ FROM ${FROM}
|
|||
ARG KUBE_VERSION=v1.10.3
|
||||
ARG CEPH_RELEASE=mimic
|
||||
|
||||
ARG CEPH_REPO=http://mirror.mirantis.com/testing/ceph-mimic/xenial/
|
||||
ARG CEPH_KEY=http://mirror.mirantis.com/testing/ceph-mimic/xenial/archive-ceph-mimic.key
|
||||
ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-mimic/xenial/
|
||||
ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-mimic/xenial/archive-ceph-mimic.key
|
||||
|
||||
ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
|
||||
RUN set -ex ;\
|
||||
export DEBIAN_FRONTEND=noninteractive ;\
|
||||
apt-get update ;\
|
||||
apt-get dist-upgrade -y ;\
|
||||
apt-get install -y apt-transport-https ca-certificates ;\
|
||||
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 ;\
|
||||
|
@ -18,8 +21,6 @@ RUN set -ex ;\
|
|||
apt-get update ;\
|
||||
apt-get dist-upgrade -y ;\
|
||||
apt-get install --no-install-recommends -y \
|
||||
apt-transport-https \
|
||||
ca-certificates \
|
||||
ceph \
|
||||
curl \
|
||||
gcc \
|
||||
|
|
|
@ -7,12 +7,15 @@ ARG CEPH_RELEASE=mimic
|
|||
ARG ETCDCTL_VERSION=3.2.18
|
||||
ARG CONFD_VERSION=0.16.0
|
||||
|
||||
ARG CEPH_REPO=http://mirror.mirantis.com/testing/ceph-mimic/xenial/
|
||||
ARG CEPH_KEY=http://mirror.mirantis.com/testing/ceph-mimic/xenial/archive-ceph-mimic.key
|
||||
ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-mimic/xenial/
|
||||
ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-mimic/xenial/archive-ceph-mimic.key
|
||||
|
||||
ADD ${CEPH_KEY} /etc/apt/ceph-${CEPH_RELEASE}.key
|
||||
RUN set -ex ;\
|
||||
export DEBIAN_FRONTEND=noninteractive ;\
|
||||
apt-get update ;\
|
||||
apt-get dist-upgrade -y ;\
|
||||
apt-get install -y apt-transport-https ca-certificates ;\
|
||||
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 ;\
|
||||
|
@ -21,8 +24,6 @@ RUN set -ex ;\
|
|||
apt-get update ;\
|
||||
apt-get dist-upgrade -y ;\
|
||||
apt-get install --no-install-recommends -y \
|
||||
apt-transport-https \
|
||||
ca-certificates \
|
||||
ceph \
|
||||
ceph-common \
|
||||
radosgw \
|
||||
|
|
|
@ -4,8 +4,8 @@ FROM ${FROM}
|
|||
ARG CEPH_RELEASE=mimic
|
||||
ARG KUBE_VERSION=1.12.2
|
||||
|
||||
ARG CEPH_REPO=http://mirror.mirantis.com/testing/ceph-mimic/xenial/
|
||||
ARG CEPH_KEY=http://mirror.mirantis.com/testing/ceph-mimic/xenial/archive-ceph-mimic.key
|
||||
ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-mimic/xenial/
|
||||
ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-mimic/xenial/archive-ceph-mimic.key
|
||||
|
||||
RUN set -xe \
|
||||
&& export DEBIAN_FRONTEND=noninteractive \
|
||||
|
|
Loading…
Reference in New Issue