diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml deleted file mode 100644 index f16461da..00000000 --- a/.github/workflows/mirror.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Mirror to Gitee Repo - -# on: [ push, delete, create ] -on: - push: - branches: - - main - -jobs: - git-mirror: - runs-on: ubuntu-latest - steps: - - name: Configure Private Key - env: - SSH_PRIVATE_KEY: ${{ secrets.GITEE_PRIVATE_KEY }} - run: | - mkdir -p ~/.ssh - echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - echo "StrictHostKeyChecking no" >> ~/.ssh/config - - name: Push Mirror - env: - # SOURCE_REPO: 'https://github.com/mgithubTestOrg/giteeMirror.git' - SOURCE_REPO: "https://github.com/${{ github.repository }}.git" - # DESTINATION_REPO: 'git@gitee.com:mgithubTestOrg/giteeMirror.git' - # DESTINATION_REPO: 'git@gitee.com:${{ github.repository }}.git' - DESTINATION_REPO: "git@gitee.com:websoft9/${{ github.event.repository.name }}.git" - BASE_REPO: "https://github.com/${{ github.repository }}" - run: | - git clone "$SOURCE_REPO" && cd `basename "$BASE_REPO"` - git config --global user.name "${{ github.actor }}" - git config --global user.email "xxx@websoft9.com" - - git remote set-url --push origin "$DESTINATION_REPO" - git push origin main --force diff --git a/appmanage/Dockerfile b/appmanage/Dockerfile index 7a4cb109..8b1d2295 100644 --- a/appmanage/Dockerfile +++ b/appmanage/Dockerfile @@ -10,7 +10,7 @@ COPY static ./static COPY requirements.txt main.py database.sqlite ./ RUN apt update -# Install supervisord +# Install supervisords RUN apt install -y supervisor COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY config/cmd.sh /cmd.sh diff --git a/appmanage/api/service/db.py b/appmanage/api/service/db.py index 676714d7..b3bd1bc9 100644 --- a/appmanage/api/service/db.py +++ b/appmanage/api/service/db.py @@ -3,7 +3,7 @@ from pydantic import BaseModel from api.model.user import User import sqlite3 -conn = sqlite3.connect('/usr/src/app/database.sqlite') +conn = sqlite3.connect('/usr/src/app/database.sqlite', check_same_thread=False) cursor = conn.cursor()