update config

usdot-fhwa-stol · Jan 14, 2025 · 28749af · 28749af
1 parent a833d2b
commit 28749af
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 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: usdotfhwastol
+      docker_image_tag: carma-system-4.5.0
     steps:
       - id: docker-org-and-tag
         uses: usdot-fhwa-stol/actions/docker-org-and-tag@main

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -4,6 +4,4 @@ on:
       types: [opened, synchronize, reopened]
 jobs:
   dockerhub:
-    uses: usdot-fhwa-stol/actions/.github/workflows/docker.yml@main
-    with:
-      tag_name_suffix: "carma-system-4.5.0"
+    uses: usdot-fhwa-stol/actions/.github/workflows/docker.yml@main
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
@@ -11,9 +11,6 @@ on:
 jobs:
   dockerhub:
     uses: usdot-fhwa-stol/actions/.github/workflows/dockerhub.yml@main
-    with:
-      tag_name_suffix: "carma-system-4.5.0"
-      image_name: "carma-base"
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,7 @@
 
 ARG DOCKER_ORG="usdotfhwastol"
 ARG DOCKER_TAG="carma-system-4.5.0"
-FROM ${DOCKER_ORG}/carma-base:${DOCKER_TAG} as base_image
+FROM usdotfhwastol/carma-base:carma-system-4.5.0 as base_image
 FROM base_image as setup
 ARG GIT_BRANCH="release/prowler"