Skip to content

Commit d48e3fd

Browse files
committed
Add builderx default
Signed-off-by: pvijayakrish <[email protected]>
1 parent 7364661 commit d48e3fd

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

.github/workflows/nightly-ci.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,8 @@ jobs:
262262
BUILD_STATUS=$(echo "$JOBS" | jq -r --arg job_name "$BUILD_JOB_NAME" '.jobs[] | select(.name == $job_name) | .conclusion')
263263
echo "Build status for '$BUILD_JOB_NAME': $BUILD_STATUS"
264264
if [ "$BUILD_STATUS" != "success" ]; then
265-
echo "Build failed or did not complete successfully. Skipping tests."
266-
echo "skip=true" >> $GITHUB_OUTPUT
267-
exit 0
265+
echo "Build failed or did not complete successfully. Failing tests."
266+
exit 1
268267
fi
269268
echo "Build succeeded. Proceeding with tests."
270269
- name: Login to Container Registries
@@ -395,9 +394,8 @@ jobs:
395394
BUILD_STATUS=$(echo "$JOBS" | jq -r --arg job_name "$BUILD_JOB_NAME" '.jobs[] | select(.name == $job_name) | .conclusion')
396395
echo "Build status for '$BUILD_JOB_NAME': $BUILD_STATUS"
397396
if [ "$BUILD_STATUS" != "success" ]; then
398-
echo "Build failed or did not complete successfully. Skipping tests."
399-
echo "skip=true" >> $GITHUB_OUTPUT
400-
exit 0
397+
echo "Build failed or did not complete successfully. Failing tests."
398+
exit 1
401399
fi
402400
echo "Build succeeded. Proceeding with tests."
403401
- name: Login to Container Registries

container/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@ if [[ -z "${DEV_IMAGE_INPUT:-}" ]]; then
882882
# Use BuildKit for enhanced metadata
883883
if [ -z "$RUN_PREFIX" ]; then
884884
if docker buildx version &>/dev/null; then
885-
docker buildx build --progress=plain --load -f "${SOURCE_DIR}/Dockerfile" --target runtime $PLATFORM $BUILD_ARGS $CACHE_FROM $CACHE_TO --tag $DYNAMO_BASE_IMAGE $BUILD_CONTEXT_ARG $BUILD_CONTEXT $NO_CACHE 2>&1 | tee "${BASE_BUILD_LOG}"
885+
docker buildx build --builder default --progress=plain --load -f "${SOURCE_DIR}/Dockerfile" --target runtime $PLATFORM $BUILD_ARGS $CACHE_FROM $CACHE_TO --tag $DYNAMO_BASE_IMAGE $BUILD_CONTEXT_ARG $BUILD_CONTEXT $NO_CACHE 2>&1 | tee "${BASE_BUILD_LOG}"
886886
BUILD_EXIT_CODE=${PIPESTATUS[0]}
887887
else
888888
DOCKER_BUILDKIT=1 docker build --progress=plain -f "${SOURCE_DIR}/Dockerfile" --target runtime $PLATFORM $BUILD_ARGS $CACHE_FROM $CACHE_TO --tag $DYNAMO_BASE_IMAGE $BUILD_CONTEXT_ARG $BUILD_CONTEXT $NO_CACHE 2>&1 | tee "${BASE_BUILD_LOG}"
@@ -908,7 +908,7 @@ if [[ -z "${DEV_IMAGE_INPUT:-}" ]]; then
908908
# Use BuildKit for enhanced metadata
909909
if [ -z "$RUN_PREFIX" ]; then
910910
if docker buildx version &>/dev/null; then
911-
docker buildx build --progress=plain --load -f $DOCKERFILE $TARGET_STR $PLATFORM $BUILD_ARGS $CACHE_FROM $CACHE_TO $TAG $LATEST_TAG $BUILD_CONTEXT_ARG $BUILD_CONTEXT $NO_CACHE 2>&1 | tee "${FRAMEWORK_BUILD_LOG}"
911+
docker buildx build --builder default --progress=plain --load -f $DOCKERFILE $TARGET_STR $PLATFORM $BUILD_ARGS $CACHE_FROM $CACHE_TO $TAG $LATEST_TAG $BUILD_CONTEXT_ARG $BUILD_CONTEXT $NO_CACHE 2>&1 | tee "${FRAMEWORK_BUILD_LOG}"
912912
BUILD_EXIT_CODE=${PIPESTATUS[0]}
913913
else
914914
DOCKER_BUILDKIT=1 docker build --progress=plain -f $DOCKERFILE $TARGET_STR $PLATFORM $BUILD_ARGS $CACHE_FROM $CACHE_TO $TAG $LATEST_TAG $BUILD_CONTEXT_ARG $BUILD_CONTEXT $NO_CACHE 2>&1 | tee "${FRAMEWORK_BUILD_LOG}"
@@ -930,7 +930,7 @@ if [[ -z "${DEV_IMAGE_INPUT:-}" ]]; then
930930
# Use BuildKit for enhanced metadata
931931
if [ -z "$RUN_PREFIX" ]; then
932932
if docker buildx version &>/dev/null; then
933-
docker buildx build --progress=plain --load -f $DOCKERFILE $TARGET_STR $PLATFORM $BUILD_ARGS $CACHE_FROM $CACHE_TO $TAG $LATEST_TAG $BUILD_CONTEXT_ARG $BUILD_CONTEXT $NO_CACHE 2>&1 | tee "${SINGLE_BUILD_LOG}"
933+
docker buildx build --builder default --progress=plain --load -f $DOCKERFILE $TARGET_STR $PLATFORM $BUILD_ARGS $CACHE_FROM $CACHE_TO $TAG $LATEST_TAG $BUILD_CONTEXT_ARG $BUILD_CONTEXT $NO_CACHE 2>&1 | tee "${SINGLE_BUILD_LOG}"
934934
BUILD_EXIT_CODE=${PIPESTATUS[0]}
935935
else
936936
DOCKER_BUILDKIT=1 docker build --progress=plain -f $DOCKERFILE $TARGET_STR $PLATFORM $BUILD_ARGS $CACHE_FROM $CACHE_TO $TAG $LATEST_TAG $BUILD_CONTEXT_ARG $BUILD_CONTEXT $NO_CACHE 2>&1 | tee "${SINGLE_BUILD_LOG}"

0 commit comments

Comments
 (0)