From 73708128e0db0417b9caa807b30ec0d8e341420f Mon Sep 17 00:00:00 2001 From: Cp0204 Date: Mon, 11 Dec 2023 17:33:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96docker=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 25 ++++++++----------------- db.sqlite3 => db/db.sqlite3 | Bin docker-compose.yaml | 6 ++++-- run.sh | 6 +++++- rustdesk_server_api/settings.py | 6 +++--- 5 files changed, 20 insertions(+), 23 deletions(-) rename db.sqlite3 => db/db.sqlite3 (100%) diff --git a/Dockerfile b/Dockerfile index 50a38fc..c5da823 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,27 +1,18 @@ -FROM python:3.10.3-slim-bullseye +FROM python:3.10.3-alpine 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 -ENV TZ=Asia/Shanghai \ - DEBIAN_FRONTEND=noninteractive +RUN set -ex \ + && pip install --no-cache-dir --disable-pip-version-check -r requirements.txt \ + && rm -rf /var/cache/apk/* \ + && cp -r ./db ./db_bak +ENV HOST=0.0.0.0 +ENV TZ=Asia/Shanghai ENV CSRF_TRUSTED_ORIGINS="" - EXPOSE 21114/tcp EXPOSE 21114/udp -RUN cd /rustdesk-api-server - - -ENTRYPOINT ["bash", "run.sh"] - +ENTRYPOINT ["sh", "run.sh"] diff --git a/db.sqlite3 b/db/db.sqlite3 similarity index 100% rename from db.sqlite3 rename to db/db.sqlite3 diff --git a/docker-compose.yaml b/docker-compose.yaml index 2e64278..9564f46 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -7,10 +7,12 @@ services: environment: - HOST=0.0.0.0 - TZ=Asia/Shanghai - - CSRF_TRUSTED_ORIGINS= + - CSRF_TRUSTED_ORIGINS=http://www.baidu.com volumes: - - ./db.sqlite3:/rustdesk-api-server/db.sqlite3 + - ./db:/rustdesk-api-server/db - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro + network_mode: bridge ports: - "21114:21114" + restart: unless-stopped \ No newline at end of file diff --git a/run.sh b/run.sh index e6f4efc..4e77d6e 100644 --- a/run.sh +++ b/run.sh @@ -1,4 +1,8 @@ #!/bin/bash -cd /rustdesk-api-server; +if [ ! -e "./db/db.sqlite3" ]; then + cp "./db_bak/db.sqlite3" "./db/db.sqlite3" + echo "首次运行，初始化数据库" +fi + python manage.py runserver $HOST:21114; diff --git a/rustdesk_server_api/settings.py b/rustdesk_server_api/settings.py index c62e6f2..da7df75 100644 --- a/rustdesk_server_api/settings.py +++ b/rustdesk_server_api/settings.py @@ -78,7 +78,7 @@ WSGI_APPLICATION = 'rustdesk_server_api.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', + 'NAME': BASE_DIR / 'db/db.sqlite3', } } @@ -123,8 +123,8 @@ STATIC_URL = 'static/' if DEBUG: STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static')] - + else: - + STATIC_ROOT = os.path.join(BASE_DIR, 'static') # 新增 From e1f481b5dc596c3580d6e861e94224854034d9d9 Mon Sep 17 00:00:00 2001 From: cococo Date: Mon, 11 Dec 2023 21:33:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"=E4=BC=98=E5=8C=96docker=E6=9E=84?= =?UTF-8?q?=E5=BB=BA"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 25 +++++++++++++++++-------- db/db.sqlite3 => db.sqlite3 | Bin docker-compose.yaml | 6 ++---- run.sh | 6 +----- rustdesk_server_api/settings.py | 6 +++--- 5 files changed, 23 insertions(+), 20 deletions(-) rename db/db.sqlite3 => db.sqlite3 (100%) diff --git a/Dockerfile b/Dockerfile index c5da823..50a38fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,27 @@ -FROM python:3.10.3-alpine +FROM python:3.10.3-slim-bullseye WORKDIR /rustdesk-api-server ADD . /rustdesk-api-server -RUN set -ex \ - && pip install --no-cache-dir --disable-pip-version-check -r requirements.txt \ - && rm -rf /var/cache/apk/* \ - && cp -r ./db ./db_bak +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 +ENV TZ=Asia/Shanghai \ + DEBIAN_FRONTEND=noninteractive -ENV HOST=0.0.0.0 -ENV TZ=Asia/Shanghai ENV CSRF_TRUSTED_ORIGINS="" + EXPOSE 21114/tcp EXPOSE 21114/udp -ENTRYPOINT ["sh", "run.sh"] +RUN cd /rustdesk-api-server + + +ENTRYPOINT ["bash", "run.sh"] + diff --git a/db/db.sqlite3 b/db.sqlite3 similarity index 100% rename from db/db.sqlite3 rename to db.sqlite3 diff --git a/docker-compose.yaml b/docker-compose.yaml index 9564f46..2e64278 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -7,12 +7,10 @@ services: environment: - HOST=0.0.0.0 - TZ=Asia/Shanghai - - CSRF_TRUSTED_ORIGINS=http://www.baidu.com + - CSRF_TRUSTED_ORIGINS= volumes: - - ./db:/rustdesk-api-server/db + - ./db.sqlite3:/rustdesk-api-server/db.sqlite3 - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro - network_mode: bridge ports: - "21114:21114" - restart: unless-stopped \ No newline at end of file diff --git a/run.sh b/run.sh index 4e77d6e..e6f4efc 100644 --- a/run.sh +++ b/run.sh @@ -1,8 +1,4 @@ #!/bin/bash -if [ ! -e "./db/db.sqlite3" ]; then - cp "./db_bak/db.sqlite3" "./db/db.sqlite3" - echo "首次运行，初始化数据库" -fi - +cd /rustdesk-api-server; python manage.py runserver $HOST:21114; diff --git a/rustdesk_server_api/settings.py b/rustdesk_server_api/settings.py index da7df75..c62e6f2 100644 --- a/rustdesk_server_api/settings.py +++ b/rustdesk_server_api/settings.py @@ -78,7 +78,7 @@ WSGI_APPLICATION = 'rustdesk_server_api.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db/db.sqlite3', + 'NAME': BASE_DIR / 'db.sqlite3', } } @@ -123,8 +123,8 @@ STATIC_URL = 'static/' if DEBUG: STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static')] - + else: - + STATIC_ROOT = os.path.join(BASE_DIR, 'static') # 新增