jimmy/nas-tools
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge dev to main: Security improvements and comprehensive test infrastructure #39

Merged
jimmy merged 195 commits from dev into main 2026-04-08 01:42:27 +08:00
Conversation 0 Commits 195 Files Changed 87
+3 -3
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ee72a891d5 - Show all commits
.gitea/workflows/deploy-dev.yml
+1 -1
View File
@@ -58,7 +58,7 @@ jobs:
- name: Build dev image - name: Build dev image
run: | run: |
export DOCKER_API_VERSION=1.43 export DOCKER_API_VERSION=1.43
DOCKER_BUILDKIT=0 docker build --cache-from nas-dashboard-dev:latest -t nas-dashboard-dev:latest dashboard/ DOCKER_BUILDKIT=1 docker build --cache-from nas-dashboard-dev:latest -t nas-dashboard-dev:latest dashboard/
- name: Sync runtime compose file - name: Sync runtime compose file
run: cp dashboard/docker-compose.dev.yml /nas-dashboard/docker-compose.dev.yml run: cp dashboard/docker-compose.dev.yml /nas-dashboard/docker-compose.dev.yml
- name: Deploy dev - name: Deploy dev
.gitea/workflows/deploy.yml
+1 -1
View File
@@ -56,7 +56,7 @@ jobs:
prewarm_base_image "python:3.12-slim" prewarm_base_image "python:3.12-slim"
- name: Build - name: Build
run: DOCKER_BUILDKIT=0 docker build -t nas-dashboard:latest dashboard/ run: DOCKER_BUILDKIT=1 docker build -t nas-dashboard:latest dashboard/
- name: Sync runtime compose file - name: Sync runtime compose file
run: cp dashboard/docker-compose.yml /nas-dashboard/docker-compose.yml run: cp dashboard/docker-compose.yml /nas-dashboard/docker-compose.yml
- name: Deploy - name: Deploy
dashboard/Dockerfile
+1 -1
View File
@@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends openssh-client
RUN adduser --disabled-password --no-create-home --gecos "" app RUN adduser --disabled-password --no-create-home --gecos "" app
WORKDIR /app WORKDIR /app
COPY backend/requirements.txt . COPY backend/requirements.txt .
RUN pip install --no-cache-dir -r requirements.txt RUN pip install --no-cache-dir --index-url https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt
COPY backend/ ./ COPY backend/ ./
COPY --from=frontend /build/dist /app/static COPY --from=frontend /build/dist /app/static
RUN chown -R app:app /app RUN chown -R app:app /app