Skip to content

Commit 25653e3

Browse files
committed
Merge pull request #4654 from olalonde/builder-source-version
feat(builder): make SOURCE_VERSION env variable
2 parents 4d5db42 + af4dd28 commit 25653e3

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

  • builder/rootfs/etc/confd/templates

builder/rootfs/etc/confd/templates/builder

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ if [ $CODE -ne 0 ]; then
8585
exit 1
8686
fi
8787

88-
BUILD_OPTS=()
89-
BUILD_OPTS+='/usr/bin/docker'
90-
BUILD_OPTS+=' run -v /etc/environment_proxy:/etc/environment_proxy'
91-
# get application configuration
92-
BUILD_OPTS+=$(echo $RESPONSE | get-app-values)
93-
9488
# if no Dockerfile is present, use slugbuilder to compile a heroku slug
9589
# and write out a Dockerfile to use that slug
9690
if [ ! -f Dockerfile ]; then
91+
BUILD_OPTS=()
92+
BUILD_OPTS+='/usr/bin/docker'
93+
BUILD_OPTS+=' run -v /etc/environment_proxy:/etc/environment_proxy'
94+
# get application configuration
95+
BUILD_OPTS+=$(echo $RESPONSE | get-app-values)
96+
BUILD_OPTS+=" -e SOURCE_VERSION=$GIT_SHA"
9797
# run in the background, we'll attach to it to retrieve logs
9898
BUILD_OPTS+=' -d'
9999
BUILD_OPTS+=' -v '

0 commit comments

Comments
 (0)