MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:Budibase/budibase into feature/BUDI-7108

This commit is contained in:
mike12345567 2023-08-15 12:55:04 +01:00
parent 5d2813361c a5f8d9994b
commit 92dd5f1d85
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hosting/couchdb/Dockerfile
View File

@ -5,11 +5,11 @@ ENV COUCHDB_PASSWORD admin
EXPOSE 5984 EXPOSE 5984
RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common wget unzip curl && \ 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://security.debian.org/debian-security bullseye-security/updates main' && \
apt-add-repository 'deb http://archive.debian.org/debian stretch-backports main' && \ apt-add-repository 'deb http://archive.debian.org/debian stretch-backports main' && \
apt-add-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ && \ apt-add-repository 'deb https://packages.adoptium.net/artifactory/deb bullseye main' && \
apt-get update && apt-get install -y --no-install-recommends adoptopenjdk-8-hotspot && \ apt-get update && apt-get install -y --no-install-recommends temurin-8-jdk && \
rm -rf /var/lib/apt/lists/ rm -rf /var/lib/apt/lists/
# setup clouseau # setup clouseau

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.9.24-alpha.4", "version": "2.9.26-alpha.0",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

4
qa-core/src/integrations/validators/dynamodb.integration.spec.ts
View File

@ -28,8 +28,8 @@ describe("datasource validators", () => {
8000 8000
)}`, )}`,
} }
env._set("AWS_ACCESS_KEY_ID", "mocked_key") env._set("AWS_ACCESS_KEY_ID", "mockedkey")
env._set("AWS_SECRET_ACCESS_KEY", "mocked_secret") env._set("AWS_SECRET_ACCESS_KEY", "mockedsecret")
}) })
it("test valid connection string", async () => { it("test valid connection string", async () => {

4
scripts/build.js
View File

@ -25,10 +25,10 @@ function runBuild(entry, outfile) {
if (!fs.existsSync("../pro/src")) { if (!fs.existsSync("../pro/src")) {
// If we don't have pro, we cannot bundle backend-core. // If we don't have pro, we cannot bundle backend-core.
// Otherwise, the main context will not be shared between libraries // Otherwise, the main context will not be shared between libraries
delete tsconfigPathPluginContent.compilerOptions.paths[ delete tsconfigPathPluginContent?.compilerOptions?.paths?.[
"@budibase/backend-core" "@budibase/backend-core"
] ]
delete tsconfigPathPluginContent.compilerOptions.paths[ delete tsconfigPathPluginContent?.compilerOptions?.paths?.[
"@budibase/backend-core/*" "@budibase/backend-core/*"
] ]
} }