Skip to content

Commit

Permalink
Merge #360: Fix docker compose
Browse files Browse the repository at this point in the history
406abbf refactor: rename struct field to avoid clippy error (Jose Celano)
9777d26 fix: docker compose (Jose Celano)

Pull request description:

ACKs for top commit:
  josecelano:
    ACK 406abbf

Tree-SHA512: 953dd1e31d9d01cd6ac409b0d8d58946d950cb876fb4753d0f83ff094ea3841208a0582727c9f34928ec8df91d44cb7dd93089d2bafbfdf8461d40d1ff2512ba
  • Loading branch information
josecelano committed Oct 27, 2023
2 parents 1cebf8f + 406abbf commit db99842
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 11 deletions.
10 changes: 5 additions & 5 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ services:
image: torrust-index:release
tty: true
environment:
- TORRUST_INDEX_CONFIG=${TORRUST_TRACKER_CONFIG}
- TORRUST_INDEX_DATABASE_DRIVER=${TORRUST_TRACKER_DATABASE_DRIVER:-sqlite3}
- TORRUST_INDEX_CONFIG=${TORRUST_INDEX_CONFIG}
- TORRUST_INDEX_DATABASE_DRIVER=${TORRUST_INDEX_DATABASE_DRIVER:-sqlite3}
- TORRUST_INDEX_TRACKER_API_TOKEN=${TORRUST_INDEX_TRACKER_API_TOKEN:-MyAccessToken}
networks:
- server_side
ports:
- 3001:3001
volumes:
- ./storage/tracker/lib:/var/lib/torrust/index:Z
- ./storage/tracker/log:/var/log/torrust/index:Z
- ./storage/tracker/etc:/etc/torrust/index:Z
- ./storage/index/lib:/var/lib/torrust/index:Z
- ./storage/index/log:/var/log/torrust/index:Z
- ./storage/index/etc:/etc/torrust/index:Z
depends_on:
- tracker
- mailcatcher
Expand Down
5 changes: 1 addition & 4 deletions tests/common/contexts/torrent/asserts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@ pub fn assert_expected_torrent_details(torrent: &TorrentDetails, expected_torren
("info_hash", torrent.info_hash == expected_torrent.info_hash),
("title", torrent.title == expected_torrent.title),
("description", torrent.description == expected_torrent.description),
(
"category.category_id",
torrent.category.category_id == expected_torrent.category.category_id,
),
("category.category_id", torrent.category.id == expected_torrent.category.id),
("category.name", torrent.category.name == expected_torrent.category.name),
("file_size", torrent.file_size == expected_torrent.file_size),
("seeders", torrent.seeders == expected_torrent.seeders),
Expand Down
2 changes: 1 addition & 1 deletion tests/common/contexts/torrent/responses.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ pub struct TorrentDetails {

#[derive(Deserialize, PartialEq, Debug)]
pub struct Category {
pub category_id: CategoryId,
pub id: CategoryId,
pub name: String,
pub num_torrents: u64,
}
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/web/api/v1/contexts/torrent/contract.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ mod for_guests {
title: test_torrent.index_info.title.clone(),
description: test_torrent.index_info.description,
category: Category {
category_id: software_predefined_category_id(),
id: software_predefined_category_id(),
name: test_torrent.index_info.category,
num_torrents: 19, // Ignored in assertion
},
Expand Down

0 comments on commit db99842

Please sign in to comment.