Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,5 @@ production.env
# Local settings
pythonie/pythonie/settings/pgdev.py

# MinIO data directory
mc/

# Personal notes
TODO.md
2 changes: 1 addition & 1 deletion CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ uv run python pythonie/manage.py runserver --settings=pythonie.settings.dev

### Docker Development (preferred)

Uses Task for most operations. Requires docker-compose with services: web, postgres, redis, minio.
Uses Task for most operations. Requires docker-compose with services: web, postgres, redis.

```bash
# Build docker image
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Website for Python Ireland (python.ie / pycon.ie) community, built with Django 6

2. Start supporting services:
```bash
docker compose up -d postgres redis minio
docker compose up -d postgres redis
```

3. Run database migrations:
Expand Down
2 changes: 1 addition & 1 deletion Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ tasks:
stack:pull:
desc: Pull the docker images for the stack
cmds:
- docker compose pull postgres minio mc redis
- docker compose pull postgres redis

stack:services:
desc: List the services from the docker compose file
Expand Down
29 changes: 0 additions & 29 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ services:
command: /usr/bin/fish
depends_on:
- postgres
- minio
- redis
env_file:
- development.env
Expand All @@ -30,31 +29,6 @@ services:
redis:
image: redis:6.2

minio:
image: quay.io/minio/minio
ports:
- "9000:9000"
- "9001:9001"
command: server --console-address ":9001" /data
environment:
MINIO_ROOT_USER: pythonie
MINIO_ROOT_PASSWORD: pythonie
volumes:
- minio-data:/data
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
interval: 30s
timeout: 20s
retries: 3

mc:
image: quay.io/minio/mc
links:
- minio
volumes:
- ./mc:/root/.mc
- ../s3:/s3

test:
image: python.ie/website-dev
environment:
Expand All @@ -63,6 +37,3 @@ services:
- .:/app
working_dir: /app
command: python pythonie/manage.py test pythonie --verbosity=3

volumes:
minio-data:
Loading