🔧 Push release version to Docker image (#114)

* 🔧 Push release version to Docker image

Signed-off-by: Luke Tainton <luke@tainton.uk>

* Restyle 🔧 Push release version to Docker image (#115)

* Restyled by php-cs-fixer

* Restyled by whitespace

Co-authored-by: Restyled.io <commits@restyled.io>

Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com>
Co-authored-by: Restyled.io <commits@restyled.io>

Dockerfile

@@ -4,6 +4,8 @@ RUN composer --working-dir=/srv install
 
 FROM php:apache
 LABEL maintainer="Luke Tainton <luke@tainton.uk>"
+ARG VERSION
 RUN docker-php-ext-install pdo_mysql && a2enmod rewrite remoteip
 COPY vhost.conf /etc/apache2/sites-enabled/000-default.conf
 COPY --from=build /srv /srv
+RUN echo $VERSION > /srv/includes/VERSION

app/includes/app_functions.php

@@ -1,5 +1,13 @@
 <?php
-  function get_all_users($db) {
+
+  function get_version()
+  {
+      $version = "v" . file_get_contents(__DIR__ . '/VERSION');
+      return $version;
+  }
+
+  function get_all_users($db)
+  {
       try {
           $stmt = "SELECT * FROM users";
           $sql = $db->prepare($stmt);
@@ -12,7 +20,8 @@
       return $result;
   }
 
-  function get_user_name($db, $user_uuid) {
+  function get_user_name($db, $user_uuid)
+  {
       try {
           $stmt = "SELECT given_name, family_name FROM users WHERE uuid=:uuid";
           $sql = $db->prepare($stmt);
@@ -27,7 +36,8 @@
       return $usr;
   }
 
-  function get_my_open_requests($db) {
+  function get_my_open_requests($db)
+  {
       $ticket_stmt = "SELECT * FROM tickets WHERE created_by=:uuid AND status != 'Closed'";
       $ticket_sql = $db->prepare($ticket_stmt);
       $ticket_sql->bindParam(':uuid', $_SESSION['uuid']);
@@ -37,7 +47,8 @@
       return $ticket_result;
   }
 
-  function get_my_closed_requests($db) {
+  function get_my_closed_requests($db)
+  {
       $ticket_stmt = "SELECT * FROM tickets WHERE created_by=:uuid AND status = 'Closed'";
       $ticket_sql = $db->prepare($ticket_stmt);
       $ticket_sql->bindParam(':uuid', $_SESSION['uuid']);
@@ -47,7 +58,8 @@
       return $ticket_result;
   }
 
-  function get_subscribed_requests($db) {
+  function get_subscribed_requests($db)
+  {
       $requests = array();
       $sub_tickets_stmt = "SELECT ticket_uuid FROM ticket_subscribers WHERE user_uuid=:uuid";
       $sub_tickets_sql = $db->prepare($sub_tickets_stmt);
@@ -67,7 +79,8 @@
       return $requests;
   }
 
-  function get_open_subscribed_requests($db) {
+  function get_open_subscribed_requests($db)
+  {
       $requests = array();
       $all_subs = get_subscribed_requests($db);
       foreach ($all_subs as $sub) {
@@ -78,7 +91,8 @@
       return $requests;
   }
 
-  function get_closed_subscribed_requests($db) {
+  function get_closed_subscribed_requests($db)
+  {
       $requests = array();
       $all_subs = get_subscribed_requests($db);
       foreach ($all_subs as $sub) {
@@ -89,7 +103,8 @@
       return $requests;
   }
 
-  function get_request($db, $uuid) {
+  function get_request($db, $uuid)
+  {
       $ticket_stmt = "SELECT * FROM tickets WHERE uuid=:uuid";
       $ticket_sql = $db->prepare($ticket_stmt);
       $ticket_sql->bindParam(':uuid', $uuid);
@@ -101,7 +116,8 @@
   }
 
 
-  function get_updates($db, $request) {
+  function get_updates($db, $request)
+  {
       $updates_stmt = "SELECT * FROM ticket_updates WHERE ticket=:uuid";
       $updates_sql = $db->prepare($updates_stmt);
       $updates_sql->bindParam(':uuid', $request['uuid']);
@@ -111,7 +127,8 @@
       return $updates_result;
   }
 
-  function get_files($db, $request) {
+  function get_files($db, $request)
+  {
       $stmt = "SELECT * FROM ticket_uploads WHERE ticket=:uuid";
       $sql = $db->prepare($stmt);
       $sql->bindParam(':uuid', $request['uuid']);
@@ -121,7 +138,8 @@
       return $result;
   }
 
-  function get_single_file($db, $fileid) {
+  function get_single_file($db, $fileid)
+  {
       $stmt = "SELECT * FROM ticket_uploads WHERE id=:fileid";
       $sql = $db->prepare($stmt);
       $sql->bindParam(':fileid', $fileid);
@@ -132,7 +150,8 @@
       return $file;
   }
 
-  function get_subscribers($db, $request) {
+  function get_subscribers($db, $request)
+  {
       $subs = array();
       $users_stmt = "SELECT user_uuid FROM ticket_subscribers WHERE ticket_uuid=:uuid";
       $users_sql = $db->prepare($users_stmt);
@@ -146,6 +165,11 @@
       return $subs;
   }
 
-  function isAuthorised($user, $authorised_users, $request) {
-    if ( in_array($user, $authorised_users) || $_SESSION['uuid'] == $request['created_by']) { return true; } else { return false; }
+  function isAuthorised($user, $authorised_users, $request)
+  {
+      if (in_array($user, $authorised_users) || $_SESSION['uuid'] == $request['created_by']) {
+          return true;
+      } else {
+          return false;
+      }
   }

app/includes/footer.php

@@ -1,7 +1,7 @@
 <footer class="footer mt-auto py-3">
   <div class="text-center text-muted">
     <?php
-      echo($_ENV['APP_NAME'] . " v" . $_ENV['APP_VERSION']);
+      echo($_ENV['APP_NAME'] . " " . get_version());
       if ($_ENV['APP_NAME'] != "FHeD") {
           echo(", powered by FHeD");
       };