Update config files to point correct images

usdot-fhwa-stol · Jan 14, 2025 · 05346d7 · 05346d7
1 parent 4fc1479
commit 05346d7
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,8 +11,8 @@ jobs:
   determine_docker_org_and_tag:
     runs-on: ubuntu-latest
     outputs:
-      docker_organization: ${{ steps.docker-org-and-tag.outputs.docker_organization }}
-      docker_image_tag: ${{ steps.docker-org-and-tag.outputs.docker_image_tag }}
+      docker_organization: usdotfhwastolcandidate
+      docker_image_tag: prowler
     steps:
       - id: docker-org-and-tag
         uses: usdot-fhwa-stol/actions/docker-org-and-tag@main
@@ -24,7 +24,7 @@ jobs:
         working-directory: "/opt/carma/"
     runs-on: ubuntu-latest
     container:
-      image: ${{ needs.determine_docker_org_and_tag.outputs.docker_organization }}/carma-base:${{ needs.determine_docker_org_and_tag.outputs.docker_image_tag }}
+      image: usdotfhwastol/carma-base:carma-system-4.5.0
       env:
         INIT_ENV: "/home/carma/.base-image/init-env.sh"
         ROS_2_ENV: "/opt/ros/foxy/setup.bash"
@@ -92,4 +92,4 @@ jobs:
       uses: usdot-fhwa-stol/actions/sonar-scanner@main
       with:
         sonar-token: ${{ secrets.SONAR_TOKEN }}
-        working-dir: "/opt/carma/src/${{ github.event.repository.name }}"
+        working-dir: "/opt/carma/src/${{ github.event.repository.name }}"
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
@@ -11,8 +11,8 @@ jobs:
   determine_docker_org_and_tag:
     runs-on: ubuntu-latest
     outputs:
-      docker_organization: ${{ steps.docker-org-and-tag.outputs.docker_organization }}
-      docker_image_tag: ${{ steps.docker-org-and-tag.outputs.docker_image_tag }}
+      docker_organization: usdotfhwastolcandidate
+      docker_image_tag: prowler
     steps:
       - id: docker-org-and-tag
         uses: usdot-fhwa-stol/actions/docker-org-and-tag@main
@@ -42,7 +42,7 @@ jobs:
         with:
           context: ./carma-messenger-ui/
           push: true
-          tags: usdotfhwastol/carma-messenger-ui:${{ github.ref_name }}
+          tags: usdotfhwastolcandidate/carma-messenger-ui:${{ github.ref_name }}
           build-args: |
             BUILD_DATE=${{ steps.docker-image-metadata.outcome.build_date }}
             VCS_REF=${{ steps.docker-image-metadata.outcome.vcs_ref }}
@@ -54,7 +54,7 @@ jobs:
         with:
           context: ./carma-messenger-core/
           push: true
-          tags: usdotfhwastol/carma-messenger-core:${{ github.ref_name }}      
+          tags: usdotfhwastolcandidate/carma-messenger-core:${{ github.ref_name }}      
           build-args: |
             GIT_BRANCH=${{ github.ref_name }}
             DOCKER_TAG=${{ needs.determine_docker_org_and_tag.outputs.docker_image_tag }}
@@ -68,7 +68,7 @@ jobs:
         with:
           context: ./carma-messenger-config/chevrolet_tahoe_2018/
           push: true
-          tags: usdotfhwastol/carma-messenger-config:${{ github.ref_name }}-chevrolet_tahoe_2018
+          tags: usdotfhwastolcandiate/carma-messenger-config:${{ github.ref_name }}-chevrolet_tahoe_2018
           build-args: |
             BUILD_DATE=${{ steps.docker-image-metadata.outcome.build_date }}
             VCS_REF=${{ steps.docker-image-metadata.outcome.vcs_ref }}
@@ -79,11 +79,8 @@ jobs:
         with:
           context: ./carma-messenger-config/development/
           push: true
-          tags: usdotfhwastol/carma-messenger-config:${{ github.ref_name }}-development
+          tags: usdotfhwastolcandidate/carma-messenger-config:${{ github.ref_name }}-development
           build-args: |
             BUILD_DATE=${{ steps.docker-image-metadata.outcome.build_date }}
             VCS_REF=${{ steps.docker-image-metadata.outcome.vcs_ref }}
             VERSION=${{ steps.docker-image-metadata.outcome.version }}                
-
-      
-
diff --git a/carma-messenger-config/chevrolet_tahoe_2018/.env b/carma-messenger-config/chevrolet_tahoe_2018/.env
@@ -1,2 +1,2 @@
-DOCKER_ORG=usdotfhwastoldev
-DOCKER_TAG=develop
+DOCKER_ORG=usdotfhwastol
+DOCKER_TAG=carma-system-4.5.0
diff --git a/carma-messenger-config/chevrolet_tahoe_2018/docker-compose-background.yml b/carma-messenger-config/chevrolet_tahoe_2018/docker-compose-background.yml
@@ -17,7 +17,7 @@ version: '2'
 
 services:
   carma-messenger-ui:
