Skip to content

Commit 1ecfc17

Browse files
images/server: allow --ceph-from-custom=1
Allow `--ceph-from-custom=1` to be equivalent to `--ceph-from-custom`. This makes it easier to write a Dockerfile without conditionals tricks when constructing the command based on build args. Allow `--ceph-from-custom=0` for the same reason. The former is better when used directly from the CLI but that's rare. Signed-off-by: John Mulligan <[email protected]>
1 parent 70635bc commit 1ecfc17

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

images/server/install-packages.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ if [[ "$1" =~ ^--.+$ ]]; then
105105
--samba-version-suffix=*) samba_version_suffix="${arg/*=/}" ;;
106106
--install-custom-repos=*) install_custom_repos="${arg/*=/}" ;;
107107
--package-selection=*) package_selection="${arg/*=/}" ;;
108-
--ceph-from-custom) ceph_from_custom=1 ;;
108+
--ceph-from-custom|--ceph-from-custom=1) ceph_from_custom=1 ;;
109+
--ceph-from-custom=0) ceph_from_custom=0 ;;
109110
*)
110111
echo "error: unexpected argument: ${arg}"
111112
exit 2

0 commit comments

Comments
 (0)