From 44b721b565e2291d06f47f284b6619481caa182c Mon Sep 17 00:00:00 2001
From: Yannis Barlas <yannisbarlas@gmail.com>
Date: Wed, 14 Apr 2021 08:13:33 +0000
Subject: [PATCH] fix(*): update xsweet variables
(cherry picked from commit 525979442e1483da5515836dda80133616a1e3e4)
---
docker-compose.production.elife.yml | 8 +++++--
docker-compose.production.ncrc.yml | 8 +++++--
docker-compose.production.yml | 8 +++++--
docker-compose.yml | 14 +++++++-----
package.json | 2 +-
yarn.lock | 34 ++++++++++++++---------------
6 files changed, 45 insertions(+), 29 deletions(-)
diff --git a/docker-compose.production.elife.yml b/docker-compose.production.elife.yml
index 1a4f1d40fe..d44ea64684 100644
--- a/docker-compose.production.elife.yml
+++ b/docker-compose.production.elife.yml
@@ -52,9 +52,13 @@ services:
- ./db-data:/var/lib/postgresql/data/kotahi:z
job-xsweet:
- image: cokoapps/job-xsweet:1.5.1
+ image: pubsweet/job-xsweet:1.5.1
environment:
- - DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST:-db}:${POSTGRES_PORT}/${POSTGRES_DB}
+ - POSTGRES_HOST
+ - POSTGRES_USER
+ - POSTGRES_PORT
+ - POSTGRES_PASSWORD
+ - POSTGRES_DB
depends_on:
- server
command:
diff --git a/docker-compose.production.ncrc.yml b/docker-compose.production.ncrc.yml
index 3a16954d67..c5e95cf25c 100644
--- a/docker-compose.production.ncrc.yml
+++ b/docker-compose.production.ncrc.yml
@@ -52,9 +52,13 @@ services:
- ./db-data:/var/lib/postgresql/data/kotahi:z
job-xsweet:
- image: cokoapps/job-xsweet:1.5.1
+ image: pubsweet/job-xsweet:1.5.1
environment:
- - DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST:-db}:${POSTGRES_PORT}/${POSTGRES_DB}
+ - POSTGRES_HOST
+ - POSTGRES_USER
+ - POSTGRES_PORT
+ - POSTGRES_PASSWORD
+ - POSTGRES_DB
depends_on:
- server
command:
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
index 66b7216866..d7c6eeb9ec 100644
--- a/docker-compose.production.yml
+++ b/docker-compose.production.yml
@@ -38,7 +38,7 @@ services:
- INSTANCE_NAME=${INSTANCE_NAME:-elife}
job-xsweet:
- image: cokoapps/job-xsweet:1.5.1
+ image: pubsweet/job-xsweet:1.5.1
depends_on:
- server
command:
@@ -51,6 +51,10 @@ services:
'src/xsweet.js',
]
environment:
- - DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
+ - POSTGRES_HOST
+ - POSTGRES_USER
+ - POSTGRES_PORT
+ - POSTGRES_PASSWORD
+ - POSTGRES_DB
volumes:
- ./scripts/wait-for-it.sh:/home/node/scripts/wait-for-it.sh
diff --git a/docker-compose.yml b/docker-compose.yml
index 46b3caca50..9fc62eaee2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -80,7 +80,7 @@ services:
- ./server:/home/node/app/server
job-xsweet:
- image: cokoapps/job-xsweet:1.5.1
+ image: pubsweet/job-xsweet:1.5.1
depends_on:
- server
command:
@@ -93,7 +93,11 @@ services:
'src/xsweet.js',
]
environment:
- - DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}
+ - POSTGRES_HOST=db
+ - POSTGRES_PORT=5432
+ - POSTGRES_DB=${POSTGRES_DB:-kotahi_dev}
+ - POSTGRES_USER=${POSTGRES_USER:-dev}
+ - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
volumes:
- ./scripts/wait-for-it.sh:/home/node/scripts/wait-for-it.sh
@@ -102,9 +106,9 @@ services:
ports:
- ${POSTGRES_PORT:-5432}:5432
environment:
- - POSTGRES_USER
- - POSTGRES_DB
- - POSTGRES_PASSWORD
+ - POSTGRES_DB=${POSTGRES_DB:-kotahi_dev}
+ - POSTGRES_USER=${POSTGRES_USER:-dev}
+ - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-password}
volumes:
- ./scripts/test.sql:/docker-entrypoint-initdb.d/test.sql
diff --git a/package.json b/package.json
index c41e204c0c..5dfb24da18 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
"@pubsweet/base-model": "4.0.0",
"@pubsweet/component-send-email": "0.4.3",
"@pubsweet/errors": "^2.0.40",
- "@pubsweet/job-xsweet": "^2.2.0",
+ "@pubsweet/job-xsweet": "^2.2.1",
"@pubsweet/logger": "^0.2.50",
"@pubsweet/model-user": "6.0.3",
"@pubsweet/models": "^0.3.15",
diff --git a/yarn.lock b/yarn.lock
index 1db4321bd5..70aea773b0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2509,13 +2509,13 @@
tmp-promise "^2.0.0"
umzug "^2.1.0"
-"@pubsweet/db-manager@^3.1.23":
- version "3.1.23"
- resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-3.1.23.tgz#0d5f814605419f1dc53d6b4f306c4bfd279a9e9a"
- integrity sha512-/cJq4nntAV5EzuctXapktQqYtj7ywMbcrQt0XMN6QRE5XzBZYevDUGdZdp+2GKhdUG/8pEsPFjDeHMgi1xWbyg==
+"@pubsweet/db-manager@^3.1.24":
+ version "3.1.24"
+ resolved "https://registry.yarnpkg.com/@pubsweet/db-manager/-/db-manager-3.1.24.tgz#8ea753d05e3801c94f23c83abf51ebf640e52b0d"
+ integrity sha512-K8xTqJkIOGtmGlBPXTurfcijCikpUu705M2tfjGSnCDVRkX6dxLqjOADF/1A96w+SKhnvlbvyCKgpQx4LfS2dQ==
dependencies:
"@hapi/joi" "^14.3.0"
- "@pubsweet/logger" "^0.2.58"
+ "@pubsweet/logger" "^0.2.59"
fs-extra "^8.1.0"
knex "^0.21.1"
lodash "^4.17.11"
@@ -2531,16 +2531,16 @@
dependencies:
http-status-codes "^1.3.0"
-"@pubsweet/job-xsweet@^2.2.0":
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/@pubsweet/job-xsweet/-/job-xsweet-2.2.0.tgz#5a0c095cdb4a3232060555957a047701684d9411"
- integrity sha512-yvYL9qkWZxDsFHCTFhShTPklox5PaR2Uz5DypkJWDHx4g91q/Hab9uDCBYKfQgjkFNoYN7jihz7FUHODbKzDsw==
+"@pubsweet/job-xsweet@^2.2.1":
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/@pubsweet/job-xsweet/-/job-xsweet-2.2.1.tgz#0bdda8428f43cfc1d47bb6959248416f91942e2e"
+ integrity sha512-caTIatzUkoVy2qRi1FS9ON7AuR9wvbYHtJMOuxJY22QDq+ANezLOD17MFyvIEsAu81u0ghdKdEoMpQtY+//brA==
dependencies:
- "@pubsweet/db-manager" "^3.1.23"
- "@pubsweet/logger" "^0.2.58"
+ "@pubsweet/db-manager" "^3.1.24"
+ "@pubsweet/logger" "^0.2.59"
express-fileupload v1.1.1-alpha.2
node-wait-for-it "^0.2.0"
- pubsweet-server "^13.12.7"
+ pubsweet-server "^13.12.8"
tmp-promise "^2.0.0"
waait "^1.0.5"
@@ -2552,10 +2552,10 @@
"@hapi/joi" "^14.5.0"
config "^3.0.1"
-"@pubsweet/logger@^0.2.58":
- version "0.2.58"
- resolved "https://registry.yarnpkg.com/@pubsweet/logger/-/logger-0.2.58.tgz#baab6a6f627e0861fd8d485f5f34fe92ffdca68c"
- integrity sha512-8KmpEnEeqKLWWANcYbFyjEt/AHUwHVvJ/mMq3AYLPuwNmr2oifxfO3aps3YOFzAAdH3ayvhOXrL7P5D/HJkctg==
+"@pubsweet/logger@^0.2.59":
+ version "0.2.59"
+ resolved "https://registry.yarnpkg.com/@pubsweet/logger/-/logger-0.2.59.tgz#300a4e9469386234effcfeeddd0214f318c19529"
+ integrity sha512-//oS0IATG0Lf1Yrmty13jaUCL5/YM11g4woUdbKtZDPjJfBiQqYAx4kRcYLPWDnwuxtX44UeZHXjJYDKM9bqZQ==
dependencies:
"@hapi/joi" "^14.5.0"
config "^3.0.1"
@@ -16472,7 +16472,7 @@ pubsweet-client@^10.2.5:
styled-normalize "^8.0.6"
subscriptions-transport-ws "^0.9.12"
-pubsweet-server@13.12.3, pubsweet-server@^13.11.6, pubsweet-server@^13.12.3, pubsweet-server@^13.12.7:
+pubsweet-server@13.12.3, pubsweet-server@^13.11.6, pubsweet-server@^13.12.3, pubsweet-server@^13.12.8:
version "13.12.3"
resolved "https://registry.yarnpkg.com/pubsweet-server/-/pubsweet-server-13.12.3.tgz#f5fade9667000d2be8bc448f15b1df9a89fb58b2"
integrity sha512-tl3LemBnFBBo5x/UucwevGDBYb2Jg7mwcYaxQ4tkzVHCoFqC9BB5wx9qGVHM9EwcwhiNMK+vqmzvDClFZrrbvw==
--
GitLab