diff --git a/backend/api/src/handlers/external_db/get_tmdb_data.rs b/backend/api/src/handlers/external_db/get_tmdb_data.rs index fcdc7513..979dee35 100644 --- a/backend/api/src/handlers/external_db/get_tmdb_data.rs +++ b/backend/api/src/handlers/external_db/get_tmdb_data.rs @@ -48,7 +48,7 @@ async fn get_tmdb_movie_data(client: &Client, id: u64) -> Result< .collect(), description: tmdb_movie.inner.overview, original_language: Some( - Language::from_str(&tmdb_movie.inner.original_language).unwrap_or(Language::Other), + Language::from_str(&tmdb_movie.inner.original_language.name).unwrap_or(Language::Other), ), original_release_date: tmdb_movie .inner diff --git a/backend/storage/.env.example b/backend/storage/.env.example index 03d0d013..54afe31c 100644 --- a/backend/storage/.env.example +++ b/backend/storage/.env.example @@ -1,2 +1,2 @@ # Connection string for the database. -DATABASE_URL=postgres://postgres:password@localhost:5432/arcadia +DATABASE_URL=postgresql://postgres:password@localhost:5432/arcadia diff --git a/compose.yml b/compose.yml index dc5855e8..28cbb4e3 100644 --- a/compose.yml +++ b/compose.yml @@ -18,6 +18,7 @@ services: - 4321:5432 env_file: - backend/api/.env.docker + - backend/api/.env healthcheck: test: ["CMD-SHELL", "pg_isready -U arcadia"] interval: 5s @@ -54,7 +55,7 @@ services: command: redis-server --requirepass ${REDIS_PASSWORD} backend: - container_name: arcadia_api + container_name: arcadia_backend build: context: ./ dockerfile: backend/api/Dockerfile @@ -62,6 +63,7 @@ services: - "8080:8080" env_file: - backend/api/.env.docker + - backend/api/.env develop: watch: - path: ./backend/api @@ -80,6 +82,7 @@ services: - 5173:80 env_file: - frontend/.env.docker + - frontend/.env develop: watch: - path: ./frontend/dist diff --git a/docs/src/run-docker.md b/docs/src/run-docker.md index 86739966..c07cab4e 100644 --- a/docs/src/run-docker.md +++ b/docs/src/run-docker.md @@ -27,7 +27,7 @@ Also don't forget to use `sudo` if you aren't in the `docker` group! 2. **Start all services**: ```bash - docker compose up --env-file backend/api/.env -d + docker compose --env-file backend/api/.env up -d ``` Note: the `--env-file` option is necessary as it will make the `REDIS_PASSWORD` environment variable available before the container is ran (and not only for the container itself, it is not the same as the compose attribute `env_file`). @@ -54,7 +54,7 @@ If you prefer to start services individually: ### Redis Only ```bash - docker compose up --env-file backend/api/.env redis -d + docker compose --env-file backend/api/.env up redis -d ``` ### Backend Api Only