diff --git a/hosting/couchdb/Dockerfile b/hosting/couchdb/Dockerfile index 70b4413859..ce77002052 100644 --- a/hosting/couchdb/Dockerfile +++ b/hosting/couchdb/Dockerfile @@ -5,11 +5,11 @@ ENV COUCHDB_PASSWORD admin EXPOSE 5984 RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common wget unzip curl && \ - wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \ + wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | sudo apt-key add - && \ apt-add-repository 'deb http://security.debian.org/debian-security bullseye-security/updates main' && \ apt-add-repository 'deb http://archive.debian.org/debian stretch-backports main' && \ - apt-add-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ && \ - apt-get update && apt-get install -y --no-install-recommends adoptopenjdk-8-hotspot && \ + apt-add-repository 'deb https://packages.adoptium.net/artifactory/deb bullseye main' && \ + apt-get update && apt-get install -y --no-install-recommends temurin-8-jdk && \ rm -rf /var/lib/apt/lists/ # setup clouseau diff --git a/lerna.json b/lerna.json index 1514e668d2..369927cfdd 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.9.24-alpha.4", + "version": "2.9.26-alpha.0", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/qa-core/src/integrations/validators/dynamodb.integration.spec.ts b/qa-core/src/integrations/validators/dynamodb.integration.spec.ts index c885f64213..d1cec7bca1 100644 --- a/qa-core/src/integrations/validators/dynamodb.integration.spec.ts +++ b/qa-core/src/integrations/validators/dynamodb.integration.spec.ts @@ -28,8 +28,8 @@ describe("datasource validators", () => { 8000 )}`, } - env._set("AWS_ACCESS_KEY_ID", "mocked_key") - env._set("AWS_SECRET_ACCESS_KEY", "mocked_secret") + env._set("AWS_ACCESS_KEY_ID", "mockedkey") + env._set("AWS_SECRET_ACCESS_KEY", "mockedsecret") }) it("test valid connection string", async () => { diff --git a/scripts/build.js b/scripts/build.js index 2ca41b5f7d..e5c2c8ba34 100755 --- a/scripts/build.js +++ b/scripts/build.js @@ -25,10 +25,10 @@ function runBuild(entry, outfile) { if (!fs.existsSync("../pro/src")) { // If we don't have pro, we cannot bundle backend-core. // Otherwise, the main context will not be shared between libraries - delete tsconfigPathPluginContent.compilerOptions.paths[ + delete tsconfigPathPluginContent?.compilerOptions?.paths?.[ "@budibase/backend-core" ] - delete tsconfigPathPluginContent.compilerOptions.paths[ + delete tsconfigPathPluginContent?.compilerOptions?.paths?.[ "@budibase/backend-core/*" ] }