From 8a300d403592d1662ea99130c208c54bf3c0f939 Mon Sep 17 00:00:00 2001
From: Leonardo Graboski Veiga <leogveiga@gmail.com>
Date: Sun, 1 Sep 2024 08:15:42 -0300
Subject: [PATCH 1/6] ci: rename workflows and jobs

Make it easier to understand which job ran, and to use act for testing
locally.

Signed-off-by: Leonardo Graboski Veiga <leogveiga@gmail.com>
---
 .github/workflows/{build-3DMount.yml => 3DMount.yml}        | 2 +-
 .github/workflows/{build-Browser.yml => Browser.yml}        | 6 +++---
 .../{build-DataAcquisition.yml => DataAcquisition.yml}      | 6 +++---
 .github/workflows/{build-Grafana.yml => Grafana.yml}        | 6 +++---
 .github/workflows/{build-InfluxDB.yml => InfluxDB.yml}      | 6 +++---
 .github/workflows/{build-Weston.yml => Weston.yml}          | 6 +++---
 6 files changed, 16 insertions(+), 16 deletions(-)
 rename .github/workflows/{build-3DMount.yml => 3DMount.yml} (98%)
 rename .github/workflows/{build-Browser.yml => Browser.yml} (95%)
 rename .github/workflows/{build-DataAcquisition.yml => DataAcquisition.yml} (94%)
 rename .github/workflows/{build-Grafana.yml => Grafana.yml} (95%)
 rename .github/workflows/{build-InfluxDB.yml => InfluxDB.yml} (95%)
 rename .github/workflows/{build-Weston.yml => Weston.yml} (95%)

diff --git a/.github/workflows/build-3DMount.yml b/.github/workflows/3DMount.yml
similarity index 98%
rename from .github/workflows/build-3DMount.yml
rename to .github/workflows/3DMount.yml
index d1c808e..af14644 100644
--- a/.github/workflows/build-3DMount.yml
+++ b/.github/workflows/3DMount.yml
@@ -9,7 +9,7 @@ on:
       - 'mount3DPrinter/**'
 
 jobs:
-  build:
+  build-3d-mount:
     runs-on: ubuntu-latest
     defaults:
       run:
diff --git a/.github/workflows/build-Browser.yml b/.github/workflows/Browser.yml
similarity index 95%
rename from .github/workflows/build-Browser.yml
rename to .github/workflows/Browser.yml
index 1f6d386..bb7f4ba 100644
--- a/.github/workflows/build-Browser.yml
+++ b/.github/workflows/Browser.yml
@@ -13,7 +13,7 @@ on:
     types: [created]
 
 jobs:
-  build:
+  build-browser:
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -33,8 +33,8 @@ jobs:
           tagname: ${{ env.imgname }}
           tagversion: rc
 
-  release:
-    needs: [build]
+  release-browser:
+    needs: [build-browser]
     if: github.event_name == 'release'
     runs-on: ubuntu-latest
     defaults:
diff --git a/.github/workflows/build-DataAcquisition.yml b/.github/workflows/DataAcquisition.yml
similarity index 94%
rename from .github/workflows/build-DataAcquisition.yml
rename to .github/workflows/DataAcquisition.yml
index 084bc0f..432a474 100644
--- a/.github/workflows/build-DataAcquisition.yml
+++ b/.github/workflows/DataAcquisition.yml
@@ -13,7 +13,7 @@ on:
     types: [created]
 
 jobs:
-  build:
+  build-data-acquisition:
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -33,8 +33,8 @@ jobs:
           tagname: ${{ env.imgname }}
           tagversion: rc
 
-  release:
-    needs: [build]
+  release-data-acquisition:
+    needs: [build-data-acquisition]
     if: github.event_name == 'release'
     runs-on: ubuntu-latest
     defaults:
diff --git a/.github/workflows/build-Grafana.yml b/.github/workflows/Grafana.yml
similarity index 95%
rename from .github/workflows/build-Grafana.yml
rename to .github/workflows/Grafana.yml
index 7e1d41f..61cc0f7 100644
--- a/.github/workflows/build-Grafana.yml
+++ b/.github/workflows/Grafana.yml
@@ -13,7 +13,7 @@ on:
     types: [created]
 
 jobs:
