Merge #367: Fix container configuration

db968d5 ci: [#363] fix container configuration (Jose Celano)

Pull request description:

  Following latest cahgnes in the Tracker and Index.

ACKs for top commit:
  josecelano:
    ACK db968d5

Tree-SHA512: 4cc437e9216aa42415fea6f3e6760f2dfcbf6227cbd7717083cf8f1e73106f4e6205b56378da586e8e02514366a64fb1d075621942e4b89e361bd2f60cb1db67

Author: josecelano

.env.local

@@ -0,0 +1,12 @@
+# App build variables
+API_BASE_URL=http://localhost:3001/v1
+
+# Rust SQLx
+DATABASE_URL=sqlite://storage/database/data.db?mode=rwc
+
+# Docker compose
+TORRUST_INDEX_CONFIG=
+USER_ID=1000
+TORRUST_TRACKER_CONFIG=
+TORRUST_TRACKER_USER_UID=1000
+TORRUST_TRACKER_API_TOKEN=MyAccessToken

.github/workflows/test_docker_build.yml

@@ -17,11 +17,16 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./Dockerfile
+          file: ./Containerfile
           push: false
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-      # todo: enable when docker compose congiguration is ready
-      #- name: Build docker-compose images
-      #  run: docker compose build
+      - id: checkout
+        name: Checkout Repository
+        uses: actions/checkout@v4
+  
+      - id: compose
+        name: Compose
+        run: docker compose build
+

.github/workflows/test.yml renamed to .github/workflows/testing.yml

@@ -24,5 +24,4 @@ jobs:
         run: npm run generate
 
       - name: E2E Tests
-        run: ./docker/bin/run-e2e-tests.sh
-
+        run: ./contrib/dev-tools/container/e2e/sqlite/run-e2e-tests.sh

.gitignore

@@ -1,6 +1,7 @@
 .cache
 .env
 .env*
+!.env.local
 .idea
 .nitro
 .nuxt

Dockerfile renamed to Containerfile

@@ -1,9 +1,10 @@
 name: torrust
 services:
 
-  idx-fron:
+  index-gui:
     build:
       context: .
+      dockerfile: ./Containerfile
       args:
         RUN_AS_USER: appuser
         UID: ${TORRUST_INDEX_GUI_USER_UID:-1001}
@@ -13,17 +14,6 @@ services:
     ports:
       - 3000:3000
       - 24678:24678
-    # todo: implement healthcheck
-    #healthcheck:
-    #  test:
-    #    [
-    #      "CMD-SHELL",
-    #      ""
-    #    ]
-    #  interval: 10s
-    #  retries: 5
-    #  start_period: 10s
-    #  timeout: 3s
     volumes:
       - ./:/app
     depends_on:
@@ -36,25 +26,16 @@ services:
     image: torrust/index:develop
     tty: true
     environment:
+      - USER_ID=${USER_ID}
       - TORRUST_INDEX_CONFIG=${TORRUST_INDEX_CONFIG}
-      - TORRUST_INDEX_DATABASE_DRIVER=${TORRUST_TRACKER_DATABASE_DRIVER:-sqlite3}
-      - TORRUST_INDEX_API_CORS_PERMISSIVE=${TORRUST_INDEX_API_CORS_PERMISSIVE:-true}
+      - TORRUST_INDEX_DATABASE=${TORRUST_INDEX_DATABASE:-e2e_testing_sqlite3}
+      - TORRUST_INDEX_DATABASE_DRIVER=${TORRUST_INDEX_DATABASE_DRIVER:-sqlite3}
       - TORRUST_INDEX_TRACKER_API_TOKEN=${TORRUST_INDEX_TRACKER_API_TOKEN:-MyAccessToken}
+      - TORRUST_INDEX_API_CORS_PERMISSIVE=${TORRUST_INDEX_API_CORS_PERMISSIVE:-true}
     networks:
       - server_side
     ports:
       - 3001:3001
-    # todo: implement healthcheck
-    #healthcheck:
-    #  test:
-    #    [
-    #      "CMD-SHELL",
-    #      "cargo run healthcheck"
-    #    ]
-    #  interval: 10s
-    #  retries: 5
-    #  start_period: 10s
-    #  timeout: 3s
     volumes:
       - ./storage/index/lib:/var/lib/torrust/index:Z
       - ./storage/index/log:/var/log/torrust/index:Z
@@ -68,8 +49,10 @@ services:
     image: torrust/tracker:develop
     tty: true
     environment:
+      - USER_ID=${USER_ID}
       - TORRUST_TRACKER_CONFIG=${TORRUST_TRACKER_CONFIG}
-      - TORRUST_TRACKER_DATABASE=${TORRUST_TRACKER_DATABASE:-sqlite3}
+      - TORRUST_TRACKER_DATABASE=${TORRUST_TRACKER_DATABASE:-e2e_testing_sqlite3}
+      - TORRUST_TRACKER_DATABASE_DRIVER=${TORRUST_TRACKER_DATABASE_DRIVER:-sqlite3}
       - TORRUST_TRACKER_API_ADMIN_TOKEN=${TORRUST_TRACKER_API_ADMIN_TOKEN:-MyAccessToken}
     networks:
       - server_side

compose.yaml

@@ -13,4 +13,4 @@ docker build \
     --build-arg UID="$TORRUST_INDEX_GUI_USER_UID" \
     --build-arg RUN_AS_USER="$TORRUST_INDEX_GUI_RUN_AS_USER" \
     --build-arg API_BASE_URL="$TORRUST_INDEX_GUI_API_BASE_URL" \
-    -t torrust-index-frontend .
+    -t torrust-index-gui .

docker/bin/build.sh renamed to contrib/dev-tools/container/build.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+USER_ID=${USER_ID:-1000} \
+    TORRUST_INDEX_CONFIG=$(cat ./share/default/config/index.e2e.container.sqlite3.toml) \
+    TORRUST_TRACKER_CONFIG=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
+    docker compose down

contrib/dev-tools/container/e2e/sqlite/e2e-env-down.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+TORRUST_INDEX_CONFIG=$(cat ./share/default/config/index.e2e.container.sqlite3.toml) \
+    docker compose build
+
+USER_ID=${USER_ID:-1000} \
+    TORRUST_INDEX_CONFIG=$(cat ./share/default/config/index.e2e.container.sqlite3.toml) \
+    TORRUST_INDEX_DATABASE="e2e_testing_sqlite3" \
+    TORRUST_INDEX_DATABASE_DRIVER="sqlite3" \
+    TORRUST_INDEX_TRACKER_API_TOKEN="MyAccessToken" \
+    TORRUST_TRACKER_CONFIG=$(cat ./share/default/config/tracker.e2e.container.sqlite3.toml) \
+    TORRUST_TRACKER_DATABASE="e2e_testing_sqlite3" \
+    TORRUST_TRACKER_DATABASE_DRIVER="sqlite3" \
+    TORRUST_TRACKER_API_ADMIN_TOKEN="MyAccessToken" \
+    docker compose up --detach --pull  always --remove-orphans

contrib/dev-tools/container/e2e/sqlite/e2e-env-up.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# This script is only intended to be used for E2E testing environment.
+
+## Index
+
+# Generate the Index sqlite database directory and file if it does not exist
+mkdir -p ./storage/index/lib/database
+
+if ! [ -f "./storage/index/lib/database/${TORRUST_INDEX_DATABASE}.db" ]; then
+    echo "Creating index database '${TORRUST_INDEX_DATABASE}.db'"
+    sqlite3 "./storage/index/lib/database/${TORRUST_INDEX_DATABASE}.db" "VACUUM;"
+fi
+
+## Tracker
+
+# Generate the Tracker sqlite database directory and file if it does not exist
+mkdir -p ./storage/tracker/lib/database
+
+if ! [ -f "./storage/tracker/lib/database/${TORRUST_TRACKER_DATABASE}.db" ]; then
+    echo "Creating tracker database '${TORRUST_TRACKER_DATABASE}.db'"
+    sqlite3 "./storage/tracker/lib/database/${TORRUST_TRACKER_DATABASE}.db" "VACUUM;"
+fi