Remove redundant Dockerfile in tests

spiffe · Nov 11, 2024 · a1094b2 · a1094b2
1 parent cc6d800
commit a1094b2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/.github/tests/it/build.sh b/.github/tests/it/build.sh
@@ -55,7 +55,8 @@ docker compose exec spire-server ./bin/spire-server entry create \
 # set ups spire agent
 docker compose up spire-agent -d
 
-docker compose build spiffe-helper
+go_version=$(sed -En 's/^go[ ]+([0-9.]+).*/\1/p' ../../../go.mod)
+docker compose build --build-arg go_version=$go_version spiffe-helper
 
 # set ups and postgres-db
 docker compose up postgres-db -d

diff --git a/.github/tests/it/docker-compose.yaml b/.github/tests/it/docker-compose.yaml
@@ -19,7 +19,9 @@ services:
   spiffe-helper:
     build: 
       context: ../../../
-      dockerfile: ./.github/tests/it/spiffe-helper/Dockerfile
+      dockerfile: ./Dockerfile
+      args:
+        - go_version
 
   postgres-db:
     build: postgres

diff --git a/.github/tests/it/spiffe-helper/Dockerfile b/.github/tests/it/spiffe-helper/Dockerfile
diff --git a/.github/workflows/pr_build.yaml b/.github/workflows/pr_build.yaml
@@ -118,7 +118,12 @@ jobs:
       matrix:
        tests: ${{ fromJson(needs.build-matrix.outputs.tests) }}
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup go
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
       - name: Build containers
         run: ./build.sh
         shell: bash