-  build:
+  build-grafana:
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -33,8 +33,8 @@ jobs:
           tagname: ${{ env.imgname }}
           tagversion: rc
 
-  release:
-    needs: [build]
+  release-grafana:
+    needs: [build-grafana]
     if: github.event_name == 'release'
     runs-on: ubuntu-latest
     defaults:
diff --git a/.github/workflows/build-InfluxDB.yml b/.github/workflows/InfluxDB.yml
similarity index 95%
rename from .github/workflows/build-InfluxDB.yml
rename to .github/workflows/InfluxDB.yml
index 407706c..d03dfa0 100644
--- a/.github/workflows/build-InfluxDB.yml
+++ b/.github/workflows/InfluxDB.yml
@@ -13,7 +13,7 @@ on:
     types: [created]
 
 jobs:
-  build:
+  build-influxdb:
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -33,8 +33,8 @@ jobs:
           tagname: ${{ env.imgname }}
           tagversion: rc
 
-  release:
-    needs: [build]
+  release-influxdb:
+    needs: [build-influxdb]
     if: github.event_name == 'release'
     runs-on: ubuntu-latest
     defaults:
diff --git a/.github/workflows/build-Weston.yml b/.github/workflows/Weston.yml
similarity index 95%
rename from .github/workflows/build-Weston.yml
rename to .github/workflows/Weston.yml
index daf9a9c..36463cb 100644
--- a/.github/workflows/build-Weston.yml
+++ b/.github/workflows/Weston.yml
@@ -13,7 +13,7 @@ on:
     types: [created]
 
 jobs:
-  build:
+  build-weston:
     runs-on: ubuntu-latest
     defaults:
       run:
@@ -33,8 +33,8 @@ jobs:
           tagname: ${{ env.imgname }}
           tagversion: rc
 
-  release:
-    needs: [build]
+  release-weston:
+    needs: [build-weston]
     if: github.event_name == 'release'
     runs-on: ubuntu-latest
     defaults:

From 1e014b79be52bec17a069ca58c9075d5181b6fd1 Mon Sep 17 00:00:00 2001
From: Leonardo Graboski Veiga <leogveiga@gmail.com>
Date: Fri, 6 Sep 2024 17:41:20 -0300
Subject: [PATCH 2/6] data: reduce retention from 180 to 30 days

It was found out in practice that InfluxDB is quite memory-hungry,
therefore reducing the data retention keeps it at bay.

There may be a better way to reduce memory usage, but for the moment
this satisfies the application requirement.

Signed-off-by: Leonardo Graboski Veiga <leogveiga@gmail.com>
---
 dataAcquisition/get-build-status.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dataAcquisition/get-build-status.sh b/dataAcquisition/get-build-status.sh
index 4f99354..3244c7f 100755
--- a/dataAcquisition/get-build-status.sh
+++ b/dataAcquisition/get-build-status.sh
@@ -22,7 +22,7 @@ IMAGE_TYPE=(
 )
 INFLUX_MEASUREMENT_NAME="jenkinsbuild"
 INFLUX_BUCKET_NAME="jenkinsdatabucket"
-INFLUX_BUCKET_RETENTION="180d"
+INFLUX_BUCKET_RETENTION="30d"
 CURL_MAX_RETRIES=30
 declare -A log_levels=([DEBUG]=0 [INFO]=1 [WARN]=2 [ERROR]=3)
 script_logging_level="INFO"

From 234c681831361c55849cb0fbf3b01e84a36e076a Mon Sep 17 00:00:00 2001
From: Leonardo Graboski Veiga <leogveiga@gmail.com>
Date: Thu, 19 Sep 2024 22:31:35 -0300
Subject: [PATCH 3/6] vscode: make update task more reliable

The update task has has some false negative updates in the past. Make it
a bit harder for that to happen by improving the regex that matches the
places that should be updated.

