Compare commits

9 Commits

Author SHA1 Message Date
9d494ab34e Merge pull request 'Fix typo' (#16) from fix/stackfile into main
Reviewed-on: #16
2025-12-02 19:38:56 +00:00
1a844132e6 Fix typo 2025-12-03 00:16:16 +05:00
85dcbd8808 Merge pull request 'Fix typo' (#15) from fix/migrations into main
Reviewed-on: #15
2025-12-02 19:04:09 +00:00
5f0df931a7 Fix typo 2025-12-02 17:32:39 +05:00
d38d2cd800 Merge pull request 'Fix typo' (#14) from fix/jenkinsfile into main
Reviewed-on: #14
2025-12-02 12:24:15 +00:00
6204a57f86 Merge branch 'main' into fix/jenkinsfile 2025-12-02 12:23:38 +00:00
4af4b0c02f Fix typo 2025-12-02 17:23:13 +05:00
6402a5b418 Merge pull request 'Jenkinsfile update' (#13) from fix/jenkinsfile into main
Reviewed-on: #13
2025-12-02 11:57:42 +00:00
09d66613ea Jenkinsfile update 2025-12-02 16:56:59 +05:00
4 changed files with 27 additions and 9 deletions

2
Jenkinsfile vendored
View File

@@ -31,7 +31,7 @@ pipeline {
} }
stage('Checkout Code') { stage('Checkout Code') {
steps { steps {
git branch: 'main', credentialsId: 'ssh', url: 'git@github.com:JscorpTech/uzxarid.git' git branch: 'main', credentialsId: 'muhammadvadud', url: 'https://gitea.felixits.uz/uzxarid/backend.git'
} }
} }
stage('Prepare') { stage('Prepare') {

View File

@@ -5,8 +5,12 @@ CHANNEL_LAYERS = {
"default": { "default": {
"BACKEND": "channels_redis.core.RedisChannelLayer", "BACKEND": "channels_redis.core.RedisChannelLayer",
"CONFIG": { "CONFIG": {
"hosts": [(env.str("REDIS_HOST", "redis"), env.int("REDIS_PORT", 6379))], "hosts": [
(
env.str("REDIS_HOST", "redis"),
env.int("REDIS_PORT_6379_TCP_PORT", 6379)
)
],
}, },
}, },
} }

View File

@@ -0,0 +1,14 @@
# Generated by Django 5.2.7 on 2025-12-02 12:32
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('api', '0014_category_name_en_category_name_ru_category_name_uz'),
('api', '0015_alter_adoption_ad'),
]
operations = [
]

View File

@@ -34,7 +34,7 @@ services:
cpus: '1.00' cpus: '1.00'
memory: 512M memory: 512M
healthcheck: healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres -d uzxarid"] test: [ "CMD-SHELL", "pg_isready -U postgres -d uzxarid" ]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5
@@ -47,7 +47,7 @@ services:
redis: redis:
image: redis:7-alpine image: redis:7-alpine
command: ["redis-server", "--appendonly", "yes"] command: [ "redis-server", "--appendonly", "yes" ]
networks: networks:
- uzxarid - uzxarid
volumes: volumes:
@@ -72,7 +72,7 @@ services:
cpus: '0.50' cpus: '0.50'
memory: 256M memory: 256M
healthcheck: healthcheck:
test: ["CMD", "redis-cli", "ping"] test: [ "CMD", "redis-cli", "ping" ]
interval: 15s interval: 15s
timeout: 10s timeout: 10s
retries: 5 retries: 5
@@ -117,7 +117,7 @@ services:
cpus: '1.50' cpus: '1.50'
memory: 1024M memory: 1024M
healthcheck: healthcheck:
test: ["CMD-SHELL", "curl -f http://localhost:8000/health/ || exit 1"] test: [ "CMD-SHELL", "curl -f http://localhost:8000/health/ || exit 1" ]
interval: 15s interval: 15s
timeout: 15s timeout: 15s
retries: 5 retries: 5
@@ -133,7 +133,7 @@ services:
ports: ports:
- mode: ingress - mode: ingress
target: 80 target: 80
published: ${PORT:?enviromentda PORT topilmadi} published: 8034
protocol: tcp protocol: tcp
volumes: volumes:
- type: bind - type: bind
@@ -167,7 +167,7 @@ services:
- /var/run - /var/run
- /var/tmp - /var/tmp
healthcheck: healthcheck:
test: ["CMD-SHELL", "curl -f http://localhost/health/ || exit 1"] test: [ "CMD-SHELL", "curl -f http://localhost/health/ || exit 1" ]
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5