Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d29c2c3a13 | |||
| 951d68f022 | |||
| c8b87561a8 | |||
| 6fce702820 | |||
| 6ed875ae81 | |||
| aa19085538 | |||
| fa2d96d58a | |||
| 9e72e8abdf | |||
| ab24bd8526 | |||
| fccdf64435 | |||
| 1e695011ac | |||
| 789e4124be | |||
| c27dfbfe35 |
+16
-16
@@ -14,7 +14,7 @@ concurrency:
|
|||||||
jobs:
|
jobs:
|
||||||
backend-tests:
|
backend-tests:
|
||||||
name: Backend Tests
|
name: Backend Tests
|
||||||
runs-on: ubuntu-latest
|
runs-on: vps
|
||||||
env:
|
env:
|
||||||
SECRET_KEY: test-secret-key-for-ci-environment-32chars-minimum
|
SECRET_KEY: test-secret-key-for-ci-environment-32chars-minimum
|
||||||
|
|
||||||
@@ -22,7 +22,7 @@ jobs:
|
|||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
run: |
|
run: |
|
||||||
if [ ! -d .git ]; then
|
if [ ! -d .git ]; then
|
||||||
git clone --depth=1 "http://gitea:3000/${GITHUB_REPOSITORY}.git" .
|
git clone --depth=1 "http://100.78.131.124:3300/${GITHUB_REPOSITORY}.git" .
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Setup Python
|
- name: Setup Python
|
||||||
@@ -55,32 +55,32 @@ jobs:
|
|||||||
cd dashboard/backend
|
cd dashboard/backend
|
||||||
if [ "${{ steps.cache-python.outputs.cache-hit }}" = "true" ]; then
|
if [ "${{ steps.cache-python.outputs.cache-hit }}" = "true" ]; then
|
||||||
echo "Restoring venv from cache $CACHE_KEY..."
|
echo "Restoring venv from cache $CACHE_KEY..."
|
||||||
if cp -a $CACHE_DIR/venv . && [ -f venv/bin/activate ]; then
|
if cp -a $CACHE_DIR/venv . && [ -f venv/bin/activate ] && venv/bin/python -m pytest --version >/dev/null 2>&1; then
|
||||||
echo "Cache restored successfully"
|
echo "Cache restored successfully"
|
||||||
else
|
else
|
||||||
echo "Cache corrupted, installing fresh..."
|
echo "Cache corrupted, installing fresh..."
|
||||||
rm -rf venv
|
rm -rf venv
|
||||||
python3 -m venv venv
|
python3 -m venv venv
|
||||||
. venv/bin/activate
|
. venv/bin/activate
|
||||||
timeout 300 pip install --cache-dir=$PIP_CACHE_DIR --retries 3 --timeout 30 -r requirements.txt || \
|
timeout 600 pip install --cache-dir=$PIP_CACHE_DIR --retries 3 --timeout 30 -r requirements.txt || \
|
||||||
timeout 300 pip install --cache-dir=$PIP_CACHE_DIR --index-url https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn -r requirements.txt || \
|
timeout 600 pip install --cache-dir=$PIP_CACHE_DIR --index-url https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn -r requirements.txt || \
|
||||||
pip install -r requirements.txt
|
pip install -r requirements.txt
|
||||||
timeout 300 pip install --cache-dir=$PIP_CACHE_DIR --retries 3 --timeout 30 -r requirements-dev.txt || \
|
timeout 600 pip install --cache-dir=$PIP_CACHE_DIR --retries 3 --timeout 30 -r requirements-dev.txt || \
|
||||||
timeout 300 pip install --cache-dir=$PIP_CACHE_DIR --index-url https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn -r requirements-dev.txt || \
|
timeout 600 pip install --cache-dir=$PIP_CACHE_DIR --index-url https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn -r requirements-dev.txt || \
|
||||||
pip install -r requirements-dev.txt
|
pip install -r requirements-dev.txt
|
||||||
timeout 300 pip install --cache-dir=$PIP_CACHE_DIR pytest-timeout pytest-cov || pip install pytest-timeout pytest-cov
|
timeout 600 pip install --cache-dir=$PIP_CACHE_DIR pytest-timeout pytest-cov || pip install pytest-timeout pytest-cov
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "Installing fresh dependencies..."
|
echo "Installing fresh dependencies..."
|
||||||
python3 -m venv venv
|
python3 -m venv venv
|
||||||
. venv/bin/activate
|
. venv/bin/activate
|
||||||
timeout 300 pip install --cache-dir=$PIP_CACHE_DIR --retries 3 --timeout 30 -r requirements.txt || \
|
timeout 600 pip install --cache-dir=$PIP_CACHE_DIR --retries 3 --timeout 30 -r requirements.txt || \
|
||||||
timeout 300 pip install --cache-dir=$PIP_CACHE_DIR --index-url https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn -r requirements.txt || \
|
timeout 600 pip install --cache-dir=$PIP_CACHE_DIR --index-url https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn -r requirements.txt || \
|
||||||
pip install -r requirements.txt
|
pip install -r requirements.txt
|
||||||
timeout 300 pip install --cache-dir=$PIP_CACHE_DIR --retries 3 --timeout 30 -r requirements-dev.txt || \
|
timeout 600 pip install --cache-dir=$PIP_CACHE_DIR --retries 3 --timeout 30 -r requirements-dev.txt || \
|
||||||
timeout 300 pip install --cache-dir=$PIP_CACHE_DIR --index-url https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn -r requirements-dev.txt || \
|
timeout 600 pip install --cache-dir=$PIP_CACHE_DIR --index-url https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn -r requirements-dev.txt || \
|
||||||
pip install -r requirements-dev.txt
|
pip install -r requirements-dev.txt
|
||||||
timeout 300 pip install --cache-dir=$PIP_CACHE_DIR pytest-timeout pytest-cov || pip install pytest-timeout pytest-cov
|
timeout 600 pip install --cache-dir=$PIP_CACHE_DIR pytest-timeout pytest-cov || pip install pytest-timeout pytest-cov
|
||||||
echo "Saving venv to cache $CACHE_KEY..."
|
echo "Saving venv to cache $CACHE_KEY..."
|
||||||
cp -a venv $CACHE_DIR/ || echo "Warning: cache save failed"
|
cp -a venv $CACHE_DIR/ || echo "Warning: cache save failed"
|
||||||
fi
|
fi
|
||||||
@@ -102,13 +102,13 @@ jobs:
|
|||||||
|
|
||||||
frontend-tests:
|
frontend-tests:
|
||||||
name: Frontend Tests
|
name: Frontend Tests
|
||||||
runs-on: ubuntu-latest
|
runs-on: vps
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
run: |
|
run: |
|
||||||
if [ ! -d .git ]; then
|
if [ ! -d .git ]; then
|
||||||
git clone --depth=1 "http://gitea:3000/${GITHUB_REPOSITORY}.git" .
|
git clone --depth=1 "http://100.78.131.124:3300/${GITHUB_REPOSITORY}.git" .
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Setup Node.js
|
- name: Setup Node.js
|
||||||
@@ -170,7 +170,7 @@ jobs:
|
|||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
name: Deploy to Production
|
name: Deploy to Production
|
||||||
runs-on: ubuntu-latest
|
runs-on: nas
|
||||||
if: always()
|
if: always()
|
||||||
needs: [backend-tests, frontend-tests]
|
needs: [backend-tests, frontend-tests]
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -7,9 +7,13 @@ services:
|
|||||||
stdin_open: true
|
stdin_open: true
|
||||||
tty: true
|
tty: true
|
||||||
working_dir: /repos/nas-tools
|
working_dir: /repos/nas-tools
|
||||||
|
env_file:
|
||||||
|
- /volume1/docker/claude-dev/.env
|
||||||
volumes:
|
volumes:
|
||||||
- /volume1/repos:/repos
|
- /volume1/repos:/repos
|
||||||
- /volume1/docker/claude-dev/claude-config:/root/.claude
|
- /volume1/docker/claude-dev/claude-config:/root/.claude
|
||||||
- /volume1/docker/claude-dev/claude-config/.claude.json:/root/.claude.json
|
- /volume1/docker/claude-dev/claude-config/.claude.json:/root/.claude.json
|
||||||
- /volume1/docker/claude-dev/gitea_token:/root/.gitea_token:ro
|
- /volume1/docker/claude-dev/gitea_token:/root/.gitea_token:ro
|
||||||
- /volume1/docker/claude-dev/bashrc:/root/.bashrc
|
- /volume1/docker/claude-dev/bashrc:/root/.bashrc
|
||||||
|
- /volume1:/volume1
|
||||||
|
- /:/nas-root
|
||||||
|
|||||||
@@ -103,7 +103,7 @@ if not TRANSMISSION_USER or not TRANSMISSION_PASS:
|
|||||||
|
|
||||||
# Networking configs
|
# Networking configs
|
||||||
LAN_IP_RANGES = os.environ.get("LAN_IP_RANGES", "192.168.31.0/24").split(",")
|
LAN_IP_RANGES = os.environ.get("LAN_IP_RANGES", "192.168.31.0/24").split(",")
|
||||||
TRUSTED_PROXIES = os.environ.get("TRUSTED_PROXIES", "127.0.0.1,::1,172.21.0.1").split(",")
|
TRUSTED_PROXIES = os.environ.get("TRUSTED_PROXIES", "127.0.0.1,::1,172.21.0.1,172.17.0.1").split(",")
|
||||||
|
|
||||||
|
|
||||||
def _parse_ip(ip_str: str):
|
def _parse_ip(ip_str: str):
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ services:
|
|||||||
- SECRET_KEY=${SECRET_KEY}
|
- SECRET_KEY=${SECRET_KEY}
|
||||||
- ADMIN_USER=jimmy
|
- ADMIN_USER=jimmy
|
||||||
- ADMIN_PASSWORD_HASH=${ADMIN_PASSWORD_HASH}
|
- ADMIN_PASSWORD_HASH=${ADMIN_PASSWORD_HASH}
|
||||||
|
- TRUSTED_PROXIES=127.0.0.1,::1,172.21.0.1,172.17.0.1
|
||||||
- TELEGRAM_BOT_TOKEN=${TELEGRAM_BOT_TOKEN:-}
|
- TELEGRAM_BOT_TOKEN=${TELEGRAM_BOT_TOKEN:-}
|
||||||
- TELEGRAM_CHAT_ID=${TELEGRAM_CHAT_ID:-}
|
- TELEGRAM_CHAT_ID=${TELEGRAM_CHAT_ID:-}
|
||||||
- TELEGRAM_PROXY=${TELEGRAM_PROXY:-}
|
- TELEGRAM_PROXY=${TELEGRAM_PROXY:-}
|
||||||
|
|||||||
Reference in New Issue
Block a user