aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorLibravatar Ricardo <ricardo@cino.io>2023-10-13 14:12:03 +0200
committerLibravatar GitHub <noreply@github.com>2023-10-13 13:12:03 +0100
commite503468660a13760010a94ecda5f0625c6f47f87 (patch)
treefa532f54fc5f091de08d55405ec6339bd2440a02 /docker
parent1.3.16 [skip ci] (diff)
downloadferdium-server-e503468660a13760010a94ecda5f0625c6f47f87.tar.gz
ferdium-server-e503468660a13760010a94ecda5f0625c6f47f87.tar.zst
ferdium-server-e503468660a13760010a94ecda5f0625c6f47f87.zip
Server re-build with latest AdonisJS framework & Typescript (#47)
* chore: setup first basis structure * chore: ensure styling is loaded correctly * chore: comply to new routing syntax by replace . with / in routes/resource locations * chore: add login controller * chore: correctly use views with slash instead of dot * chore: working login + tests * chore: clean up tests * chore: add password-forgot endpoint and matching test * chore: add delete page test * chore: add logout test * chore: add reset-password route and tests * chore: remove obsolete comment * chore: add account-page and tests * chore: add data page & first step of the test * chore: add transfer/import data feature and tests * chore: add export and basic test * chore: add all static api routes with tests * Regenerate 'pnpm-lock.json' and fix bad merge conflict WIP: - Tests have been commented out since they dont work - Server doesn't start * easier dev and test runs * - remove --require-pragma from reformat-files so formatting works properly - run pnpm reformat-files over codebase - remove .json files from .eslintignore - add invalid.json file to .eslintignore - configure prettier properly in eslint config - add type jsdoc to prettier config - run adonis generate:manifest command to regenerate ace-manifest.json - specify volta in package.json - introduce typecheck npm script - remove unused .mjs extension from npm scripts - install missing type definition dependencies - add pnpm.allowedDeprecatedVersions to package.json - fix invalid extends in tsconfig.json causing TS issues throughout codebase - remove @ts-ignore throughout codebase which is not relevant anymore - enable some of the tsconfig options - remove outdated eslint-disable from codebase - change deprecated faker.company.companyName() to faker.company.name() - fix TS issues inside transfer.spec.ts * - update to latest node and pnpm versions - upgrade all non-major dependencies to latest - install missing @types/luxon dependency - add cuid to pnpm.allowedDeprecatedVersions - add esModuleInterop config option to tsconfig - migrate more deprecated faker methods to new ones - add more temporary ts-ignore to code * - update eslint config - remove trailingComma: all since default in prettier v3 - add typecheck command to prepare-code npm script - upgrade various dependencies to latest major version - update tsconfig to include only useful config options - disable some lint issues and fix others * - add test command to prepare-code - disable strictPropertyInitialization flag in tsconfig which creates issues with adonis models - update precommit hook to excute pnpm prepare-code - remove ts-ignore statements from all models * fix node and pnpm dependency update * add cross env (so that we can develop on windows) * add signup endpoint (TODO: JWT auth) * Add login endpoint * Add me and updateMe endpoints * Add service endpoint * refactor: change endpoints to use jwt * add recipes endpoint * add workspaces endpoint * fix web controllors for login and post import * Update node deps * Change auth middleware (for web) and exempt api from CSRF * Add import endpoint (franz import) * Fix export/import logic * Fix service and workspace data in user/data * Fix partial lint * chore: workaround lint issues * fix: migration naming had two . * Sync back node with recipes repo * Temporarily ignore typescript * Fix adonisrc to handle public folder static assets * Fix issue with production database * add Legacy Password Provider * Fix lint errors * Fix issue on login errors frontend * add Legacy Password Provider * Fix issue with customIcons * Fix issue with auth tokens * Update 'node' to '18.18.0' * make docker work * improve docker entrypoint (test api performance) * Add migration database script * NODE_ENV on recipes * prefer @ts-expect-error over @ts-ignore * small fixes * Update 'pnpm' to '8.7.6' * fix error catch * Automatically generate JWT Public and Private keys * Use custom Adonis5-jwt * Update code to use secret (old way, no breaking changes) * Normalize appKey * Trick to make JWT tokens on client work with new version * Fix error with new JWT logic * Change migration and how we store JWT * Fix 500 response code (needs to be 401) * Improve logic and fix bugs * Fix build and entrypoint logic * Catch error if appKey changes * Add newToken logic * Fix lint (ignore any errors) * Add build for PRs * pnpm reformat-files result * Fix some tests * Fix reset password not working (test failing) * Restore csrfTokens (disabled by accident) * Fix pnpm start command with .env * Disable failing tests on the transfer endpoint (TODO) * Add tests to PR build * Fix build * Remove unnecessary assertStatus * Add typecheck * hash password on UserFactory (fix build) * Add JWT_USE_PEM true by default (increase security) * fix name of github action --------- Co-authored-by: Vijay A <vraravam@users.noreply.github.com> Co-authored-by: Balaji Vijayakumar <kuttibalaji.v6@gmail.com> Co-authored-by: MCMXC <16797721+mcmxcdev@users.noreply.github.com> Co-authored-by: André Oliveira <oliveira.andrerodrigues95@gmail.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/docker-compose.yml6
-rwxr-xr-xdocker/entrypoint.sh90
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 @@
1version: "2" 1version: "2"
2services: 2services:
3 ferdium-server: 3 ferdium-server:
4 image: ferdium/ferdium-server:latest 4 image: ferdium-server
5 container_name: ferdium-server 5 container_name: ferdium-server
6 environment: 6 environment:
7 - NODE_ENV=development 7 - NODE_ENV=development
@@ -25,8 +25,7 @@ services:
25 - IS_REGISTRATION_ENABLED=true 25 - IS_REGISTRATION_ENABLED=true
26 - CONNECT_WITH_FRANZ=false 26 - CONNECT_WITH_FRANZ=false
27 - DATA_DIR=/data 27 - DATA_DIR=/data
28 - PUID=1000 28 - JWT_USE_PEM=true
29 - PGID=1000
30 volumes: 29 volumes:
31 - ferdium-database-vol:/data 30 - ferdium-database-vol:/data
32 - ferdium-recipes-vol:/app/recipes 31 - ferdium-recipes-vol:/app/recipes
@@ -34,5 +33,4 @@ services:
34 - 3333:3333 33 - 3333:3333
35 restart: unless-stopped 34 restart: unless-stopped
36volumes: 35volumes:
37 ferdium-database-vol:
38 ferdium-recipes-vol: 36 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
17EOL 17EOL
18 18
19# Update recipes from official git repository 19# Update recipes from official git repository
20
21# We need to set NODE_ENV to development to install devDependencies
22SAVE_NODE_ENV=$NODE_ENV
23NODE_ENV=development
24
20if [ ! -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 25if [ ! -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
21then 26then
22 echo '**** Generating recipes for first run ****' 27 echo '**** Generating recipes for first run ****'
23 git clone --branch main https://github.com/ferdium/ferdium-recipes recipes 28 git clone --branch main https://github.com/ferdium/ferdium-recipes recipes
24else 29else
25 echo '**** Updating recipes ****' 30 echo '**** Updating recipes ****'
26 chown -R root /app/recipes # Fixes ownership problem when doing git pull -r 31 chown -R root /app/recipes # Fixes ownership problem when doing git pull -r
27 cd recipes 32 cd recipes
28 git stash -u 33 git stash -u
29 git pull -r 34 git pull -r
30 git stash pop 35 git stash pop
31 cd .. 36 cd ..
32fi 37fi
33 38
34cd recipes 39cd recipes
@@ -39,31 +44,72 @@ pnpm i
39pnpm package 44pnpm package
40cd .. 45cd ..
41 46
47# Restore NODE_ENV
48NODE_ENV=$SAVE_NODE_ENV
49
42key_file="${DATA_DIR}/FERDIUM_APP_KEY.txt" 50key_file="${DATA_DIR}/FERDIUM_APP_KEY.txt"
43 51
44print_app_key_message() { 52print_app_key_message() {
45 app_key=$1 53 app_key=$1
46 printf '**** App key is %s. ' ${app_key} 54 printf '**** App key is %s. ' ${app_key}
47 printf 'You can modify `%s` to update the app key ****\n' ${key_file} 55 printf 'You can modify `%s` to update the app key ****\n' ${key_file}
48} 56}
49 57
50# Create APP key if needed 58# Create APP key if needed
51if [ -z ${APP_KEY} ] && [ ! -f ${key_file} ] 59if [ -z ${APP_KEY} ] && [ ! -f ${key_file} ]
52then 60then
53 echo '**** Generating Ferdium-server app key for first run ****' 61 echo '**** Generating Ferdium-server app key for first run ****'
54 adonis key:generate 62 adonis key:generate
55 APP_KEY=$(grep APP_KEY .env | cut -d '=' -f2) 63 APP_KEY=$(grep APP_KEY .env | cut -d '=' -f2)
56 echo ${APP_KEY} > ${key_file} 64 echo ${APP_KEY} > ${key_file}
57 print_app_key_message ${APP_KEY} 65 print_app_key_message ${APP_KEY}
58else 66else
59 APP_KEY=$(cat ${key_file}) 67 APP_KEY=$(cat ${key_file})
60 print_app_key_message ${APP_KEY} 68 print_app_key_message ${APP_KEY}
61fi 69fi
62 70
71# -------------------------------------
72# Create JWT public/private keys if needed
73
74# Check if JWT_USE_PEM is true
75if [ "$JWT_USE_PEM" = "true" ]; then
76 # Define file paths for public and private keys
77 publicKeyFile="${DATA_DIR}/FERDIUM_JWT_PUBLIC_KEY.pem"
78 privateKeyFile="${DATA_DIR}/FERDIUM_JWT_PRIVATE_KEY.pem"
79 # Check if public and private key files exist
80 if [ ! -f "$publicKeyFile" ] || [ ! -f "$privateKeyFile" ]; then
81 echo "Generating public and private keys..."
82
83 # Use Node.js to generate the keys
84 node ace jwt:generate-keys $DATA_DIR
85 mv ${DATA_DIR}/public.pem ${publicKeyFile}
86 mv ${DATA_DIR}/private.pem ${privateKeyFile}
87
88 echo "Public and private keys generated successfully."
89 else
90 echo "Using existing public and private keys."
91 fi
92 JWT_PUBLIC_KEY=$(cat ${publicKeyFile})
93 JWT_PRIVATE_KEY=$(cat ${privateKeyFile})
94 export JWT_PUBLIC_KEY
95 export JWT_PRIVATE_KEY
96else
97 echo "JWT_USE_PEM is not set to true. Skipping JWT certificate generation."
98fi
99# End of JWT public/private keys
100# -------------------------------------
101
63export APP_KEY 102export APP_KEY
64 103
65node ace migration:run --force 104# Enable the errexit option
105set -e
66 106
67chown -R "${PUID:-1000}":"${PGID:-1000}" "${DATA_DIR}" /app # This is the cause of the problem on line 29/32 107# Run the script to migrate from AdonisJS v4 to v5
108sh /app/scripts/adonisjs-4-to-5.sh
109
110# Disable the errexit option
111set +e
112
113node ace migration:run --force
68 114
69su-exec "${PUID:-1000}":"${PGID:-1000}" node server.js 115node build/server.js