File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 2222 SERVICES_DIR : ./services
2323 SCRIPTS_DIR : ./scripts
2424 TEMPLATES_DIR : ./templates
25- ENVIROS_DIR : ./environments
25+ BUILD_DIR : ./build
26+ ENVIROS_DIR : ' {{.BUILD_DIR}}/'
2627
2728 CONTAINER_BIN : docker
2829 CONTAINER_COMPOSE_BIN : ' {{.CONTAINER_BIN}} compose '
3738
3839 ENVIRO_SCRIPT : ' {{.SCRIPTS_DIR}}/env.sh'
3940 ENVIRO_FILE : ' {{.CONTAINER_DIR}}/.env'
40- ENVIRO_PATH : ' {{.TEMPLATES_DIR}}/env.template'
41+ ENVIRO_TEMPLATE : ' {{.TEMPLATES_DIR}}/env.template'
4142
4243 MAVEN_HTTPS_PROXY : ' -s./settings.xml'
4344 MAVEN_SETTINGS_FILE : ' {{.MAVEN_SETTINGS_FILE | default ""}}'
@@ -363,7 +364,7 @@ tasks:
363364 export OPENMCT_PORT={{.OPENMCT_PORT}}
364365 export OPENMCT_HOST_PORT={{.OPENMCT_HOST_PORT}}
365366
366- export ENV_PATH={{.ENVIROS_DIR}} /${PROJECT}/${MISSION}/${SPACECRAFT}/
367+ export ENV_PATH={{.BUILD_DIR}}/docker /${PROJECT}/${MISSION}/${SPACECRAFT}/
367368 export ENV_SHELL=${PROJECT}-${MISSION}-${SPACECRAFT}.sh
368369
369370 mkdir -p ${ENV_PATH}
@@ -386,8 +387,8 @@ tasks:
386387 $OPENMCT_HOST \
387388 $OPENMCT_PORT \
388389 $OPENMCT_HOST_PORT' \
389- < {{.TEMPLATES_DIR}}/env.template \
390- > ${ENV_PATH}/${ENV_SHELL}
390+ < {{.ENVIRO_TEMPLATE}} > ${ENV_PATH}/${ENV_SHELL} && \
391+ chmod +x ${ENV_PATH}/${ENV_SHELL}
391392 silent : true
392393
393394# nos3 native tasks
You can’t perform that action at this time.
0 commit comments