Skip to content

Commit 5f192e1

Browse files
committed
Merge pull request #22 from Joshua-Anderson/v2-update
fix(builder): use workflow v2 hook urls
2 parents 33e16e5 + 74eed90 commit 5f192e1

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

rootfs/etc/confd/templates/builder

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ do
132132
echo "no file"
133133
done
134134

135-
URL="http://$DEIS_WORKFLOW_SERVICE_HOST:$DEIS_WORKFLOW_SERVICE_PORT/v1/hooks/config"
135+
URL="http://$DEIS_WORKFLOW_SERVICE_HOST:$DEIS_WORKFLOW_SERVICE_PORT/v2/hooks/config"
136136
RESPONSE=$(get-app-config -url="$URL" -key="{{ getv "/deis/controller/builderKey" }}" -user=$USER -app=$APP_NAME)
137137
CODE=$?
138138
if [ $CODE -ne 0 ]; then
@@ -143,7 +143,7 @@ fi
143143
# use Procfile if provided, otherwise try default process types from ./release
144144

145145
puts-step "Launching... "
146-
URL="http://$DEIS_WORKFLOW_SERVICE_HOST:$DEIS_WORKFLOW_SERVICE_PORT/v1/hooks/build"
146+
URL="http://$DEIS_WORKFLOW_SERVICE_HOST:$DEIS_WORKFLOW_SERVICE_PORT/v2/hooks/build"
147147
DATA="$(generate-buildhook "$SHORT_SHA" "$USER" "$APP_NAME" "$APP_NAME" "$PROCFILE" "$USING_DOCKERFILE")"
148148
PUBLISH_RELEASE=$(echo "$DATA" | publish-release-controller -url=$URL -key={{ getv "/deis/controller/builderKey" }})
149149
CODE=$?

rootfs/etc/confd/templates/receiver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ curl \
1212
-H 'Content-Type: application/json' \
1313
-H "X-Deis-Builder-Auth: {{ getv "/deis/controller/builderKey" }}" \
1414
-d "{\"receive_user\": \"$username\", \"receive_repo\": \"$app\", \"sha\": \"$sha\", \"fingerprint\": \"$fingerprint\", \"ssh_connection\": \"$SSH_CONNECTION\", \"ssh_original_command\": \"$SSH_ORIGINAL_COMMAND\"}" \
15-
--silent "http://$DEIS_WORKFLOW_SERVICE_HOST:$DEIS_WORKFLOW_SERVICE_PORT/v1/hooks/push" >/dev/null
15+
--silent "http://$DEIS_WORKFLOW_SERVICE_HOST:$DEIS_WORKFLOW_SERVICE_PORT/v2/hooks/push" >/dev/null

0 commit comments

Comments
 (0)