dev: more work

.github/workflows/container.yaml

@@ -35,16 +35,9 @@ jobs:
 
     steps:
       - id: checkout_index
-        name: Checkout Repository (Index)
+        name: Checkout Repository (index)
         uses: actions/checkout@v3
 
-      - id: checkout_tracker
-        name: Checkout Repository (Tracker)
-        uses: actions/checkout@v3
-        with:
-          repository: torrust/torrust-tracker
-          path: tracker
-
       - id: setup
         name: Setup Toolchain
         uses: docker/setup-buildx-action@v2
@@ -65,7 +58,7 @@ jobs:
         name: Build (tracker)
         uses: docker/build-push-action@v4
         with:
-          context: tracker
+          context: https://github.com/torrust/torrust-tracker.git#pull/363/head
           push: false
           load: true
           target: debug
@@ -89,8 +82,8 @@ jobs:
         name: Run Applications
 
         run: |
-          export TORRUST_INDEX_CONFIG=$(cat index/config-index.mysql.local.toml)
-          export TORRUST_TRACKER_CONFIG=$(cat index/config-tracker.local.toml)
+          export TORRUST_INDEX_CONFIG=$(cat config-index.mysql.local.toml)
+          export TORRUST_TRACKER_CONFIG=$(cat config-tracker.local.toml)
 
           docker compose up --detach
 

compose.yaml

@@ -8,13 +8,12 @@ services:
     environment:
       - TORRUST_INDEX_CONFIG=${TORRUST_INDEX_CONFIG}
       - TORRUST_INDEX_CORS_PERMISSIVE=true
-      - CARGO_HOME=/home/appuser/.cargo
     networks:
       - server_side
     ports:
       - 3001:3001
     volumes:
-      - ./lib/torrust:/var/lib/torrust
+      - ./storage:/var/lib/torrust/index
     depends_on:
       - tracker
       - mailcatcher
@@ -33,7 +32,7 @@ services:
       - 6969:6969/udp
       - 1212:1212/tcp
     volumes:
-      - ./lib/torrust:/var/lib/torrust
+      - ./storage:/var/lib/torrust/tracker
     depends_on:
       - mysql
 

config-index.sqlite.local.toml

@@ -20,7 +20,7 @@ max_password_length = 64
 secret_key = "MaxVerstappenWC2021"
 
 [database]
-connect_url = "sqlite:///var/lib/torrust/database/torrust_index_backend_e2e_testing.db?mode=rwc"
+connect_url = "sqlite:///var/lib/torrust/index/database/torrust_index_backend_e2e_testing.db?mode=rwc"
 
 [mail]
 email_verification_enabled = false

config-tracker.local.toml

@@ -1,7 +1,7 @@
 log_level = "info"
 mode = "public"
 db_driver = "Sqlite3"
-db_path = "/var/lib/torrust/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

docker/bin/build.sh

@@ -1,13 +1,4 @@
 #!/bin/bash
 
-TORRUST_INDEX_USER_UID=${TORRUST_INDEX_USER_UID:-1000}
-TORRUST_IDX_BACK_RUN_AS_USER=${TORRUST_IDX_BACK_RUN_AS_USER:-appuser}
-
-echo "Building docker image ..."
-echo "TORRUST_INDEX_USER_UID: $TORRUST_INDEX_USER_UID"
-echo "TORRUST_IDX_BACK_RUN_AS_USER: $TORRUST_IDX_BACK_RUN_AS_USER"
-
-docker build \
-    --build-arg UID="$TORRUST_INDEX_USER_UID" \
-    --build-arg RUN_AS_USER="$TORRUST_IDX_BACK_RUN_AS_USER" \
-    --target debug --tag torrust-index-backend:debug .
+docker build --target debug --tag torrust-index-backend:debug .
+docker build --target debug --tag torrust-tracker:debug https://github.com/torrust/torrust-tracker.git#pull/363/head	

docker/bin/e2e/mysql/e2e-env-up.sh

@@ -1,12 +1,11 @@
 #!/bin/bash
 
-USER_UID=${USER_UID:-1000} \
-    docker compose build
-
-USER_UID=${USER_UID:-1000} \
-    TORRUST_INDEX_CONFIG=$(cat config-index.mysql.local.toml) \
-    TORRUST_INDEX_MYSQL_DATABASE="torrust_index_backend_e2e_testing" \
-    TORRUST_TRACKER_CONFIG=$(cat config-tracker.local.toml) \
-    TORRUST_TRACKER_API_TOKEN=${TORRUST_TRACKER_API_TOKEN:-MyAccessToken} \
-    docker compose up -d
+docker compose build
+
+
+TORRUST_INDEX_CONFIG=$(cat config-index.mysql.local.toml) \
+TORRUST_INDEX_MYSQL_DATABASE="torrust_index_backend_e2e_testing" \
+TORRUST_TRACKER_CONFIG=$(cat config-tracker.local.toml) \
+TORRUST_TRACKER_API_TOKEN=${TORRUST_TRACKER_API_TOKEN:-MyAccessToken} \
+docker compose up -d
 

docker/bin/e2e/sqlite/e2e-env-up.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-USER_UID=${USER_UID:-1000} \
-    docker compose build
-
-USER_UID=${USER_UID:-1000} \
-    TORRUST_INDEX_CONFIG=$(cat config-index.sqlite.local.toml) \
-    TORRUST_TRACKER_CONFIG=$(cat config-tracker.local.toml) \
-    TORRUST_TRACKER_API_TOKEN=${TORRUST_TRACKER_API_TOKEN:-MyAccessToken} \
-    docker compose up -d
+
+docker compose build
+
+
+TORRUST_INDEX_CONFIG=$(cat config-index.sqlite.local.toml) \
+TORRUST_TRACKER_CONFIG=$(cat config-tracker.local.toml) \
+TORRUST_TRACKER_API_TOKEN=${TORRUST_TRACKER_API_TOKEN:-MyAccessToken} \
+docker compose up -d

docker/bin/run.sh

@@ -1,11 +1,10 @@
 #!/bin/bash
 
-TORRUST_INDEX_USER_UID=${TORRUST_INDEX_USER_UID:-1000}
 TORRUST_INDEX_CONFIG=$(cat config.toml)
 
 docker run -it \
-    --user="$TORRUST_INDEX_USER_UID" \
     --publish 3001:3001/tcp \
     --env TORRUST_INDEX_CONFIG="$TORRUST_INDEX_CONFIG" \
-    --volume "$(pwd)/lib/torrust":"/var/lib/torrust" \
-    torrust-index-backend
+    --volume "$(pwd)/source":"/var/lib/torrust" \
+    --entrypoint "torrust-index-backend" \
+    torrust-index-backend:debug