version id, 2

.woodpecker.yml

@@ -10,6 +10,9 @@ steps:
         from_secret: container_registry_username
       password: 
         from_secret: container_registry_password
+      build_args:
+        - VERSION_ID1=${CI_COMMIT_SHA}
+        - VERSION_ID2=${CI_COMMIT_TAG}
       dockerfile: Dockerfile
     when:
       - event: [push, tag]

Dockerfile

@@ -1,6 +1,8 @@
 FROM python:3.12-alpine3.19
 
 ARG APP_DIR="/opt/app"
+ARG VERSION_ID1="x"
+ARG VERSION_ID2="alpha"
 
 COPY ./src/ ${APP_DIR}/
 COPY start.sh ${APP_DIR}/
@@ -9,7 +11,9 @@ WORKDIR ${APP_DIR}
 
 RUN \
   apk add --no-cache build-base libpq-dev && \
-  pip install -r requirements.txt
+  pip install -r requirements.txt && \
+  if [ "${VERSION_ID2}" != "" ]; then VERSION_ID=${VERSION_ID2}; else VERSION_ID=${VERSION_ID1}; fi && \
+  sed -i -e 's/VERSION_ID/'$VERSION_ID'/' ${APP_DIR}/templates/index.html 
 
 EXPOSE 8080
 

deployment/deploy.sh

@@ -2,7 +2,7 @@
 
 if [ "$1" == "test" ]; then
   POSTFIX="-test"
-  IMAGE_TAG="latest"
+  IMAGE_TAG=${CI_COMMIT_SHA}
 else
   POSTFIX=""
 fi

src/Run.py

@@ -65,7 +65,7 @@ def get_products():
     try:
         conn = psycopg2.connect()
         with conn.cursor() as cursor:
-            cursor.execute('SELECT name FROM nutrition_table')
+            cursor.execute('SELECT name FROM nutrition_table ORDER BY name')
             products = cursor.fetchall()
             return {'products': [product[0] for product in products]}
     finally:

src/templates/index.html

@@ -177,6 +177,7 @@ function updateTotalNutrition() {
     <nav id="navbar">
         <h1>Elo's Rezept Rechner</h1>
         <ul>
+	    <li class="versionid">VERSION_ID</li>
             <li><a href="/" class="active">Rechner</a></li>
             <li><a href="/nutrition">Neue Lebensmittel</a></li>
         </ul>
@@ -232,4 +233,4 @@ function updateTotalNutrition() {
         </table>
     </div>
 </body>
-</html>
+</html>