Skip to content

Commit 7574f6e

Browse files
committed
Extend dockerfile patches
1 parent 7ad86cb commit 7574f6e

File tree

2 files changed

+18
-118
lines changed

2 files changed

+18
-118
lines changed

scripts/fix_custom_reporter_path.py

Lines changed: 0 additions & 28 deletions
This file was deleted.

scripts/upload_instance_images_to_ghcr.sh

Lines changed: 18 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,11 @@ fix_pkg_config_dockerfile() {
275275
"huggingface__transformers-26164"
276276
"huggingface__transformers-27463"
277277
"huggingface__transformers-27561"
278+
"huggingface__transformers-27663"
278279
"huggingface__transformers-27717"
279280
"huggingface__transformers-28010"
281+
"huggingface__transformers-28071"
282+
"huggingface__transformers-28115"
280283
"huggingface__transformers-28517"
281284
"huggingface__transformers-28522"
282285
"huggingface__transformers-28535"
@@ -321,20 +324,34 @@ fix_debian_buster_dockerfile() {
321324
"coder__code-server-5633"
322325
"coder__code-server-6115"
323326
"coder__code-server-6225"
327+
"coder__code-server-6278"
324328
"coder__code-server-6423"
325329
"huggingface__transformers-6744"
326330
"huggingface__transformers-7075"
331+
"huggingface__transformers-7078"
327332
"huggingface__transformers-7272"
333+
"huggingface__transformers-7374"
328334
"huggingface__transformers-7562"
335+
"huggingface__transformers-7991"
329336
"huggingface__transformers-8435"
337+
"huggingface__transformers-8554"
338+
"huggingface__transformers-8624"
339+
"huggingface__transformers-8747"
330340
"microsoft__vscode-118226"
331-
"microsoft__vscode-122796"
341+
"microsoft__vscode-122796"
342+
"microsoft__vscode-122991"
332343
"microsoft__vscode-123112"
344+
"microsoft__vscode-123294"
333345
"microsoft__vscode-124621"
346+
"microsoft__vscode-127071"
334347
"microsoft__vscode-127257"
335348
"microsoft__vscode-128931"
336349
"microsoft__vscode-130088"
350+
"microsoft__vscode-135197"
337351
"microsoft__vscode-132041"
352+
"microsoft__vscode-132628"
353+
"microsoft__vscode-135805"
354+
"microsoft__vscode-136347"
338355
"microsoft__vscode-178291"
339356
)
340357

@@ -356,90 +373,6 @@ fix_debian_buster_dockerfile() {
356373
fi
357374
}
358375

359-
# Fix custom-reporter.js path issues for material-ui instances
360-
fix_custom_reporter_path() {
361-
local dockerfile="$1"
362-
local instance_id="$2"
363-
364-
# List of specific material-ui instances that need the custom-reporter.js fix
365-
# These are the 55 instances with resolved=false (excluding the 6 that already work)
366-
local mui_instances=(
367-
"mui__material-ui-7444"
368-
"mui__material-ui-11446"
369-
"mui__material-ui-11825"
370-
"mui__material-ui-12389"
371-
"mui__material-ui-13582"
372-
"mui__material-ui-13743"
373-
"mui__material-ui-13789"
374-
"mui__material-ui-13828"
375-
"mui__material-ui-14023"
376-
"mui__material-ui-14036"
377-
"mui__material-ui-14266"
378-
"mui__material-ui-14465"
379-
"mui__material-ui-15097"
380-
"mui__material-ui-15430"
381-
"mui__material-ui-15495"
382-
"mui__material-ui-16137"
383-
"mui__material-ui-16882"
384-
"mui__material-ui-17005"
385-
"mui__material-ui-17301"
386-
"mui__material-ui-17640"
387-
"mui__material-ui-17691"
388-
"mui__material-ui-17829"
389-
"mui__material-ui-18744"
390-
"mui__material-ui-19612"
391-
"mui__material-ui-19794"
392-
"mui__material-ui-20133"
393-
"mui__material-ui-20247"
394-
"mui__material-ui-20781"
395-
"mui__material-ui-20851"
396-
"mui__material-ui-21192"
397-
"mui__material-ui-21226"
398-
"mui__material-ui-23174"
399-
"mui__material-ui-23364"
400-
"mui__material-ui-25784"
401-
"mui__material-ui-26173"
402-
"mui__material-ui-26231"
403-
"mui__material-ui-26323"
404-
"mui__material-ui-26460"
405-
"mui__material-ui-26600"
406-
"mui__material-ui-26746"
407-
"mui__material-ui-28813"
408-
"mui__material-ui-33312"
409-
"mui__material-ui-34138"
410-
"mui__material-ui-34158"
411-
"mui__material-ui-34207"
412-
"mui__material-ui-34478"
413-
"mui__material-ui-34548"
414-
"mui__material-ui-36426"
415-
"mui__material-ui-37118"
416-
"mui__material-ui-37845"
417-
"mui__material-ui-37908"
418-
"mui__material-ui-38167"
419-
"mui__material-ui-38788"
420-
"mui__material-ui-39071"
421-
"mui__material-ui-40180"
422-
)
423-
424-
# Check if this instance needs the fix
425-
local needs_fix=false
426-
for mui_instance in "${mui_instances[@]}"; do
427-
if [[ "$instance_id" == "$mui_instance" ]]; then
428-
needs_fix=true
429-
break
430-
fi
431-
done
432-
433-
# Only apply fix to specific material-ui instances that have custom-reporter.js
434-
if [[ "$needs_fix" == "true" ]] && [[ "$dockerfile" == *"custom-reporter.js"* ]]; then
435-
log_info "Applying custom-reporter.js path fix for $instance_id" >&2
436-
437-
python scripts/fix_custom_reporter_path.py "$dockerfile"
438-
else
439-
echo "$dockerfile"
440-
fi
441-
}
442-
443376
# Build and upload a single instance image
444377
process_instance() {
445378
local instance_data="$1"
@@ -463,9 +396,6 @@ process_instance() {
463396
# Apply HF URL fix
464397
dockerfile=$(fix_huggingface_model_downloads "$dockerfile" "$instance_id")
465398

466-
# Apply custom-reporter.js path fix if needed
467-
dockerfile=$(fix_custom_reporter_path "$dockerfile" "$instance_id")
468-
469399
log_info "Processing instance: $instance_id ($language)"
470400

471401
# Check if image already exists and skip if requested
@@ -567,7 +497,6 @@ export -f fix_pkg_config_dockerfile
567497
export -f fix_debian_buster_dockerfile
568498
export -f fix_poetry_version
569499
export -f fix_huggingface_model_downloads
570-
export -f fix_custom_reporter_path
571500
export GHCR_REGISTRY VERSION DRY_RUN REPO_PATH SKIP_EXISTING GH_PAT
572501
export RED GREEN YELLOW BLUE NC
573502
export SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -670,7 +599,6 @@ $(declare -f fix_pkg_config_dockerfile)
670599
$(declare -f fix_debian_buster_dockerfile)
671600
$(declare -f fix_poetry_version)
672601
$(declare -f fix_huggingface_model_downloads)
673-
$(declare -f fix_custom_reporter_path)
674602
export GHCR_REGISTRY="$GHCR_REGISTRY"
675603
export VERSION="$VERSION"
676604
export DRY_RUN="$DRY_RUN"

0 commit comments

Comments
 (0)