Store app version information in .env

Author: Programie

.github/workflows/build-and-release.yml

@@ -20,5 +20,5 @@ jobs:
     with:
       path: /app
       zip_name: Tracky
-      additional_files: .env.sample version
+      additional_files: .env.sample
     secrets: inherit

.gitignore

@@ -10,5 +10,4 @@
 /public/bundles/
 /var/
 /vendor/
-/version
 /webpack.assets.json

Dockerfile

@@ -22,17 +22,12 @@ RUN composer install --no-dev --ignore-platform-reqs && \
 
 FROM ghcr.io/programie/php-docker
 
-ARG APP_VERSION
-ARG APP_GIT_COMMIT
-
 ENV WEB_ROOT=/app/public
 
 RUN install-php 8.2 curl dom intl pdo-mysql && \
     a2enmod rewrite && \
     mkdir -p /app/var && \
-    chown www-data: /app/var && \
-    echo "version=${APP_VERSION}" > /app/version && \
-    echo "git_commit=${APP_GIT_COMMIT}" >> /app/version
+    chown www-data: /app/var
 
 ENV PATH="${PATH}:/app/bin"
 WORKDIR /app
@@ -48,3 +43,9 @@ COPY public /app/public
 COPY src /app/src
 COPY templates /app/templates
 COPY .env /app
+
+ARG APP_VERSION
+ARG APP_GIT_COMMIT
+
+RUN echo "APP_VERSION=${APP_VERSION}" >> /app/.env && \
+    echo "APP_GIT_COMMIT=${APP_GIT_COMMIT}" >> /app/.env

src/main/php/tracky/controller/AboutController.php

@@ -10,31 +10,9 @@ class AboutController extends AbstractController
     #[Route("/about", name: "about_page")]
     public function about(): Response
     {
-        $versionInfo = [];
-        $versionFile = sprintf("%s/version", $this->getParameter("kernel.project_dir"));
-
-        if (is_file($versionFile)) {
-            foreach (explode("\n", file_get_contents($versionFile)) as $line) {
-                $line = trim($line);
-                if ($line === "") {
-                    continue;
-                }
-
-                list($key, $value) = explode("=", $line, 2);
-
-                $key = trim($key);
-                $value = trim($value);
-
-                if ($key === "") {
-                    continue;
-                }
-
-                $versionInfo[$key] = $value;
-            }
-        }
-
         return $this->render("about.twig", [
-            "versionInfo" => $versionInfo
+            "version" => $_ENV["APP_VERSION"] ?? null,
+            "commit" => $_ENV["APP_GIT_COMMIT"] ?? null
         ]);
     }
 }

templates/about.twig

@@ -41,11 +41,10 @@
             <h3 class="fs-4">{{ "about.version.title"|trans }}</h3>
 
             <p>
-                {% set version = versionInfo.version|default(null) %}
                 {% if version %}
                     {{ version }}
-                    {% if versionInfo.git_commit|default(null) %}
-                        • <a href="https://github.com/Programie/Tracky/commit/{{ versionInfo.git_commit }}" target="_blank">{{ versionInfo.git_commit|slice(0, 7) }}</a>
+                    {% if commit %}
+                        • <a href="https://github.com/Programie/Tracky/commit/{{ commit }}" target="_blank">{{ commit|slice(0, 7) }}</a>
                     {% endif %}
                 {% else %}
                     N/A