k1nq
/
test_task_crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update build and deploy steps in workflow and refine docker-compose configuration
Build and deploy / build (push) Successful in 10s Details
Build and deploy / deploy (push) Failing after 4s Details

This commit is contained in:
k1nq 2025-11-29 19:32:12 +05:00
parent 3f071a7f36
commit e1b15f57a0
2 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
.gitea/workflows/build.yml
View File

@ -21,30 +21,30 @@ jobs:
docker build -t ${{ secrets.GIT_HOST }}/${{ gitea.repository }}:app -f app/Dockerfile . docker build -t ${{ secrets.GIT_HOST }}/${{ gitea.repository }}:app -f app/Dockerfile .
docker push ${{ secrets.GIT_HOST }}/${{ gitea.repository }}:app docker push ${{ secrets.GIT_HOST }}/${{ gitea.repository }}:app
# deploy: deploy:
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# needs: build needs: build
# steps: steps:
# - name: Checkout - name: Checkout
# uses: actions/checkout@v4 uses: actions/checkout@v4
# - name: Instasll SSH key - name: Instasll SSH key
# uses: webfactory/ssh-agent@v0.9.0 uses: webfactory/ssh-agent@v0.9.0
# with: with:
# ssh-private-key: ${{ secrets.DEPLOY_SSH_KEY }} ssh-private-key: ${{ secrets.DEPLOY_SSH_KEY }}
# - name: Add host to known_hosts - name: Add host to known_hosts
# run: ssh-keyscan -H ${{ secrets.LXC_HOST }} >> ~/.ssh/known_hosts run: ssh-keyscan -H ${{ secrets.LXC_HOST }} >> ~/.ssh/known_hosts
# - name: Deploy docker-compose-ci.yml - name: Deploy docker-compose-ci.yml
# run: scp docker-compose-ci.yml ${{ secrets.LXC_USER }}@${{ secrets.LXC_HOST }}:/srv/app/docker-compose.yml run: scp docker-compose-ci.yml ${{ secrets.LXC_USER }}@${{ secrets.LXC_HOST }}:/srv/app/docker-compose.yml
# - name: Restart services - name: Restart services
# run: | run: |
# ssh ${{ secrets.LXC_USER }}@${{ secrets.LXC_HOST }} << 'EOF' ssh ${{ secrets.LXC_USER }}@${{ secrets.LXC_HOST }} << 'EOF'
# echo "${{ secrets.TOKEN }}" | docker login ${{ secrets.GIT_HOST }} -u ${{ secrets.USERNAME }} --password-stdin echo "${{ secrets.TOKEN }}" | docker login ${{ secrets.GIT_HOST }} -u ${{ secrets.USERNAME }} --password-stdin
# docker pull ${{ secrets.GIT_HOST }}/${{ gitea.repository }}:app docker pull ${{ secrets.GIT_HOST }}/${{ gitea.repository }}:app
# cd /srv/app cd /srv/app
# docker compose up -d --force-recreate docker compose up -d --force-recreate
# docker image prune -f docker image prune -f
# EOF EOF

15
docker-compose-ci.yml
View File

@ -1,8 +1,8 @@
version: '3.9'
services: services:
app: app:
build: image: https://${{ GIT_HOST }}/${{ GIT_USER }}/${{ GIT_REPO }}:app
context: .
dockerfile: app/Dockerfile
command: uvicorn app.main:app --host 0.0.0.0 --port 8000 command: uvicorn app.main:app --host 0.0.0.0 --port 8000
env_file: env_file:
- .env - .env
@ -10,7 +10,7 @@ services:
PROJECT_NAME: ${PROJECT_NAME} PROJECT_NAME: ${PROJECT_NAME}
VERSION: ${VERSION} VERSION: ${VERSION}
API_V1_PREFIX: ${API_V1_PREFIX} API_V1_PREFIX: ${API_V1_PREFIX}
DB_HOST: ${DB_HOST:-postgres} DB_HOST: postgres
DB_PORT: ${DB_PORT} DB_PORT: ${DB_PORT}
DB_NAME: ${DB_NAME} DB_NAME: ${DB_NAME}
DB_USER: ${DB_USER} DB_USER: ${DB_USER}
@ -21,7 +21,7 @@ services:
ACCESS_TOKEN_EXPIRE_MINUTES: ${ACCESS_TOKEN_EXPIRE_MINUTES} ACCESS_TOKEN_EXPIRE_MINUTES: ${ACCESS_TOKEN_EXPIRE_MINUTES}
REFRESH_TOKEN_EXPIRE_DAYS: ${REFRESH_TOKEN_EXPIRE_DAYS} REFRESH_TOKEN_EXPIRE_DAYS: ${REFRESH_TOKEN_EXPIRE_DAYS}
REDIS_ENABLED: ${REDIS_ENABLED} REDIS_ENABLED: ${REDIS_ENABLED}
REDIS_URL: ${REDIS_URL:-redis://redis:6379/0} REDIS_URL: redis://redis:6379/0
ANALYTICS_CACHE_TTL_SECONDS: ${ANALYTICS_CACHE_TTL_SECONDS} ANALYTICS_CACHE_TTL_SECONDS: ${ANALYTICS_CACHE_TTL_SECONDS}
ANALYTICS_CACHE_BACKOFF_MS: ${ANALYTICS_CACHE_BACKOFF_MS} ANALYTICS_CACHE_BACKOFF_MS: ${ANALYTICS_CACHE_BACKOFF_MS}
ports: ports:
@ -36,8 +36,6 @@ services:
POSTGRES_DB: ${DB_NAME} POSTGRES_DB: ${DB_NAME}
POSTGRES_USER: ${DB_USER} POSTGRES_USER: ${DB_USER}
POSTGRES_PASSWORD: ${DB_PASSWORD} POSTGRES_PASSWORD: ${DB_PASSWORD}
volumes:
- postgres_data:/var/lib/postgresql/data
ports: ports:
- "5432:5432" - "5432:5432"
@ -46,6 +44,3 @@ services:
command: redis-server --save "" --appendonly no command: redis-server --save "" --appendonly no
ports: ports:
- "6379:6379" - "6379:6379"
volumes:
postgres_data: