change to vars in github

.github/workflows/build-push-Image.yaml

@@ -11,12 +11,14 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+
+    env:
+      OSQUERY_VERSION: ${{ vars.OSQUERY_VERSION }}
+      OSCTRL_VERSION: ${{ vars.OSCTRL_VERSION }}
 
     strategy:
       matrix:
         service:
-          # Each object in this list represents one image to build
-          # Adjust paths if your Dockerfiles differ
           - name: osctrl-tls
             file: deploy/docker/dockerfiles/Dockerfile-dev-tls
           - name: osctrl-admin
@@ -27,8 +29,6 @@ jobs:
             file: deploy/docker/dockerfiles/Dockerfile-dev-cli
           - name: osctrl-osquery
             file: deploy/docker/dockerfiles/Dockerfile-osquery
-          # If you want to build the dev images, replace the file paths with e.g.:
-          # ./deploy/docker/dockerfiles/Dockerfile-dev-tls, etc.
 
     steps:
       - name: Checkout
@@ -47,15 +47,12 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # Optional: Set up Go if you need to run 'go build' or 'make' steps before Docker build
-      # - name: Set up Go
-      #   uses: actions/setup-go@v5
-      #   with:
-      #     go-version: "stable"
-
       - name: Build and Push ${{ matrix.service.name }}
         uses: docker/build-push-action@v6
         with:
+          build-args: |
+            OSQUERY_VERSION=${{ env.OSQUERY_VERSION }}
+            OSCTRL_VERSION=${{ env.OSCTRL_VERSION }}
           context: .
           # The key line: specify the correct Dockerfile path from the matrix
           file: ${{ matrix.service.file }}