From 3f3aeafb470787d1bfcdec39921f00031759ea79 Mon Sep 17 00:00:00 2001
From: sam#gemmi-win10 <sam@china.gz>
Date: Mon, 2 Oct 2023 15:58:46 +0800
Subject: [PATCH] # COPY files/usr/local/bin/* /usr/local/apps/scripts/

---
 builder/Dockerfile | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/builder/Dockerfile b/builder/Dockerfile
index 3ee36f2..7c9c9a9 100644
--- a/builder/Dockerfile
+++ b/builder/Dockerfile
@@ -77,10 +77,6 @@ RUN \
   # /etc/dropbear 
 
 
-# copy in static files
-# all scripts are 0755 (rwx r-x r-x)
-COPY files/usr/local/bin/* /usr/local/apps/scripts/
-
 # RUN echo "Installing Packages ..." \
 #     && DEBIAN_FRONTEND=noninteractive clean-install \
 #       iptables iproute2 bash ca-certificates curl rsync \
@@ -94,10 +90,20 @@ COPY files/usr/local/bin/* /usr/local/apps/scripts/
 RUN mkdir -p /opt/cni/bin /kind/;
 COPY --from=trans /rootfs /
 
+# copy in static files
+# # all scripts are 0755 (rwx r-x r-x)
+# COPY files/usr/local/bin/* /usr/local/apps/scripts/
+
+# COPY ./files/etc/cni/net.d/bridge-nerdctl-cpout.conflist /etc/cni/net.d/
+# COPY ./files/10-containerd-net.conflist /etc/cni/net.d/
+# COPY ./files/edgecore-conf.yml /
+# copy> add
+ADD files/etc /etc
+
 # 默认版本
+  # chmod +x /usr/local/apps/scripts/*; \
+  # ls /usr/local/apps/scripts/ |while read one; do ln -s /usr/local/apps/scripts/$one /usr/local/bin/; done; \
 RUN \
-  chmod +x /usr/local/apps/scripts/*; \
-  ls /usr/local/apps/scripts/ |while read one; do ln -s /usr/local/apps/scripts/$one /usr/local/bin/; done; \
   \
   ln -s /usr/local/apps/cfssl/cfssl_1.6.3_linux_amd64 /usr/local/bin/cfssl; \
   ln -s /usr/local/apps/cfssl/cfssljson_1.6.3_linux_amd64 /usr/local/bin/cfssljson; \
@@ -107,12 +113,6 @@ RUN \
   find /usr/local/bin /opt/cni/bin 
 
 
-# COPY ./files/etc/cni/net.d/bridge-nerdctl-cpout.conflist /etc/cni/net.d/
-# COPY ./files/10-containerd-net.conflist /etc/cni/net.d/
-# COPY ./files/edgecore-conf.yml /
-# copy> add
-ADD files/etc /etc
-
 #[linux/amd64 stage-4 14/14] 52 0.070 /bin/sh: line 1: /usr/local/bin/ctr: No such file or directory
 #57 0.116 qemu-aarch64: Could not open '/lib/ld-linux-aarch64.so.1': No such file or directory
 RUN echo "Installing containerd ..." \