-    image: ${DOCKER_ORG}/carma-messenger-ui:${DOCKER_TAG}
+    image: usdotfhwastolcandidate/carma-messenger-ui:prowler
     network_mode: host
     container_name: carma-messenger-ui
     environment:

diff --git a/carma-messenger-config/chevrolet_tahoe_2018/docker-compose.yml b/carma-messenger-config/chevrolet_tahoe_2018/docker-compose.yml
@@ -43,7 +43,7 @@ services:
     command: bash -c 'wait-for-it localhost:11311 -- rosparam load /opt/carma/vehicle/config/bridge.yml && source ~/.base-image/workspace/install/setup.bash && ros2 run ros1_bridge dynamic_bridge --multi-threads'
 
   messenger:
-    image: ${DOCKER_ORG}/carma-messenger-core:${DOCKER_TAG}
+    image: usdotfhwastolcandidate/carma-messenger-core:prowler
     network_mode: host
     container_name: carma-messenger-core
     volumes_from:
@@ -56,7 +56,7 @@ services:
     command: wait-for-it localhost:11311 -- roslaunch /opt/carma/vehicle/config/carma-messenger-docker.launch
 
   messenger_ros2:
-    image: ${DOCKER_ORG}/carma-messenger-core:${DOCKER_TAG}
+    image: usdotfhwastolcandidate/carma-messenger-core:prowler
     network_mode: host
     container_name: messenger_ros2
     volumes_from:

diff --git a/carma-messenger-config/development/.env b/carma-messenger-config/development/.env
@@ -1,2 +1,2 @@
-DOCKER_ORG=usdotfhwastoldev
-DOCKER_TAG=develop
+DOCKER_ORG=usdotfhwastol
+DOCKER_TAG=carma-system-4.5.0
diff --git a/carma-messenger-config/development/docker-compose-background.yml b/carma-messenger-config/development/docker-compose-background.yml
@@ -17,7 +17,7 @@ version: '2'
 
 services:
   carma-messenger-ui:
-    image: ${DOCKER_ORG}/carma-messenger-ui:${DOCKER_TAG}
+    image: usdotfhwastolcandidate/carma-messenger-ui:prowler
     network_mode: host
     container_name: carma-messenger-ui
     volumes_from: 

diff --git a/carma-messenger-config/development/docker-compose.yml b/carma-messenger-config/development/docker-compose.yml
@@ -40,7 +40,7 @@ services:
     command: bash -c 'wait-for-it localhost:11311 -- rosparam load /opt/carma/vehicle/config/bridge.yml && source ~/.base-image/workspace/install/setup.bash && ros2 run ros1_bridge dynamic_bridge --multi-threads'
 
   messenger:
-    image: ${DOCKER_ORG}/carma-messenger-core:${DOCKER_TAG}
+    image: usdotfhwastolcandidate/carma-messenger-core:prowler
     network_mode: host
     container_name: carma-messenger-core
     volumes_from:
@@ -52,7 +52,7 @@ services:
     command: wait-for-it localhost:11311 -- roslaunch /opt/carma/vehicle/config/carma-messenger-docker.launch
 
   messenger_ros2:
-    image: ${DOCKER_ORG}/carma-messenger-core:${DOCKER_TAG}
+    image: usdotfhwastolcandidate/carma-messenger-core:prowler
     network_mode: host
     container_name: messenger_ros2
     volumes_from:

diff --git a/carma-messenger-core/Dockerfile b/carma-messenger-core/Dockerfile
@@ -11,11 +11,11 @@
 #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #  License for the specific language governing permissions and limitations under
 #  the License.
-ARG DOCKER_ORG="usdotfhwastoldev"
-ARG DOCKER_TAG="develop"
-FROM ${DOCKER_ORG}/carma-base:${DOCKER_TAG} as base_image
+ARG DOCKER_ORG="usdotfhwastolcandidate"
+ARG DOCKER_TAG="prowler"
+FROM usdotfhwastol/carma-base:carma-system-4.5.0 as base_image
 FROM base_image as setup
-ARG GIT_BRANCH="develop" 
+ARG GIT_BRANCH="release/prowler" 
 
 RUN mkdir ~/src
 COPY --chown=carma . /home/carma/src/

diff --git a/carma-messenger-core/docker/checkout.bash b/carma-messenger-core/docker/checkout.bash
@@ -37,6 +37,6 @@ while [[ $# -gt 0 ]]; do
       esac
 done
 
-git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch $BRANCH
-git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch $BRANCH
+git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/CARMAMsgs --branch carma-system-4.5.0
+git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUtils --branch carma-system-4.5.0