2 files changed, 70 insertions, 26 deletions

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index d2985d3..62c13e4 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "2"
 services:
   ferdium-server:
-    image: ferdium/ferdium-server:latest
+    image: ferdium-server
     container_name: ferdium-server
     environment:
       - NODE_ENV=development
@@ -25,8 +25,7 @@ services:
       - IS_REGISTRATION_ENABLED=true
       - CONNECT_WITH_FRANZ=false
       - DATA_DIR=/data
-      - PUID=1000
-      - PGID=1000
+      - JWT_USE_PEM=true
     volumes:
       - ferdium-database-vol:/data
       - ferdium-recipes-vol:/app/recipes
@@ -34,5 +33,4 @@ services:
       - 3333:3333
     restart: unless-stopped
 volumes:
-  ferdium-database-vol:
   ferdium-recipes-vol:
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 4178d97..b2f4924 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -17,18 +17,23 @@ Brought to you by ferdium.org
 EOL
 
 # Update recipes from official git repository
+
+# We need to set NODE_ENV to development to install devDependencies
+SAVE_NODE_ENV=$NODE_ENV
+NODE_ENV=development
+
 if [ ! -d "/app/recipes/.git" ]; # When we mount an existing volume (ferdium-recipes-vol:/app/recipes) if this is only /app/recipes it is always true
 then
-  echo '**** Generating recipes for first run ****'
-  git clone --branch main https://github.com/ferdium/ferdium-recipes recipes
+    echo '**** Generating recipes for first run ****'
+    git clone --branch main https://github.com/ferdium/ferdium-recipes recipes
 else
-  echo '**** Updating recipes ****'
-  chown -R root /app/recipes # Fixes ownership problem when doing git pull -r
-  cd recipes
-  git stash -u
-  git pull -r
-  git stash pop
-  cd ..
+    echo '**** Updating recipes ****'
+    chown -R root /app/recipes # Fixes ownership problem when doing git pull -r
+    cd recipes
+    git stash -u
+    git pull -r
+    git stash pop
+    cd ..
 fi
 
 cd recipes
@@ -39,31 +44,72 @@ pnpm i
 pnpm package
 cd ..
 
+# Restore NODE_ENV
+NODE_ENV=$SAVE_NODE_ENV
+
 key_file="${DATA_DIR}/FERDIUM_APP_KEY.txt"
 
 print_app_key_message() {
-  app_key=$1
-  printf '**** App key is %s. ' ${app_key}
-  printf 'You can modify `%s` to update the app key ****\n' ${key_file}
+    app_key=$1
+    printf '**** App key is %s. ' ${app_key}
+    printf 'You can modify `%s` to update the app key ****\n' ${key_file}
 }
 
 # Create APP key if needed
 if [ -z ${APP_KEY} ] && [ ! -f ${key_file} ]
 then
-  echo '**** Generating Ferdium-server app key for first run ****'
-  adonis key:generate
-  APP_KEY=$(grep APP_KEY .env | cut -d '=' -f2)
-  echo ${APP_KEY} > ${key_file}
-  print_app_key_message ${APP_KEY}
+    echo '**** Generating Ferdium-server app key for first run ****'
+    adonis key:generate
+    APP_KEY=$(grep APP_KEY .env | cut -d '=' -f2)
+    echo ${APP_KEY} > ${key_file}
+    print_app_key_message ${APP_KEY}
 else
-  APP_KEY=$(cat ${key_file})
-  print_app_key_message ${APP_KEY}
+    APP_KEY=$(cat ${key_file})
+    print_app_key_message ${APP_KEY}
 fi
 
+# -------------------------------------
+# Create JWT public/private keys if needed
+
+# Check if JWT_USE_PEM is true
+if [ "$JWT_USE_PEM" = "true" ]; then
+  # Define file paths for public and private keys
+  publicKeyFile="${DATA_DIR}/FERDIUM_JWT_PUBLIC_KEY.pem"
+  privateKeyFile="${DATA_DIR}/FERDIUM_JWT_PRIVATE_KEY.pem"
+  # Check if public and private key files exist
+  if [ ! -f "$publicKeyFile" ] || [ ! -f "$privateKeyFile" ]; then
+      echo "Generating public and private keys..."
+
+      # Use Node.js to generate the keys
+      node ace jwt:generate-keys $DATA_DIR
+      mv ${DATA_DIR}/public.pem ${publicKeyFile}
+      mv ${DATA_DIR}/private.pem ${privateKeyFile}
+
+      echo "Public and private keys generated successfully."
+  else
+      echo "Using existing public and private keys."
+  fi
+  JWT_PUBLIC_KEY=$(cat ${publicKeyFile})
+  JWT_PRIVATE_KEY=$(cat ${privateKeyFile})
+  export JWT_PUBLIC_KEY
+  export JWT_PRIVATE_KEY
+else
+    echo "JWT_USE_PEM is not set to true. Skipping JWT certificate generation."
+fi
+# End of JWT public/private keys
+# -------------------------------------
+
 export APP_KEY
 
-node ace migration:run --force
+# Enable the errexit option
+set -e
 
-chown -R "${PUID:-1000}":"${PGID:-1000}" "${DATA_DIR}" /app # This is the cause of the problem on line 29/32
+# Run the script to migrate from AdonisJS v4 to v5
+sh /app/scripts/adonisjs-4-to-5.sh
+
+# Disable the errexit option
+set +e
+
+node ace migration:run --force
 
-su-exec "${PUID:-1000}":"${PGID:-1000}" node server.js
+node build/server.js