Skip to content

Commit ea89ef4

Browse files
committed
cleanup
1 parent 5a04cc2 commit ea89ef4

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

.pipelines/cni/cilium/nightly-release-test.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,14 @@ stages:
7272
# Add ARG and ENV statements to disable systemcrypto for Microsoft Go
7373
sed -i '/^FROM.*builder/a ARG GOEXPERIMENT=boringcrypto \nENV GOEXPERIMENT=${GOEXPERIMENT}\nENV CGO_ENABLED=1' "$DOCKERFILE_PATH"
7474
75-
# Clear Go module and build caches completely, then rebuild everything with nosystemcrypto
75+
# Clear Go module and build caches completely, then rebuild everything with boringcrypto
7676
sed -i '/ENV CGO_ENABLED=1/a RUN rm -rf /go/pkg /root/.cache && \\\n mkdir -p /go/pkg /tmp/gocache && \\\n cd /tmp && \\\n GOCACHE=/tmp/gocache CGO_ENABLED=1 go env && \\\n GOCACHE=/tmp/gocache CGO_ENABLED=1 GOEXPERIMENT=boringcrypto go install -a -x std' "$DOCKERFILE_PATH"
77-
78-
# Remove ALL cache mounts for /go/pkg and /root/.cache to avoid conflicts
79-
sed -i 's/--mount=type=cache,target=\/go\/pkg[[:space:]]*//g' "$DOCKERFILE_PATH"
80-
sed -i 's/--mount=type=cache,target=\/root\/\.cache[[:space:]]*//g' "$DOCKERFILE_PATH"
81-
82-
echo "Modified Dockerfile contents (first 80 lines):"
83-
head -80 "$DOCKERFILE_PATH"
8477
fi
8578
8679
BUILD_ARGS=${GO_ARGS}${ALPINE_ARGS}
8780
DOCKER_FLAGS="$BUILD_ARGS" \
8881
make $(type)
8982
90-
# Clean up builder after build
91-
docker buildx rm cilium-builder || true
9283
name: BuildCiliumImage
9384
displayName: "Build Cilium Image"
9485
- task: AzureCLI@2

0 commit comments

Comments
 (0)