Merge pull request #1304 from ScilifelabDataCentre/add-version

Add version to web pages

.github/workflows/publish_and_trivyscan.yml

@@ -68,5 +68,6 @@ jobs:
           file: Dockerfiles/backend.Dockerfile
           context: .
           push: true
+          build-args: version=${{ github.ref_name }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

CHANGELOG.md

@@ -161,3 +161,4 @@ Please add a _short_ line describing the PR you make, if the PR implements a spe
 
 - Limit projects listing to active projects only; a `--show-all` flag can be used for listing all projects, active and inactive ([#1302](https://github.com/ScilifelabDataCentre/dds_web/pull/1302))
 - Return name of project creator from UserProjects ([#1303](https://github.com/ScilifelabDataCentre/dds_web/pull/1303))
+- Add version to the footer of the web pages ([#1304](https://github.com/ScilifelabDataCentre/dds_web/pull/1304))

Dockerfiles/backend.Dockerfile

@@ -19,6 +19,10 @@ RUN apk add jpeg-dev zlib-dev libjpeg
 RUN apk add tzdata
 ENV TZ="UCT"
 
+# Extract version from Github during build
+ARG version
+ENV DDS_VERSION=$version
+
 # Copy the content to a code folder in container
 COPY ./requirements.txt /code/requirements.txt
 

dds_web/__init__.py

@@ -271,6 +271,11 @@ def load_user(user_id):
         app.cli.add_command(update_uploaded_file_with_log)
         app.cli.add_command(lost_files_s3_db)
 
+        # Make version available inside jinja templates:
+        @app.template_filter("dds_version")
+        def dds_version_filter(_):
+            return os.environ.get("DDS_VERSION", "Unknown")
+
         with app.app_context():  # Everything in here has access to sessions
             from dds_web.database import models
 

dds_web/templates/base.html

@@ -51,6 +51,11 @@ <h3>Important Information</h3>
 
         <div class="footer border-top bg-light text-muted py-5 mt-5">
             <div class="container">
+	        <div class="row mb-3">
+	            <div class="text-md-center small fw-bold">
+	                Version: {{ "Unknown" | dds_version }}
+	            </div>
+	        </div>
                 <div class="row">
                     <div class="col-md-4">
                         <p class="small mb-0 mt-2">Dark mode</p>

docker-compose.yml

@@ -51,6 +51,7 @@ services:
     working_dir: /code
     command: sh -c "flask db upgrade && flask init-db $$DB_TYPE && flask run -h 0.0.0.0 -p 5000"
     environment:
+      - DDS_VERSION=local-dev
       - DDS_APP_CONFIG=/code/dds_web/sensitive/dds_app.cfg
       - FLASK_ENV=development
       - FLASK_APP=dds_web