From 819d0a9f28e3963b47e5987ec5ba97350ac32e0f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Apr 2022 18:33:48 +0100
Subject: [PATCH 01/20] Bump anothrNick/github-tag-action from 1.38.0 to 1.39.0
 (#20)

* Update LICENSE

* Bump actions/checkout from 2 to 3

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* clean and license

* update url of license

* Bump anothrNick/github-tag-action from 1.38.0 to 1.39.0

Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.38.0 to 1.39.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.38.0...1.39.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: Alex Fernandes <84147256+AlexFernandes-MOVAI@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alex Fernandes <alex.fernandes@mov.ai>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/workflows/bump-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
index 909d418..7c2cca1 100644
--- a/.github/workflows/bump-version.yml
+++ b/.github/workflows/bump-version.yml
@@ -11,7 +11,7 @@ jobs:
       with:
         fetch-depth: '0'
     - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.38.0
+      uses: anothrNick/github-tag-action@1.39.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         WITH_V: true

From 11782db41e86c82f4d47e4bc36bb14d835b70598 Mon Sep 17 00:00:00 2001
From: Alex Fernandes <84147256+AlexFernandes-MOVAI@users.noreply.github.com>
Date: Tue, 19 Apr 2022 18:36:53 +0100
Subject: [PATCH 02/20] add public push (#21)

---
 .github/workflows/docker-ci.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index 4644928..ede7d34 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -16,37 +16,45 @@ on:
     types: [released]
 jobs:
   movai-base-melodic:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@feat/docker_args
     with:
       docker_file: melodic/Dockerfile
       docker_image: registry.cloud.mov.ai/devops/movai-base-melodic
+      public: true
+      public_image: ce/movai-base-melodic
       github_ref: ${{ github.ref }}
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
   movai-base-noetic:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@feat/docker_args
     with:
       docker_file: noetic/Dockerfile
       docker_image: registry.cloud.mov.ai/devops/movai-base-noetic
+      public: true
+      public_image: ce/movai-base-noetic
       github_ref: ${{ github.ref }}
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
   movai-base-bionic:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@feat/docker_args
     with:
       docker_file: melodic/Dockerfile-rosfree
       docker_image: registry.cloud.mov.ai/devops/movai-base-bionic
+      public: true
+      public_image: ce/movai-base-bionic
       github_ref: ${{ github.ref }}
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
   movai-base-focal:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@feat/docker_args
     with:
       docker_file: noetic/Dockerfile-rosfree
       docker_image: registry.cloud.mov.ai/devops/movai-base-focal
+      public: true
+      public_image: ce/movai-base-focal
       github_ref: ${{ github.ref }}
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}

From 09255aab459155552ca57b0a77986cf285086c6d Mon Sep 17 00:00:00 2001
From: Alex Fernandes <alex.fernandes@mov.ai>
Date: Tue, 19 Apr 2022 21:08:50 +0000
Subject: [PATCH 03/20] add snyk secret

---
 .github/workflows/docker-ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index ede7d34..a7287fd 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -26,6 +26,7 @@ jobs:
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
+      snyk_token: ${{ secrets.SNYK_TOKEN }}
   movai-base-noetic:
     uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@feat/docker_args
     with:
@@ -37,6 +38,7 @@ jobs:
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
+      snyk_token: ${{ secrets.SNYK_TOKEN }}
   movai-base-bionic:
     uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@feat/docker_args
     with:
@@ -48,6 +50,7 @@ jobs:
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
+      snyk_token: ${{ secrets.SNYK_TOKEN }}
   movai-base-focal:
     uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@feat/docker_args
     with:
@@ -59,4 +62,5 @@ jobs:
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
+      snyk_token: ${{ secrets.SNYK_TOKEN }}
 

From 0c65e28a733320079dc3bd7054cb1f91888ac839 Mon Sep 17 00:00:00 2001
From: Alex Fernandes <alex.fernandes@mov.ai>
Date: Tue, 19 Apr 2022 21:28:51 +0000
Subject: [PATCH 04/20] active snyk_check

---
 .github/workflows/docker-ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index a7287fd..3b6fd82 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -23,6 +23,7 @@ jobs:
       public: true
       public_image: ce/movai-base-melodic
       github_ref: ${{ github.ref }}
+      snyk_check: true
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
@@ -35,6 +36,7 @@ jobs:
       public: true
       public_image: ce/movai-base-noetic
       github_ref: ${{ github.ref }}
+      snyk_check: true
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
@@ -47,6 +49,7 @@ jobs:
       public: true
       public_image: ce/movai-base-bionic
       github_ref: ${{ github.ref }}
+      snyk_check: true
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
@@ -59,6 +62,7 @@ jobs:
       public: true
       public_image: ce/movai-base-focal
       github_ref: ${{ github.ref }}
+      snyk_check: true
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}

