[PATCH v3 compass-ci] providers/docker: copy rootfs/addon/root/. to container

Signed-off-by: Xiao Shenwei <xiaoshenwei96@163.com> --- providers/docker/bin/entrypoint.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/providers/docker/bin/entrypoint.sh b/providers/docker/bin/entrypoint.sh index 4388e19..9848b4f 100755 --- a/providers/docker/bin/entrypoint.sh +++ b/providers/docker/bin/entrypoint.sh @@ -2,7 +2,6 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved. -mkdir -p /root/.ssh -cp /lkp/lkp/src/rootfs/addon/root/.ssh/id_rsa /root/.ssh/ +cp -r /lkp/lkp/src/rootfs/addon/root/. /root cp -r /lkp/lkp/src/rootfs/addon/usr/* /usr sh /lkp/lkp/src/rootfs/addon/etc/init.d/lkp-bootstrap -- 2.23.0

On Wed, Jan 06, 2021 at 06:45:40PM +0800, Xiao Shenwei wrote:
Signed-off-by: Xiao Shenwei <xiaoshenwei96@163.com> --- providers/docker/bin/entrypoint.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/providers/docker/bin/entrypoint.sh b/providers/docker/bin/entrypoint.sh index 4388e19..9848b4f 100755 --- a/providers/docker/bin/entrypoint.sh +++ b/providers/docker/bin/entrypoint.sh @@ -2,7 +2,6 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
-mkdir -p /root/.ssh -cp /lkp/lkp/src/rootfs/addon/root/.ssh/id_rsa /root/.ssh/ +cp -r /lkp/lkp/src/rootfs/addon/root/. /root
cp -r /lkp/lkp/src/rootfs/addon/root/* /root Thanks, Xijian
cp -r /lkp/lkp/src/rootfs/addon/usr/* /usr sh /lkp/lkp/src/rootfs/addon/etc/init.d/lkp-bootstrap -- 2.23.0

On Wed, Jan 06, 2021 at 07:05:36PM +0800, Xu Xijian wrote:
On Wed, Jan 06, 2021 at 06:45:40PM +0800, Xiao Shenwei wrote:
Signed-off-by: Xiao Shenwei <xiaoshenwei96@163.com> --- providers/docker/bin/entrypoint.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/providers/docker/bin/entrypoint.sh b/providers/docker/bin/entrypoint.sh index 4388e19..9848b4f 100755 --- a/providers/docker/bin/entrypoint.sh +++ b/providers/docker/bin/entrypoint.sh @@ -2,7 +2,6 @@ # SPDX-License-Identifier: MulanPSL-2.0+ # Copyright (c) 2020 Huawei Technologies Co., Ltd. All rights reserved.
-mkdir -p /root/.ssh -cp /lkp/lkp/src/rootfs/addon/root/.ssh/id_rsa /root/.ssh/ +cp -r /lkp/lkp/src/rootfs/addon/root/. /root
cp -r /lkp/lkp/src/rootfs/addon/root/* /root
/* can't copy hidden file .ssh .xxx Thanks, Shenwei
Thanks, Xijian
cp -r /lkp/lkp/src/rootfs/addon/usr/* /usr sh /lkp/lkp/src/rootfs/addon/etc/init.d/lkp-bootstrap -- 2.23.0

-cp /lkp/lkp/src/rootfs/addon/root/.ssh/id_rsa /root/.ssh/ +cp -r /lkp/lkp/src/rootfs/addon/root/. /root
cp -r /lkp/lkp/src/rootfs/addon/root/* /root
/* can't copy hidden file .ssh .xxx
you can just copy the dir root to / Thanks, Luan Shengde
Thanks, Shenwei
Thanks, Xijian
cp -r /lkp/lkp/src/rootfs/addon/usr/* /usr sh /lkp/lkp/src/rootfs/addon/etc/init.d/lkp-bootstrap -- 2.23.0
participants (3)
-
Luan Shengde
-
Xiao Shenwei
-
Xu Xijian