diff --git a/compile/build-alpine/Dockerfile b/compile/build-alpine/Dockerfile index a767b6c2..83f3fafa 100644 --- a/compile/build-alpine/Dockerfile +++ b/compile/build-alpine/Dockerfile @@ -165,16 +165,16 @@ COPY --from=xrdp ${STATIC} /rootfs${STATIC} COPY --from=dropbear ${STATIC} /rootfs${STATIC} COPY --from=suckless ${STATIC} /rootfs${STATIC} -# clear lib,share/man; create links -RUN rm -rf /rootfs/bin /rootfs/sbin; mkdir -p /rootfs/bin /rootfs/sbin; \ +# clear lib,share/man; create links: (ubt/deb: bin> /usr/bin) +RUN rm -rf /rootfs/usr/bin /rootfs/usr/sbin; mkdir -p /rootfs/usr/bin /rootfs/usr/sbin; \ find /rootfs/usr/local/static -type d |egrep "/share/man$|xrdp/lib$" | \ while read one; do du -sh $one; rm -rf $one; done; \ \ find /rootfs/usr/local/static -type f |grep "/sbin/" |sort | \ - while read one; do ls -lh $one; one2=$(echo $one|sed "s^/rootfs^^g"); ln -s $one2 /rootfs/sbin/; done; \ + while read one; do ls -lh $one; one2=$(echo $one|sed "s^/rootfs^^g"); ln -s $one2 /rootfs/usr/sbin/; done; \ \ find /rootfs/usr/local/static -type f |grep "/bin/" |sort | \ - while read one; do ls -lh $one; one2=$(echo $one|sed "s^/rootfs^^g"); ln -s $one2 /rootfs/bin/; done; + while read one; do ls -lh $one; one2=$(echo $one|sed "s^/rootfs^^g"); ln -s $one2 /rootfs/usr/bin/; done; # keeplist, outDir; # .. # upx