From d0e3d7320637754b365d700aaf060bf4a8cc2b41 Mon Sep 17 00:00:00 2001 From: Jose Celano Date: Thu, 7 Sep 2023 16:18:38 +0100 Subject: [PATCH] fix: docker compose with the new tracker container image The Torrust Tracker container images has changed. We have to upgrade the configuration to use the latest version. --- .env.local | 4 ++-- compose.yaml | 22 +++++++--------------- config-tracker.local.toml | 2 +- docker/README.md | 3 ++- docker/bin/e2e/mysql/e2e-env-reset.sh | 10 +++++----- docker/bin/e2e/mysql/e2e-env-up.sh | 3 ++- docker/bin/e2e/sqlite/e2e-env-reset.sh | 8 ++++---- docker/bin/e2e/sqlite/e2e-env-up.sh | 5 ++++- 8 files changed, 27 insertions(+), 30 deletions(-) diff --git a/.env.local b/.env.local index 90b3e4b3..a94b279e 100644 --- a/.env.local +++ b/.env.local @@ -2,5 +2,5 @@ DATABASE_URL=sqlite://storage/database/data.db?mode=rwc TORRUST_IDX_BACK_CONFIG= TORRUST_IDX_BACK_USER_UID=1000 TORRUST_TRACKER_CONFIG= -TORRUST_TRACKER_USER_UID=1000 -TORRUST_TRACKER_API_TOKEN=MyAccessToken +TORRUST_TRACKER_DATABASE=sqlite +TORRUST_TRACKER_API_ADMIN_TOKEN=MyAccessToken diff --git a/compose.yaml b/compose.yaml index 8bf4741e..8c09ad96 100644 --- a/compose.yaml +++ b/compose.yaml @@ -38,29 +38,21 @@ services: tracker: image: torrust/tracker:develop - user: ${TORRUST_TRACKER_USER_UID:-1000}:${TORRUST_TRACKER_USER_UID:-1000} tty: true environment: - TORRUST_TRACKER_CONFIG=${TORRUST_TRACKER_CONFIG} - - TORRUST_TRACKER_API_TOKEN=${TORRUST_TRACKER_API_TOKEN:-MyAccessToken} + - TORRUST_TRACKER_DATABASE=${TORRUST_TRACKER_DATABASE:-sqlite3} + - TORRUST_TRACKER_API_ADMIN_TOKEN=${TORRUST_TRACKER_API_ADMIN_TOKEN:-MyAccessToken} networks: - server_side ports: - 6969:6969/udp - - 1212:1212/tcp - # todo: implement healthcheck - #healthcheck: - # test: - # [ - # "CMD-SHELL", - # "/app/main healthcheck" - # ] - # interval: 10s - # retries: 5 - # start_period: 10s - # timeout: 3s + - 7070:7070 + - 1212:1212 volumes: - - ./storage:/app/storage + - ./storage/tracker/lib:/var/lib/torrust/tracker:Z + - ./storage/tracker/log:/var/log/torrust/tracker:Z + - ./storage/tracker/etc:/etc/torrust/tracker:Z depends_on: - mysql diff --git a/config-tracker.local.toml b/config-tracker.local.toml index 9db1b578..2c7cb704 100644 --- a/config-tracker.local.toml +++ b/config-tracker.local.toml @@ -1,7 +1,7 @@ log_level = "info" mode = "public" db_driver = "Sqlite3" -db_path = "./storage/database/torrust_tracker_e2e_testing.db" +db_path = "/var/lib/torrust/tracker/database/torrust_tracker_e2e_testing.db" announce_interval = 120 min_announce_interval = 120 max_peer_timeout = 900 diff --git a/docker/README.md b/docker/README.md index be47bfad..4e094776 100644 --- a/docker/README.md +++ b/docker/README.md @@ -65,8 +65,9 @@ Build and run it locally: ```s TORRUST_IDX_BACK_USER_UID=${TORRUST_IDX_BACK_USER_UID:-1000} \ TORRUST_IDX_BACK_CONFIG=$(cat config-idx-back.local.toml) \ + TORRUST_TRACKER_DATABASE=${TORRUST_TRACKER_DATABASE:-mysql} \ TORRUST_TRACKER_CONFIG=$(cat config-tracker.local.toml) \ - TORRUST_TRACKER_API_TOKEN=${TORRUST_TRACKER_API_TOKEN:-MyAccessToken} \ + TORRUST_TRACKER_API_ADMIN_TOKEN=${TORRUST_TRACKER_API_ADMIN_TOKEN:-MyAccessToken} \ docker compose up -d --build ``` diff --git a/docker/bin/e2e/mysql/e2e-env-reset.sh b/docker/bin/e2e/mysql/e2e-env-reset.sh index d8dc0764..8bd8e09a 100755 --- a/docker/bin/e2e/mysql/e2e-env-reset.sh +++ b/docker/bin/e2e/mysql/e2e-env-reset.sh @@ -19,15 +19,15 @@ mysql -h $MYSQL_HOST -u $MYSQL_USER -p$MYSQL_PASSWORD -e "DROP DATABASE IF EXIST # Tracker # Delete tracker database -rm -f ./storage/database/torrust_tracker_e2e_testing.db +rm -f ./storage/tracker/lib/database/torrust_tracker_e2e_testing.db # Generate storage directory if it does not exist -mkdir -p "./storage/database" +mkdir -p "./storage/tracker/lib/database" # Generate the sqlite database for the tracker if it does not exist -if ! [ -f "./storage/database/torrust_tracker_e2e_testing.db" ]; then - touch ./storage/database/torrust_tracker_e2e_testing.db - echo ";" | sqlite3 ./storage/database/torrust_tracker_e2e_testing.db +if ! [ -f "./storage/tracker/lib/database/torrust_tracker_e2e_testing.db" ]; then + touch ./storage/tracker/lib/database/torrust_tracker_e2e_testing.db + echo ";" | sqlite3 ./storage/tracker/lib/database/torrust_tracker_e2e_testing.db fi ./docker/bin/e2e/mysql/e2e-env-up.sh diff --git a/docker/bin/e2e/mysql/e2e-env-up.sh b/docker/bin/e2e/mysql/e2e-env-up.sh index 195409b1..ddf54d57 100755 --- a/docker/bin/e2e/mysql/e2e-env-up.sh +++ b/docker/bin/e2e/mysql/e2e-env-up.sh @@ -7,6 +7,7 @@ TORRUST_IDX_BACK_USER_UID=${TORRUST_IDX_BACK_USER_UID:-1000} \ TORRUST_IDX_BACK_CONFIG=$(cat config-idx-back.mysql.local.toml) \ TORRUST_IDX_BACK_MYSQL_DATABASE="torrust_index_backend_e2e_testing" \ TORRUST_TRACKER_CONFIG=$(cat config-tracker.local.toml) \ - TORRUST_TRACKER_API_TOKEN=${TORRUST_TRACKER_API_TOKEN:-MyAccessToken} \ + TORRUST_TRACKER_DATABASE=${TORRUST_TRACKER_DATABASE:-mysql} \ + TORRUST_TRACKER_API_ADMIN_TOKEN=${TORRUST_TRACKER_API_ADMIN_TOKEN:-MyAccessToken} \ docker compose up -d diff --git a/docker/bin/e2e/sqlite/e2e-env-reset.sh b/docker/bin/e2e/sqlite/e2e-env-reset.sh index 8eeefd6f..7498fe50 100755 --- a/docker/bin/e2e/sqlite/e2e-env-reset.sh +++ b/docker/bin/e2e/sqlite/e2e-env-reset.sh @@ -5,7 +5,7 @@ docker compose down rm -f ./storage/database/torrust_index_backend_e2e_testing.db -rm -f ./storage/database/torrust_tracker_e2e_testing.db +rm -f ./storage/tracker/lib/database/torrust_tracker_e2e_testing.db # Generate storage directory if it does not exist mkdir -p "./storage/database" @@ -18,9 +18,9 @@ if ! [ -f "./storage/database/torrust_index_backend_e2e_testing.db" ]; then fi # Generate the sqlite database for the tracker if it does not exist -if ! [ -f "./storage/database/torrust_tracker_e2e_testing.db" ]; then - touch ./storage/database/torrust_tracker_e2e_testing.db - echo ";" | sqlite3 ./storage/database/torrust_tracker_e2e_testing.db +if ! [ -f "./storage/tracker/lib/database/torrust_tracker_e2e_testing.db" ]; then + touch ./storage/tracker/lib/database/torrust_tracker_e2e_testing.db + echo ";" | sqlite3 ./storage/tracker/lib/database/torrust_tracker_e2e_testing.db fi ./docker/bin/e2e/sqlite/e2e-env-up.sh diff --git a/docker/bin/e2e/sqlite/e2e-env-up.sh b/docker/bin/e2e/sqlite/e2e-env-up.sh index 25911757..ca3442cf 100755 --- a/docker/bin/e2e/sqlite/e2e-env-up.sh +++ b/docker/bin/e2e/sqlite/e2e-env-up.sh @@ -5,6 +5,9 @@ TORRUST_IDX_BACK_USER_UID=${TORRUST_IDX_BACK_USER_UID:-1000} \ TORRUST_IDX_BACK_USER_UID=${TORRUST_IDX_BACK_USER_UID:-1000} \ TORRUST_IDX_BACK_CONFIG=$(cat config-idx-back.sqlite.local.toml) \ + TORRUST_IDX_BACK_MYSQL_DATABASE="torrust_index_backend_e2e_testing" \ TORRUST_TRACKER_CONFIG=$(cat config-tracker.local.toml) \ - TORRUST_TRACKER_API_TOKEN=${TORRUST_TRACKER_API_TOKEN:-MyAccessToken} \ + TORRUST_TRACKER_DATABASE=${TORRUST_TRACKER_DATABASE:-sqlite3} \ + TORRUST_TRACKER_API_ADMIN_TOKEN=${TORRUST_TRACKER_API_ADMIN_TOKEN:-MyAccessToken} \ docker compose up -d +