Pull images on ci test

.github/workflows/budibase_ci.yml

@@ -186,7 +186,7 @@ jobs:
         id: dotenv
         uses: falti/dotenv-action@v1.1.3
         with:
-          path: ./packages/server/datasource-sha.env
+          path: ./packages/server/images-sha.env
 
       - name: Pull testcontainers images
         run: |
@@ -213,6 +213,7 @@ jobs:
           docker pull redis &
           docker pull testcontainers/ryuk:0.5.1 &
           docker pull budibase/couchdb:v3.3.3-sqs-v2.1.1 &
+          docker pull ${{ steps.dotenv.outputs.KEYCLOCK_IMAGE }} &
 
           wait $(jobs -p)
 

packages/server/images-sha.env

@@ -4,4 +4,5 @@ POSTGRES_SHA=sha256:bd0d8e485d1aca439d39e5ea99b931160bd28d862e74c786f7508e9d0053
 MONGODB_SHA=sha256:afa36bca12295b5f9dae68a493c706113922bdab520e901bd5d6c9d7247a1d8d
 MARIADB_SHA=sha256:e59ba8783bf7bc02a4779f103bb0d8751ac0e10f9471089709608377eded7aa8
 ELASTICSEARCH_SHA=sha256:9a6443f55243f6acbfeb4a112d15eb3b9aac74bf25e0e39fa19b3ddd3a6879d0
-DYNAMODB_SHA=sha256:cf8cebd061f988628c02daff10fdb950a54478feff9c52f6ddf84710fe3c3906
+DYNAMODB_SHA=sha256:cf8cebd061f988628c02daff10fdb950a54478feff9c52f6ddf84710fe3c3906
+KEYCLOCK_IMAGE=quay.io/keycloak/keycloak@sha256:2ce6c7c70994c70dbbd70b372a5422c3b4eebb32583175eac03751320609e52c

packages/server/src/integrations/tests/utils/images.ts

@@ -1,7 +1,7 @@
 import dotenv from "dotenv"
 import { join } from "path"
 
-const path = join(__dirname, "..", "..", "..", "..", "datasource-sha.env")
+const path = join(__dirname, "..", "..", "..", "..", "images-sha.env")
 dotenv.config({
   path,
 })
@@ -14,3 +14,4 @@ export const MONGODB_IMAGE = `mongo@${process.env.MONGODB_SHA}`
 export const MARIADB_IMAGE = `mariadb@${process.env.MARIADB_SHA}`
 export const ELASTICSEARCH_IMAGE = `elasticsearch@${process.env.ELASTICSEARCH_SHA}`
 export const DYNAMODB_IMAGE = `amazon/dynamodb-local@${process.env.DYNAMODB_SHA}`
+export const KEYCLOCK_IMAGE = process.env.KEYCLOCK_IMAGE || ""

packages/server/src/sdk/app/oauth2/tests/utils.spec.ts

@@ -4,11 +4,10 @@ import sdk from "../../.."
 import TestConfiguration from "../../../../tests/utilities/TestConfiguration"
 import { generateToken } from "../utils"
 import path from "path"
+import { KEYCLOCK_IMAGE } from "../../../../integrations/tests/utils/images"
 
 const config = new TestConfiguration()
 
-const keyClockImage = `quay.io/keycloak/keycloak@sha256:2ce6c7c70994c70dbbd70b372a5422c3b4eebb32583175eac03751320609e52c`
-
 const volumePath = path.resolve(__dirname, "docker-volume")
 
 describe("oauth2 utils", () => {
@@ -19,7 +18,7 @@ describe("oauth2 utils", () => {
   beforeAll(async () => {
     await config.init()
 
-    container = await new GenericContainer(keyClockImage)
+    container = await new GenericContainer(KEYCLOCK_IMAGE)
       .withName("keycloak_testcontainer")
       .withReuse()
       .withExposedPorts(8080)