Fix remove NoowAi, Fix download dir in docker

This commit is contained in:
Heiner Lohaus 2023-12-16 20:17:02 +01:00
parent b615a95a41
commit 854dc6c90f
3 changed files with 14 additions and 4 deletions

View File

@ -155,6 +155,7 @@ cd gpt4free
4. Build the Docker image: 4. Build the Docker image:
```bash ```bash
docker pull selenium/node-chrome
docker-compose build docker-compose build
``` ```

View File

@ -11,8 +11,12 @@ ENV G4F_USER ${G4F_USER:-g4f}
ARG G4F_USER_ID ARG G4F_USER_ID
ENV G4F_USER_ID ${G4F_USER_ID:-1000} ENV G4F_USER_ID ${G4F_USER_ID:-1000}
ARG G4F_NO_GUI ARG G4F_NO_GUI
ENV G4F_NO_GUI ${G4F_NO_GUI} ENV G4F_NO_GUI $G4F_NO_GUI
ENV HOME /home/$G4F_USER ENV HOME /home/$G4F_USER
ENV SE_DOWNLOAD_DIR $HOME/Downloads
ENV SEL_USER $G4F_USER
ENV SEL_UID $G4F_USER_ID
ENV SEL_GID $G4F_USER_ID
USER root USER root
@ -46,9 +50,15 @@ RUN if [ "$G4F_NO_GUI" ] ; then \
# Change background image # Change background image
COPY docker/background.png /usr/share/images/fluxbox/ubuntu-light.png COPY docker/background.png /usr/share/images/fluxbox/ubuntu-light.png
# Switch user # Add user
RUN groupadd -g $G4F_USER_ID $G4F_USER RUN groupadd -g $G4F_USER_ID $G4F_USER
RUN useradd -rm -G sudo -u $G4F_USER_ID -g $G4F_USER_ID $G4F_USER RUN useradd -rm -G sudo -u $G4F_USER_ID -g $G4F_USER_ID $G4F_USER
# Fix permissions
RUN mkdir "${SE_DOWNLOAD_DIR}"
RUN chown "${G4F_USER_ID}:${G4F_USER_ID}" $SE_DOWNLOAD_DIR /var/run/supervisor /var/log/supervisor
# Switch user
USER $G4F_USER_ID USER $G4F_USER_ID
# Set the working directory in the container. # Set the working directory in the container.
@ -61,7 +71,7 @@ COPY requirements.txt $G4F_DIR
RUN pip install --upgrade pip && pip install -r requirements.txt RUN pip install --upgrade pip && pip install -r requirements.txt
# Copy the entire package into the container. # Copy the entire package into the container.
ADD --chown=$G4F_USER g4f $G4F_DIR/ ADD --chown=$G4F_USER:$G4F_USER g4f $G4F_DIR/
# Expose ports # Expose ports
EXPOSE 8080 1337 EXPOSE 8080 1337

View File

@ -39,7 +39,6 @@ from .Koala import Koala
from .Liaobots import Liaobots from .Liaobots import Liaobots
from .Llama2 import Llama2 from .Llama2 import Llama2
from .MyShell import MyShell from .MyShell import MyShell
from .NoowAi import NoowAi
from .OnlineGpt import OnlineGpt from .OnlineGpt import OnlineGpt
from .Opchatgpts import Opchatgpts from .Opchatgpts import Opchatgpts
from .PerplexityAi import PerplexityAi from .PerplexityAi import PerplexityAi