diff --git a/.github/workflows/php-integration.yml b/.github/workflows/php-integration.yml index 89267a1..d35e8ba 100644 --- a/.github/workflows/php-integration.yml +++ b/.github/workflows/php-integration.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - keycloak: [17.0.0, 18.0.0, 19.0.0, 20.0.0, 21.0.0, 22.0.0, 22.0.5, 23.0.0, 24.0.0, 25.0.0] + keycloak: [ 17.0.0, 18.0.0, 19.0.0, 20.0.0, 21.0.0, 22.0.0, 22.0.5, 23.0.0, 24.0.0, 25.0.0 ] php: [ 8.1 ] env: @@ -49,8 +49,8 @@ jobs: - name: Wait for Keycloak uses: iFaxity/wait-on-action@v1 with: - resource: ${{ env.KEYCLOAK_BASE_URL }} - httpTimeout: 30000 + resource: http-get://localhost:8080 + timeout: 30000 - name: Wait some more for Keycloak 24.0.0 zZz if: ${{ matrix.keycloak == '24.0.0' }} diff --git a/docker-compose.yml b/docker-compose.yml index 81a13ec..9f952eb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.7' - services: php: image: php:8.2-cli @@ -8,7 +6,7 @@ services: working_dir: /app keycloak: - image: quay.io/keycloak/keycloak:25.0.0 + image: quay.io/keycloak/keycloak:24.0.0 command: start-dev environment: KEYCLOAK_ADMIN: admin