From 4ad50170624c76cb5947d69f6444bad68856356c Mon Sep 17 00:00:00 2001 From: dany Date: Sun, 10 Mar 2024 15:34:09 +0100 Subject: [PATCH] Update Dockerfile --- Dockerfile | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3e7ad49..de9b964 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ -FROM ubuntu:jammy AS build-env -RUN apt-get update && DEBIAN_FRONTEND="noninteractive" \ - apt-get --yes --no-install-recommends install \ - wget curl\ +FROM debian:bookworm AS deploy-env + +RUN apt-get update && apt-get --yes --no-install-recommends install \ build-essential \ make \ libsqlite3-dev \ @@ -12,16 +11,34 @@ 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 \ - tree \ - gdb -RUN apt-get update && DEBIAN_FRONTEND="noninteractive" \ - apt-get --yes --no-install-recommends install git -#RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo bash -c 'curl https://sh.rustup.rs -sSf | sh -s -- -y' -#RUN chmod -R 777 /opt/rust/ \ No newline at end of file + lua5.3 +ENV RUSTUP_HOME=/opt/rust/rustup +ENV CARGO_HOME=/opt/rust/cargo + +RUN bash -c 'curl https://sh.rustup.rs -sSf | sh -s -- -y' +RUN . /opt/rust/cargo/env && rustup default stable +RUN chmod -R 777 /opt/rust/ +RUN apt-get update && apt-get --yes --no-install-recommends install \ + nodejs npm git wget libfuse2 fuse3 + +# 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 \ No newline at end of file