Skip to content

Commit

Permalink
bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
pcaskey committed Oct 31, 2017
1 parent e402d48 commit 941b739
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions configBuilder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ echo "mount all of their configuration from the container host's local "
echo "filesystem or would you like to use a hybrid config utilizing secrets (requires a swarm)?"
echo ""
while [ ${BURNMOUNT} == "None" ]; do
echo -n "Please select your choice (please enter either \"burn\" or \"mount\" or \"hybrid\"): "
echo -n "Please select your choice (please enter either \"burn\" or \"mount\" or \"hybrid\", if you aren't sure, enter hybrid): "
read response
case $response in
Mount|mount|M|m)
Expand All @@ -311,7 +311,7 @@ while [ ${BURNMOUNT} == "None" ]; do
BURNMOUNT=hybrid
;;
*)
echo "You must choose either \"burn\" or \"mount\" or \"hybrid\" (default is hybrid)."
echo "You must choose either \"burn\" or \"mount\" or \"hybrid\"."
esac
done
#echo "Burn/Mount option choice is: $BURNMOUNT"
Expand Down Expand Up @@ -472,6 +472,7 @@ s/^# alternatives/ alternatives/
s/^# http/ http/
s/^# \&\&/ \&\&/
EOF
rm -f Dockerfile
sed -f docker_edit.sed Dockerfile.dist > Dockerfile
rm -f docker_edit.sed

Expand All @@ -484,6 +485,7 @@ if [ ${BURNMOUNT} == "burn" ] || [ ${BURNMOUNT} == "hybrid" ]; then
s/^## ADD /ADD /
/^VOLUME/,+10 s/^/#/
EOF
rm -f Dockerfile
sed -f docker_edit.sed Dockerfile.setup > Dockerfile
rm -f Dockerfile.setup
rm -f docker_edit.sed
Expand Down

0 comments on commit 941b739

Please sign in to comment.