@@ -174,24 +174,23 @@ pipeline {
174174 sh '''
175175 set -euxo pipefail
176176 driver="${BUILDX_DRIVER:-docker}"
177- builder_name="star-sw-${BUILD_NUMBER}-${STAR_BASE}-${COMPILER}"
178- echo "${builder_name}" > .buildx-builder-name
179- docker buildx rm "${builder_name}" || true
177+ rm -f .buildx-builder-name
180178
181179 if [ "${driver}" = "docker-container" ]; then
180+ builder_name="star-sw-${BUILD_NUMBER}-${STAR_BASE}-${COMPILER}"
181+ echo "${builder_name}" > .buildx-builder-name
182+ docker buildx rm "${builder_name}" || true
182183 docker buildx create \
183184 --name "${builder_name}" \
184185 --driver docker-container \
185186 --driver-opt "env.BUILDKIT_STEP_LOG_MAX_SIZE=${BUILDKIT_STEP_LOG_MAX_SIZE}" \
186187 --use
188+ docker buildx inspect "${builder_name}" --bootstrap
187189 else
188- docker buildx create \
189- --name "${builder_name}" \
190- --driver docker \
191- --use
190+ echo "Using default docker driver builder from the current Docker context"
191+ docker buildx use default || true
192+ docker buildx inspect default --bootstrap || docker buildx inspect --bootstrap
192193 fi
193-
194- docker buildx inspect "${builder_name}" --bootstrap
195194 '''
196195 }
197196 }
@@ -201,7 +200,6 @@ pipeline {
201200 sh '''
202201 set -euxo pipefail
203202 driver="${BUILDX_DRIVER:-docker}"
204- builder_name="$(cat .buildx-builder-name)"
205203 starenv="${STAR_BASE}-${COMPILER}"
206204 image_tag="ghcr.io/star-bnl/star-sw-${starenv}"
207205 image_tar="${ARTIFACT_DIR}/star-sw-${starenv}.tar"
@@ -210,15 +208,28 @@ pipeline {
210208
211209 echo "=== Building ${image_tag} ==="
212210 echo "=== Using Buildx driver ${driver} ==="
213- docker buildx build \
214- --builder "${builder_name}" \
215- --progress plain \
216- --pull=false \
217- --build-arg "starenv=${STAR_BASE}" \
218- --build-arg "compiler=${COMPILER}" \
219- --tag "${image_tag}" \
220- --output "type=docker,dest=${image_tar}" \
221- .
211+
212+ if [ -f .buildx-builder-name ]; then
213+ builder_name="$(cat .buildx-builder-name)"
214+ docker buildx build \
215+ --builder "${builder_name}" \
216+ --progress plain \
217+ --pull=false \
218+ --build-arg "starenv=${STAR_BASE}" \
219+ --build-arg "compiler=${COMPILER}" \
220+ --tag "${image_tag}" \
221+ --output "type=docker,dest=${image_tar}" \
222+ .
223+ else
224+ docker buildx build \
225+ --progress plain \
226+ --pull=false \
227+ --build-arg "starenv=${STAR_BASE}" \
228+ --build-arg "compiler=${COMPILER}" \
229+ --tag "${image_tag}" \
230+ --output "type=docker,dest=${image_tar}" \
231+ .
232+ fi
222233
223234 ls -lh "${image_tar}"
224235 '''
0 commit comments