mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-09 16:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update images with ceph container as the base image

Browse Source 
plugin images were using centos 7 images as the base image. This
is now moved to the ceph container image that supports required
content since 14.2 version.

Fixes #344

Signed-off-by: ShyamsundarR <srangana@redhat.com>
This commit is contained in:
ShyamsundarR 2019-05-02 20:41:30 -04:00 committed by mergify[bot]
parent 3a308eaeee
commit 0166bd356a
3 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -44,6 +44,12 @@ cephcsi:
if [ ! -d ./vendor ]; then dep ensure -vendor-only; fi
CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' -o _output/cephcsi ./cmd/
rbdplugin: cephcsi
cp _output/cephcsi _output/rbdplugin
cephfsplugin: cephcsi
cp _output/cephcsi _output/cephfsplugin
image-cephcsi: cephcsi
cp deploy/cephcsi/image/Dockerfile _output
$(CONTAINER_CMD) build -t $(CSI_IMAGE_NAME):$(CSI_IMAGE_VERSION) _output
@ -53,7 +59,7 @@ image-rbdplugin: cephcsi
$(CONTAINER_CMD) build -t $(RBD_IMAGE_NAME):$(RBD_IMAGE_VERSION) deploy/rbd/docker
image-cephfsplugin: cephcsi
cp _output/cephsci deploy/cephfs/docker/cephfsplugin
cp _output/cephcsi deploy/cephfs/docker/cephfsplugin
$(CONTAINER_CMD) build -t $(CEPHFS_IMAGE_NAME):$(CEPHFS_IMAGE_VERSION) deploy/cephfs/docker
push-image-rbdplugin: image-rbdplugin

19
deploy/cephfs/docker/Dockerfile
View File

@ -1,15 +1,12 @@
FROM centos:7
LABEL maintainers="Kubernetes Authors"
LABEL description="CephFS CSI Plugin"
FROM ceph/ceph:v14.2
LABEL maintainers="Ceph-CSI Authors"
LABEL description="Ceph-CSI Plugin"
ENV CEPH_VERSION "mimic"
RUN yum install -y centos-release-ceph && \
yum install -y kmod ceph-common ceph-fuse attr && \
yum clean all
ENV CSIBIN=/usr/local/bin/cephcsi
COPY cephfsplugin /cephfsplugin
COPY cephfsplugin $CSIBIN
RUN chmod +x /cephfsplugin && \
mkdir -p /var/log/ceph
RUN chmod +x $CSIBIN && \
ln -sf $CSIBIN /usr/local/bin/cephcsi-cephfs
ENTRYPOINT ["/cephfsplugin"]
ENTRYPOINT ["/usr/local/bin/cephcsi-cephfs"]

20
deploy/rbd/docker/Dockerfile
View File

@ -1,12 +1,12 @@
FROM centos:7
LABEL maintainers="Kubernetes Authors"
LABEL description="RBD CSI Plugin"
FROM ceph/ceph:v14.2
LABEL maintainers="Ceph-CSI Authors"
LABEL description="Ceph-CSI Plugin"
ENV CEPH_VERSION "mimic"
RUN yum install -y centos-release-ceph && \
yum install -y ceph-common e2fsprogs xfsprogs rbd-nbd && \
yum clean all
ENV CSIBIN=/usr/local/bin/cephcsi
COPY rbdplugin /rbdplugin
RUN chmod +x /rbdplugin
ENTRYPOINT ["/rbdplugin"]
COPY rbdplugin $CSIBIN
RUN chmod +x $CSIBIN && \
ln -sf $CSIBIN /usr/local/bin/cephcsi-rbd
ENTRYPOINT ["/usr/local/bin/cephcsi-rbd"]