Merge #264: Fix docker compose configuration with the new tracker container image

b5244d4 fix: [#262] docker compose with the new tracker container image (Jose Celano)

Pull request description:

  The [Torrust Tracker container image has changed](torrust/torrust-tracker@7d133ae).

  We have to upgrade the configuration to use the latest version.

  Integration tests fail for pull requests because the tracker container cannot start.

  The significant changes introduced were:

  - Rename some env vars: TORRUST_TRACKER_API_TOKEN->TORRUST_TRACKER_API_ADMIN_TOKEN
  - Database folder was moved to a new location

Top commit has no ACKs.

Tree-SHA512: d23bdd86893b7e7b8fe09c437f2dd15b854b4a17dbb34582ba862d0ee5729d0b28e42f4d8fc298fc0f2a381c251d20915cf9ff52b588a7e8c36aa69b9fee74a5

Author: josecelano

bin/install.sh

@@ -10,16 +10,13 @@ fi
 mkdir -p "./storage/database"
 
 # Generate the sqlite database for the index backend if it does not exist
-if ! [ -f "./storage/database/torrust_index_backend_e2e_testing.db" ]; then
-    # todo: it should get the path from config.toml and only do it when we use sqlite
-    touch ./storage/database/torrust_index_backend_e2e_testing.db
-    echo ";" | sqlite3 ./storage/database/torrust_index_backend_e2e_testing.db
+if ! [ -f "./storage/database/data.db" ]; then
+    sqlite3 ./storage/database/data.db "VACUUM;"
 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/sqlite3.db" ]; then
+    sqlite3 ./storage/tracker/lib/database/sqlite3.db "VACUUM;"
 fi
 
 npm install

compose.yaml

@@ -64,29 +64,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
 

config-tracker.local.toml

@@ -1,8 +1,7 @@
 log_level = "info"
 mode = "public"
 db_driver = "Sqlite3"
-db_path = "./storage/database/torrust_tracker_e2e_testing.db" # SQLite
-#db_path = "mysql://root:root_secret_password@mysql:3306/torrust_tracker_e2e_testing" # MySQL
+db_path = "/var/lib/torrust/tracker/database/torrust_tracker_e2e_testing.db"
 announce_interval = 120
 min_announce_interval = 120
 max_peer_timeout = 900

docker/bin/e2e-env-down.sh

@@ -3,6 +3,8 @@
 TORRUST_IDX_BACK_USER_UID=${TORRUST_IDX_BACK_USER_UID:-1000} \
     TORRUST_IDX_BACK_CONFIG=$(cat config-idx-back.local.toml) \
     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 down
+    
 

docker/bin/e2e-env-up.sh

@@ -6,5 +6,6 @@ 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.local.toml) \
     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