Update Dockerfile

Dockerfile

@@ -1,7 +1,6 @@
-FROM  ubuntu:focal AS build-env
+FROM  debian:bookworm AS deploy-env
-RUN apt-get update &&  DEBIAN_FRONTEND="noninteractive" \
+
-    apt-get --yes --no-install-recommends install \
+RUN apt-get update && apt-get --yes --no-install-recommends install \
-    wget \
     build-essential \
     make \
     libsqlite3-dev \
@@ -12,19 +11,39 @@ RUN apt-get update &&  DEBIAN_FRONTEND="noninteractive" \
     autotools-dev \
     autoconf \
     libtool \
+    curl \
     automake \
     libffi-dev \
     ca-certificates \
     unzip \
-    libjpeg-turbo8-dev \
+    libjpeg62-turbo-dev \
     libvncserver-dev \
-    lua5.3 \
+    lua5.3
-    tree
+ENV RUSTUP_HOME=/opt/rust/rustup
+ENV CARGO_HOME=/opt/rust/cargo
 
-# app image tool support
+RUN bash -c 'curl https://sh.rustup.rs -sSf | sh -s -- -y'
-RUN DEBIAN_FRONTEND="noninteractive" \
+RUN . /opt/rust/cargo/env && rustup default stable
-    apt-get --yes --no-install-recommends install \
+RUN chmod -R 777 /opt/rust/
-    binutils coreutils desktop-file-utils fakeroot \
+RUN apt-get update && apt-get --yes --no-install-recommends install \
-    fuse libgdk-pixbuf2.0-dev patchelf python3-pip \
+    nodejs npm git wget libfuse2 fuse3
-    python3-setuptools squashfs-tools strace \
+
-    util-linux zsync
+# cross build support
+RUN dpkg --add-architecture armhf
+RUN dpkg --add-architecture arm64
+RUN apt-get update && apt-get --yes --no-install-recommends install \
+    crossbuild-essential-armhf \
+    crossbuild-essential-arm64 \
+    libsqlite3-dev:arm64 zlib1g-dev:arm64 libreadline-dev:arm64 libssl-dev:arm64 \
+    libffi-dev:arm64 libjpeg62-turbo-dev:arm64 libvncclient1:arm64 \
+    libsqlite3-dev:armhf zlib1g-dev:armhf libreadline-dev:armhf libssl-dev:armhf \
+    libffi-dev:armhf libjpeg62-turbo-dev:armhf libvncclient1:armhf
+RUN ln -sf /usr/lib/arm-linux-gnueabihf/libvncclient.so.1 /usr/lib/arm-linux-gnueabihf/libvncclient.so
+RUN ln -sf /usr/lib/aarch64-linux-gnu/libvncclient.so.1 /usr/lib/aarch64-linux-gnu/libvncclient.so
+#RUN ln -sf /usr/lib/arm-linux-gnueabihf/libjpeg.so.62 /usr/lib/arm-linux-gnueabihf/libjpeg.so
+#RUN ln -sf /usr/lib/aarch64-linux-gnu/libjpeg.so.62 /usr/lib/aarch64-linux-gnu/libjpeg.so
+
+RUN groupadd -g 1000 -o ci
+RUN useradd -m -u 1000 -g 1000 -o -s /bin/bash ci
+USER ci
+WORKDIR /home/ci

Jenkinsfile

@@ -24,18 +24,10 @@ pipeline{
         set -e
         set -x
         cd $WORKSPACE
-        # docker rmi -f $(docker images -f "dangling=true" -q)
-        docker run --rm --privileged docker/binfmt:a7996909642ee92942dcd6cff44b9b95f08dad64
-        for arch in arm arm64 amd64; do
-            echo "build for architecture $arch"
-            arch_name="${arch////-}"
         docker buildx build \
-            --platform $arch \
+            --platform amd64 \
-            --output "type=docker,push=false,name=xsangle/ci-tools:latest-$arch_name" \
+            --output "type=docker,push=false,name=xsangle/ci-tools:latest" \
             .
-            docker tag xsangle/ci-tools:latest-$arch_name workstation:5000/xsangle/ci-tools:latest-$arch_name
-            docker push workstation:5000/xsangle/ci-tools:latest-$arch_name
-        done
         '''
       }
     }