Furthermore, print the diff for the user instead of just asking, so that
a better UX is provided.

Signed-off-by: Leonardo Graboski Veiga <leogveiga@gmail.com>
---
 .conf/update_project_version.sh | 34 ++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/.conf/update_project_version.sh b/.conf/update_project_version.sh
index 9f9ab72..e5366db 100755
--- a/.conf/update_project_version.sh
+++ b/.conf/update_project_version.sh
@@ -22,12 +22,28 @@ fi
 
 cd "$1" || exit
 
-find . \
-    '(' -name "docker-compose*yml" -o -name "settings.json" ')' \
-    -type f \
-    -not -path "./.git/*" \
-    -exec fgrep -l "$OLD_VERSION" {} + | \
-    xargs sed -i "s/$OLD_VERSION/$NEW_VERSION/g"
-
-echo "Version update from $OLD_VERSION to $NEW_VERSION"
-echo "Check your 'git diff' to make sure all went as expected"
+# Replace the version string in Docker Compose files
+# shellcheck disable=SC2038
+find . -name "docker-compose*yml" \
+    -type f -not -path "./.git/*" \
+    -exec fgrep -l "$OLD_VERSION" {} + \
+    | xargs -I {} sed -i \
+    -E "s#(^\s*image: .+):$OLD_VERSION#\1:$NEW_VERSION#g" {}
+
+# Replace the version string in settings JSON files
+# shellcheck disable=SC2038
+find . -name "settings.json" \
+    -type f -not -path "./.git/*" \
+    -exec fgrep -l "$OLD_VERSION" {} + \
+    | xargs -I {} sed -i \
+    -E "s/(^\s*\"docker_tag\": \")$OLD_VERSION(\")/\1$NEW_VERSION\2/g" {}
+
+# Replace the version string in the top-level settings JSON file
+sed -i \
+    -E "s/(^\s*\"project_version\": \")$OLD_VERSION(\")/\1$NEW_VERSION\2/g" \
+    .vscode/settings.json
+
+# Ask the user to review the changes
+git --no-pager diff
+echo "Version updated from $OLD_VERSION to $NEW_VERSION"
+echo "Check the 'git diff' above to make sure all went as expected"

From 2a3ce8cd97940aa1e5eed708a69ee709a084f8e0 Mon Sep 17 00:00:00 2001
From: Leonardo Graboski Veiga <leogveiga@gmail.com>
Date: Thu, 26 Sep 2024 23:02:11 -0300
Subject: [PATCH 4/6] vscode: automatically create commit for new version

Make the process more automatic by creating a new commit when the user
want to update the project version number.

Signed-off-by: Leonardo Graboski Veiga <leogveiga@gmail.com>
---
 .conf/update_project_version.sh | 204 +++++++++++++++++++++++++++++++-
 1 file changed, 199 insertions(+), 5 deletions(-)

diff --git a/.conf/update_project_version.sh b/.conf/update_project_version.sh
index e5366db..90262bd 100755
--- a/.conf/update_project_version.sh
+++ b/.conf/update_project_version.sh
@@ -1,26 +1,155 @@
 #!/bin/bash
 
