build: Add robust proxy handling

    - Add proxy handling for apt in different enviroments
    - fix non proxy env invalid error

Signed-off-by: Nabendu Maiti <nabendu.bikash.maiti@intel.com>

Author: nbmaiti

.devcontainer/devcontainer.json

@@ -11,38 +11,21 @@
     4200
   ],
   "containerEnv": {
-    "HTTP_PROXY": "${localEnv:http_proxy}",
-    "HTTPS_PROXY": "${localEnv:https_proxy}",
-    "NO_PROXY": "${localEnv:no_proxy}",
-    "http_proxy": "${localEnv:http_proxy}",
-    "https_proxy": "${localEnv:https_proxy}",
-    "no_proxy": "${localEnv:no_proxy}"
+    "HTTP_PROXY": "${localEnv:HTTP_PROXY:}",
+    "HTTPS_PROXY": "${localEnv:HTTPS_PROXY:}",
+    "NO_PROXY": "${localEnv:NO_PROXY:}",
+    "http_proxy": "${localEnv:http_proxy:}",
+    "https_proxy": "${localEnv:https_proxy:}",
+    "no_proxy": "${localEnv:no_proxy:}"
   },
-  "runArgs": [
-    "--env",
-    "HTTP_PROXY=${env:http_proxy:-}",
-    "--env",
-    "HTTPS_PROXY=${env:https_proxy:-}",
-    "--env",
-    "NO_PROXY=${env:no_proxy:-}",
-    "--env",
-    "http_proxy=${env:http_proxy:-}",
-    "--env",
-    "https_proxy=${env:https_proxy:-}",
-    "--env",
-    "no_proxy=${env:no_proxy:-}"
-  ],
-
   "portsAttributes": {
     "4200": {
       "label": "Angular Dev Server",
       "onAutoForward": "notify"
     }
   },
-  // Use 'onCreateCommand' to run commands once when the container is created.
-  "onCreateCommand": "if [ -n \"$HTTP_PROXY\" ] || [ -n \"$HTTPS_PROXY\" ]; then sudo bash -c \"echo 'Acquire::http::Proxy \\\"'$HTTP_PROXY'\\\";' > /etc/apt/apt.conf.d/proxy.conf && echo 'Acquire::https::Proxy \\\"'$HTTPS_PROXY'\\\";' >> /etc/apt/apt.conf.d/proxy.conf\"; fi",
   // Use 'postCreateCommand' to run commands after the container is created.
-  "postCreateCommand": "/bin/bash .devcontainer/post-create.sh"
+  "postCreateCommand": "sed -i 's/\\r$//' .devcontainer/post-create.sh && /bin/bash .devcontainer/post-create.sh"
   // Configure tool-specific properties.
   // "customizations": {},
   // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.

.devcontainer/post-create.sh

@@ -1,4 +1,3 @@
-
 #!/bin/bash
 set -e
 
@@ -8,19 +7,29 @@ for var in HTTP_PROXY HTTPS_PROXY NO_PROXY http_proxy https_proxy no_proxy; do
   if [ -z "$v" ]; then unset $var; fi
 done
 
-# Configure apt proxy if proxies are present
+# Strip all trailing '/' or '\\' from proxy URLs for apt config
+strip_trailing_slash() {
+  local url="$1"
+  # Remove all trailing / or \
+  url="${url%%*(/|\\)}"
+  # Fallback for Bash < 4.0 (no extglob): use sed
+  echo "$url" | sed 's%[\\/]*$%%'
+}
+
 if [ -n "$HTTP_PROXY" ] || [ -n "$http_proxy" ] || [ -n "$HTTPS_PROXY" ] || [ -n "$https_proxy" ]; then
   echo "Configuring apt to use proxy..."
   sudo mkdir -p /etc/apt/apt.conf.d
+  # Remove all trailing / or \\ from proxy URLs
+  apt_http_proxy="$(strip_trailing_slash "${HTTP_PROXY:-${http_proxy:-}}")"
+  apt_https_proxy="$(strip_trailing_slash "${HTTPS_PROXY:-${https_proxy:-}}")"
   sudo tee /etc/apt/apt.conf.d/99proxy > /dev/null <<EOF
-Acquire::http::Proxy \"${HTTP_PROXY:-${http_proxy:-}}\";
-Acquire::https::Proxy \"${HTTPS_PROXY:-${https_proxy:-}}\";
+Acquire::http::Proxy "$apt_http_proxy";
+Acquire::https::Proxy "$apt_https_proxy";
 EOF
 fi
 
 npm install
 
-
 sudo apt-get update
 sudo apt-get install -y libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 libasound2 libxtst6 xauth xvfb
 npm install