FreeGPT improved

FreeGPT improved


FreeGPT improved


FreeGPT improved


FreeGPT improved


FreeGPT improved


FreeGPT improved
This commit is contained in:
STAM 2023-07-05 17:46:07 +03:00
parent 8111e059b9
commit c6d33c1741
Signed by: stam
GPG Key ID: 4F57E51F9C45F8CD
50 changed files with 434 additions and 306 deletions

View File

@ -24,45 +24,28 @@ jobs:
run: make
- name: Build and Deploy freegpt-webui 1.0
run: cd linux/ecosystem/freegpt-webui/chat/1.0 && make build && make deploy
run: cd linux/ecosystem/freegpt-webui/1.0 && make build && make deploy
- name: Build and Deploy freegpt-webui 1.1
run: cd linux/ecosystem/freegpt-webui/chat/1.1 && make build && make deploy
run: cd linux/ecosystem/freegpt-webui/1.1 && make build && make deploy
- name: Build and Deploy freegpt-webui 1.2
run: cd linux/ecosystem/freegpt-webui/chat/1.2 && make build && make deploy
run: cd linux/ecosystem/freegpt-webui/1.2 && make build && make deploy
- name: Build and Deploy freegpt-webui 1.3
run: cd linux/ecosystem/freegpt-webui/chat/1.3 && make build && make deploy
run: cd linux/ecosystem/freegpt-webui/1.3 && make build && make deploy
- name: Build and Deploy freegpt-webui 1.3.1
run: cd linux/ecosystem/freegpt-webui/chat/1.3.1 && make build && make deploy
run: cd linux/ecosystem/freegpt-webui/1.3.1 && make build && make deploy
- name: Build and Deploy freegpt-webui 1.3.2
run: cd linux/ecosystem/freegpt-webui/chat/1.3.2 && make build && make deploy
run: cd linux/ecosystem/freegpt-webui/1.3.2 && make build && make deploy
- name: Build and Deploy freegpt-webui 1.4
run: cd linux/ecosystem/freegpt-webui/chat/1.4 && make build && make deploy
run: cd linux/ecosystem/freegpt-webui/1.4 && make build && make deploy
- name: Build and Deploy freegpt-webui latest
run: cd linux/ecosystem/freegpt-webui/chat/latest && make build && make deploy
##################################################################################
- name: Build and Deploy freegpt-webui endpoint 1.3
run: cd linux/ecosystem/freegpt-webui/endpoint/1.3 && make build && make deploy
- name: Build and Deploy freegpt-webui endpoint 1.3.1
run: cd linux/ecosystem/freegpt-webui/endpoint/1.3.1 && make build && make deploy
- name: Build and Deploy freegpt-webui endpoint 1.3.2
run: cd linux/ecosystem/freegpt-webui/endpoint/1.3.2 && make build && make deploy
- name: Build and Deploy freegpt-webui endpoint 1.4
run: cd linux/ecosystem/freegpt-webui/endpoint/1.4 && make build && make deploy
- name: Build and Deploy freegpt-webui endpoint latest
run: cd linux/ecosystem/freegpt-webui/endpoint/latest && make build && make deploy
run: cd linux/ecosystem/freegpt-webui/latest && make build && make deploy
##################################################################################
- name: Cleanup

View File

@ -403,21 +403,14 @@ ecosystem-nodejs-images:
cd `pwd`/linux/ecosystem/nodejs/node20 && pwd && make build && make deploy
ecosystem-freegpt-webui-images:
cd `pwd`/linux/ecosystem/freegpt-webui/chat/1.0 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/chat/1.1 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/chat/1.2 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/chat/1.3 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/chat/1.3.1 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/chat/1.3.2 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/chat/1.4 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/chat/latest && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/endpoint/1.3 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/endpoint/1.3.1 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/endpoint/1.3.2 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/endpoint/1.4 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/endpoint/latest && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/1.0 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/1.1 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/1.2 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/1.3 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/1.3.1 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/1.3.2 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/1.4 && pwd && make build && make deploy
cd `pwd`/linux/ecosystem/freegpt-webui/latest && pwd && make build && make deploy
ecosystem-vk2discord-images:
cd `pwd`/linux/ecosystem/vk2discord && pwd && make build && make deploy

