Compare commits
7 Commits
Backend
...
3e225b158f
| Author | SHA1 | Date | |
|---|---|---|---|
| 3e225b158f | |||
| 8ec8b1aa42 | |||
| e3d85f4775 | |||
| 2a0d022e37 | |||
| 5fb56a636f | |||
| 721f7b51f7 | |||
| 54086236c6 |
@@ -10,7 +10,8 @@
|
||||
"Bash(curl:*)",
|
||||
"Bash(docker logs:*)",
|
||||
"Bash(docker exec:*)",
|
||||
"Bash(ls:*)"
|
||||
"Bash(ls:*)",
|
||||
"Bash(docker build:*)"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
122
.gitea/workflows/docker.yml
Normal file
122
.gitea/workflows/docker.yml
Normal file
@@ -0,0 +1,122 @@
|
||||
name: Build and Push Docker Images
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
tags:
|
||||
- 'v*.*.*'
|
||||
|
||||
env:
|
||||
REGISTRY: git.benoitsz.com
|
||||
IMAGE_BACKEND: audio-classifier-backend
|
||||
IMAGE_FRONTEND: audio-classifier-frontend
|
||||
|
||||
jobs:
|
||||
build-backend:
|
||||
name: Build Backend Image
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Login to Gitea Container Registry
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: ${{ env.REGISTRY }}
|
||||
username: ${{ gitea.actor }}
|
||||
password: ${{ secrets.REGISTRY_TOKEN }}
|
||||
|
||||
- name: Determine version
|
||||
id: version
|
||||
run: |
|
||||
if [[ "${{ gitea.ref }}" == refs/tags/v* ]]; then
|
||||
echo "VERSION=${GITEA_REF#refs/tags/}" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo "VERSION=dev-$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Extract metadata
|
||||
id: meta
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: ${{ env.REGISTRY }}/${{ gitea.repository_owner }}/${{ env.IMAGE_BACKEND }}
|
||||
tags: |
|
||||
type=semver,pattern={{version}}
|
||||
type=semver,pattern={{major}}.{{minor}}
|
||||
type=raw,value=latest,enable=${{ startsWith(gitea.ref, 'refs/tags/v') }}
|
||||
type=raw,value=dev,enable=${{ gitea.ref == 'refs/heads/main' }}
|
||||
type=sha,prefix=dev-,format=short,enable=${{ gitea.ref == 'refs/heads/main' }}
|
||||
|
||||
- name: Build and push backend
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: .
|
||||
file: ./backend/Dockerfile
|
||||
push: true
|
||||
build-args: |
|
||||
VERSION=${{ steps.version.outputs.VERSION }}
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ gitea.repository_owner }}/${{ env.IMAGE_BACKEND }}:buildcache
|
||||
cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ gitea.repository_owner }}/${{ env.IMAGE_BACKEND }}:buildcache,mode=max
|
||||
|
||||
build-frontend:
|
||||
name: Build Frontend Image
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
|
||||
- name: Login to Gitea Container Registry
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: ${{ env.REGISTRY }}
|
||||
username: ${{ gitea.actor }}
|
||||
password: ${{ secrets.REGISTRY_TOKEN }}
|
||||
|
||||
- name: Determine version
|
||||
id: version
|
||||
run: |
|
||||
if [[ "${{ gitea.ref }}" == refs/tags/v* ]]; then
|
||||
echo "VERSION=${GITEA_REF#refs/tags/}" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo "VERSION=dev-$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Extract metadata
|
||||
id: meta
|
||||
uses: docker/metadata-action@v5
|
||||
with:
|
||||
images: ${{ env.REGISTRY }}/${{ gitea.repository_owner }}/${{ env.IMAGE_FRONTEND }}
|
||||
tags: |
|
||||
type=semver,pattern={{version}}
|
||||
type=semver,pattern={{major}}.{{minor}}
|
||||
type=raw,value=latest,enable=${{ startsWith(gitea.ref, 'refs/tags/v') }}
|
||||
type=raw,value=dev,enable=${{ gitea.ref == 'refs/heads/main' }}
|
||||
type=sha,prefix=dev-,format=short,enable=${{ gitea.ref == 'refs/heads/main' }}
|
||||
|
||||
- name: Build and push frontend
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: .
|
||||
file: ./frontend/Dockerfile
|
||||
push: true
|
||||
build-args: |
|
||||
VERSION=${{ steps.version.outputs.VERSION }}
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
||||
cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ gitea.repository_owner }}/${{ env.IMAGE_FRONTEND }}:buildcache
|
||||
cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ gitea.repository_owner }}/${{ env.IMAGE_FRONTEND }}:buildcache,mode=max
|
||||
@@ -14,7 +14,7 @@ Le système est **100% autonome** - aucune action manuelle requise ! Les modèle
|
||||
|
||||
1. **Cloner le projet** :
|
||||
```bash
|
||||
git clone <votre-repo>
|
||||
git clone https://git.benoitsz.com/benoit/Audio-Classifier.git
|
||||
cd Audio-Classifier
|
||||
```
|
||||
|
||||
@@ -36,6 +36,8 @@ docker-compose up -d
|
||||
|
||||
C'est tout ! 🎉
|
||||
|
||||
**Note** : Les images Docker sont automatiquement téléchargées depuis git.benoitsz.com. Aucun build nécessaire !
|
||||
|
||||
### Premier Scan
|
||||
|
||||
1. Ouvrir http://localhost:3000
|
||||
|
||||
17
README.md
17
README.md
@@ -41,8 +41,8 @@ Outil de classification audio automatique capable d'indexer et analyser des bibl
|
||||
|
||||
```bash
|
||||
# 1. Cloner le projet
|
||||
git clone <repo>
|
||||
cd audio-classifier
|
||||
git clone https://git.benoitsz.com/benoit/Audio-Classifier.git
|
||||
cd Audio-Classifier
|
||||
|
||||
# 2. Configurer le chemin audio (optionnel)
|
||||
echo "AUDIO_LIBRARY_PATH=/chemin/vers/votre/musique" > .env
|
||||
@@ -53,6 +53,8 @@ docker-compose up -d
|
||||
|
||||
**C'est tout !** 🎉
|
||||
|
||||
Les images Docker sont automatiquement téléchargées depuis le registry Gitea.
|
||||
|
||||
- Frontend : http://localhost:3000
|
||||
- API : http://localhost:8001
|
||||
- API Docs : http://localhost:8001/docs
|
||||
@@ -66,13 +68,22 @@ docker-compose up -d
|
||||
|
||||
### ✨ Particularités
|
||||
|
||||
- **Aucun téléchargement manuel** : Les modèles Essentia (28 MB) sont inclus dans l'image Docker
|
||||
- **Images pré-construites** : Téléchargées automatiquement depuis git.benoitsz.com
|
||||
- **Modèles inclus** : Les modèles Essentia (28 MB) sont intégrés dans l'image
|
||||
- **Aucune configuration** : Tout fonctionne out-of-the-box
|
||||
- **Transcodage automatique** : MP3 128kbps créés pour streaming rapide
|
||||
- **Waveforms pré-calculées** : Chargement instantané
|
||||
|
||||
📖 **Documentation complète** : Voir [DEPLOYMENT.md](DEPLOYMENT.md)
|
||||
|
||||
### 🛠 Build local (développement)
|
||||
|
||||
Si vous voulez builder les images localement :
|
||||
```bash
|
||||
docker-compose -f docker-compose.build.yml build
|
||||
docker-compose -f docker-compose.build.yml up -d
|
||||
```
|
||||
|
||||
## 📖 Utilisation
|
||||
|
||||
### Scanner un dossier
|
||||
|
||||
@@ -32,7 +32,7 @@ WORKDIR /app
|
||||
RUN pip install --no-cache-dir --upgrade pip setuptools wheel
|
||||
|
||||
# Copy requirements
|
||||
COPY requirements.txt .
|
||||
COPY backend/requirements.txt .
|
||||
|
||||
# Install Python dependencies in stages for better caching
|
||||
# Using versions compatible with Python 3.9
|
||||
@@ -45,11 +45,11 @@ RUN pip install --no-cache-dir essentia-tensorflow
|
||||
RUN pip install --no-cache-dir -r requirements.txt
|
||||
|
||||
# Copy application code
|
||||
COPY src/ ./src/
|
||||
COPY alembic.ini .
|
||||
COPY backend/src/ ./src/
|
||||
COPY backend/alembic.ini .
|
||||
|
||||
# Copy Essentia models into image
|
||||
COPY models/ ./models/
|
||||
# Copy Essentia models into image (28 MB total)
|
||||
COPY backend/models/ ./models/
|
||||
RUN ls -lh /app/models
|
||||
|
||||
# Expose port
|
||||
|
||||
64
docker-compose.build.yml
Normal file
64
docker-compose.build.yml
Normal file
@@ -0,0 +1,64 @@
|
||||
# Docker Compose pour build local (développement)
|
||||
# Usage: docker-compose -f docker-compose.build.yml build
|
||||
|
||||
services:
|
||||
postgres:
|
||||
image: pgvector/pgvector:pg16
|
||||
container_name: audio_classifier_db
|
||||
environment:
|
||||
POSTGRES_USER: ${POSTGRES_USER:-audio_user}
|
||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-audio_password}
|
||||
POSTGRES_DB: ${POSTGRES_DB:-audio_classifier}
|
||||
ports:
|
||||
- "5433:5432"
|
||||
volumes:
|
||||
- postgres_data:/var/lib/postgresql/data
|
||||
- ./backend/init-db.sql:/docker-entrypoint-initdb.d/init-db.sql
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-audio_user}"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
restart: unless-stopped
|
||||
|
||||
backend:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: backend/Dockerfile
|
||||
container_name: audio_classifier_api
|
||||
depends_on:
|
||||
postgres:
|
||||
condition: service_healthy
|
||||
environment:
|
||||
DATABASE_URL: postgresql://${POSTGRES_USER:-audio_user}:${POSTGRES_PASSWORD:-audio_password}@postgres:5432/${POSTGRES_DB:-audio_classifier}
|
||||
CORS_ORIGINS: ${CORS_ORIGINS:-http://localhost:3000}
|
||||
ANALYSIS_USE_CLAP: ${ANALYSIS_USE_CLAP:-false}
|
||||
ANALYSIS_NUM_WORKERS: ${ANALYSIS_NUM_WORKERS:-4}
|
||||
ESSENTIA_MODELS_PATH: /app/models
|
||||
ports:
|
||||
- "8001:8000"
|
||||
volumes:
|
||||
# Mount your audio library (read-write for transcoding and waveforms)
|
||||
- ${AUDIO_LIBRARY_PATH:-./audio_samples}:/audio
|
||||
restart: unless-stopped
|
||||
|
||||
frontend:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: frontend/Dockerfile
|
||||
args:
|
||||
NEXT_PUBLIC_API_URL: http://localhost:8001
|
||||
container_name: audio_classifier_ui
|
||||
environment:
|
||||
# Use localhost:8001 because the browser (client-side) needs to access the API
|
||||
# The backend is mapped to port 8001 on the host machine
|
||||
NEXT_PUBLIC_API_URL: http://localhost:8001
|
||||
ports:
|
||||
- "3000:3000"
|
||||
depends_on:
|
||||
- backend
|
||||
restart: unless-stopped
|
||||
|
||||
volumes:
|
||||
postgres_data:
|
||||
driver: local
|
||||
@@ -19,7 +19,7 @@ services:
|
||||
restart: unless-stopped
|
||||
|
||||
backend:
|
||||
build: ./backend
|
||||
image: git.benoitsz.com/benoit/audio-classifier-backend:latest
|
||||
container_name: audio_classifier_api
|
||||
depends_on:
|
||||
postgres:
|
||||
@@ -38,10 +38,7 @@ services:
|
||||
restart: unless-stopped
|
||||
|
||||
frontend:
|
||||
build:
|
||||
context: ./frontend
|
||||
args:
|
||||
NEXT_PUBLIC_API_URL: http://localhost:8001
|
||||
image: git.benoitsz.com/benoit/audio-classifier-frontend:latest
|
||||
container_name: audio_classifier_ui
|
||||
environment:
|
||||
# Use localhost:8001 because the browser (client-side) needs to access the API
|
||||
|
||||
@@ -4,13 +4,13 @@ FROM node:20-alpine
|
||||
WORKDIR /app
|
||||
|
||||
# Copy package files
|
||||
COPY package*.json ./
|
||||
COPY frontend/package*.json ./
|
||||
|
||||
# Install dependencies
|
||||
RUN npm ci
|
||||
|
||||
# Copy application code
|
||||
COPY . .
|
||||
COPY frontend/ .
|
||||
|
||||
# Build argument for API URL
|
||||
ARG NEXT_PUBLIC_API_URL=http://localhost:8001
|
||||
|
||||
19
frontend/Dockerfile.dev
Normal file
19
frontend/Dockerfile.dev
Normal file
@@ -0,0 +1,19 @@
|
||||
FROM node:20-alpine
|
||||
|
||||
# Set working directory
|
||||
WORKDIR /app
|
||||
|
||||
# Copy package files
|
||||
COPY package*.json ./
|
||||
|
||||
# Debug: List files and Node.js version
|
||||
RUN ls -la && node --version && npm --version
|
||||
|
||||
# Install dependencies with more verbose output
|
||||
RUN npm install --verbose
|
||||
|
||||
# Expose port
|
||||
EXPOSE 3000
|
||||
|
||||
# Start the development server
|
||||
CMD ["npm", "run", "dev"]
|
||||
Reference in New Issue
Block a user