Skip to content

Commit 47800f6

Browse files
Made some changes for workflow file and docker-compose.yml
1 parent 2be616a commit 47800f6

File tree

3 files changed

+17
-31
lines changed

3 files changed

+17
-31
lines changed

.github/workflows/django.yml

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -10,73 +10,56 @@ jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212
strategy:
13-
max-parallel: 4
1413
matrix:
15-
python-version: [3.12]
14+
python-version: [3.13.3]
1615

1716
services:
1817
database:
1918
image: postgres:17.4
20-
container_name: database
21-
restart: always
22-
volumes:
23-
- database:/var/lib/postgresql/data
2419
env:
2520
POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
2621
POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
2722
POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
28-
healthcheck:
29-
test: [ "CMD-SHELL", "pg_isready -U ${{ secrets.POSTGRES_USER }} -d ${{ secrets.POSTGRES_DB }}" ]
30-
interval: 10s
31-
timeout: 5s
32-
retries: 5
3323
ports:
3424
- 5432:5432
35-
3625
cache:
3726
image: redis:7.4.2
38-
container_name: cache
39-
restart: always
4027
ports:
41-
- "6379:6379"
28+
- 6379:6379
4229

4330
rabbitmq:
4431
image: rabbitmq:3-management
45-
container_name: broker
46-
restart: always
47-
ports:
48-
- "15672:15672"
49-
- "5672:5672"
5032
env:
5133
RABBITMQ_DEFAULT_USER: ${{ secrets.RABBITMQ_USER }}
5234
RABBITMQ_DEFAULT_PASS: ${{ secrets.RABBITMQ_PASSWORD }}
53-
healthcheck:
54-
test: [ "CMD", "rabbitmq-diagnostics", "ping" ]
55-
interval: 10s
56-
timeout: 5s
57-
retries: 3
35+
ports:
36+
- 15672:15672
37+
- 5672:5672
5838

5939
steps:
6040
- uses: actions/checkout@v4
6141

6242
- name: Set up Python ${{ matrix.python-version }}
63-
uses: actions/setup-python@v3
43+
uses: actions/setup-python@v4
6444
with:
6545
python-version: ${{ matrix.python-version }}
6646

6747
- name: Install Dependencies
6848
run: |
49+
sudo apt-get update
50+
sudo apt-get install -y build-essential python3-dev
6951
python -m pip install --upgrade pip
7052
pip install -r requirements.txt
7153
7254
- name: Run Tests
7355
env:
7456
DOMAIN: localhost:8000
7557
SITE_NAME: "Luqta eCommerce"
76-
DB_NAME: ${{ secrets.POSTGRES_DB }}
77-
DB_USER: ${{ secrets.POSTGRES_USER }}
78-
DB_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
58+
POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
59+
POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
60+
POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
7961
DB_HOST: localhost
62+
DB_PORT: 5432
8063
REDIS_HOST: localhost
8164
REDIS_PORT: 6379
8265
EMAIL_HOST_USER: ${{ secrets.EMAIL_HOST_USER }}

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# Pull official base Python Docker image
2-
FROM python:3.12.3-slim
2+
FROM python:3.13.3-slim
33

44
# Install system dependencies
55
# This layer is cached unless the base image or the list of packages changes
66
RUN apt-get update && apt-get install -y \
77
build-essential \
8+
python-dev \
89
libpq-dev \
910
curl \
1011
&& rm -rf /var/lib/apt/lists/*

docker-compose.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ services:
33
image: postgres:17.4
44
container_name: database
55
restart: always
6+
ports:
7+
- "5432:5432"
68
volumes:
79
- database:/var/lib/postgresql/data
810
environment:
@@ -40,7 +42,7 @@ services:
4042
web:
4143
build: .
4244
container_name: backend
43-
command: [ "./wait-for-it.sh", "db:5432", "--",
45+
command: [ "./wait-for-it.sh", "database:5432", "--",
4446
"uwsgi", "--ini", "/code/config/uwsgi/uwsgi.ini" ]
4547
restart: always
4648
volumes:

0 commit comments

Comments
 (0)