Skip to content

Commit 1d943ef

Browse files
committed
ref(builder): remove dockerfile from builder
1 parent cfa1cbe commit 1d943ef

1 file changed

Lines changed: 4 additions & 7 deletions

File tree

builder/templates/builder

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@ git archive $GIT_SHA | tar -xmC $TMP_DIR
6565
# switch to app context
6666
cd $TMP_DIR
6767

68+
USING_DOCKERFILE=false
69+
6870
if [ -f Dockerfile ]; then
69-
DOCKERFILE=$(cat Dockerfile)
71+
USING_DOCKERFILE=true
7072
fi
7173

7274
if [ -f Procfile ]; then
@@ -143,17 +145,12 @@ if [ -f $TMP_DIR/Procfile ]; then
143145
RELEASE_INFO=$(echo $RELEASE_INFO | python -c "import sys,json,os,yaml;obj=json.load(sys.stdin);procfile=open('Procfile').read();obj.update(yaml.safe_load(procfile));print json.dumps(obj)")
144146
fi
145147

146-
if [ -f $TMP_DIR/Dockerfile ]; then
147-
DOCKERFILE=$(cat $TMP_DIR/Dockerfile)
148-
fi
149-
150148
# safely escape double quotes
151149
RELEASE_INFO=$(echo $RELEASE_INFO | sed -e 's/\"/\\\"/g')
152-
DOCKERFILE=$(echo $DOCKERFILE | sed -e 's/\"/\\\"/g' -e 's/ \\/ /g')
153150

154151
puts-step "Launching... "
155152
URL="{{ .deis_controller_protocol }}://{{ .deis_controller_host }}:{{ .deis_controller_port }}/v1/hooks/build"
156-
DATA="{\"sha\":\"$SHORT_SHA\",\"receive_user\":\"$USER\",\"receive_repo\":\"$APP_NAME\",\"image\":\"$APP_NAME\",\"procfile\":\"$RELEASE_INFO\",\"dockerfile\":\"$DOCKERFILE\"}"
153+
DATA="{\"sha\":\"$SHORT_SHA\",\"receive_user\":\"$USER\",\"receive_repo\":\"$APP_NAME\",\"image\":\"$APP_NAME\",\"procfile\":\"$RELEASE_INFO\",\"dockerfile\": $USING_DOCKERFILE}"
157154

158155
# notify the controller that the push was successful
159156
RESPONSE=$(curl -s -XPOST \

0 commit comments

Comments
 (0)