archives/FHeD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 40 Activity

🔧 Push release version to Docker image

Browse Source 
Signed-off-by: Luke Tainton <luke@tainton.uk>
This commit is contained in:
Luke Tainton
2020-08-17 11:57:30 +01:00
parent c8576aa757
commit 099b82f13a
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

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

6
app/includes/app_functions.php
View File

@@ -1,4 +1,10 @@
<?php <?php
function get_version() {
$version = "v" . file_get_contents(__DIR__ . '/VERSION');
return $version;
}
function get_all_users($db) { function get_all_users($db) {
try { try {
$stmt = "SELECT * FROM users"; $stmt = "SELECT * FROM users";

2
app/includes/footer.php
View File

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