Final merge edits for the original Docketeer app

Co-authored-by: Abigail Gerig <[email protected]>

Co-authored-by: Christian Looff <[email protected]>

Co-authored-by: Ruli Warner-Rosen <[email protected]>

Co-authored-by: Trine Medina <[email protected]>

Co-authored-by: Matt Dias <[email protected]>

Author: Schmang13

src/components/helper/commands.js

@@ -55,12 +55,26 @@ export const addRunning = (runningList, callback) => {
  * @param {*} callback
  * @param {*} runningList
  */
+
+const errorsCalled = {};
+
+const errorCheck = (key, error) => {
+  if(!errorsCalled[key]) {
+    errorsCalled[key] = error.message;
+    alert(`Make sure Docker Desktop is running. \n\n ${error.message}`);
+  }
+  else{
+    console.log(error.message);
+  }
+  return
+}
+
 export const refreshRunning = (refreshRunningContainers) => {
   exec(
     'docker stats --no-stream --format "{{json .}},"',
     (error, stdout, stderr) => {
       if (error) {
-        alert(`${error.message}`);
+        errorCheck("refreshRunning", error);
         return;
       }
       if (stderr) {
@@ -89,7 +103,7 @@ export const refreshStopped = (refreshStoppedContainers) => {
     'docker ps -f "status=exited" --format "{{json .}},"',
     (error, stdout, stderr) => {
       if (error) {
-        alert(`${error.message}`);
+        errorCheck("refreshStopped", error);
         return;
       }
       if (stderr) {
@@ -113,7 +127,7 @@ export const refreshStopped = (refreshStoppedContainers) => {
 export const refreshImages = (callback) => {
   exec('docker images', (error, stdout, stderr) => {
     if (error) {
-      alert(`${error.message}`);
+      errorCheck("refreshImages", error);
       return;
     }
     if (stderr) {

src/components/helper/initDatabase.js

@@ -7,12 +7,12 @@ config();
 export default () => {
   const directory =
     process.env.NODE_ENV === 'development'
-      ? path.resolve(__dirname, '..', '..', 'database')
+      ? path.resolve(__dirname, '../../database')
       : path.join(path.dirname(__dirname), 'database');
 
-  exec(`cd src/database ; docker compose up --no-recreate --wait`, (error, stdout, stderr) => {
+  exec(`cd ${directory} && docker compose up --no-recreate --wait -d`, (error, stdout, stderr) => {
     if (error) {
-      alert(`${error.message} `);
+      alert(`Make sure Docker Desktop is running. \n\n ${error.message} `);
       return;
     }
     if (stderr) {