From 7d476e57533a484c273bf04d7086a9763a80b630 Mon Sep 17 00:00:00 2001 From: ferocknew Date: Wed, 6 Dec 2023 10:30:28 +0800 Subject: [PATCH 1/8] Create Dockerfile --- Dockerfile | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..d27f71b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,19 @@ +FROM python:3.11.7-slim-bullseye + +RUN pip install pip -U +RUN pip config set global.index-url https://mirrors.cloud.tencent.com/pypi/simple +RUN pip config set install.trusted-host mirrors.cloud.tencent.com + +WORKDIR /rustdesk-api-server +ADD . /rustdesk-api-server + +VOLUME /rustdesk-api-server/db.sqlite3 + +ENV HOST 0.0.0.0 +ENV TZ=Asia/Shanghai \ + DEBIAN_FRONTEND=noninteractive + +EXPOSE 21114/tcp +EXPOSE 21114/udp + +ENTRYPOINT ["python", "manage.py", "runserver $HOST:21114"] From 5e84f1fc6e098cc4bf3b60d1f3e23c7fd969cad4 Mon Sep 17 00:00:00 2001 From: ferocknew Date: Wed, 6 Dec 2023 10:37:54 +0800 Subject: [PATCH 2/8] Create docker-compose.yaml --- docker-compose.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 docker-compose.yaml diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..e5188b0 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,15 @@ +version: "3.8" +services: + rustdesk-api-server: + container_name: rustdesk-api-server + build: + context: . + environment: + - HOST=0.0.0.0 + - TZ=Asia/Shanghai + volumes: + - ./db.sqilte3:/rustdesk-api-server/db.sqlite3 + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + ports: + - "21114:21114" From c834ef77fbae72b8f3b5bc78eb64e1ebec7a1cfc Mon Sep 17 00:00:00 2001 From: ferocknew Date: Wed, 6 Dec 2023 12:33:59 +0800 Subject: [PATCH 3/8] Create run.sh --- run.sh | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 run.sh diff --git a/run.sh b/run.sh new file mode 100644 index 0000000..e6f4efc --- /dev/null +++ b/run.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +cd /rustdesk-api-server; +python manage.py runserver $HOST:21114; From c244f599cae0b80d0f83c3fd5b92349e1b0731a3 Mon Sep 17 00:00:00 2001 From: ferocknew Date: Wed, 6 Dec 2023 12:34:21 +0800 Subject: [PATCH 4/8] Update docker-compose.yaml --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index e5188b0..b6ef74d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -8,7 +8,7 @@ services: - HOST=0.0.0.0 - TZ=Asia/Shanghai volumes: - - ./db.sqilte3:/rustdesk-api-server/db.sqlite3 + - ./db.sqlite3:/rustdesk-api-server/db.sqlite3 - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro ports: From 86559425ca1e3ee890fe3a407ea05d137dbdd19f Mon Sep 17 00:00:00 2001 From: ferocknew Date: Wed, 6 Dec 2023 12:35:03 +0800 Subject: [PATCH 5/8] Update Dockerfile --- Dockerfile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index d27f71b..17d633b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,13 @@ -FROM python:3.11.7-slim-bullseye - -RUN pip install pip -U -RUN pip config set global.index-url https://mirrors.cloud.tencent.com/pypi/simple -RUN pip config set install.trusted-host mirrors.cloud.tencent.com +FROM python:3.10.3-slim-bullseye WORKDIR /rustdesk-api-server ADD . /rustdesk-api-server +RUN pip install pip -U -i https://mirrors.cloud.tencent.com/pypi/simple +RUN pip config set global.index-url https://mirrors.cloud.tencent.com/pypi/simple +RUN pip config set install.trusted-host mirrors.cloud.tencent.com +RUN pip install -r requirements.txt + VOLUME /rustdesk-api-server/db.sqlite3 ENV HOST 0.0.0.0 @@ -16,4 +17,6 @@ ENV TZ=Asia/Shanghai \ EXPOSE 21114/tcp EXPOSE 21114/udp -ENTRYPOINT ["python", "manage.py", "runserver $HOST:21114"] +RUN cd /rustdesk-api-server + +ENTRYPOINT ["bash", "run.sh"] From 9a4fb52af05955532a211a3284cb71931eb6b031 Mon Sep 17 00:00:00 2001 From: ferocknew Date: Thu, 7 Dec 2023 12:36:32 +0800 Subject: [PATCH 6/8] Update docker-compose.yaml --- docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index b6ef74d..2e64278 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -7,6 +7,7 @@ services: environment: - HOST=0.0.0.0 - TZ=Asia/Shanghai + - CSRF_TRUSTED_ORIGINS= volumes: - ./db.sqlite3:/rustdesk-api-server/db.sqlite3 - /etc/timezone:/etc/timezone:ro From afe1ea1f75ef24a2c751fc3233b978f3ca7935cb Mon Sep 17 00:00:00 2001 From: ferocknew Date: Thu, 7 Dec 2023 12:37:02 +0800 Subject: [PATCH 7/8] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 17d633b..52c6b3f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ VOLUME /rustdesk-api-server/db.sqlite3 ENV HOST 0.0.0.0 ENV TZ=Asia/Shanghai \ DEBIAN_FRONTEND=noninteractive +ENV CSRF_TRUSTED_ORIGINS="" EXPOSE 21114/tcp EXPOSE 21114/udp From 10e86e3e393f728f1f63bb187990fa4623837b06 Mon Sep 17 00:00:00 2001 From: ferocknew Date: Thu, 7 Dec 2023 12:37:25 +0800 Subject: [PATCH 8/8] Update settings.py --- rustdesk_server_api/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rustdesk_server_api/settings.py b/rustdesk_server_api/settings.py index df310d3..ca0e852 100644 --- a/rustdesk_server_api/settings.py +++ b/rustdesk_server_api/settings.py @@ -14,7 +14,7 @@ from pathlib import Path # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent - +CSRF_TRUSTED_ORIGINS = [os.environ.get("CSRF_TRUSTED_ORIGINS", "None")] # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/ @@ -126,4 +126,4 @@ if DEBUG: else: - STATIC_ROOT = os.path.join(BASE_DIR, 'static') # 新增 \ No newline at end of file + STATIC_ROOT = os.path.join(BASE_DIR, 'static') # 新增