Skip to content

Commit 8f2955c

Browse files
authored
Merge pull request #3910 from flatcar/krnowak/docker-full-output
build_sdk_container_image: Stop truncating output from docker build
2 parents 9518012 + 9eb6040 commit 8f2955c

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

build_sdk_container_image

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,10 @@ fi
125125

126126
# --
127127

128+
docker_build() {
129+
PROGRESS_NO_TRUNC=1 $docker build --progress plain "${@}"
130+
}
131+
128132
# build plain SDK container w/o board support
129133
#
130134
import_image="flatcar-sdk-import:${docker_vernum}"
@@ -137,7 +141,7 @@ else
137141
if [ -n "$cleanup" ] ; then
138142
echo "$docker image rm -f '${import_image}'" >> "$cleanup"
139143
fi
140-
$docker build -t "$import_image" \
144+
docker_build -t "$import_image" \
141145
--build-arg VERSION="${docker_vernum}" \
142146
-f sdk_lib/Dockerfile.sdk-import \
143147
.
@@ -208,7 +212,7 @@ else
208212
if [ -n "$cleanup" ] ; then
209213
echo "$docker image rm -f '${sdk_build_image}'" >> "$cleanup"
210214
fi
211-
$docker build -t "${sdk_build_image}" \
215+
docker_build -t "${sdk_build_image}" \
212216
--build-arg VERSION="${docker_vernum}" \
213217
--build-arg BINHOST="http://${binhost}" \
214218
--build-arg OFFICIAL="${official}" \
@@ -231,7 +235,7 @@ for a in all arm64 amd64; do
231235
arm64) rmarch="amd64-usr"; rmcross="x86_64-cros-linux-gnu";;
232236
amd64) rmarch="arm64-usr"; rmcross="aarch64-cros-linux-gnu";;
233237
esac
234-
$docker build -t "$sdk_container_common_registry/flatcar-sdk-${a}:${docker_vernum}" \
238+
docker_build -t "$sdk_container_common_registry/flatcar-sdk-${a}:${docker_vernum}" \
235239
--build-arg VERSION="${docker_vernum}" \
236240
--build-arg RMARCH="${rmarch}" \
237241
--build-arg RMCROSS="${rmcross}" \

0 commit comments

Comments
 (0)