fix e2e tests

tetrateio · Mar 1, 2024 · a9a4db8 · a9a4db8
1 parent ec35452
commit a9a4db8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -85,11 +85,6 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
-      - uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
       - run: make docker e2e/${{ matrix.group }}
       - name: Upload e2e logs on failure
         uses: actions/upload-artifact@v4
@@ -120,11 +115,6 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
-      - uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
       - run: make docker e2e/legacy
       - name: Upload e2e logs on failure
         uses: actions/upload-artifact@v4

diff --git a/e2e/keycloak/docker-compose.yaml b/e2e/keycloak/docker-compose.yaml
@@ -62,7 +62,7 @@ services:
         condition: service_completed_successfully
       idp-proxy:
         condition: service_started
-    image: gcr.io/tetrate-internal-containers/authservice:latest-${ARCH:-amd64}
+    image: ${DOCKER_HUB}/authservice:latest-${ARCH:-amd64}
     platform: linux/${ARCH:-amd64}
     volumes:
       - type: bind

diff --git a/e2e/mock/docker-compose.yaml b/e2e/mock/docker-compose.yaml
@@ -31,7 +31,7 @@ services:
 
   # This is the `authservice` image that should be up-to-date when running the tests.
   ext-authz:
-    image: gcr.io/tetrate-internal-containers/authservice:latest-${ARCH:-amd64}
+    image: ${DOCKER_HUB}/authservice:latest-${ARCH:-amd64}
     platform: linux/${ARCH:-amd64}
     volumes:
       - type: bind

diff --git a/env.mk b/env.mk
@@ -26,13 +26,14 @@ ENVTEST       ?= sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
 NAME    ?= authservice
 TARGETS ?= linux-amd64 linux-arm64 #darwin-amd64 darwin-arm64
 
-DOCKER_HUB            ?= $(GO_MODULE:github.com/%=ghcr.io/%)
+# DOCKER_HUB is exported so that it can be referenced in e2e docker compose files
+export DOCKER_HUB     ?= $(GO_MODULE:github.com/%=ghcr.io/%)
 DOCKER_TARGETS        ?= linux-amd64 linux-arm64
 DOCKER_BUILDER_NAME   ?= $(NAME)-builder
 
 ifneq ($(strip $(VERSION)),)
 # Remove the suffix as we want N.N.N instead of vN.N.N
-DOCKER_TAG ?= $(strip $(VERSION:v%=%))
+EXPORT DOCKER_TAG ?= $(strip $(VERSION:v%=%))
 else
 DOCKER_TAG ?= $(shell git rev-parse HEAD)
 endif