RepoMirrors
/
go-ceph
mirror of https://github.com/ceph/go-ceph
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

makefile: use "octopus" as our default ceph version 

We're adding a fair amount of octopus (and later) only features now, and
at the time of this writing, pacific is already out. Stop defaulting to
nautilus and default to octopus instead.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
John Mulligan 2021-04-30 10:17:54 -04:00 committed by mergify[bot]
parent 0381a092d2
commit 986dcab058
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -3,7 +3,7 @@ CONTAINER_CMD ?=
CONTAINER_OPTS := --security-opt $(shell grep -q selinux /sys/kernel/security/lsm 2>/dev/null && echo "label=disable" || echo "apparmor:unconfined")
CONTAINER_CONFIG_DIR := testing/containers/ceph
VOLUME_FLAGS :=
CEPH_VERSION := nautilus
CEPH_VERSION := octopus
RESULTS_DIR :=
CHECK_GOFMT_FLAGS := -e -s -l
IMPLEMENTS_OPTS :=

4
testing/containers/ceph/Dockerfile
View File

@ -1,7 +1,7 @@
ARG CEPH_VERSION
FROM ceph/daemon-base:latest-${CEPH_VERSION:-nautilus}
FROM ceph/daemon-base:latest-${CEPH_VERSION:-octopus}
ENV CEPH_VERSION=${CEPH_VERSION:-nautilus}
ENV CEPH_VERSION=${CEPH_VERSION:-octopus}
RUN true && \
yum clean all && \