Update to use stol feature branch actions which set docker build arg

usdot-fhwa-stol · Apr 23, 2024 · 43161a2 · 43161a2
1 parent f5a532f
commit 43161a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -6,14 +6,6 @@ on:
 
 jobs:
   docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Build
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          build-args: BUILDKIT_CONTEXT_KEEP_GIT_DIR=1
+    uses: usdot-fhwa-stol/actions/.github/workflows/docker.yml@feature-docker-build-github-submodule
+    with:
+      github_submodules: true
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
@@ -10,8 +10,10 @@ on:
       - carma-system-*
 jobs:
   dockerhub:
-    uses: usdot-fhwa-stol/actions/.github/workflows/dockerhub.yml@main
+    uses: usdot-fhwa-stol/actions/.github/workflows/dockerhub.yml@feature-docker-build-github-submodule
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-      GH_PAT: ${{ secrets.GH_PAT }}
+      GH_PAT: ${{ secrets.GH_PAT }}
+    with:
+      github_submodules: true