janezicmatej/ahab
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: update default service names

Browse Source
This commit is contained in:
Matej Janezic
2026-02-24 08:52:08 -05:00
parent 7912e9a516
commit 2000204250
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -21,5 +21,5 @@ Completion files are generated **during build process** in `target/*/build/*/out
Currently `ahab` respects three environment variables. Currently `ahab` respects three environment variables.
- `COMPOSE_FILE`: control which docker-compose file is used - defaults to `docker/local/docker-compose.yaml` - `COMPOSE_FILE`: control which docker-compose file is used - defaults to `docker/local/docker-compose.yaml`
- `AHAB_DJANGO_CONTAINER`: control which compose service is used for sending django commands - defaults to `appserver` - `AHAB_DJANGO_CONTAINER`: control which compose service is used for sending django commands - defaults to `django`
- `AHAB_POSTGRES_CONTAINER`: control which compose service is used for sending postgres commands - defaults to `postgresdb` - `AHAB_POSTGRES_CONTAINER`: control which compose service is used for sending postgres commands - defaults to `db`

3
src/main.rs
View File

@@ -34,8 +34,7 @@ fn main() -> Result<()> {
cli::Django::Test => scripts::django::test(), cli::Django::Test => scripts::django::test(),
}, },
cli::Commands::Postgres { command } => { cli::Commands::Postgres { command } => {
let db_container = let db_container = std::env::var("AHAB_POSTGRES_CONTAINER").unwrap_or("db".to_string());
std::env::var("AHAB_POSTGRES_CONTAINER").unwrap_or("postgresdb".to_string());
match command { match command {
cli::Postgres::Import { path } => scripts::postgres::import(&db_container, &path), cli::Postgres::Import { path } => scripts::postgres::import(&db_container, &path),
cli::Postgres::Dump { path } => scripts::postgres::dump(&db_container, &path), cli::Postgres::Dump { path } => scripts::postgres::dump(&db_container, &path),

2
src/scripts/django.rs
View File

@@ -55,7 +55,7 @@ pub fn make_command(app: &PathBuf, name: &str) -> Result<()> {
} }
pub fn manage(rest: &[String]) -> Result<()> { pub fn manage(rest: &[String]) -> Result<()> {
let container = env::var("AHAB_DJANGO_CONTAINER").unwrap_or("appserver".to_string()); let container = env::var("AHAB_DJANGO_CONTAINER").unwrap_or("django".to_string());
let joined = rest.join(" "); let joined = rest.join(" ");
let command = format!("run --rm {container} python manage.py {joined}"); let command = format!("run --rm {container} python manage.py {joined}");
CommandBuilder::docker_compose().args(&command).exec() CommandBuilder::docker_compose().args(&command).exec()

2
src/scripts/docker_compose.rs
View File

@@ -12,7 +12,7 @@ pub fn down() -> Result<()> {
} }
pub fn exec(rest: &[String]) -> Result<()> { pub fn exec(rest: &[String]) -> Result<()> {
let container = std::env::var("AHAB_DJANGO_CONTAINER").unwrap_or("appserver".to_string()); let container = std::env::var("AHAB_DJANGO_CONTAINER").unwrap_or("django".to_string());
CommandBuilder::docker_compose() CommandBuilder::docker_compose()
.args("exec") .args("exec")
.args(&container) .args(&container)