+###--- VARIABLES ---###
+STATE_IS_STASHED=0      # 1 - stash any changes
+STATE_IS_MODIFIED=0     # 2 - modify the version
+STATE_IS_STAGED=0       # 3 - stage modified version
+STATE_IS_COMMITTED=0    # 4 - commit new version
+STATE_IS_TAGGED=0       # 5 - tag new version
+STATE_IS_PUSHED=0       # 6 - push to GitHub
+STATE_IS_PR=0           # 7 - create GitHub PR
+
+###--- FUNCTIONS ---###
+
+ask_user_confirmation() {
+    read -p "Do you want to proceed? (y/n)" -n 1 -r
+    echo # just go to newlin
+
+    if [[ $REPLY =~ ^[Yy]$ ]]
+    then
+        user_confirmation=0
+    else
+        user_confirmation=1
+    fi
+
+    return $user_confirmation
+}
+
+dirty_exit() {
+    printf "\nAborting the release!\n\n"
+
+    # Undo 7 - create GitHub PR
+    if [ "$STATE_IS_PR" -ne "0" ]; then
+        gh pr close "$(git branch --show-current)"
+        echo "GitHub PR closed. If you want to delete it, do it manually"
+        STATE_IS_PR=0
+    fi
+
+    # Undo 5 - tag new version
+    if [ "$STATE_IS_TAGGED" -ne "0" ]; then
+        git tag --delete "$NEW_VERSION"
+        STATE_IS_TAGGED=0
+    fi
+
+    # Undo 4 - commit new version
+    if [ "$STATE_IS_COMMITTED" -ne "0" ]; then
+        git reset --soft HEAD~1
+        STATE_IS_COMMITTED=0
+    fi
+
+    # Undo 6 - push to GitHub
+    if [ "$STATE_IS_PUSHED" -ne "0" ]; then
+        git push --force
+        STATE_IS_PUSHED=0
+    fi
+
+    # Undo 3 - stage modified version
+    if [ "$STATE_IS_STAGED" -ne "0" ]; then
+        git reset
+        STATE_IS_STAGED=0
+    fi
+
+    # Undo 2 - modify the version
+    if [ "$STATE_IS_MODIFIED" -ne "0" ]; then
+        git restore .
+        STATE_IS_MODIFIED=0
+    fi
+
+    # Undo 1 - stash any changes
+    if [ "$STATE_IS_STASHED" -ne "0" ]; then
+        git stash pop
+        STATE_IS_STASHED=0
+    fi
+
+    # Remove leftover file(s)
+    rm -f .commitmsg
+
+    # Always exit with error code if this function is called
+    printf "\n\nRelease aborted\n"
+    echo "Double-check your git state (local and remote)"
+    exit 1
+}
+
+clean_exit() {
+    printf "\nConcluding the release process!\n\n"
+
+    # No need to undo 4 - commit new version
+    # No need to undo 3 - stage modified version
+    # No need to undo 2 - modify the version
+
+    # Undo 1 - stash any changes
+    if [ "$STATE_IS_STASHED" -ne "0" ]; then
+        git stash pop
+        printf "\n\nThe previously stashed changes are unstashed\n"
+        STATE_IS_STASHED=0
+    fi
+
+    # Remove leftover file(s)
+    rm -f .commitmsg
+
+    echo "Double-check your git state (local and remote)"
+    echo "Then proceed to making the release on GitHub"
+    exit 0
+}
+
+###--- SCRIPT ---###
+
 echo "Updating project version..."
 
 # Check if env variables are set
 if [[ -z "$NEW_VERSION" ]]; then
     echo "Error: NEW_VERSION is not set $NEW_VERSION"
-    exit 1
+    dirty_exit
 fi
 
 # Check if env variables are set
 if [[ -z "$OLD_VERSION" ]]; then
     echo "Error: OLD_VERSION is not set $OLD_VERSION"
-    exit 1
+    dirty_exit
 fi
 
 # Check if the path to the root multi-project directory is passed
 if [ -z "$1" ]; then
-  echo "Error: No positional argument provided. Exiting."
-  exit 1
+    echo "Error: No positional argument provided. Exiting."
+    dirty_exit
+fi
+
+cd "$1" || dirty_exit
+
+# Only proceed if there are no unstaged changes
+if ! git diff --quiet; then
+    echo "There are unstaged changes"
+    echo "If you continue they will be stashed"
+    if ! ask_user_confirmation; then
+        git stash
+        STATE_IS_STASHED=1
+    else
+        dirty_exit
+    fi
 fi
+cd "$1" || dirty_exit
 
-cd "$1" || exit
+# Only proceed if there are no unstaged changes
+if ! git diff --quiet; then
+    echo "There are unstaged changes"
+    echo "If you continue they will be stashed"
+    if ! ask_user_confirmation; then
+        git stash
+        STATE_IS_STASHED=1
+    else
+        dirty_exit
+    fi
+fi
 
 # Replace the version string in Docker Compose files
 # shellcheck disable=SC2038
