修改docker传参位置

scripts/build-image-docker.sh

@@ -170,15 +170,6 @@ LOG build board image with docker: ${docker_file}.
 
 (echo "FROM $docker_img_name" && grep -v FROM ${config_dir}/Dockerfile) | \
     docker build -t ${docker_img_name}-${buildid} \
-    --build-arg board=${board} \
-    --build-arg docker_file=${docker_file} \
-    --build-arg name=${name} \
-    --build-arg kernel_url=${kernel_url} \
-    --build-arg branch=${branch} \
-    --build-arg default_defconfig=${default_defconfig} \
-    --build-arg repo_file=${repo_file} \
-    --build-arg spec_param=${spec_param} \
-    --build-arg make_cores=${make_cores} \
     --no-cache -f- ${config_dir}
     
 echo docker run --rm --privileged=true \
@@ -186,6 +177,15 @@ echo docker run --rm --privileged=true \
     ${docker_img_name}-${buildid}
 docker run --rm --privileged=true \
     -v ${cur_dir}:/work \
+    -e board=${board} \
+    -e docker_file=${docker_file} \
+    -e name=${name} \
+    -e kernel_url=${kernel_url} \
+    -e branch=${branch} \
+    -e default_defconfig=${default_defconfig} \
+    -e repo_file=${repo_file} \
+    -e spec_param=${spec_param} \
+    -e make_cores=${make_cores} \
     ${docker_img_name}-${buildid}
 chmod -R a+r ${workdir}
 docker image rm ${docker_img_name}-${buildid}

scripts/configs/rockchip/Dockerfile

@@ -1,13 +1,4 @@
 FROM openeuler-22.03-lts-sp3:latest
-ARG board="firefly-rk3399"
-ARG docker_file="https://repo.openeuler.org/openEuler-22.03-LTS-SP3/docker_img/aarch64/openEuler-docker.aarch64.tar.xz"
-ARG name="openEuler-22.03-LTS-SP3-firefly-rk3399-aarch64-alpha1"
-ARG kernel_url="https://gitee.com/openeuler/rockchip-kernel.git"
-ARG branch="openEuler-22.03-LTS-SP3"
-ARG default_defconfig="openeuler_rockchip_defconfig"
-ARG repo_file="https://gitee.com/src-openeuler/openEuler-repos/raw/openEuler-22.03-LTS-SP3/generic.repo"
-ARG spec_param="headless"
-ARG make_cores="1"
 
 RUN dnf clean expire-cache
 
@@ -16,13 +7,13 @@ ENV SHELL=/bin/bash
 RUN dnf install sudo -y
 
 RUN echo "cd /work && bash build.sh \
-    --board ${board} \
+    --board \${board} \
-    -n ${name} \
+    -n \${name} \
-    -k ${kernel_url} \
+    -k \${kernel_url} \
-    -b ${branch} \
+    -b \${branch} \
-    -c ${default_defconfig} \
+    -c \${default_defconfig} \
-    -r ${repo_file} \
+    -r \${repo_file} \
-    -s ${spec_param} \
+    -s \${spec_param} \
-    --cores ${make_cores}" >> /start-build.sh
+    --cores \${make_cores}" >> /start-build.sh
 
 ENTRYPOINT ["/bin/bash", "/start-build.sh"]