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

Merge branch 'master' into BUDI-8588

This commit is contained in:
Sam Rose 2024-09-20 16:29:08 +01:00 committed by GitHub
parent ddc360a3da 67b5d54d37
commit 460b30bbeb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/budibase_ci.yml vendored
View File

@ -108,7 +108,7 @@ jobs:
- name: Pull testcontainers images - name: Pull testcontainers images
run: | run: |
docker pull testcontainers/ryuk:0.5.1 & docker pull testcontainers/ryuk:0.5.1 &
docker pull budibase/couchdb:v3.3.3 & docker pull budibase/couchdb:v3.3.3-sqs-v2.1.1 &
docker pull redis & docker pull redis &
wait $(jobs -p) wait $(jobs -p)
@ -179,7 +179,7 @@ jobs:
docker pull minio/minio & docker pull minio/minio &
docker pull redis & docker pull redis &
docker pull testcontainers/ryuk:0.5.1 & docker pull testcontainers/ryuk:0.5.1 &
docker pull budibase/couchdb:v3.3.3 & docker pull budibase/couchdb:v3.3.3-sqs-v2.1.1 &
wait $(jobs -p) wait $(jobs -p)

2
charts/budibase/values.yaml
View File

@ -641,7 +641,7 @@ couchdb:
# @ignore # @ignore
repository: budibase/couchdb repository: budibase/couchdb
# @ignore # @ignore
tag: v3.3.3 tag: v3.3.3-sqs-v2.1.1
# @ignore # @ignore
pullPolicy: Always pullPolicy: Always

2
globalSetup.ts
View File

@ -46,7 +46,7 @@ export default async function setup() {
await killContainers(containers) await killContainers(containers)
try { try {
const couchdb = new GenericContainer("budibase/couchdb:v3.3.3") const couchdb = new GenericContainer("budibase/couchdb:v3.3.3-sqs-v2.1.1")
.withExposedPorts(5984, 4984) .withExposedPorts(5984, 4984)
.withEnvironment({ .withEnvironment({
COUCHDB_PASSWORD: "budibase", COUCHDB_PASSWORD: "budibase",

2
hosting/single/Dockerfile
View File

@ -1,4 +1,4 @@
ARG BASEIMG=budibase/couchdb:v3.3.3 ARG BASEIMG=budibase/couchdb:v3.3.3-sqs-v2.1.1
FROM node:20-slim as build FROM node:20-slim as build
# install node-gyp dependencies # install node-gyp dependencies

2
scripts/build-single-image-sqs.sh
View File

@ -2,4 +2,4 @@
yarn build:apps yarn build:apps
version=$(./scripts/getCurrentVersion.sh) version=$(./scripts/getCurrentVersion.sh)
docker build -f hosting/single/Dockerfile -t budibase:sqs --build-arg BUDIBASE_VERSION=$version --build-arg TARGETBUILD=single --build-arg BASEIMG=budibase/couchdb:v3.3.3-sqs . docker build -f hosting/single/Dockerfile -t budibase:sqs --build-arg BUDIBASE_VERSION=$version --build-arg TARGETBUILD=single --build-arg BASEIMG=budibase/couchdb:v3.3.3-sqs-v2.1.1 .