From efef5a5a1a24d73628f6db82735d8710e32f2043 Mon Sep 17 00:00:00 2001
From: Derek Nola <derek.nola@suse.com>
Date: Wed, 23 Apr 2025 09:39:46 -0700
Subject: [PATCH] Remove legacy PROXY Envs in build system

Signed-off-by: Derek Nola <derek.nola@suse.com>
---
 Dockerfile.dapper     | 8 --------
 Dockerfile.local      | 7 -------
 scripts/package-image | 6 +-----
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 58847eadba..fbaa6dd23e 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -1,14 +1,6 @@
 ARG GOLANG=golang:1.24.2-alpine3.21
 FROM ${GOLANG}
 
-# Set proxy environment variables
-ARG http_proxy
-ARG https_proxy
-ARG no_proxy
-ENV http_proxy=${http_proxy} \
-    https_proxy=${https_proxy} \
-    no_proxy=${no_proxy}
-
 # Install necessary packages
 RUN apk -U --no-cache add \
     bash git gcc musl-dev docker vim less file curl wget ca-certificates jq linux-headers \
diff --git a/Dockerfile.local b/Dockerfile.local
index 5c24bdb33a..f66e0c9dc6 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -1,13 +1,6 @@
 ARG GOLANG=golang:1.24.2-alpine3.21
 FROM ${GOLANG} AS infra
 
-ARG http_proxy
-ARG https_proxy
-ARG no_proxy
-ENV http_proxy=$http_proxy
-ENV https_proxy=$https_proxy
-ENV no_proxy=$no_proxy
-
 RUN apk -U --no-cache add bash git gcc musl-dev docker vim less file curl wget ca-certificates jq linux-headers \
     zlib-dev tar zip squashfs-tools npm coreutils openssl-dev libffi-dev libseccomp libseccomp-dev \
     libseccomp-static make libuv-static sqlite-dev sqlite-static libselinux libselinux-dev zlib-dev zlib-static \
diff --git a/scripts/package-image b/scripts/package-image
index 9ae43e58b7..edb8b58e8b 100755
--- a/scripts/package-image
+++ b/scripts/package-image
@@ -14,10 +14,6 @@ REPO=${REPO:-rancher}
 IMAGE_NAME=${IMAGE_NAME:-k3s}
 
 IMAGE=${REPO}/${IMAGE_NAME}:${TAG}
-PROXY_OPTS=
-[ -z "$http_proxy" ] || PROXY_OPTS="$PROXY_OPTS --build-arg http_proxy=$http_proxy"
-[ -z "$https_proxy" ] || PROXY_OPTS="$PROXY_OPTS --build-arg https_proxy=$https_proxy"
-[ -z "$no_proxy" ] || PROXY_OPTS="$PROXY_OPTS --build-arg no_proxy=$no_proxy"
-docker build ${PROXY_OPTS} --build-arg DRONE_TAG=${VERSION_TAG} -t ${IMAGE} -f package/Dockerfile .
+docker build --build-arg DRONE_TAG=${VERSION_TAG} -t ${IMAGE} -f package/Dockerfile .
 ./scripts/image_scan.sh ${IMAGE} ${ARCH}
 echo Built ${IMAGE}