@@ -43,7 +172,72 @@ sed -i \
     -E "s/(^\s*\"project_version\": \")$OLD_VERSION(\")/\1$NEW_VERSION\2/g" \
     .vscode/settings.json
 
+STATE_IS_MODIFIED=1
+
 # Ask the user to review the changes
 git --no-pager diff
 echo "Version updated from $OLD_VERSION to $NEW_VERSION"
 echo "Check the 'git diff' above to make sure all went as expected"
+
+# Only proceed if the user agree
+if ! ask_user_confirmation; then
+    dirty_exit
+fi
+
+# Generate release commit and wait for the user approve it
+echo "Generating release commit, please review and commit it"
+sleep 3
+git add -u
+STATE_IS_STAGED=1
+
+{
+    printf "### Review and uncomment the following lines ###\n"
+    printf "#Release %s\n\n" "$NEW_VERSION"
+    git log --pretty=format:'#* %s' HEAD..."$OLD_VERSION"
+    printf "\n\n#Signed-off-by: %s <%s> \n\n" "$(git config user.name)" "$(git config user.email)"
+} > .commitmsg
+
+if ! git commit --template=.commitmsg; then
+    echo "The commit was aborted or failed"
+    dirty_exit
+fi
+STATE_IS_COMMITTED=1
+rm -f .commitmsg
+
+# Tag the commit
+if ! git tag -a "$NEW_VERSION" -m "Release $NEW_VERSION"; then
+    echo "The tagging was aborted or failed"
+    dirty_exit
+fi
+STATE_IS_TAGGED=1
+
+# Push current branch to remote
+echo "The following local commits will be pushed to the remote, please review them:"
+git log --oneline '@{u}..'
+
+# Only proceed if the user agree
+if ! ask_user_confirmation; then
+    dirty_exit
+fi
+
+# Push commit
+if ! git push; then
+    echo "Push commit to remote failed. Stopping the release process"
+    dirty_exit
+else
+    # Push tag
+    if ! git push --tags; then
+        echo "Push tags to remote failed. Stopping the release process"
+        dirty_exit
+    fi
+fi
+STATE_IS_PUSHED=1
+
+if ! gh pr create --title "Release $NEW_VERSION" --fill; then
+    echo "Creation of GitHub PR failed. Stopping the release process"
+    dirty_exit
+fi
+STATE_IS_PR=1
+
+# Clean exit
+clean_exit

From 9dc378505dee01344d70d9c5ae6211cbb430c5e0 Mon Sep 17 00:00:00 2001
From: Leonardo Graboski Veiga <leogveiga@gmail.com>
Date: Wed, 2 Oct 2024 21:39:54 -0300
Subject: [PATCH 5/6] vscode: update release task name

The previous name was only denoting the version bump, but not the entire
release process, and therefore it required an updated name.

Signed-off-by: Leonardo Graboski Veiga <leogveiga@gmail.com>
---
 .conf/{update_project_version.sh => setup_gh_release.sh} | 0
 .vscode/tasks.json                                       | 8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename .conf/{update_project_version.sh => setup_gh_release.sh} (100%)

diff --git a/.conf/update_project_version.sh b/.conf/setup_gh_release.sh
similarity index 100%
rename from .conf/update_project_version.sh
rename to .conf/setup_gh_release.sh
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 2d6f85d..97c1235 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -2,8 +2,8 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "update-version",
-            "detail": "Update the project version on all\nworkspaces",
+            "label": "setup-gh-release",
+            "detail": "Prepare a release PR on\nGitHub",
             "command": "bash",
             "type": "process",
             "presentation": {
@@ -13,7 +13,7 @@
                 "panel": "shared",
                 "showReuseMessage": true,
                 "clear": false,
-                "group": "update-version"
+                "group": "setup-gh-release"
             },
             "options": {
                 "env": {
@@ -22,7 +22,7 @@
                 }
             },
             "args": [
-                "${workspaceFolder}/.conf/update_project_version.sh",
+                "${workspaceFolder}/.conf/setup_gh_release.sh",
                 "${workspaceFolder}"
             ],
             "dependsOrder": "sequence",