View File

@ -11,8 +11,6 @@ ARG FREEGPT_VERSION=1.0
ENV FREEGPT_PATH=/app
ENV FREEGPT_PORT=1338
ENV FREEGTP_PY_BIN=/root/.local/bin
ENV PATH=/root/.local/bin:$PATH
RUN git clone --depth 1 --branch ${FREEGPT_VERSION} https://github.com/Em1tSan/freegpt-webui-ru.git ${FREEGPT_PATH} && \
rm -rfv ${FREEGPT_PATH}/.git
@ -24,6 +22,8 @@ RUN apt-get update && \
libcurl4-openssl-dev && \
pip3 install --user --no-cache-dir -r ${FREEGPT_PATH}/requirements.txt
RUN find ${FREEGPT_PATH} -type f -exec dos2unix -k -s -o {} ';'
##################################################################
##################################################################
##################################################################
@ -35,16 +35,23 @@ FROM epicmorg/python:3.10 AS production
ENV FREEGPT_PATH=/app
ENV FREEGPT_PORT=1338
ENV FREEGTP_PY_BIN=/root/.local/bin
ENV PATH=/root/.local/bin:$PATH
RUN mkdir -p ${FREEGTP_PY_BIN} ${FREEGPT_PATH}
RUN mkdir -p ${FREEGPT_PATH}
##################################################################
# Setup supervisord
##################################################################
RUN apt-get update && \
apt-get install -y \
supervisor
COPY etc/supervisor/conf.d/freegpt.conf /etc/supervisor/conf.d/freegpt.conf
##################################################################
# Copy bins
##################################################################
COPY --from=build /root/.local /root/.local
COPY --from=build /app /app
COPY --from=build /root/.local /usr/local
COPY --from=build /app ${FREEGPT_PATH}
##################################################################
# cleaninig up
@ -59,4 +66,4 @@ RUN apt clean -y && \
WORKDIR ${FREEGPT_PATH}
EXPOSE ${FREEGPT_PORT}
CMD ["python3", "./run.py"]
CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/conf.d/freegpt.conf"]

View File

