Remove redundant Dockerfile in tests

.github/tests/it/build.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 fingerprint () {
 	# calculate the SHA1 digest of the DER bytes of the certificate using the
@@ -55,7 +56,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

.github/tests/it/client/Dockerfile

@@ -27,5 +27,5 @@ RUN chown client:client \
     /run/client/certs/root.crt
 
 USER root
-COPY --from=it-spiffe-helper /service/spiffe-helper /opt/helper/spiffe-helper
+COPY --from=it-spiffe-helper /spiffe-helper /opt/helper/spiffe-helper
 COPY --from=builder /service/client /opt/go-client/client

.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

.github/tests/it/go-server/Dockerfile

@@ -16,5 +16,5 @@ RUN chown go-server:go-server \
     /run/go-server/certs/root.crt
 
 USER root
-COPY --from=it-spiffe-helper /service/spiffe-helper /opt/helper/spiffe-helper
+COPY --from=it-spiffe-helper /spiffe-helper /opt/helper/spiffe-helper
 COPY --from=builder /service/server /opt/go-server/server

.github/tests/it/mysql/Dockerfile

@@ -10,4 +10,4 @@ RUN touch /var/lib/mysql/server-cert.pem /var/lib/mysql/server-key.pem /var/lib/
 RUN chmod 660 /var/lib/mysql/server-cert.pem /var/lib/mysql/server-key.pem /var/lib/mysql/ca.pem
 
 USER root
-COPY --from=it-spiffe-helper /service/spiffe-helper /opt/helper/spiffe-helper
+COPY --from=it-spiffe-helper /spiffe-helper /opt/helper/spiffe-helper

.github/tests/it/postgres/Dockerfile

@@ -21,4 +21,4 @@ RUN chmod 700 /var/lib/postgresql/data
 RUN initdb -D /var/lib/postgresql/data
 
 USER root
-COPY --from=it-spiffe-helper /service/spiffe-helper /opt/helper/spiffe-helper
+COPY --from=it-spiffe-helper /spiffe-helper /opt/helper/spiffe-helper

.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