diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 559455aedf3..8b7cf97ce90 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,8 @@ jobs: id-token: "write" services: postgres: - image: postgres:15.4 + # Image is pinned to v15, OK since it's just for testing + image: ankane/pgvector # This env variables must be the same in the file PARABOL_BUILD_ENV_PATH env: POSTGRES_PASSWORD: "temppassword" diff --git a/packages/server/email/MailManagerDebug.ts b/packages/server/email/MailManagerDebug.ts index 0ac3458e671..3ca089c510b 100644 --- a/packages/server/email/MailManagerDebug.ts +++ b/packages/server/email/MailManagerDebug.ts @@ -9,9 +9,11 @@ export default class MailManagerDebug extends MailManager { Subject: ${subject} Body: ${body}`) + const toStr = to.toString() + const {html} = options // limit filename length so it does not exceed filesystem limits - const filename = `${to.slice(0, 50)}-${subject.replaceAll(' ', '-').slice(0, 180)}.html` + const filename = `${toStr.slice(0, 50)}-${subject.replaceAll(' ', '-').slice(0, 180)}.html` const folder = '/tmp' fs.writeFileSync(`${folder}/${filename}`, html) // make it a link so you can click it in the terminal diff --git a/packages/server/package.json b/packages/server/package.json index 70538edd626..ddeec07ce0d 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -128,7 +128,7 @@ "react": "^17.0.2", "react-dom": "^17.0.2", "relay-runtime": "^14.1.0", - "rethinkdb-ts": "2.5.1", + "rethinkdb-ts": "2.6.0", "rrule": "^2.7.2", "samlify": "^2.8.2", "sharp": "^0.32.6", diff --git a/packages/server/postgres/Dockerfile b/packages/server/postgres/Dockerfile index 8558479fe14..e37b75a097e 100644 --- a/packages/server/postgres/Dockerfile +++ b/packages/server/postgres/Dockerfile @@ -2,9 +2,16 @@ FROM postgres:15.4 ADD extensions /extensions -RUN apt-get update && apt-get install -y build-essential locales +RUN apt-get update && apt-get install -y \ + build-essential \ + locales \ + postgresql-server-dev-15 \ + git RUN cd /extensions/postgres-json-schema && make install && make installcheck +RUN git clone --branch v0.5.0 \ + https://github.com/pgvector/pgvector.git /extensions/pgvector && \ + cd extensions/pgvector && make clean && make && make install RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 diff --git a/packages/server/postgres/extensions/install.sql b/packages/server/postgres/extensions/install.sql index ddc60250061..b2670548069 100644 --- a/packages/server/postgres/extensions/install.sql +++ b/packages/server/postgres/extensions/install.sql @@ -1 +1,2 @@ CREATE EXTENSION IF NOT EXISTS "postgres-json-schema"; +CREATE EXTENSION IF NOT EXISTS "vector"; diff --git a/yarn.lock b/yarn.lock index 25d9bed60eb..387e01c6ac9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12898,6 +12898,7 @@ draft-js-utils@^1.4.0: "draft-js@https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6": version "0.10.5" + uid "025fddba56f21aaf3383aee778e0b17025c9a7bc" resolved "https://github.com/mattkrick/draft-js/tarball/559a21968370c4944511657817d601a6c4ade0f6#025fddba56f21aaf3383aee778e0b17025c9a7bc" dependencies: fbjs "^0.8.15" @@ -21053,7 +21054,7 @@ rethinkdb-ts-migrate@^0.3.6: sucrase "^3.21.0" tslib "^2.4.0" -rethinkdb-ts@2.5.1, rethinkdb-ts@2.6.0, rethinkdb-ts@^2.4.5: +rethinkdb-ts@2.6.0, rethinkdb-ts@^2.4.5: version "2.6.0" resolved "https://registry.yarnpkg.com/rethinkdb-ts/-/rethinkdb-ts-2.6.0.tgz#25ad1561d58836761463718470310b4bf911f9eb" integrity sha512-RKkTP/P1dNNK265qmNjBqiiWlawRw7+MNVoro9UJa8RPvdB9+MJwzWxz7rgTLrfJr77FuaRQMqzlRexx6ivfUQ==