@ -0,0 +1,29 @@
[unix_http_server]
file=/var/run/supervisor.sock ; (the path to the socket file)
chmod=0700 ; sockef file mode (default 0700)
username = freegpt
password = freegpt
[supervisord]
logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP)
nodaemon=true
user=root
[rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
[supervisorctl]
serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket
username = freegpt
password = freegpt
[program:freegpt-webui]
command=/usr/local/bin/python3.10 /app/run.py
directory=/app
user=root
autostart=true
autorestart=unexpected
priority=666
startsecs=5

View File

@ -11,8 +11,6 @@ ARG FREEGPT_VERSION=1.1
ENV FREEGPT_PATH=/app
ENV FREEGPT_PORT=1338
ENV FREEGTP_PY_BIN=/root/.local/bin
ENV PATH=/root/.local/bin:$PATH
RUN git clone --depth 1 --branch ${FREEGPT_VERSION} https://github.com/Em1tSan/freegpt-webui-ru.git ${FREEGPT_PATH} && \
rm -rfv ${FREEGPT_PATH}/.git
@ -24,6 +22,8 @@ RUN apt-get update && \
libcurl4-openssl-dev && \
pip3 install --user --no-cache-dir -r ${FREEGPT_PATH}/requirements.txt
RUN find ${FREEGPT_PATH} -type f -exec dos2unix -k -s -o {} ';'
##################################################################
##################################################################
##################################################################
@ -35,16 +35,23 @@ FROM epicmorg/python:3.10 AS production
ENV FREEGPT_PATH=/app
ENV FREEGPT_PORT=1338
ENV FREEGTP_PY_BIN=/root/.local/bin
ENV PATH=/root/.local/bin:$PATH
RUN mkdir -p ${FREEGTP_PY_BIN} ${FREEGPT_PATH}
RUN mkdir -p ${FREEGPT_PATH}
##################################################################
# Setup supervisord
##################################################################
RUN apt-get update && \
apt-get install -y \
supervisor
COPY etc/supervisor/conf.d/freegpt.conf /etc/supervisor/conf.d/freegpt.conf
##################################################################
# Copy bins
##################################################################
COPY --from=build /root/.local /root/.local
COPY --from=build /app /app
COPY --from=build /root/.local /usr/local
COPY --from=build /app ${FREEGPT_PATH}
##################################################################
# cleaninig up
@ -59,4 +66,4 @@ RUN apt clean -y && \
WORKDIR ${FREEGPT_PATH}
EXPOSE ${FREEGPT_PORT}
CMD ["python3", "./run.py"]
CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/conf.d/freegpt.conf"]

View File

@ -0,0 +1,29 @@
[unix_http_server]
file=/var/run/supervisor.sock ; (the path to the socket file)
chmod=0700 ; sockef file mode (default 0700)
username = freegpt
password = freegpt
[supervisord]
logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP)
nodaemon=true
user=root
[rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
[supervisorctl]
serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket
username = freegpt
password = freegpt
[program:freegpt-webui]
command=/usr/local/bin/python3.10 /app/run.py
directory=/app
user=root
autostart=true
autorestart=unexpected
priority=666
startsecs=5

View File

@ -11,8 +11,6 @@ ARG FREEGPT_VERSION=1.2
ENV FREEGPT_PATH=/app
ENV FREEGPT_PORT=1338
ENV FREEGTP_PY_BIN=/root/.local/bin
ENV PATH=/root/.local/bin:$PATH
RUN git clone --depth 1 --branch ${FREEGPT_VERSION} https://github.com/Em1tSan/freegpt-webui-ru.git ${FREEGPT_PATH} && \
rm -rfv ${FREEGPT_PATH}/.git
@ -24,6 +22,8 @@ RUN apt-get update && \
libcurl4-openssl-dev && \
pip3 install --user --no-cache-dir -r ${FREEGPT_PATH}/requirements.txt
RUN find ${FREEGPT_PATH} -type f -exec dos2unix -k -s -o {} ';'
##################################################################
##################################################################
##################################################################
@ -35,16 +35,23 @@ FROM epicmorg/python:3.10 AS production
ENV FREEGPT_PATH=/app
ENV FREEGPT_PORT=1338
ENV FREEGTP_PY_BIN=/root/.local/bin
ENV PATH=/root/.local/bin:$PATH
RUN mkdir -p ${FREEGTP_PY_BIN} ${FREEGPT_PATH}
RUN mkdir -p ${FREEGPT_PATH}
##################################################################
# Setup supervisord
##################################################################
RUN apt-get update && \
apt-get install -y \
supervisor
COPY etc/supervisor/conf.d/freegpt.conf /etc/supervisor/conf.d/freegpt.conf
##################################################################
# Copy bins
##################################################################
COPY --from=build /root/.local /root/.local
COPY --from=build /app /app
COPY --from=build /root/.local /usr/local
COPY --from=build /app ${FREEGPT_PATH}
##################################################################
# cleaninig up
@ -59,4 +66,4 @@ RUN apt clean -y && \
WORKDIR ${FREEGPT_PATH}
EXPOSE ${FREEGPT_PORT}
CMD ["python3", "./run.py"]
CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/conf.d/freegpt.conf"]

View File

@ -0,0 +1,29 @@
[unix_http_server]
file=/var/run/supervisor.sock ; (the path to the socket file)
chmod=0700 ; sockef file mode (default 0700)
username = freegpt
password = freegpt
[supervisord]
logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP)
nodaemon=true
user=root
[rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
[supervisorctl]
serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket
username = freegpt
password = freegpt
[program:freegpt-webui]
command=/usr/local/bin/python3.10 /app/run.py
directory=/app
user=root
autostart=true
autorestart=unexpected
priority=666
startsecs=5

View File

@ -11,8 +11,7 @@ ARG FREEGPT_VERSION=1.3.1
ENV FREEGPT_PATH=/app
ENV FREEGPT_PORT=1338
ENV FREEGTP_PY_BIN=/root/.local/bin
ENV PATH=/root/.local/bin:$PATH
ENV FREEGPT_ENDPOINT_PORT=1337
RUN git clone --depth 1 --branch ${FREEGPT_VERSION} https://github.com/Em1tSan/freegpt-webui-ru.git ${FREEGPT_PATH} && \
rm -rfv ${FREEGPT_PATH}/.git
@ -24,6 +23,8 @@ RUN apt-get update && \
libcurl4-openssl-dev && \
pip3 install --user --no-cache-dir -r ${FREEGPT_PATH}/requirements.txt
RUN find ${FREEGPT_PATH} -type f -exec dos2unix -k -s -o {} ';'
##################################################################
##################################################################
##################################################################
@ -35,16 +36,24 @@ FROM epicmorg/python:3.10 AS production
ENV FREEGPT_PATH=/app
ENV FREEGPT_PORT=1338
ENV FREEGTP_PY_BIN=/root/.local/bin
ENV PATH=/root/.local/bin:$PATH
ENV FREEGPT_ENDPOINT_PORT=1337
RUN mkdir -p ${FREEGTP_PY_BIN} ${FREEGPT_PATH}
RUN mkdir -p ${FREEGPT_PATH}
##################################################################
# Setup supervisord
##################################################################
RUN apt-get update && \
apt-get install -y \
supervisor
COPY etc/supervisor/conf.d/freegpt.conf /etc/supervisor/conf.d/freegpt.conf
##################################################################
# Copy bins
##################################################################
COPY --from=build /root/.local /root/.local
COPY --from=build /app /app
COPY --from=build /root/.local /usr/local
COPY --from=build /app ${FREEGPT_PATH}
##################################################################
# cleaninig up
@ -57,6 +66,6 @@ RUN apt clean -y && \
rm -rfv /tmp/*
WORKDIR ${FREEGPT_PATH}
EXPOSE ${FREEGPT_PORT}
EXPOSE ${FREEGPT_PORT} ${FREEGPT_ENDPOINT_PORT}
CMD ["python3", "./run.py"]
CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/conf.d/freegpt.conf"]

View File

@ -0,0 +1,38 @@
[unix_http_server]
file=/var/run/supervisor.sock ; (the path to the socket file)
chmod=0700 ; sockef file mode (default 0700)
username = freegpt
password = freegpt
[supervisord]
logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP)
nodaemon=true
user=root
[rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
[supervisorctl]
serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket
username = freegpt
password = freegpt
[program:freegpt-webui]
command=/usr/local/bin/python3.10 /app/run.py
directory=/app
user=root
autostart=true
autorestart=unexpected
priority=666
startsecs=5
[program:freegpt-endpoint]
command=/usr/local/bin/python3.10 /app/endpoint.py
directory=/app
user=root
autostart=true
autorestart=unexpected
priority=777
startsecs=7

View File

@ -11,8 +11,7 @@ ARG FREEGPT_VERSION=1.3.2
ENV FREEGPT_PATH=/app
ENV FREEGPT_PORT=1338
ENV FREEGTP_PY_BIN=/root/.local/bin
ENV PATH=/root/.local/bin:$PATH
ENV FREEGPT_ENDPOINT_PORT=1337
RUN git clone --depth 1 --branch ${FREEGPT_VERSION} https://github.com/Em1tSan/freegpt-webui-ru.git ${FREEGPT_PATH} && \
rm -rfv ${FREEGPT_PATH}/.git
@ -24,6 +23,8 @@ RUN apt-get update && \
libcurl4-openssl-dev && \
pip3 install --user --no-cache-dir -r ${FREEGPT_PATH}/requirements-docker.txt
RUN find ${FREEGPT_PATH} -type f -exec dos2unix -k -s -o {} ';'
##################################################################
##################################################################
##################################################################
@ -35,16 +36,24 @@ FROM epicmorg/python:3.10 AS production
ENV FREEGPT_PATH=/app
ENV FREEGPT_PORT=1338
ENV FREEGTP_PY_BIN=/root/.local/bin
ENV PATH=/root/.local/bin:$PATH
ENV FREEGPT_ENDPOINT_PORT=1337
RUN mkdir -p ${FREEGTP_PY_BIN} ${FREEGPT_PATH}
RUN mkdir -p ${FREEGPT_PATH}
##################################################################
# Setup supervisord
##################################################################
RUN apt-get update && \
apt-get install -y \
supervisor
COPY etc/supervisor/conf.d/freegpt.conf /etc/supervisor/conf.d/freegpt.conf
##################################################################
# Copy bins
##################################################################
COPY --from=build /root/.local /root/.local
COPY --from=build /app /app
COPY --from=build /root/.local /usr/local
COPY --from=build /app ${FREEGPT_PATH}
##################################################################
# cleaninig up
@ -57,6 +66,6 @@ RUN apt clean -y && \
rm -rfv /tmp/*
WORKDIR ${FREEGPT_PATH}
EXPOSE ${FREEGPT_PORT}
EXPOSE ${FREEGPT_PORT} ${FREEGPT_ENDPOINT_PORT}
CMD ["python3", "./run.py"]
CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/conf.d/freegpt.conf"]

View File

@ -0,0 +1,38 @@
[unix_http_server]
file=/var/run/supervisor.sock ; (the path to the socket file)
chmod=0700 ; sockef file mode (default 0700)
username = freegpt
password = freegpt
[supervisord]
logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP)
nodaemon=true
user=root
[rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
[supervisorctl]
serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket
username = freegpt
password = freegpt
[program:freegpt-webui]
command=/usr/local/bin/python3.10 /app/run.py
directory=/app
user=root
autostart=true
autorestart=unexpected
priority=666
startsecs=5
[program:freegpt-endpoint]
command=/usr/local/bin/python3.10 /app/endpoint.py
directory=/app
user=root
autostart=true
autorestart=unexpected
priority=777
startsecs=7

View File

@ -11,8 +11,7 @@ ARG FREEGPT_VERSION=1.3
ENV FREEGPT_PATH=/app
ENV FREEGPT_PORT=1338
ENV FREEGTP_PY_BIN=/root/.local/bin
ENV PATH=/root/.local/bin:$PATH
ENV FREEGPT_ENDPOINT_PORT=1337
RUN git clone --depth 1 --branch ${FREEGPT_VERSION} https://github.com/Em1tSan/freegpt-webui-ru.git ${FREEGPT_PATH} && \
rm -rfv ${FREEGPT_PATH}/.git
@ -24,6 +23,8 @@ RUN apt-get update && \
libcurl4-openssl-dev && \
pip3 install --user --no-cache-dir -r ${FREEGPT_PATH}/requirements.txt
RUN find ${FREEGPT_PATH} -type f -exec dos2unix -k -s -o {} ';'
##################################################################
##################################################################
##################################################################
@ -35,16 +36,24 @@ FROM epicmorg/python:3.10 AS production
ENV FREEGPT_PATH=/app
ENV FREEGPT_PORT=1338
ENV FREEGTP_PY_BIN=/root/.local/bin
ENV PATH=/root/.local/bin:$PATH
ENV FREEGPT_ENDPOINT_PORT=1337
RUN mkdir -p ${FREEGTP_PY_BIN} ${FREEGPT_PATH}
RUN mkdir -p ${FREEGPT_PATH}
##################################################################
# Setup supervisord
##################################################################
RUN apt-get update && \
apt-get install -y \
supervisor
COPY etc/supervisor/conf.d/freegpt.conf /etc/supervisor/conf.d/freegpt.conf
##################################################################
# Copy bins
##################################################################
COPY --from=build /root/.local /root/.local
COPY --from=build /app /app
COPY --from=build /root/.local /usr/local
COPY --from=build /app ${FREEGPT_PATH}
##################################################################
# cleaninig up
@ -57,6 +66,6 @@ RUN apt clean -y && \
rm -rfv /tmp/*
WORKDIR ${FREEGPT_PATH}
EXPOSE ${FREEGPT_PORT}
EXPOSE ${FREEGPT_PORT} ${FREEGPT_ENDPOINT_PORT}
CMD ["python3", "./run.py"]
CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/conf.d/freegpt.conf"]

View File

@ -0,0 +1,38 @@
[unix_http_server]
file=/var/run/supervisor.sock ; (the path to the socket file)
chmod=0700 ; sockef file mode (default 0700)
username = freegpt
password = freegpt
[supervisord]
logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP)
nodaemon=true
user=root
[rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
[supervisorctl]
serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket
username = freegpt
password = freegpt
[program:freegpt-webui]
command=/usr/local/bin/python3.10 /app/run.py
directory=/app
user=root
autostart=true
autorestart=unexpected
priority=666
startsecs=5
[program:freegpt-endpoint]
command=/usr/local/bin/python3.10 /app/endpoint.py
directory=/app
user=root
autostart=true
autorestart=unexpected
priority=777
startsecs=7

View File

@ -11,8 +11,7 @@ ARG FREEGPT_VERSION=1.4
ENV FREEGPT_PATH=/app
ENV FREEGPT_PORT=1338
ENV FREEGTP_PY_BIN=/root/.local/bin
ENV PATH=/root/.local/bin:$PATH
ENV FREEGPT_ENDPOINT_PORT=1337
RUN git clone --depth 1 --branch ${FREEGPT_VERSION} https://github.com/Em1tSan/freegpt-webui-ru.git ${FREEGPT_PATH} && \
rm -rfv ${FREEGPT_PATH}/.git
@ -24,6 +23,8 @@ RUN apt-get update && \
libcurl4-openssl-dev && \
pip3 install --user --no-cache-dir -r ${FREEGPT_PATH}/requirements-docker.txt
RUN find ${FREEGPT_PATH} -type f -exec dos2unix -k -s -o {} ';'
##################################################################
##################################################################
##################################################################
@ -35,16 +36,24 @@ FROM epicmorg/python:3.10 AS production
ENV FREEGPT_PATH=/app
ENV FREEGPT_PORT=1338
ENV FREEGTP_PY_BIN=/root/.local/bin
ENV PATH=/root/.local/bin:$PATH
ENV FREEGPT_ENDPOINT_PORT=1337
RUN mkdir -p ${FREEGTP_PY_BIN} ${FREEGPT_PATH}
RUN mkdir -p ${FREEGPT_PATH}
##################################################################
# Setup supervisord
##################################################################
RUN apt-get update && \
apt-get install -y \
supervisor
COPY etc/supervisor/conf.d/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
##################################################################
# Copy bins
##################################################################
COPY --from=build /root/.local /root/.local
COPY --from=build /app /app
COPY --from=build /root/.local /usr/local
COPY --from=build /app ${FREEGPT_PATH}
##################################################################
# cleaninig up
@ -57,6 +66,6 @@ RUN apt clean -y && \
rm -rfv /tmp/*
WORKDIR ${FREEGPT_PATH}
EXPOSE ${FREEGPT_PORT}
EXPOSE ${FREEGPT_PORT} ${FREEGPT_ENDPOINT_PORT}
CMD ["python3", "./run.py"]
CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/conf.d/freegpt.conf"]

View File

@ -0,0 +1,38 @@
[unix_http_server]
file=/var/run/supervisor.sock ; (the path to the socket file)
chmod=0700 ; sockef file mode (default 0700)
username = freegpt
password = freegpt
[supervisord]
logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP)
nodaemon=true
user=root
[rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
[supervisorctl]
serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket
username = freegpt
password = freegpt
[program:freegpt-webui]
command=/usr/local/bin/python3.10 /app/run.py
directory=/app
user=root
autostart=true
autorestart=unexpected
priority=666
startsecs=5
[program:freegpt-endpoint]
command=/usr/local/bin/python3.10 /app/endpoint.py
directory=/app
user=root
autostart=true
autorestart=unexpected
priority=777
startsecs=7

View File

@ -3,32 +3,21 @@
* Improved docker images.
* Original repo here: [Em1tSan/freegpt-webui-ru](https://github.com/Em1tSan/freegpt-webui-ru)
## Ready docker-compose example
* All versions now running by `supervisord` instead of direct `CMD python3 ./run.py`
* Since `v1.3+` image contain **both** applications in background - `webui` chat (via port `1338`) and `endpoint` api (via port `1337`).
### Normal WebUI (All versions)
# Ready docker-compose example
```yml
version: "3.9"
services:
freegpt-webui:
image: epicmorg/freegpt-webui:latest #1.3.2, 1.3.1, etc
container_name: freegpt-webui
hostname: freegpt-webui
restart: always
ports:
- 1338:1338
```
### Endpoint API (v1.3+ only)
```yml
version: "3.9"
services:
freegpt-webui:
image: epicmorg/freegpt-webui:latest-endpoint # 1.3, 1.3.1, 1.3.2, 1.4, etc
image: epicmorg/freegpt-webui:latest #1.3.2, <...>, 1.0, etc
container_name: freegpt-webui
hostname: freegpt-webui
restart: always
ports:
- 1337:1337
- 1338:1338
```

View File

@ -1,11 +0,0 @@
##################################################################
##################################################################
##################################################################
# Production stage
##################################################################
##################################################################
##################################################################
FROM epicmorg/freegpt-webui:1.3.1 AS production
ENV FREEGPT_PORT=1337
CMD ["python3", "./endpoint.py"]

View File

@ -1,19 +0,0 @@
all: app
app:
make build
make deploy
make clean
build:
docker-compose build --compress --no-cache --progress plain
deploy:
docker-compose push
clean:
docker container prune -f
docker image prune -f
docker network prune -f
docker volume prune -f
docker system prune -af

View File

@ -1,6 +0,0 @@
version: '3.9'
services:
app:
image: "epicmorg/freegpt-webui:1.3.1-endpoint"
build:
context: .

View File

@ -1,11 +0,0 @@
##################################################################
##################################################################
##################################################################
# Production stage
##################################################################
##################################################################
##################################################################
FROM epicmorg/freegpt-webui:1.3.2 AS production
ENV FREEGPT_PORT=1337
CMD ["python3", "./endpoint.py"]

View File

@ -1,19 +0,0 @@
all: app
app:
make build
make deploy
make clean
build:
docker-compose build --compress --no-cache --progress plain
deploy:
docker-compose push
clean:
docker container prune -f
docker image prune -f
docker network prune -f
docker volume prune -f
docker system prune -af

View File

@ -1,6 +0,0 @@
version: '3.9'
services:
app:
image: "epicmorg/freegpt-webui:1.3.2-endpoint"
build:
context: .

View File

@ -1,11 +0,0 @@
##################################################################
##################################################################
##################################################################
# Production stage
##################################################################
##################################################################
##################################################################
FROM epicmorg/freegpt-webui:1.3 AS production
ENV FREEGPT_PORT=1337
CMD ["python3", "./endpoint.py"]

View File

@ -1,19 +0,0 @@
all: app
app:
make build
make deploy
make clean
build:
docker-compose build --compress --no-cache --progress plain
deploy:
docker-compose push
clean:
docker container prune -f
docker image prune -f
docker network prune -f
docker volume prune -f
docker system prune -af

View File

@ -1,6 +0,0 @@
version: '3.9'
services:
app:
image: "epicmorg/freegpt-webui:1.3-endpoint"
build:
context: .

View File

@ -1,11 +0,0 @@
##################################################################
##################################################################
##################################################################
# Production stage
##################################################################
##################################################################
##################################################################
FROM epicmorg/freegpt-webui:1.4 AS production
ENV FREEGPT_PORT=1337
CMD ["python3", "./endpoint.py"]

View File

@ -1,19 +0,0 @@
all: app
app:
make build
make deploy
make clean
build:
docker-compose build --compress --no-cache --progress plain
deploy:
docker-compose push
clean:
docker container prune -f
docker image prune -f
docker network prune -f
docker volume prune -f
docker system prune -af

View File

@ -1,6 +0,0 @@
version: '3.9'
services:
app:
image: "epicmorg/freegpt-webui:1.4-endpoint"
build:
context: .

View File

@ -1,11 +0,0 @@
##################################################################
##################################################################
##################################################################
# Production stage
##################################################################
##################################################################
##################################################################
FROM epicmorg/freegpt-webui:latest AS production
ENV FREEGPT_PORT=1337
CMD ["python3", "./endpoint.py"]

View File

@ -1,19 +0,0 @@
all: app
app:
make build
make deploy
make clean
build:
docker-compose build --compress --no-cache --progress plain
deploy:
docker-compose push
clean:
docker container prune -f
docker image prune -f
docker network prune -f
docker volume prune -f
docker system prune -af

View File

@ -1,6 +0,0 @@
version: '3.9'
services:
app:
image: "epicmorg/freegpt-webui:latest-endpoint"
build:
context: .

View File

@ -9,8 +9,7 @@ FROM epicmorg/python:3.10-develop AS build
ENV FREEGPT_PATH=/app
ENV FREEGPT_PORT=1338
ENV FREEGTP_PY_BIN=/root/.local/bin
ENV PATH=/root/.local/bin:$PATH
ENV FREEGPT_ENDPOINT_PORT=1337
RUN git clone https://github.com/Em1tSan/freegpt-webui-ru.git ${FREEGPT_PATH} && \
rm -rfv ${FREEGPT_PATH}/.git
@ -22,6 +21,8 @@ RUN apt-get update && \
libcurl4-openssl-dev && \
pip3 install --user --no-cache-dir -r ${FREEGPT_PATH}/requirements-docker.txt
RUN find ${FREEGPT_PATH} -type f -exec dos2unix -k -s -o {} ';'
##################################################################
##################################################################
##################################################################
@ -33,16 +34,24 @@ FROM epicmorg/python:3.10 AS production
ENV FREEGPT_PATH=/app
ENV FREEGPT_PORT=1338
ENV FREEGTP_PY_BIN=/root/.local/bin
ENV PATH=/root/.local/bin:$PATH
ENV FREEGPT_ENDPOINT_PORT=1337
RUN mkdir -p ${FREEGTP_PY_BIN} ${FREEGPT_PATH}
RUN mkdir -p ${FREEGPT_PATH}
##################################################################
# Setup supervisord
##################################################################
RUN apt-get update && \
apt-get install -y \
supervisor
COPY etc/supervisor/conf.d/freegpt.conf /etc/supervisor/conf.d/freegpt.conf
##################################################################
# Copy bins
##################################################################
COPY --from=build /root/.local /root/.local
COPY --from=build /app /app
COPY --from=build /root/.local /usr/local
COPY --from=build /app ${FREEGPT_PATH}
##################################################################
# cleaninig up
@ -55,6 +64,6 @@ RUN apt clean -y && \
rm -rfv /tmp/*
WORKDIR ${FREEGPT_PATH}
EXPOSE ${FREEGPT_PORT}
EXPOSE ${FREEGPT_PORT} ${FREEGPT_ENDPOINT_PORT}
CMD ["python3", "./run.py"]
CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/conf.d/freegpt.conf"]

View File

@ -0,0 +1,38 @@
[unix_http_server]
file=/var/run/supervisor.sock ; (the path to the socket file)
chmod=0700 ; sockef file mode (default 0700)
username = freegpt
password = freegpt
[supervisord]
logfile=/var/log/supervisor/supervisord.log ; (main log file;default $CWD/supervisord.log)
pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
childlogdir=/var/log/supervisor ; ('AUTO' child log dir, default $TEMP)
nodaemon=true
user=root
[rpcinterface:supervisor]
supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
[supervisorctl]
serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL for a unix socket
username = freegpt
password = freegpt
[program:freegpt-webui]
command=/usr/local/bin/python3.10 /app/run.py
directory=/app
user=root
autostart=true
autorestart=unexpected
priority=666
startsecs=5
[program:freegpt-endpoint]
command=/usr/local/bin/python3.10 /app/endpoint.py
directory=/app
user=root
autostart=true
autorestart=unexpected
priority=777
startsecs=7