@@ -92,26 +92,6 @@ check_requirements() {
9292 fi
9393}
9494
95- create_compose_command () {
96- local VENDORS
97- DOCKER_COMPOSE_CMD=' docker-compose -f docker-compose.yml'
98- if [ -n " ${COMPOSE_ONLY_VENDORS} " ]; then
99- VENDORS=${COMPOSE_ONLY_VENDORS// ,/ }
100- else
101- VENDORS=$( cd compose && ls -- * .yml | tr ' \n' ' ' )
102- VENDORS=${VENDORS// .yml/ }
103- fi
104- if [ -n " ${COMPOSE_EXCEPT_VENDORS} " ]; then
105- for COMPOSE_EXCEPT_VENDOR in ${COMPOSE_EXCEPT_VENDORS// ,/ } ; do
106- # @bug what if a COMPOSE_EXCEPT_VENDOR is a substring of a VENDOR ?
107- VENDORS=${VENDORS/ $COMPOSE_EXCEPT_VENDOR / }
108- done
109- fi
110- for DC_CONF_FILE in ${VENDORS} ; do
111- DOCKER_COMPOSE_CMD=" ${DOCKER_COMPOSE_CMD} -f compose/${DC_CONF_FILE} .yml"
112- done
113- }
114-
11595# @todo have this function looked at by a bash guru to validate it's not a brainf**t
11696# load_config_value() {
11797# local VALUE=
@@ -191,6 +171,26 @@ setup_local_config() {
191171 # @todo allow setting up: custom db root account pwd, sf env, etc...
192172}
193173
174+ create_compose_command () {
175+ local VENDORS
176+ DOCKER_COMPOSE_CMD=' docker-compose -f docker-compose.yml'
177+ if [ -n " ${COMPOSE_ONLY_VENDORS} " ]; then
178+ VENDORS=${COMPOSE_ONLY_VENDORS// ,/ }
179+ else
180+ VENDORS=$( cd compose && ls -- * .yml | tr ' \n' ' ' )
181+ VENDORS=${VENDORS// .yml/ }
182+ fi
183+ if [ -n " ${COMPOSE_EXCEPT_VENDORS} " ]; then
184+ for COMPOSE_EXCEPT_VENDOR in ${COMPOSE_EXCEPT_VENDORS// ,/ } ; do
185+ # @bug what if a COMPOSE_EXCEPT_VENDOR is a substring of a VENDOR ?
186+ VENDORS=${VENDORS/ $COMPOSE_EXCEPT_VENDOR / }
187+ done
188+ fi
189+ for DC_CONF_FILE in ${VENDORS} ; do
190+ DOCKER_COMPOSE_CMD=" ${DOCKER_COMPOSE_CMD} -f compose/${DC_CONF_FILE} .yml"
191+ done
192+ }
193+
194194build () {
195195 local IMAGES
196196
0 commit comments