From e07bd90d823ee463901e3d0d4fc1a423404f338c Mon Sep 17 00:00:00 2001 From: foxfire52 Date: Wed, 27 Nov 2024 17:41:50 +0100 Subject: [PATCH 1/3] Update Dockerfile-armv7 --- docker/Dockerfile-armv7 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile-armv7 b/docker/Dockerfile-armv7 index 0a28ee6ebf2..79b98a2aecb 100644 --- a/docker/Dockerfile-armv7 +++ b/docker/Dockerfile-armv7 @@ -11,9 +11,9 @@ ENV G4F_USER_ID $G4F_USER_ID ENV G4F_DIR /app RUN apt-get update && apt-get upgrade -y \ - && apt-get install -y git \ + && apt-get install -y git curl \ && apt-get install --quiet --yes --no-install-recommends \ - build-essential libffi-dev zlib1g-dev libjpeg-dev \ + build-essential libffi-dev zlib1g-dev libjpeg-dev libssl-dev pkg-config \ # Add user and user group && groupadd -g $G4F_USER_ID $G4F_USER \ && useradd -rm -G sudo -u $G4F_USER_ID -g $G4F_USER_ID $G4F_USER \ @@ -28,6 +28,9 @@ WORKDIR $G4F_DIR ENV HOME /home/$G4F_USER ENV PATH "${HOME}/.local/bin:${PATH}" +# Install rust toolchain +RUN curl https://sh.rustup.rs -sSf | bash -s -- -y + # Create app dir and copy the project's requirements file into it RUN mkdir -p $G4F_DIR COPY requirements-min.txt $G4F_DIR From 0dbf9a4daafa5619de6ebfa91058cf6adbbbf1c5 Mon Sep 17 00:00:00 2001 From: foxfire52 Date: Wed, 27 Nov 2024 18:32:00 +0100 Subject: [PATCH 2/3] Update Dockerfile-armv7 --- docker/Dockerfile-armv7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile-armv7 b/docker/Dockerfile-armv7 index 79b98a2aecb..b1abb9d4cb0 100644 --- a/docker/Dockerfile-armv7 +++ b/docker/Dockerfile-armv7 @@ -26,7 +26,7 @@ USER $G4F_USER_ID WORKDIR $G4F_DIR ENV HOME /home/$G4F_USER -ENV PATH "${HOME}/.local/bin:${PATH}" +ENV PATH "${HOME}/.local/bin:${HOME}/.cargo/bin:${PATH}" # Install rust toolchain RUN curl https://sh.rustup.rs -sSf | bash -s -- -y From 0b0ffb3639a91f957fdb61e52ef9ae12d4190348 Mon Sep 17 00:00:00 2001 From: foxfire52 Date: Wed, 27 Nov 2024 18:34:12 +0100 Subject: [PATCH 3/3] Update Dockerfile-armv7 --- docker/Dockerfile-armv7 | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile-armv7 b/docker/Dockerfile-armv7 index b1abb9d4cb0..9cd19e351c7 100644 --- a/docker/Dockerfile-armv7 +++ b/docker/Dockerfile-armv7 @@ -59,6 +59,7 @@ RUN pip uninstall --yes \ USER root # Clean up build deps +RUN rm --recursive --force "${HOME}/.rustup" RUN apt-get purge --auto-remove --yes \ build-essential \ && apt-get clean \