From 9dce48e99f62d5f79f87636baa67c3f738746384 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 10 Jul 2025 16:01:59 +0000 Subject: [PATCH] Docker nightmare --- .env.development | 4 +++- backend/server2.js | 31 +++++++++++++------------------ docker-compose.prod.yml | 4 ++-- user_profile.db | Bin 200704 -> 200704 bytes 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/.env.development b/.env.development index 4f8265c..9037b4e 100755 --- a/.env.development +++ b/.env.development @@ -21,4 +21,6 @@ GCP_CLOUD_SQL_PASSWORD=q2O}1PU-R:|l57S0 TWILIO_ACCOUNT_SID=ACd700c6fb9f691ccd9ccab73f2dd4173d TWILIO_AUTH_TOKEN=fb8979ccb172032a249014c9c30eba80 -TWILIO_MESSAGING_SERVICE_SID=MGMGaa07992a9231c841b1bfb879649026d6 \ No newline at end of file +TWILIO_MESSAGING_SERVICE_SID=MGMGaa07992a9231c841b1bfb879649026d6 + +JWT_SECRET=gW4QsOu4AJA4MooIUC9ld2i71VbBovzV1INsaU6ftxYPrxLIeMq6/OY61j0X2RV7 \ No newline at end of file diff --git a/backend/server2.js b/backend/server2.js index e9695fd..d6374d0 100755 --- a/backend/server2.js +++ b/backend/server2.js @@ -62,34 +62,29 @@ app.get('/healthz', (req, res) => res.sendStatus(204)); // 204 No Content * DB connections **************************************************/ - let db; -const initDB = async () => { +let userProfileDb; + +async function initDatabases() { try { db = await open({ filename: '/home/jcoakley/aptiva-dev1-app/salary_info.db', - driver: sqlite3.Database, + driver : sqlite3.Database }); - console.log('Connected to SQLite salary_info.db'); - } catch (error) { - console.error('Error connecting to salary_info.db:', error); - } -}; -initDB(); + console.log('✅ Connected to salary_info.db'); -let userProfileDb; -const initUserProfileDb = async () => { - try { userProfileDb = await open({ filename: '/home/jcoakley/aptiva-dev1-app/user_profile.db', - driver: sqlite3.Database, + driver : sqlite3.Database }); - console.log('Connected to user_profile.db.'); - } catch (error) { - console.error('Error connecting to user_profile.db:', error); + console.log('✅ Connected to user_profile.db'); + } catch (err) { + console.error('❌ DB init failed →', err); + process.exit(1); // let Docker restart the service } -}; -initUserProfileDb(); +} + +await initDatabases(); /************************************************** * Security, CORS, JSON Body diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 378a307..99b567e 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -23,7 +23,7 @@ services: - SALARY_DB=/home/jcoakley/aptiva-dev1-app/salary_info.db volumes: - /home/jcoakley/aptiva-dev1-app/salary_info.db:/home/jcoakley/aptiva-dev1-app/salary_info.db:ro - - /home/jcoakley/aptiva-dev1-app/user_profile.db:/home/jcoakley/aptiva-dev1-app/user_profile.db:ro + - /home/jcoakley/aptiva-dev1-app/user_profile.db:/home/jcoakley/aptiva-dev1-app/user_profile.db - /home/jcoakley/aptiva-dev1-app/public:/home/jcoakley/aptiva-dev1-app/public:ro # ─── server3 ─── @@ -39,4 +39,4 @@ services: - TWILIO_MESSAGING_SERVICE_SID=MGMGaa07992a9231c841b1bfb879649026d6 volumes: - /home/jcoakley/aptiva-dev1-app/public:/home/jcoakley/aptiva-dev1-app/public:ro - - /home/jcoakley/aptiva-dev1-app/user_profile.db:/home/jcoakley/aptiva-dev1-app/user_profile.db:ro \ No newline at end of file + - /home/jcoakley/aptiva-dev1-app/user_profile.db:/home/jcoakley/aptiva-dev1-app/user_profile.db \ No newline at end of file diff --git a/user_profile.db b/user_profile.db index 00f0fa0f9d13aefd47cd814409c428503dbc0b5a..88314bdb3b5d2d5deaebb669e71abb47d0e4ebd3 100644 GIT binary patch delta 710 zcmY+CJ#Q015Qgy`N+8%libMrSW1&cvVq0e)mX&mf1`4W(5-IDu@p;jD_t+1cOXEZ& zWuzd4+@|0MKoR9PP|(p^qM@VU2LQ9a@KxPvH1odCymJR<)q}I@>Fvtm^__>6#o^xh zUgh1-Fs?P;t_Jm>);MnjKdLv^!+NE&-HN08opuz(7yVlB>HEfNxVW(T;7ZpSxI|+>>5NIf&zACSc)|)WOLhjB5skUh7BZAX;)%(fFr{Opmx7ZiYGVo3r%Cc<{{L;^k3k1W3rVRbh9Y|5 zxF+Yam%`@R$TmUn@%;1G;MS}SkJJ<=sLMFL6H&s0$6%Eb2F8?_#?(>yxf+1VJ))E4 zI+R7~w@8!_NL$jNk23d%p`$bH|B722@C{Z~)B7pE&>e*G6l CQ2X-$ delta 71 zcmV-N0J#5vpbUVZ43HZE-jN(b0p5XNwO|3H{{u1&Hzu2xSJ1v4MF8w~Yn^a|w9j7VZE5