From e10dcf6fd64bdca46d10e5b3ba5552e3dd1f242a Mon Sep 17 00:00:00 2001
From: Alex Fernandes <84147256+AlexFernandes-MOVAI@users.noreply.github.com>
Date: Wed, 20 Apr 2022 11:40:13 +0100
Subject: [PATCH 05/20] Update docker-ci.yml (#24)

---
 .github/workflows/docker-ci.yml | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index 3b6fd82..410c0a9 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -16,55 +16,46 @@ on:
     types: [released]
 jobs:
   movai-base-melodic:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@feat/docker_args
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
     with:
       docker_file: melodic/Dockerfile
       docker_image: registry.cloud.mov.ai/devops/movai-base-melodic
       public: true
       public_image: ce/movai-base-melodic
       github_ref: ${{ github.ref }}
-      snyk_check: true
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
-      snyk_token: ${{ secrets.SNYK_TOKEN }}
   movai-base-noetic:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@feat/docker_args
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
     with:
       docker_file: noetic/Dockerfile
       docker_image: registry.cloud.mov.ai/devops/movai-base-noetic
       public: true
       public_image: ce/movai-base-noetic
       github_ref: ${{ github.ref }}
-      snyk_check: true
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
-      snyk_token: ${{ secrets.SNYK_TOKEN }}
   movai-base-bionic:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@feat/docker_args
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
     with:
       docker_file: melodic/Dockerfile-rosfree
       docker_image: registry.cloud.mov.ai/devops/movai-base-bionic
       public: true
       public_image: ce/movai-base-bionic
       github_ref: ${{ github.ref }}
-      snyk_check: true
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
-      snyk_token: ${{ secrets.SNYK_TOKEN }}
   movai-base-focal:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@feat/docker_args
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
     with:
       docker_file: noetic/Dockerfile-rosfree
       docker_image: registry.cloud.mov.ai/devops/movai-base-focal
       public: true
       public_image: ce/movai-base-focal
       github_ref: ${{ github.ref }}
-      snyk_check: true
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
-      snyk_token: ${{ secrets.SNYK_TOKEN }}
-

From d392fc235ac02b22a10e556beeafb27f7e53128a Mon Sep 17 00:00:00 2001
From: Alex Fernandes <84147256+AlexFernandes-MOVAI@users.noreply.github.com>
Date: Wed, 20 Apr 2022 11:44:59 +0100
Subject: [PATCH 06/20] Update docker-ci.yml

---
 .github/workflows/docker-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index 0cd3dff..410c0a9 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -16,7 +16,7 @@ on:
     types: [released]
 jobs:
   movai-base-melodic:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@feat/docker_args
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
     with:
       docker_file: melodic/Dockerfile
       docker_image: registry.cloud.mov.ai/devops/movai-base-melodic
@@ -27,7 +27,7 @@ jobs:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
   movai-base-noetic:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@feat/docker_args
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
     with:
       docker_file: noetic/Dockerfile
       docker_image: registry.cloud.mov.ai/devops/movai-base-noetic
@@ -38,7 +38,7 @@ jobs:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
   movai-base-bionic:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@feat/docker_args
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
     with:
       docker_file: melodic/Dockerfile-rosfree
       docker_image: registry.cloud.mov.ai/devops/movai-base-bionic
@@ -49,7 +49,7 @@ jobs:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
   movai-base-focal:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@feat/docker_args
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
     with:
       docker_file: noetic/Dockerfile-rosfree
       docker_image: registry.cloud.mov.ai/devops/movai-base-focal

From 423e6ff30b45f7bc0dafdcaea2dc8c51f5ec59c5 Mon Sep 17 00:00:00 2001
From: Alex Fernandes <84147256+AlexFernandes-MOVAI@users.noreply.github.com>
Date: Wed, 20 Apr 2022 17:10:37 +0100
Subject: [PATCH 07/20] fix namespaces

---
 .github/workflows/docker-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index 410c0a9..4eb9286 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -19,7 +19,7 @@ jobs:
     uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
     with:
       docker_file: melodic/Dockerfile
-      docker_image: registry.cloud.mov.ai/devops/movai-base-melodic
+      docker_image: devops/movai-base-melodic
       public: true
       public_image: ce/movai-base-melodic
       github_ref: ${{ github.ref }}
@@ -30,7 +30,7 @@ jobs:
     uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
     with:
       docker_file: noetic/Dockerfile
-      docker_image: registry.cloud.mov.ai/devops/movai-base-noetic
+      docker_image: devops/movai-base-noetic
       public: true
       public_image: ce/movai-base-noetic
       github_ref: ${{ github.ref }}
@@ -41,7 +41,7 @@ jobs:
     uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
     with:
       docker_file: melodic/Dockerfile-rosfree
-      docker_image: registry.cloud.mov.ai/devops/movai-base-bionic
+      docker_image: devops/movai-base-bionic
       public: true
       public_image: ce/movai-base-bionic
       github_ref: ${{ github.ref }}
@@ -52,7 +52,7 @@ jobs:
     uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
     with:
       docker_file: noetic/Dockerfile-rosfree
-      docker_image: registry.cloud.mov.ai/devops/movai-base-focal
+      docker_image: devops/movai-base-focal
       public: true
       public_image: ce/movai-base-focal
       github_ref: ${{ github.ref }}

From 8b1ee4d1278cc75c8f9c9eaf5a8a3a69f002c6ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Sep 2022 15:19:23 +0100
Subject: [PATCH 08/20] Bump anothrNick/github-tag-action from 1.39.0 to 1.46.0
 (#31)

* Revert CICD (#25)

* Bump anothrNick/github-tag-action from 1.38.0 to 1.39.0 (#20)

* Update LICENSE

* Bump actions/checkout from 2 to 3

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* clean and license

* update url of license

* Bump anothrNick/github-tag-action from 1.38.0 to 1.39.0

Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.38.0 to 1.39.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.38.0...1.39.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: Alex Fernandes <84147256+AlexFernandes-MOVAI@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alex Fernandes <alex.fernandes@mov.ai>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* add public push (#21)

* add snyk secret

* active snyk_check

* Update docker-ci.yml (#24)

* Update docker-ci.yml

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Fix deploy namespaces (#26)

* Bump anothrNick/github-tag-action from 1.38.0 to 1.39.0 (#20)

* Update LICENSE

* Bump actions/checkout from 2 to 3

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* clean and license

* update url of license

* Bump anothrNick/github-tag-action from 1.38.0 to 1.39.0

Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.38.0 to 1.39.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.38.0...1.39.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: Alex Fernandes <84147256+AlexFernandes-MOVAI@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alex Fernandes <alex.fernandes@mov.ai>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* add public push (#21)

* add snyk secret

* active snyk_check

* Update docker-ci.yml (#24)

* Update docker-ci.yml

* fix namespaces

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update docker-ci.yml

* Bump anothrNick/github-tag-action from 1.39.0 to 1.46.0

Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.39.0 to 1.46.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.39.0...1.46.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* remove multiplatform build

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Alex Fernandes <84147256+AlexFernandes-MOVAI@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: duartecoelhomovai <84720623+duartecoelhomovai@users.noreply.github.com>
---
 .github/workflows/bump-version.yml |  2 +-
 .github/workflows/docker-ci.yml    | 38 ++++++++++++++++++++++++++----
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
index 7c2cca1..e7e0d0c 100644
--- a/.github/workflows/bump-version.yml
+++ b/.github/workflows/bump-version.yml
@@ -11,7 +11,7 @@ jobs:
       with:
         fetch-depth: '0'
     - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.39.0
+      uses: anothrNick/github-tag-action@1.46.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         WITH_V: true
diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index 4eb9286..f033ab7 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -7,55 +7,85 @@ on:
   push:
     branches:
       - main
+      - dev
     tags:
       - 'v*.*.*'
   pull_request:
     branches:
       - main
+      - dev
   release:
     types: [released]
 jobs:
   movai-base-melodic:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
     with:
       docker_file: melodic/Dockerfile
       docker_image: devops/movai-base-melodic
       public: true
       public_image: ce/movai-base-melodic
       github_ref: ${{ github.ref }}
+      deploy: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v')}}
+      version: ${GITHUB_REF##*/}
+      push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }}
+      snyk_check: true
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
+      pub_registry_user: ${{ secrets.PORTUS_APP_USER }}
+      pub_registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
+      snyk_token: ${{ secrets.SNYK_TOKEN }}
   movai-base-noetic:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
     with:
       docker_file: noetic/Dockerfile
       docker_image: devops/movai-base-noetic
       public: true
       public_image: ce/movai-base-noetic
       github_ref: ${{ github.ref }}
+      deploy: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v')}}
+      version: ${GITHUB_REF##*/}
+      push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }}
+      snyk_check: true
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
+      pub_registry_user: ${{ secrets.PORTUS_APP_USER }}
+      pub_registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
+      snyk_token: ${{ secrets.SNYK_TOKEN }}
   movai-base-bionic:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
     with:
       docker_file: melodic/Dockerfile-rosfree
       docker_image: devops/movai-base-bionic
       public: true
       public_image: ce/movai-base-bionic
       github_ref: ${{ github.ref }}
+      deploy: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v')}}
+      version: ${GITHUB_REF##*/}
+      push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }}
+      snyk_check: true
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
+      pub_registry_user: ${{ secrets.PORTUS_APP_USER }}
+      pub_registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
+      snyk_token: ${{ secrets.SNYK_TOKEN }}
   movai-base-focal:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@main
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
     with:
       docker_file: noetic/Dockerfile-rosfree
       docker_image: devops/movai-base-focal
       public: true
       public_image: ce/movai-base-focal
       github_ref: ${{ github.ref }}
+      deploy: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v')}}
+      version: ${GITHUB_REF##*/}
+      push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }}
+      snyk_check: true
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
+      pub_registry_user: ${{ secrets.PORTUS_APP_USER }}
+      pub_registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
+      snyk_token: ${{ secrets.SNYK_TOKEN }}

From 9f9569dc839e7376dcac47c192a5eeea0a41f1df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Sep 2022 10:04:02 +0100
Subject: [PATCH 09/20] Bump anothrNick/github-tag-action from 1.39.0 to 1.46.0
 (#34)

Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.39.0 to 1.46.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.39.0...1.46.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

From 9f31aedf71ef1eb87c3085f25618dfec4a9895a0 Mon Sep 17 00:00:00 2001
From: Alex Fernandes <84147256+AlexFernandes-MOVAI@users.noreply.github.com>
Date: Fri, 23 Sep 2022 14:25:04 +0100
Subject: [PATCH 10/20] DP-112 : Feat/cicd build for arm (#32)

* review cicd params

* fix common workflow release

* add , linux/arm64

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .github/workflows/docker-ci.yml |  5 +++++
 README.md                       | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index f033ab7..524c472 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -29,6 +29,7 @@ jobs:
       version: ${GITHUB_REF##*/}
       push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }}
       snyk_check: true
+      platforms: linux/amd64, linux/arm/v7, linux/arm64
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
@@ -47,12 +48,14 @@ jobs:
       version: ${GITHUB_REF##*/}
       push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }}
       snyk_check: true
+      platforms: linux/amd64, linux/arm/v7, linux/arm64
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
       pub_registry_user: ${{ secrets.PORTUS_APP_USER }}
       pub_registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
       snyk_token: ${{ secrets.SNYK_TOKEN }}
+      platforms: linux/amd64, linux/arm/v7
   movai-base-bionic:
     uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
     with:
@@ -65,6 +68,7 @@ jobs:
       version: ${GITHUB_REF##*/}
       push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }}
       snyk_check: true
+      platforms: linux/amd64, linux/arm/v7, linux/arm64
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
@@ -83,6 +87,7 @@ jobs:
       version: ${GITHUB_REF##*/}
       push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }}
       snyk_check: true
+      platforms: linux/amd64, linux/arm/v7, linux/arm64
     secrets:
       registry_user: ${{ secrets.PORTUS_APP_USER }}
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
diff --git a/README.md b/README.md
index 9554f99..c55196e 100644
--- a/README.md
+++ b/README.md
@@ -45,5 +45,17 @@ Build MOVAI image based on Ubuntu 20.04 :
 
     docker build -t movai-base:focal -f noetic/Dockerfile-rosfree .
 
+## Build for multi-arch
+
+
+    docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+    docker buildx create --name multiarch --driver docker-container --use
+    docker buildx inspect --bootstrap
+
+    DOCKER_PLATFORMS=linux/amd64,linux/armhf,linux/arm64
+    docker buildx build --pull --platform $DOCKER_PLATFORMS -t movai-base:noetic -f noetic/Dockerfile .
+
+    docker buildx build --push --pull --platform $DOCKER_PLATFORMS -t registry.aws.cloud.mov.ai/devops/multiarch-movai-base-noetic -f noetic/Dockerfile .
+
 ## License
 https://www.mov.ai/flow-license/

From 270b2645efb3211b51f5be67ed9cf22969b3be6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 09:50:54 +0100
Subject: [PATCH 11/20] Bump anothrNick/github-tag-action from 1.46.0 to 1.51.0
 (#38)

Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.46.0 to 1.51.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.46.0...1.51.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/bump-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
index e7e0d0c..680a415 100644
--- a/.github/workflows/bump-version.yml
+++ b/.github/workflows/bump-version.yml
@@ -11,7 +11,7 @@ jobs:
       with:
         fetch-depth: '0'
     - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.46.0
+      uses: anothrNick/github-tag-action@1.51.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         WITH_V: true

From df9d27210f76c4d50426db43d5db527106d2595e Mon Sep 17 00:00:00 2001
From: Alex Fernandes <84147256+AlexFernandes-MOVAI@users.noreply.github.com>
Date: Tue, 4 Oct 2022 10:17:33 +0100
Subject: [PATCH 12/20] fix bad merge issue

---
 .github/workflows/docker-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index 524c472..90ea1a9 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -55,7 +55,6 @@ jobs:
       pub_registry_user: ${{ secrets.PORTUS_APP_USER }}
       pub_registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
       snyk_token: ${{ secrets.SNYK_TOKEN }}
-      platforms: linux/amd64, linux/arm/v7
   movai-base-bionic:
     uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
     with:

From e7d6c68619d38e6d21234184b84c9f6491f4c041 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Dec 2022 15:02:20 +0000
Subject: [PATCH 13/20] Bump anothrNick/github-tag-action from 1.46.0 to 1.54.0
 (#42)

Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.46.0 to 1.54.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.46.0...1.54.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alex Fernandes <84147256+AlexFernandes-MOVAI@users.noreply.github.com>
---
 .github/workflows/bump-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
index 680a415..bca57eb 100644
--- a/.github/workflows/bump-version.yml
+++ b/.github/workflows/bump-version.yml
@@ -11,7 +11,7 @@ jobs:
       with:
         fetch-depth: '0'
     - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.51.0
+      uses: anothrNick/github-tag-action@1.54.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         WITH_V: true

From 54329eb303669eb12f44f878940417618015aab8 Mon Sep 17 00:00:00 2001
From: Alex Fernandes <84147256+AlexFernandes-MOVAI@users.noreply.github.com>
Date: Tue, 20 Dec 2022 15:05:05 +0000
Subject: [PATCH 14/20] add dependencies for dal (#27)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 melodic/packages.apt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/melodic/packages.apt b/melodic/packages.apt
index fcc657d..0d30d68 100644
--- a/melodic/packages.apt
+++ b/melodic/packages.apt
@@ -25,3 +25,5 @@ python3-pip
 python3-setuptools
 # redis
 redis-tools
+libjpeg-dev
+zlib1g
\ No newline at end of file

From 3957259d12a769662151534afe6d896a1ca77ab8 Mon Sep 17 00:00:00 2001
From: duartecoelhomovai <84720623+duartecoelhomovai@users.noreply.github.com>
Date: Tue, 20 Dec 2022 15:18:41 +0000
Subject: [PATCH 15/20] DP-956 add proxy, remove melodic (#40)

* DP-956 add proxy, remove melodic

* review

* review to include precommit and dockerignore

* fix builds

Co-authored-by: Alex Fernandes <alex.fernandes@mov.ai>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .dockerignore                                 |  3 ++
 .github/dependabot.yml                        |  6 ++-
 .github/workflows/docker-ci.yml               | 25 ++-------
 .pre-commit-config.yaml                       |  7 +++
 .../melodic}/Dockerfile-rosfree               |  2 +-
 {melodic => docker/melodic}/packages.apt      |  0
 {noetic => docker/noetic}/Dockerfile          | 12 +++--
 {noetic => docker/noetic}/Dockerfile-rosfree  |  2 +-
 {noetic => docker/noetic}/packages.apt        |  0
 files/welcome                                 |  2 +-
 melodic/Dockerfile                            | 54 -------------------
 11 files changed, 28 insertions(+), 85 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 .pre-commit-config.yaml
 rename {melodic => docker/melodic}/Dockerfile-rosfree (96%)
 rename {melodic => docker/melodic}/packages.apt (100%)
 rename {noetic => docker/noetic}/Dockerfile (73%)
 rename {noetic => docker/noetic}/Dockerfile-rosfree (96%)
 rename {noetic => docker/noetic}/packages.apt (100%)
 delete mode 100644 melodic/Dockerfile

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..85ec735
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+*
+!files/
+!docker/
\ No newline at end of file
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2c7d170..8460be8 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,4 +4,8 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "daily"
+      interval: "weekly"
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "docker/noetic/" # Location of package manifests
+    schedule:
+      interval: "weekly"
\ No newline at end of file
diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index 90ea1a9..da6ba51 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -17,29 +17,10 @@ on:
   release:
     types: [released]
 jobs:
-  movai-base-melodic:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
-    with:
-      docker_file: melodic/Dockerfile
-      docker_image: devops/movai-base-melodic
-      public: true
-      public_image: ce/movai-base-melodic
-      github_ref: ${{ github.ref }}
-      deploy: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v')}}
-      version: ${GITHUB_REF##*/}
-      push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }}
-      snyk_check: true
-      platforms: linux/amd64, linux/arm/v7, linux/arm64
-    secrets:
-      registry_user: ${{ secrets.PORTUS_APP_USER }}
-      registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
-      pub_registry_user: ${{ secrets.PORTUS_APP_USER }}
-      pub_registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
-      snyk_token: ${{ secrets.SNYK_TOKEN }}
   movai-base-noetic:
     uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
     with:
-      docker_file: noetic/Dockerfile
+      docker_file: docker/noetic/Dockerfile
       docker_image: devops/movai-base-noetic
       public: true
       public_image: ce/movai-base-noetic
@@ -58,7 +39,7 @@ jobs:
   movai-base-bionic:
     uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
     with:
-      docker_file: melodic/Dockerfile-rosfree
+      docker_file: docker/melodic/Dockerfile-rosfree
       docker_image: devops/movai-base-bionic
       public: true
       public_image: ce/movai-base-bionic
@@ -77,7 +58,7 @@ jobs:
   movai-base-focal:
     uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
     with:
-      docker_file: noetic/Dockerfile-rosfree
+      docker_file: docker/noetic/Dockerfile-rosfree
       docker_image: devops/movai-base-focal
       public: true
       public_image: ce/movai-base-focal
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000..6ac0630
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,7 @@
+---
+repos:
+  - repo: https://github.com/hadolint/hadolint
+    rev: v2.12.0
+    hooks:
+      - id: hadolint-docker
+        args: ["docker/noetic/Dockerfile", "docker/noetic/Dockerfile-rosfree", "docker/melodic/Dockerfile-rosfree"]
\ No newline at end of file
diff --git a/melodic/Dockerfile-rosfree b/docker/melodic/Dockerfile-rosfree
similarity index 96%
rename from melodic/Dockerfile-rosfree
rename to docker/melodic/Dockerfile-rosfree
index 32d8df8..e4b734c 100644
--- a/melodic/Dockerfile-rosfree
+++ b/docker/melodic/Dockerfile-rosfree
@@ -40,7 +40,7 @@ COPY files/movai-entrypoint.sh /usr/local/bin/movai-entrypoint.sh
 
 # Install base packages
 COPY files/packages.bash /tmp/packages.bash
-COPY $ROS_VERSION/packages.apt /tmp/packages.apt
+COPY docker/$ROS_VERSION/packages.apt /tmp/packages.apt
 RUN /usr/local/bin/install-packages.sh
 
 # Run user provision
diff --git a/melodic/packages.apt b/docker/melodic/packages.apt
similarity index 100%
rename from melodic/packages.apt
rename to docker/melodic/packages.apt
diff --git a/noetic/Dockerfile b/docker/noetic/Dockerfile
similarity index 73%
rename from noetic/Dockerfile
rename to docker/noetic/Dockerfile
index aba1a56..19c1381 100644
--- a/noetic/Dockerfile
+++ b/docker/noetic/Dockerfile
@@ -1,5 +1,5 @@
 # This Dockerfile is the base image for Mov.ai - Based on ROS NOETIC
-FROM ros:noetic-robot
+FROM ros:noetic-ros-base
 
 # Labels
 LABEL description="MOV.AI Base Image"
@@ -7,7 +7,6 @@ LABEL maintainer="devops@mov.ai"
 
 # Arguments
 ARG USER_ID=1000
-ARG ROS_GPG_KEY=C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
 ARG ROS_VERSION="noetic"
 ARG HEALTH_NODE_URL="http://health-node:8081"
 
@@ -37,11 +36,14 @@ COPY files/movai-entrypoint.sh /usr/local/bin/movai-entrypoint.sh
 
 # Install base packages
 COPY files/packages.bash /tmp/packages.bash
-COPY $ROS_VERSION/packages.apt /tmp/packages.apt
+COPY docker/$ROS_VERSION/packages.apt /tmp/packages.apt
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key "${ROS_GPG_KEY}" &&\
+
+RUN find /etc/apt/sources.list.d/ -type f -name 'ros*.list' -exec rm {} \; &&\
     echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections &&\
-    apt-get update && apt-get upgrade -y &&\
+    apt-get update && apt-get upgrade -y && apt-get install -y curl --no-install-recommends &&\
+    curl -fsSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key | gpg --dearmor -o /usr/share/keyrings/ros.key &&\
+    echo "deb [signed-by=/usr/share/keyrings/ros.key] https://artifacts.aws.cloud.mov.ai/repository/ppa-proxy-ros focal main" | tee /etc/apt/sources.list.d/movai-ros.list > /dev/null &&\
     /usr/local/bin/install-packages.sh &&\
     apt-get clean &&\
     rm -rf /var/lib/apt/lists/* &&\
diff --git a/noetic/Dockerfile-rosfree b/docker/noetic/Dockerfile-rosfree
similarity index 96%
rename from noetic/Dockerfile-rosfree
rename to docker/noetic/Dockerfile-rosfree
index 34dc325..73842de 100644
--- a/noetic/Dockerfile-rosfree
+++ b/docker/noetic/Dockerfile-rosfree
@@ -37,7 +37,7 @@ COPY files/movai-entrypoint.sh /usr/local/bin/movai-entrypoint.sh
 
 # Install base packages
 COPY files/packages.bash /tmp/packages.bash
-COPY $ROS_VERSION/packages.apt /tmp/packages.apt
+COPY docker/$ROS_VERSION/packages.apt /tmp/packages.apt
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN  echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \
     apt-get update && apt-get upgrade -y &&\
diff --git a/noetic/packages.apt b/docker/noetic/packages.apt
similarity index 100%
rename from noetic/packages.apt
rename to docker/noetic/packages.apt
diff --git a/files/welcome b/files/welcome
index ba77583..e685773 100644
--- a/files/welcome
+++ b/files/welcome
@@ -7,7 +7,7 @@
  ``         ``          `      ```````           ``     `      `  ``
 
 
- Copyright 2021 MOV.AI
+ Copyright 2023 MOV.AI
 
     Licensed under the Mov.AI License version 1.0;
     you may not use this file except in compliance with the License.
diff --git a/melodic/Dockerfile b/melodic/Dockerfile
deleted file mode 100644
index 65b4804..0000000
--- a/melodic/Dockerfile
+++ /dev/null
@@ -1,54 +0,0 @@
-# This Dockerfile is the base image for Mov.ai - Based on ROS MELODIC
-FROM ros:melodic-robot
-
-# Labels
-LABEL description="MOV.AI Base Image"
-LABEL maintainer="devops@mov.ai"
-
-# Arguments
-ARG USER_ID=1000
-ARG ROS_GPG_KEY=C1CF6E31E6BADE8868B172B4F42ED6FBAB17C654
-ARG ROS_VERSION="melodic"
-ARG HEALTH_NODE_URL="http://health-node:8081"
-
-### Environment config
-ENV MOVAI_HOME="/opt/mov.ai" \
-    ROS_VERSION="$ROS_VERSION"
-ENV APP_PATH="${MOVAI_HOME}/app" \
-    APP_LOGS="${MOVAI_HOME}/logs" \
-    APP_UPDATES="${MOVAI_HOME}/updates" \
-    LOG_HTTP_HOST="${HEALTH_NODE_URL}" \
-    USER_ID=${USER_ID}
-
-# Create Default User and copy default settings
-RUN adduser --uid ${USER_ID} --home ${MOVAI_HOME} --disabled-password --gecos '' movai
-
-COPY --chown=movai:movai files/bashrc.bash ${MOVAI_HOME}/.bashrc
-COPY --chown=movai:movai files/welcome ${MOVAI_HOME}/.welcome
-
-# Copy build scripts
-COPY files/user-provision.sh /usr/local/bin/
-COPY files/install-packages.sh /usr/local/bin/
-COPY --chown=movai:movai files/deploy.sh /usr/local/bin/deploy.sh
-
-# Copy startup files
-COPY files/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
-COPY files/movai-entrypoint.sh /usr/local/bin/movai-entrypoint.sh
-
-# Install base packages
-COPY files/packages.bash /tmp/packages.bash
-COPY $ROS_VERSION/packages.apt /tmp/packages.apt
-RUN apt-key adv --keyserver 'hkp://keyserver.ubuntu.com:80' --recv-key "${ROS_GPG_KEY}" &&\
-    apt-get update && apt-get upgrade -y &&\
-    /usr/local/bin/install-packages.sh &&\
-    apt-get clean &&\
-    rm -rf /var/lib/apt/lists/* &&\
-    rm -rf /var/log/*
-
-# Run user provision
-COPY files/user.rc /tmp/user.rc
-RUN /usr/local/bin/user-provision.sh
-
-SHELL ["/bin/bash", "-c"]
-WORKDIR ${APP_PATH}
-ENTRYPOINT [ "docker-entrypoint.sh" ]

From 9b8878751775dfefc3c547f6338b252969da40dd Mon Sep 17 00:00:00 2001
From: Alex Fernandes <84147256+AlexFernandes-MOVAI@users.noreply.github.com>
Date: Tue, 20 Dec 2022 15:23:43 +0000
Subject: [PATCH 16/20] [skip actions] update readme.md

---
 README.md | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index c55196e..ddb1041 100644
--- a/README.md
+++ b/README.md
@@ -29,21 +29,17 @@ Examples :
 
 ## Build
 
-Build MOVAI image based on ROS melodic :
-
-    docker build -t movai-base:melodic -f melodic/Dockerfile .
-
 Build MOVAI image based on ROS noetic :
 
-    docker build -t movai-base:noetic -f noetic/Dockerfile .
+    docker build -t movai-base:noetic -f docker/noetic/Dockerfile .
 
 Build MOVAI image based on Ubuntu 18.04 :
 
-    docker build -t movai-base:bionic -f melodic/Dockerfile-rosfree .
+    docker build -t movai-base:bionic -f docker/melodic/Dockerfile-rosfree .
 
 Build MOVAI image based on Ubuntu 20.04 :
 
-    docker build -t movai-base:focal -f noetic/Dockerfile-rosfree .
+    docker build -t movai-base:focal -f docker/noetic/Dockerfile-rosfree .
 
 ## Build for multi-arch
 
@@ -53,7 +49,7 @@ Build MOVAI image based on Ubuntu 20.04 :
     docker buildx inspect --bootstrap
 
     DOCKER_PLATFORMS=linux/amd64,linux/armhf,linux/arm64
-    docker buildx build --pull --platform $DOCKER_PLATFORMS -t movai-base:noetic -f noetic/Dockerfile .
+    docker buildx build --pull --platform $DOCKER_PLATFORMS -t movai-base:noetic -f docker/noetic/Dockerfile .
 
     docker buildx build --push --pull --platform $DOCKER_PLATFORMS -t registry.aws.cloud.mov.ai/devops/multiarch-movai-base-noetic -f noetic/Dockerfile .
 

From 85751fec811222769976e66661c794bcbbd7322c Mon Sep 17 00:00:00 2001
From: duartecoelhomovai <84720623+duartecoelhomovai@users.noreply.github.com>
Date: Mon, 3 Jul 2023 12:20:23 +0100
Subject: [PATCH 17/20] DP-1155 proxy ubuntu archive through movai nexus (#52)

* proxy ubuntu archive through movai nexus

* fix hadolinting

* refactor sources.list to config files

* replace seds by a back up file

* replace sed

* add no-recommend

---------

Co-authored-by: Alex Fernandes <alex.fernandes@mov.ai>
---
 docker/noetic/Dockerfile                   | 22 +++++++++++++++++++---
 docker/noetic/Dockerfile-rosfree           | 22 +++++++++++++++++++---
 files/apt/movai-ubuntu-archive-proxy.list  | 14 ++++++++++++++
 files/apt/movai-ubuntu-ports-proxy.list    | 18 ++++++++++++++++++
 files/apt/movai-ubuntu-security-proxy.list |  4 ++++
 files/install-packages.sh                  | 11 +++++------
 files/packages.bash                        | 13 +++++++++++++
 7 files changed, 92 insertions(+), 12 deletions(-)
 create mode 100644 files/apt/movai-ubuntu-archive-proxy.list
 create mode 100644 files/apt/movai-ubuntu-ports-proxy.list
 create mode 100644 files/apt/movai-ubuntu-security-proxy.list

diff --git a/docker/noetic/Dockerfile b/docker/noetic/Dockerfile
index 19c1381..f39b86d 100644
--- a/docker/noetic/Dockerfile
+++ b/docker/noetic/Dockerfile
@@ -9,7 +9,8 @@ LABEL maintainer="devops@mov.ai"
 ARG USER_ID=1000
 ARG ROS_VERSION="noetic"
 ARG HEALTH_NODE_URL="http://health-node:8081"
-
+### Environment config
+ARG APT_REPOSITORY="https://artifacts.aws.cloud.mov.ai/repository"
 ### Environment config
 ENV MOVAI_HOME="/opt/mov.ai" \
     ROS_VERSION="$ROS_VERSION"
@@ -37,19 +38,34 @@ COPY files/movai-entrypoint.sh /usr/local/bin/movai-entrypoint.sh
 # Install base packages
 COPY files/packages.bash /tmp/packages.bash
 COPY docker/$ROS_VERSION/packages.apt /tmp/packages.apt
+
+# Install requirements for ppa certificates registration
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \
+    apt update &&\
+    apt-get install -y curl gnupg --no-install-recommends
 
+COPY files/apt/movai-ubuntu-archive-proxy.list /etc/apt/sources.list.d/movai-ubuntu-archive-proxy.list
+COPY files/apt/movai-ubuntu-ports-proxy.list /etc/apt/sources.list.d/movai-ubuntu-ports-proxy.list
+COPY files/apt/movai-ubuntu-security-proxy.list /etc/apt/sources.list.d/movai-ubuntu-security-proxy.list
+
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN find /etc/apt/sources.list.d/ -type f -name 'ros*.list' -exec rm {} \; &&\
     echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections &&\
-    apt-get update && apt-get upgrade -y && apt-get install -y curl --no-install-recommends &&\
     curl -fsSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key | gpg --dearmor -o /usr/share/keyrings/ros.key &&\
     echo "deb [signed-by=/usr/share/keyrings/ros.key] https://artifacts.aws.cloud.mov.ai/repository/ppa-proxy-ros focal main" | tee /etc/apt/sources.list.d/movai-ros.list > /dev/null &&\
+    mv /etc/apt/sources.list /etc/apt/sources.list.bck &&\
+    touch /etc/apt/sources.list &&\
+    curl -fsSL $APT_REPOSITORY/movai-applications/gpg | apt-key add -  &&\
+    if [ "$(uname -m)" = "x86_64" ] ; then rm /etc/apt/sources.list.d/movai-ubuntu-ports-proxy.list ; fi &&\ 
+    if [ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "armv7l" ] ; then rm /etc/apt/sources.list.d/movai-ubuntu-archive* && rm /etc/apt/sources.list.d/movai-ubuntu-security* ; fi &&\ 
+    apt-get update && apt-get upgrade -y &&\
     /usr/local/bin/install-packages.sh &&\
     apt-get clean &&\
     rm -rf /var/lib/apt/lists/* &&\
     rm -rf /var/log/*
 
-# Run user provision
+# # Run user provision
 COPY files/user.rc /tmp/user.rc
 RUN /usr/local/bin/user-provision.sh
 
diff --git a/docker/noetic/Dockerfile-rosfree b/docker/noetic/Dockerfile-rosfree
index 73842de..c4d2558 100644
--- a/docker/noetic/Dockerfile-rosfree
+++ b/docker/noetic/Dockerfile-rosfree
@@ -8,7 +8,8 @@ LABEL maintainer="devops@mov.ai"
 # Arguments
 ARG USER_ID=1000
 ARG HEALTH_NODE_URL="http://health-node:8081"
-
+### Environment config
+ARG APT_REPOSITORY="https://artifacts.aws.cloud.mov.ai/repository"
 ### Environment config
 ENV MOVAI_HOME="/opt/mov.ai" \
     ROS_VERSION="noetic" \
@@ -35,11 +36,26 @@ COPY --chown=movai:movai files/deploy.sh /usr/local/bin/deploy.sh
 COPY files/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 COPY files/movai-entrypoint.sh /usr/local/bin/movai-entrypoint.sh
 
-# Install base packages
+
 COPY files/packages.bash /tmp/packages.bash
 COPY docker/$ROS_VERSION/packages.apt /tmp/packages.apt
+
+# Install requirements for ppa certificates registration
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \
+    apt-get update &&\
+    apt-get install -y curl gnupg ca-certificates --no-install-recommends
+
+COPY files/apt/movai-ubuntu-archive-proxy.list /etc/apt/sources.list.d/movai-ubuntu-archive-proxy.list
+COPY files/apt/movai-ubuntu-ports-proxy.list /etc/apt/sources.list.d/movai-ubuntu-ports-proxy.list
+COPY files/apt/movai-ubuntu-security-proxy.list /etc/apt/sources.list.d/movai-ubuntu-security-proxy.list
+
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN  echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \
+RUN mv /etc/apt/sources.list /etc/apt/sources.list.bck &&\
+    touch /etc/apt/sources.list &&\
+    curl -fsSL $APT_REPOSITORY/movai-applications/gpg | apt-key add -  &&\
+    if [ "$(uname -m)" = "x86_64" ] ; then rm /etc/apt/sources.list.d/movai-ubuntu-ports-proxy.list ; fi &&\ 
+    if [ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "armv7l" ] ; then rm /etc/apt/sources.list.d/movai-ubuntu-archive* && rm /etc/apt/sources.list.d/movai-ubuntu-security* ; fi &&\ 
     apt-get update && apt-get upgrade -y &&\
     /usr/local/bin/install-packages.sh &&\
     apt-get clean &&\
diff --git a/files/apt/movai-ubuntu-archive-proxy.list b/files/apt/movai-ubuntu-archive-proxy.list
new file mode 100644
index 0000000..5de7207
--- /dev/null
+++ b/files/apt/movai-ubuntu-archive-proxy.list
@@ -0,0 +1,14 @@
+# Add focal proxy
+deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal focal universe
+deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal focal multiverse
+deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal focal main
+deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal focal restricted
+# Add focal-updates proxy
+deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-updates focal-updates universe
+deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-updates focal-updates multiverse
+deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-updates focal-updates main
+deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-updates focal-updates restricted
+# Add focal-backports proxy
+deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-backports focal-backports universe
+deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-backports focal-backports multiverse
+deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-backports focal-backports main
\ No newline at end of file
diff --git a/files/apt/movai-ubuntu-ports-proxy.list b/files/apt/movai-ubuntu-ports-proxy.list
new file mode 100644
index 0000000..f006fd3
--- /dev/null
+++ b/files/apt/movai-ubuntu-ports-proxy.list
@@ -0,0 +1,18 @@
+# Add ports focal proxy
+deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal focal universe
+deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal focal multiverse
+deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal focal main
+deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal focal restricted
+# Add ports focal-updates proxy
+deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal-updates focal-updates main
+deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal-updates focal-updates multiverse
+deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal-updates focal-updates universe
+deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal-updates focal-updates restricted
+# Add ports focal-backports proxy
+deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal-backports focal-backports universe
+deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal-backports focal-backports main
+# Add ports focal-security proxy
+deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal-security focal-security main
+deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal-security focal-security multiverse
+deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal-security focal-security universe
+deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal-security focal-security restricted
diff --git a/files/apt/movai-ubuntu-security-proxy.list b/files/apt/movai-ubuntu-security-proxy.list
new file mode 100644
index 0000000..b12e1c0
--- /dev/null
+++ b/files/apt/movai-ubuntu-security-proxy.list
@@ -0,0 +1,4 @@
+# Add focal security proxy
+deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-security-focal focal-security main restricted
+deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-security-focal focal-security universe
+deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-security-focal focal-security multiverse
diff --git a/files/install-packages.sh b/files/install-packages.sh
index fbe997e..fa57548 100755
--- a/files/install-packages.sh
+++ b/files/install-packages.sh
@@ -20,6 +20,11 @@ set -eo pipefail
 # Install apt dependencies
 
 PACKAGE_FILE=/tmp/packages.apt
+PACKAGES_SCRIPT=/tmp/packages.bash
+
+# If there is a package script, install packages then clean up
+[ -f ${PACKAGES_SCRIPT} ] && { chmod 700 ${PACKAGES_SCRIPT}; ${PACKAGES_SCRIPT}; rm --preserve-root ${PACKAGES_SCRIPT}; }
+
 
 # If there is a package definition file, install packages then clean up
 if [ -f ${PACKAGE_FILE} ]; then
@@ -46,11 +51,5 @@ PIP_REQUIREMENTS=/tmp/requirements.txt
     rm --preserve-root ${PIP_REQUIREMENTS};
 }
 
-PACKAGES_SCRIPT=/tmp/packages.bash
-
-# If there is a package script, install packages then clean up
-[ -f ${PACKAGES_SCRIPT} ] && { chmod 700 ${PACKAGES_SCRIPT}; ${PACKAGES_SCRIPT}; rm --preserve-root ${PACKAGES_SCRIPT}; }
-
-
 printf "Cleaning up ...\n"
 rm -rf /tmp/*
diff --git a/files/packages.bash b/files/packages.bash
index 5737c0f..ffe7b2e 100755
--- a/files/packages.bash
+++ b/files/packages.bash
@@ -27,7 +27,20 @@ SUDO_COMMANDS=(
 
 # Setup available sudo commands for user movai
 adduser movai sudo
+mkdir -p /etc/sudoers.d
 touch /etc/sudoers.d/movai
 for SUDO_COMMAND in ${SUDO_COMMANDS[@]}; do
     echo "%sudo ALL=(ALL) NOPASSWD:SETENV: ${SUDO_COMMAND}" >> /etc/sudoers.d/movai
 done
+
+{
+    echo "Package: *" 
+    echo "Pin: origin artifacts.cloud.mov.ai"
+    echo "Pin-Priority: 1001" 
+} >> /etc/apt/preferences.d/movai
+
+{
+    echo "Package: *"
+    echo "Pin: origin artifacts.aws.cloud.mov.ai"
+    echo "Pin-Priority: 1001"
+}  >> /etc/apt/preferences.d/movai-ros

From c85134c7c5d8d950a145de4ee83068dac5a5c7cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Jul 2023 09:45:04 +0100
Subject: [PATCH 18/20] Bump MOV-AI/.github from 1 to 2 (#45)

* Bump MOV-AI/.github from 1 to 2

Bumps MOV-AI/.github from 1 to 2.

---
updated-dependencies:
- dependency-name: MOV-AI/.github
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update docker-ci.yml to v2

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alex Fernandes <84147256+AlexFernandes-MOVAI@users.noreply.github.com>
---
 .github/workflows/docker-ci.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index da6ba51..9ea451d 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -18,15 +18,13 @@ on:
     types: [released]
 jobs:
   movai-base-noetic:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v2
     with:
       docker_file: docker/noetic/Dockerfile
       docker_image: devops/movai-base-noetic
       public: true
       public_image: ce/movai-base-noetic
-      github_ref: ${{ github.ref }}
       deploy: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v')}}
-      version: ${GITHUB_REF##*/}
       push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }}
       snyk_check: true
       platforms: linux/amd64, linux/arm/v7, linux/arm64
@@ -35,17 +33,17 @@ jobs:
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
       pub_registry_user: ${{ secrets.PORTUS_APP_USER }}
       pub_registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
+      github_registry_user: ${{ secrets.RAISE_BOT_COMMIT_USER }}
+      github_registry_password: ${{ secrets.RAISE_BOT_COMMIT_PASSWORD }}
       snyk_token: ${{ secrets.SNYK_TOKEN }}
   movai-base-bionic:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v2
     with:
       docker_file: docker/melodic/Dockerfile-rosfree
       docker_image: devops/movai-base-bionic
       public: true
       public_image: ce/movai-base-bionic
-      github_ref: ${{ github.ref }}
       deploy: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v')}}
-      version: ${GITHUB_REF##*/}
       push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }}
       snyk_check: true
       platforms: linux/amd64, linux/arm/v7, linux/arm64
@@ -54,17 +52,17 @@ jobs:
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
       pub_registry_user: ${{ secrets.PORTUS_APP_USER }}
       pub_registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
+      github_registry_user: ${{ secrets.RAISE_BOT_COMMIT_USER }}
+      github_registry_password: ${{ secrets.RAISE_BOT_COMMIT_PASSWORD }}
       snyk_token: ${{ secrets.SNYK_TOKEN }}
   movai-base-focal:
-    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v1
+    uses: MOV-AI/.github/.github/workflows/docker-workflow.yml@v2
     with:
       docker_file: docker/noetic/Dockerfile-rosfree
       docker_image: devops/movai-base-focal
       public: true
       public_image: ce/movai-base-focal
-      github_ref: ${{ github.ref }}
       deploy: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v')}}
-      version: ${GITHUB_REF##*/}
       push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }}
       snyk_check: true
       platforms: linux/amd64, linux/arm/v7, linux/arm64
@@ -73,4 +71,6 @@ jobs:
       registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
       pub_registry_user: ${{ secrets.PORTUS_APP_USER }}
       pub_registry_password: ${{ secrets.PORTUS_APP_TOKEN }}
+      github_registry_user: ${{ secrets.RAISE_BOT_COMMIT_USER }}
+      github_registry_password: ${{ secrets.RAISE_BOT_COMMIT_PASSWORD }}
       snyk_token: ${{ secrets.SNYK_TOKEN }}

From 48332b70bddf528e20d89cc791b0fb46c22a10ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Jul 2023 09:45:35 +0100
Subject: [PATCH 19/20] Bump anothrNick/github-tag-action from 1.61.0 to 1.67.0
 (#50)

Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.61.0 to 1.67.0.
- [Release notes](https://github.com/anothrNick/github-tag-action/releases)
- [Commits](https://github.com/anothrNick/github-tag-action/compare/1.61.0...1.67.0)

---
updated-dependencies:
- dependency-name: anothrNick/github-tag-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/bump-version.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
index 37a3b67..17401e5 100644
--- a/.github/workflows/bump-version.yml
+++ b/.github/workflows/bump-version.yml
@@ -11,7 +11,7 @@ jobs:
       with:
         fetch-depth: '0'
     - name: Bump version and push tag
-      uses: anothrNick/github-tag-action@1.61.0
+      uses: anothrNick/github-tag-action@1.67.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         WITH_V: true

From 84193004528e24ecec8d8175f782ba90cf4dd11b Mon Sep 17 00:00:00 2001
From: Mariana Alves <mariana.alves@mov.ai>
Date: Fri, 4 Aug 2023 15:30:28 +0100
Subject: [PATCH 20/20] Add version input to docker image action

---
 .github/workflows/docker-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
index 9ea451d..65c1983 100644
--- a/.github/workflows/docker-ci.yml
+++ b/.github/workflows/docker-ci.yml
@@ -25,6 +25,7 @@ jobs:
       public: true
       public_image: ce/movai-base-noetic
       deploy: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v')}}
+      version: ${GITHUB_REF##*/}
       push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }}
       snyk_check: true
       platforms: linux/amd64, linux/arm/v7, linux/arm64
@@ -44,6 +45,7 @@ jobs:
       public: true
       public_image: ce/movai-base-bionic
       deploy: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v')}}
+      version: ${GITHUB_REF##*/}
       push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }}
       snyk_check: true
       platforms: linux/amd64, linux/arm/v7, linux/arm64
@@ -63,6 +65,7 @@ jobs:
       public: true
       public_image: ce/movai-base-focal
       deploy: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v')}}
+      version: ${GITHUB_REF##*/}
       push_latest: ${{ contains(github.ref, 'refs/heads/main') || contains(github.ref, 'refs/tags/v') }}
       snyk_check: true
       platforms: linux/amd64, linux/arm/v7, linux/arm64