From c86d286ca73d1d8884777379561db0eff7e35cd5 Mon Sep 17 00:00:00 2001
From: Leonardo Graboski Veiga <leogveiga@gmail.com>
Date: Wed, 2 Oct 2024 21:43:06 -0300
Subject: [PATCH 6/6] Release 0.6.0

* vscode: update release task name
* vscode: automatically create commit for new version
* vscode: make update task more reliable
* data: reduce retention from 180 to 30 days
* ci: rename workflows and jobs

Signed-off-by: Leonardo Graboski Veiga <leogveiga@gmail.com>
---
 .vscode/settings.json                   |  2 +-
 browser/.vscode/settings.json           |  2 +-
 browser/docker-compose.prod.yml         |  2 +-
 dataAcquisition/.vscode/settings.json   |  2 +-
 dataAcquisition/docker-compose.prod.yml |  6 +++---
 dataAcquisition/docker-compose.yml      |  4 ++--
 docker-compose.prod.yml                 | 10 +++++-----
 grafana/.vscode/settings.json           |  2 +-
 grafana/docker-compose.prod.yml         |  2 +-
 influxdb/.vscode/settings.json          |  2 +-
 influxdb/docker-compose.prod.yml        |  2 +-
 tcb/docker-compose.prod.yml             | 10 +++++-----
 weston/.vscode/settings.json            |  2 +-
 weston/docker-compose.prod.yml          |  2 +-
 14 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 70de8df..3b6b8f8 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -15,5 +15,5 @@
   "torizon_app_root": "/home/torizon",
   "tcb.packageName": "__change__",
   "tcb.version": "3.8.1",
-  "project_version": "0.5.0"
+  "project_version": "0.6.0"
 }
diff --git a/browser/.vscode/settings.json b/browser/.vscode/settings.json
index 82f0273..e5230a0 100644
--- a/browser/.vscode/settings.json
+++ b/browser/.vscode/settings.json
@@ -15,5 +15,5 @@
 	"torizon_app_root": "/home/torizon",
 	"tcb.packageName": "TorizonOSBuildStatusBrowser",
 	"tcb.version": "3.8.1",
-	"docker_tag": "0.5.0"
+	"docker_tag": "0.6.0"
 }
\ No newline at end of file
diff --git a/browser/docker-compose.prod.yml b/browser/docker-compose.prod.yml
index f7e6dfb..546e352 100644
--- a/browser/docker-compose.prod.yml
+++ b/browser/docker-compose.prod.yml
@@ -1,4 +1,4 @@
 version: "3.9"
 services:
   torizon-os-build-status-browser:
-    image: leograba/torizon-os-build-status-browser:0.5.0
+    image: leograba/torizon-os-build-status-browser:0.6.0
diff --git a/dataAcquisition/.vscode/settings.json b/dataAcquisition/.vscode/settings.json
index 02f7d79..12bf86b 100644
--- a/dataAcquisition/.vscode/settings.json
+++ b/dataAcquisition/.vscode/settings.json
@@ -15,5 +15,5 @@
 	"torizon_app_root": "/home/torizon",
 	"tcb.packageName": "TorizonOSBuildStatusDataAcquisition",
 	"tcb.version": "3.8.1",
-	"docker_tag": "0.5.0"
+	"docker_tag": "0.6.0"
 }
\ No newline at end of file
diff --git a/dataAcquisition/docker-compose.prod.yml b/dataAcquisition/docker-compose.prod.yml
index 54f3144..9745df1 100644
--- a/dataAcquisition/docker-compose.prod.yml
+++ b/dataAcquisition/docker-compose.prod.yml
@@ -10,7 +10,7 @@ services:
     - "8086"
     depends_on:
     - influxdb
-    image: leograba/torizon-os-build-status-data-acquisition:0.5.0
+    image: leograba/torizon-os-build-status-data-acquisition:0.6.0
     environment:
     - DEBUG=DEBUG
     - DEMO=1
