Update docker-compose config location (#141)

Co-authored-by: Renovate Bot <bot@renovateapp.com>

.github/workflows/deploy.yml

@@ -15,7 +15,7 @@ jobs:
       - id: release
         uses: rymndhng/release-on-push-action@master
         with:
-          bump_version_scheme: minor
+          bump_version_scheme: patch
           
       - name: Check Output Parameters
         run: |
@@ -60,7 +60,7 @@ jobs:
     - name: Update image on server
       uses: garygrossgarten/github-action-ssh@release
       with:
-        command: cd /docker/active/fhed && docker-compose pull && docker-compose up -d
+        command: docker-compose -f /docker/active/fhed.yml -p fhed pull && docker-compose -f /docker/active/fhed.yml -p fhed up -d
         host: ${{ secrets.SSH_HOST }}
         port: ${{ secrets.SSH_PORT }}
         username: ${{ secrets.SSH_USERNAME }}

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/stale@v1
+    - uses: actions/stale@v3
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue has been marked as stale due to inactivity. If this issue is still ongoing, please leave a comment.'

app/composer.json

@@ -1,8 +1,8 @@
 {
-    "require": {
+  "require": {
-        "ramsey/uuid": "^4.0",
+    "ramsey/uuid": "^4.0",
-        "vlucas/phpdotenv": "^5.0",
+    "vlucas/phpdotenv": "^5.0",
-        "jumbojett/openid-connect-php": "^0.9.0",
+    "jumbojett/openid-connect-php": "^0.9.0",
-        "sentry/sdk": "^2.1"
+    "sentry/sdk": "^3.0"
-    }
+  }
 }

app/includes/app_functions.php

@@ -8,21 +8,21 @@
 
   function oidc_set_vars($sub, $uid, $fname, $lname, $email)
   {
-    $_SESSION['uuid'] = $sub;
+      $_SESSION['uuid'] = $sub;
-    $_SESSION['username'] = $uid;
+      $_SESSION['username'] = $uid;
-    $_SESSION['given_name'] = $fname;
+      $_SESSION['given_name'] = $fname;
-    $_SESSION['family_name'] = $lname;
+      $_SESSION['family_name'] = $lname;
-    $_SESSION['full_name'] = $fname . " " . $lname;
+      $_SESSION['full_name'] = $fname . " " . $lname;
-    $_SESSION['email'] = $email;
+      $_SESSION['email'] = $email;
   }
 
   function is_signed_in()
   {
-    if (isset($_SESSION['is_signed_in'])) {
+      if (isset($_SESSION['is_signed_in'])) {
-      return true;
+          return true;
-    } else {
+      } else {
-      return false;
+          return false;
-    }
+      }
   }
 
   function user_exists($db, $uuid)
@@ -38,9 +38,9 @@
           die();
       }
       if (empty($result)) {
-         return false;
+          return false;
       } else {
-         return true;
+          return true;
       }
   }
 

app/includes/prereqs.php

@@ -18,15 +18,16 @@ Sentry\init([
 
 // Database auto-generation
 if (file_exists("/../includes/install.php")) {
-  return;
+    return;
-  add_action('run_db_populate');
+    add_action('run_db_populate');
 }
 
-function run_db_populate() {
+function run_db_populate()
+{
     // all my glorious one-time-magic.
-    include( "/../includes/install.php" );
+    include("/../includes/install.php");
-   // after all execution rename your file;
+    // after all execution rename your file;
-   rename( "/../includes/install.php", "/../includes/install-backup.php");
+    rename("/../includes/install.php", "/../includes/install-backup.php");
 }
 
 // Session
@@ -38,8 +39,9 @@ $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
 // OpenID Connect
 use Jumbojett\OpenIDConnectClient;
+
 $oidc = new OpenIDConnectClient($_ENV['OIDC_HOST'], $_ENV['OIDC_CLIENT_ID'], $_ENV['OIDC_CLIENT_SECRET']);
 if ($_ENV['OIDC_DISABLE_SSL'] == "true") {
-  $oidc->setVerifyHost(false);
+    $oidc->setVerifyHost(false);
-  $oidc->setVerifyPeer(false);
+    $oidc->setVerifyPeer(false);
 }