Skip to content

Commit db99842

Browse files
committed
Merge #360: Fix docker compose
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
2 parents 1cebf8f + 406abbf commit db99842

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

compose.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ services:
55
image: torrust-index:release
66
tty: true
77
environment:
8-
- TORRUST_INDEX_CONFIG=${TORRUST_TRACKER_CONFIG}
9-
- TORRUST_INDEX_DATABASE_DRIVER=${TORRUST_TRACKER_DATABASE_DRIVER:-sqlite3}
8+
- TORRUST_INDEX_CONFIG=${TORRUST_INDEX_CONFIG}
9+
- TORRUST_INDEX_DATABASE_DRIVER=${TORRUST_INDEX_DATABASE_DRIVER:-sqlite3}
1010
- TORRUST_INDEX_TRACKER_API_TOKEN=${TORRUST_INDEX_TRACKER_API_TOKEN:-MyAccessToken}
1111
networks:
1212
- server_side
1313
ports:
1414
- 3001:3001
1515
volumes:
16-
- ./storage/tracker/lib:/var/lib/torrust/index:Z
17-
- ./storage/tracker/log:/var/log/torrust/index:Z
18-
- ./storage/tracker/etc:/etc/torrust/index:Z
16+
- ./storage/index/lib:/var/lib/torrust/index:Z
17+
- ./storage/index/log:/var/log/torrust/index:Z
18+
- ./storage/index/etc:/etc/torrust/index:Z
1919
depends_on:
2020
- tracker
2121
- mailcatcher

tests/common/contexts/torrent/asserts.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ pub fn assert_expected_torrent_details(torrent: &TorrentDetails, expected_torren
1515
("info_hash", torrent.info_hash == expected_torrent.info_hash),
1616
("title", torrent.title == expected_torrent.title),
1717
("description", torrent.description == expected_torrent.description),
18-
(
19-
"category.category_id",
20-
torrent.category.category_id == expected_torrent.category.category_id,
21-
),
18+
("category.category_id", torrent.category.id == expected_torrent.category.id),
2219
("category.name", torrent.category.name == expected_torrent.category.name),
2320
("file_size", torrent.file_size == expected_torrent.file_size),
2421
("seeders", torrent.seeders == expected_torrent.seeders),

tests/common/contexts/torrent/responses.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pub struct TorrentDetails {
7070

7171
#[derive(Deserialize, PartialEq, Debug)]
7272
pub struct Category {
73-
pub category_id: CategoryId,
73+
pub id: CategoryId,
7474
pub name: String,
7575
pub num_torrents: u64,
7676
}

tests/e2e/web/api/v1/contexts/torrent/contract.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ mod for_guests {
182182
title: test_torrent.index_info.title.clone(),
183183
description: test_torrent.index_info.description,
184184
category: Category {
185-
category_id: software_predefined_category_id(),
185+
id: software_predefined_category_id(),
186186
name: test_torrent.index_info.category,
187187
num_torrents: 19, // Ignored in assertion
188188
},

0 commit comments

Comments
 (0)