diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index d807a86..1675d59 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -1,7 +1,4 @@ FROM debian:bookworm AS deploy-env -ARG UNAME=ci -ARG UID=1000 -ARG GID=1000 RUN apt-get update && apt-get --yes --no-install-recommends install \ build-essential \ @@ -19,11 +16,14 @@ RUN apt-get update && apt-get --yes --no-install-recommends install \ libffi-dev \ ca-certificates \ unzip \ - libturbojpeg0-dev \ + libjpeg62-turbo-dev \ libvncserver-dev \ lua5.3 +ENV RUSTUP_HOME=/opt/rust/rustup +ENV CARGO_HOME=/opt/rust/cargo -RUN RUSTUP_HOME=/opt/rust/rustup CARGO_HOME=/opt/rust/cargo bash -c 'curl https://sh.rustup.rs -sSf | sh -s -- -y' +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 @@ -33,13 +33,17 @@ 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-armhf \ - libsqlite3-0:arm64 zlib1g:arm64 libreadline8:arm64 libssl3:arm64 \ - libffi-dev:arm64 libturbojpeg0:arm64 libvncclient1:arm64 \ - libsqlite3-0:armhf zlib1g:armhf libreadline8:armhf libssl3:armhf \ - libffi-dev:armhf libturbojpeg0:armhf libvncclient1: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 \ No newline at end of file +WORKDIR /home/ci