@@ -29,7 +29,7 @@ services:
     depends_on:
     - influxdb
     - torizon-os-build-status-data-acquisition
-    image: leograba/torizon-os-build-status-grafana:0.5.0
+    image: leograba/torizon-os-build-status-grafana:0.6.0
   influxdb:
     platform: linux/arm64
     networks:
@@ -38,7 +38,7 @@ services:
       resources:
         limits:
           memory: 1G
-    image: leograba/torizon-os-build-status-influxdb:0.5.0
+    image: leograba/torizon-os-build-status-influxdb:0.6.0
     environment:
     - DOCKER_INFLUXDB_INIT_MODE=setup
     - DOCKER_INFLUXDB_INIT_USERNAME=torizon
diff --git a/dataAcquisition/docker-compose.yml b/dataAcquisition/docker-compose.yml
index 242607e..c7044f7 100644
--- a/dataAcquisition/docker-compose.yml
+++ b/dataAcquisition/docker-compose.yml
@@ -23,7 +23,7 @@ services:
 
   influxdb:
     platform: linux/arm64
-    image: leograba/torizon-os-build-status-influxdb:0.5.0
+    image: leograba/torizon-os-build-status-influxdb:0.6.0
     networks:
       - influxdbnet
     environment:
@@ -42,7 +42,7 @@ services:
   
   grafana:
     platform: linux/arm64
-    image: leograba/torizon-os-build-status-grafana:0.5.0
+    image: leograba/torizon-os-build-status-grafana:0.6.0
     networks:
       - influxdbnet
       - frontend
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 5004888..95c8759 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -2,7 +2,7 @@ version: "3.9"
 services:
 
   data-acquisition:
-    image: leograba/torizon-os-build-status-data-acquisition:0.5.0
+    image: leograba/torizon-os-build-status-data-acquisition:0.6.0
     platform: linux/arm64
     networks:
       - influxdbnet
@@ -16,7 +16,7 @@ services:
     restart: on-failure
 
   influxdb:
-    image: leograba/torizon-os-build-status-influxdb:0.5.0
+    image: leograba/torizon-os-build-status-influxdb:0.6.0
     platform: linux/arm64
     networks:
       - influxdbnet
@@ -38,7 +38,7 @@ services:
             memory: 1G
 
   grafana:
-    image: leograba/torizon-os-build-status-grafana:0.5.0
+    image: leograba/torizon-os-build-status-grafana:0.6.0
     platform: linux/arm64
     networks:
       - influxdbnet
@@ -53,7 +53,7 @@ services:
     restart: on-failure
 
   weston:
-    image: leograba/torizon-os-build-status-weston:0.5.0
+    image: leograba/torizon-os-build-status-weston:0.6.0
     platform: linux/arm
     # Required to get udev events from host udevd via netlink
     network_mode: host
@@ -80,7 +80,7 @@ services:
     restart: on-failure
 
   browser:
-    image: leograba/torizon-os-build-status-browser:0.5.0
+    image: leograba/torizon-os-build-status-browser:0.6.0
     platform: linux/arm
     environment:
       - MACHINE
diff --git a/grafana/.vscode/settings.json b/grafana/.vscode/settings.json
index f11f4d7..647893f 100644
--- a/grafana/.vscode/settings.json
+++ b/grafana/.vscode/settings.json
@@ -15,5 +15,5 @@
 	"torizon_app_root": "/home/torizon",
 	"tcb.packageName": "TorizonOSBuildStatusGrafana",
 	"tcb.version": "3.8.1",
-	"docker_tag": "0.5.0"
+	"docker_tag": "0.6.0"
 }
\ No newline at end of file
diff --git a/grafana/docker-compose.prod.yml b/grafana/docker-compose.prod.yml
index 5ec0c7e..4994ca2 100644
--- a/grafana/docker-compose.prod.yml
+++ b/grafana/docker-compose.prod.yml
@@ -1,4 +1,4 @@
 version: "3.9"
 services:
   torizon-os-build-status-grafana:
