Skip to content

Commit 39284e6

Browse files
author
Gabe Monroy
committed
fix(builder): print buildpack output, decrease verbosity
1 parent 572a709 commit 39284e6

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

rootfs/etc/confd/templates/builder

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -129,33 +129,35 @@ ACCESS_SECRET=`cat /var/run/secrets/object/store/access-secret-key`
129129
mkdir -p /var/minio-conf
130130
CONFIG_DIR=/var/minio-conf
131131
MC_PREFIX="mc -C $CONFIG_DIR --quiet"
132-
$MC_PREFIX config host add "$HTTP_PREFIX://$S3EP" $ACCESS_KEY $ACCESS_SECRET
133-
$MC_PREFIX mb "$HTTP_PREFIX://${S3EP}/git"
134-
$MC_PREFIX cp ${APP_NAME}.tar.gz $TAR_URL
135-
puts-step "stored tarfile in $TAR_URL"
132+
$MC_PREFIX config host add "$HTTP_PREFIX://$S3EP" $ACCESS_KEY $ACCESS_SECRET &>/dev/null
133+
$MC_PREFIX mb "$HTTP_PREFIX://${S3EP}/git" &>/dev/null
134+
$MC_PREFIX cp ${APP_NAME}.tar.gz $TAR_URL &>/dev/null
136135

137-
puts-step "creating builder pod in namespace $POD_NAMESPACE"
138-
kubectl --namespace=$POD_NAMESPACE create -f /etc/${SLUG_NAME}.yaml
136+
kubectl --namespace=${POD_NAMESPACE} create -f /etc/${SLUG_NAME}.yaml >/dev/null
137+
138+
# wait for pod to be running and then pull its logs
139+
until [ "`kubectl --namespace=${POD_NAMESPACE} get pods -o yaml ${META_NAME} | grep "phase: " | awk {'print $2'}`" == "Running" ]; do
140+
sleep 0.1
141+
done
142+
kubectl --namespace=${POD_NAMESPACE} logs -f ${META_NAME} 2>/dev/null &
139143

140144
#check for image creation or slug existence in S3EP
141145

142146
if [[ "$REMOTE_STORAGE" == "1" ]]; then
143147
LS_CMD="$MC_PREFIX ls $PUSH_URL"
144-
echo "Waiting for build to complete..."
145148
until $LS_CMD &> /dev/null; do
146149
echo -ne "."
147150
sleep 2
148151
done
149152
else
150-
echo -ne "Waiting for build to complete..."
151153
while [ ! -f /apps/${SLUG_NAME}/slug.tgz ]
152154
do
153155
echo -ne "."
154156
sleep 2
155157
done
156158
fi
157-
echo ""
158-
echo "Build complete."
159+
160+
# build completed
159161

160162
URL="http://$DEIS_WORKFLOW_SERVICE_HOST:$DEIS_WORKFLOW_SERVICE_PORT/v2/hooks/config"
161163
RESPONSE=$(get-app-config -url="$URL" -key="{{ getv "/deis/controller/builderKey" }}" -user=$USER -app=$APP_NAME)

rootfs/etc/deis-slugbuilder.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ spec:
1212
imagePullPolicy: Always
1313
image: quay.io/deisci/slugbuilder:v2-alpha
1414
env:
15-
- name: DEBUG
16-
value: "1"
1715
- name: TAR_URL
1816
value: tar-url
1917
- name : put_url

0 commit comments

Comments
 (0)