Skip to content

Commit 02c331e

Browse files
committed
Use separate fly location for bootstrap.
Because the bootstrap and deployer concourses won't necessarily be the same version, we should use a different fly binary for each so that we can ensure that the fly version being used matches the conourse.
1 parent 4a7d768 commit 02c331e

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
**/*.tfstate
22
vagrant/.vagrant/
3-
fly
3+
bin/fly*

bin/.gitkeep

Whitespace-only changes.

concourse/scripts/environment.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,18 @@ case $TARGET_CONCOURSE in
2121
deployer)
2222
CONCOURSE_URL="https://deployer.${DEPLOY_ENV}.dev.paas.alphagov.co.uk"
2323
FLY_TARGET=$DEPLOY_ENV
24+
FLY_CMD="${PROJECT_DIR}/bin/fly"
2425
;;
2526
bootstrap)
2627
CONCOURSE_URL="http://localhost:8080"
2728
FLY_TARGET="${DEPLOY_ENV}-bootstrap"
29+
FLY_CMD="${PROJECT_DIR}/bin/fly-bootstrap"
2830
;;
2931
*)
3032
echo "Unrecognized TARGET_CONCOURSE: '${TARGET_CONCOURSE}'. Must be set to 'deployer' or 'bootstrap'" 1>&2
3133
exit 1
3234
;;
3335
esac
34-
FLY_CMD="${PROJECT_DIR}/fly"
3536

3637
CONCOURSE_ATC_USER=${CONCOURSE_ATC_USER:-admin}
3738
if [ -z "${CONCOURSE_ATC_PASSWORD:-}" ]; then

0 commit comments

Comments
 (0)