-    image: leograba/torizon-os-build-status-grafana:0.5.0
+    image: leograba/torizon-os-build-status-grafana:0.6.0
diff --git a/influxdb/.vscode/settings.json b/influxdb/.vscode/settings.json
index b1e8c9e..3c58554 100644
--- a/influxdb/.vscode/settings.json
+++ b/influxdb/.vscode/settings.json
@@ -15,5 +15,5 @@
 	"torizon_app_root": "/home/torizon",
 	"tcb.packageName": "TorizonOSBuildStatusInfluxDB",
 	"tcb.version": "3.8.1",
-	"docker_tag": "0.5.0"
+	"docker_tag": "0.6.0"
 }
\ No newline at end of file
diff --git a/influxdb/docker-compose.prod.yml b/influxdb/docker-compose.prod.yml
index 6b9d9e6..f6d8837 100644
--- a/influxdb/docker-compose.prod.yml
+++ b/influxdb/docker-compose.prod.yml
@@ -1,4 +1,4 @@
 services:
   torizon-os-build-status-influxdb:
-    image: leograba/torizon-os-build-status-influxdb:0.5.0
+    image: leograba/torizon-os-build-status-influxdb:0.6.0
 version: "3.9"
diff --git a/tcb/docker-compose.prod.yml b/tcb/docker-compose.prod.yml
index 2cedbaa..3ad86b0 100644
--- a/tcb/docker-compose.prod.yml
+++ b/tcb/docker-compose.prod.yml
@@ -2,7 +2,7 @@ version: "3.9"
 services:
 
   data-acquisition:
-    image: leograba/torizon-os-build-status-data-acquisition:0.5.0
+    image: leograba/torizon-os-build-status-data-acquisition:0.6.0
     networks:
       - influxdbnet
       - frontend
@@ -12,7 +12,7 @@ services:
     restart: on-failure
 
   influxdb:
-    image: leograba/torizon-os-build-status-influxdb:0.5.0
+    image: leograba/torizon-os-build-status-influxdb:0.6.0
     networks:
       - influxdbnet
     environment:
@@ -28,7 +28,7 @@ services:
     restart: on-failure
 
   grafana:
-    image: leograba/torizon-os-build-status-grafana:0.5.0
+    image: leograba/torizon-os-build-status-grafana:0.6.0
     networks:
       - influxdbnet
       - frontend
@@ -42,7 +42,7 @@ services:
     restart: on-failure
 
   weston:
-    image: leograba/torizon-os-build-status-weston:0.5.0
+    image: leograba/torizon-os-build-status-weston:0.6.0
     # Required to get udev events from host udevd via netlink
     network_mode: host
     volumes:
@@ -68,7 +68,7 @@ services:
     restart: on-failure
 
   browser:
-    image: leograba/torizon-os-build-status-browser:0.5.0
+    image: leograba/torizon-os-build-status-browser:0.6.0
     environment:
       - MACHINE
     security_opt:
diff --git a/weston/.vscode/settings.json b/weston/.vscode/settings.json
index 73aa2b3..2a46a18 100644
--- a/weston/.vscode/settings.json
+++ b/weston/.vscode/settings.json
@@ -15,5 +15,5 @@
 	"torizon_app_root": "/home/torizon",
 	"tcb.packageName": "TorizonOSBuildStatusWeston",
 	"tcb.version": "3.8.1",
-	"docker_tag": "0.5.0"
+	"docker_tag": "0.6.0"
 }
\ No newline at end of file
diff --git a/weston/docker-compose.prod.yml b/weston/docker-compose.prod.yml
index a8d3ad3..b12e3a0 100644
--- a/weston/docker-compose.prod.yml
+++ b/weston/docker-compose.prod.yml
@@ -1,4 +1,4 @@
 services:
   torizon-os-build-status-weston:
-    image: leograba/torizon-os-build-status-weston:0.5.0
+    image: leograba/torizon-os-build-status-weston:0.6.0
 version: "3.9"