fix: clean build context and support no-cache builds to avoid stale files

Author: powerslider

core/genesis.go

@@ -182,14 +182,14 @@ func SetupGenesisBlock(
 		return newcfg, common.Hash{}, err
 	}
 
-	// Use the attached extras pointer to ensure upgrade bytes round-trip correctly.
-	extra := params.GetExtra(newcfg)
-	storedcfg := customrawdb.ReadChainConfig(db, stored, extra)
+	// Read stored config into a local extras copy to avoid mutating shared extras concurrently.
+	extraCopy := *params.GetExtra(newcfg)
+	storedcfg := customrawdb.ReadChainConfig(db, stored, &extraCopy)
 	// If there is no previously stored chain config, write the chain config to disk.
 	if storedcfg == nil {
 		// Note: this can happen since we did not previously write the genesis block and chain config in the same batch.
 		log.Warn("Found genesis block without chain config")
-		customrawdb.WriteChainConfig(db, stored, newcfg, *extra)
+		customrawdb.WriteChainConfig(db, stored, newcfg, *params.GetExtra(newcfg))
 		return newcfg, stored, nil
 	}
 
@@ -228,7 +228,7 @@ func SetupGenesisBlock(
 	}
 	// Required to write the chain config to disk to ensure both the chain config and upgrade bytes are persisted to disk.
 	// Note: this intentionally removes an extra check from upstream.
-	customrawdb.WriteChainConfig(db, stored, newcfg, *extra)
+	customrawdb.WriteChainConfig(db, stored, newcfg, *params.GetExtra(newcfg))
 	return newcfg, stored, nil
 }
 

scripts/build_docker_image.sh

@@ -2,6 +2,19 @@
 
 set -euo pipefail
 
+# If set, ensure a clean git workspace before building to avoid stray files in context
+if [[ -n "${CLEAN_CONTEXT:-}" ]]; then
+  echo "Cleaning build context (git clean -fdx)"
+  git -C "$(dirname "$0")/.." clean -fdx
+fi
+
+# If set, disable build cache for docker buildx
+if [[ -n "${NO_CACHE:-}" ]]; then
+  DOCKER_NO_CACHE="--no-cache"
+else
+  DOCKER_NO_CACHE=""
+fi
+
 # If set to non-empty, prompts the building of a multi-arch image when the image
 # name indicates use of a registry.
 #
@@ -34,7 +47,7 @@ ALLOW_TAG_LATEST="${ALLOW_TAG_LATEST:-}"
 # simplifies creation of multi-arch images.
 #
 # Reference: https://docs.docker.com/build/buildkit/
-DOCKER_CMD="docker buildx build"
+DOCKER_CMD="docker buildx build ${DOCKER_NO_CACHE}"
 ispush=0
 if [[ -n "${PUBLISH}" ]]; then
   echo "Pushing $IMAGE_NAME:$BUILD_IMAGE_ID"

scripts/tests.build_docker_image.sh

@@ -36,6 +36,8 @@ build_and_test() {
     VM_ID=$"${vm_id}" \
     IMAGE_NAME="${imagename}" \
     AVALANCHEGO_LOCAL_IMAGE_NAME="${avalanchego_local_image_name}" \
+    CLEAN_CONTEXT=1 \
+    NO_CACHE=1 \
     ./scripts/build_docker_image.sh
 
   echo "listing images"