Update development workflow for Apple Silicon, Node version, default port, and maildev image (#5932)

* Update ngines definition to allow for newer versions of Node.

With Node version 19 I stumbled into some issues so for now bumped it to v16, until we get to updating the libraries we use.

* docker-compose.yml updates:

1. Switch to newer maildev docker image.
2. Update local port to 5001 as 5000 seems to be used by a system process now.

* Update pymssql and pyarrow. Also commented out ibm-db until we have a way to not install it only on ARM.
This commit is contained in:
Arik Fraimovich 2023-03-24 14:36:58 -07:00 committed by GitHub
parent 8487876e7f
commit 65d0eb72f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 10 deletions

View File

@ -13,7 +13,7 @@ try {
cypressConfigBaseUrl = cypressConfig.baseUrl;
} catch (e) {}
const baseUrl = process.env.CYPRESS_baseUrl || cypressConfigBaseUrl || "http://localhost:5000";
const baseUrl = process.env.CYPRESS_baseUrl || cypressConfigBaseUrl || "http://localhost:5001";
function seedDatabase(seedValues) {
get(baseUrl + "/login", (_, { headers }) => {

View File

@ -1,5 +1,5 @@
{
"baseUrl": "http://localhost:5000",
"baseUrl": "http://localhost:5001",
"video": true,
"videoUploadOnPasses": false,
"fixturesFolder": "client/cypress/fixtures",

View File

@ -28,7 +28,7 @@ services:
- postgres
- redis
ports:
- "5000:5000"
- "5001:5000"
- "5678:5678"
environment:
<<: *redash-environment
@ -53,17 +53,17 @@ services:
restart: unless-stopped
postgres:
image: postgres:9.5-alpine
ports:
- "15432:5432"
# The following turns the DB into less durable, but gains significant performance improvements for the tests run (x3
# improvement on my personal machine). We should consider moving this into a dedicated Docker Compose configuration for
# tests.
ports:
- "15432:5432"
command: "postgres -c fsync=off -c full_page_writes=off -c synchronous_commit=OFF"
restart: unless-stopped
environment:
POSTGRES_HOST_AUTH_METHOD: "trust"
email:
image: djfarrelly/maildev
image: maildev/maildev
ports:
- "1080:80"
restart: unless-stopped

View File

@ -34,7 +34,7 @@
"url": "git+https://github.com/getredash/redash.git"
},
"engines": {
"node": "^14.16.1",
"node": ">14.16.0 <17.0.0",
"yarn": "^1.22.10"
},
"author": "Redash Contributors",

View File

@ -9,7 +9,7 @@ pyhive==0.6.1
pymongo[tls,srv]==3.9.0
vertica-python==0.9.5
td-client==1.0.0
pymssql==2.1.4
pymssql==2.1.5
dql==0.5.26
dynamo3==0.4.10
boto3>=1.10.0,<1.11.0
@ -24,7 +24,7 @@ simple_salesforce==0.74.3
PyAthena>=1.5.0,<=1.11.5
pymapd==0.19.0
qds-sdk>=1.9.6
ibm-db>=2.0.9
# ibm-db>=2.0.9
pydruid==0.5.7
requests_aws_sign==0.1.5
snowflake-connector-python==2.1.3
@ -47,3 +47,4 @@ nzpy>=1.15
nzalchemy
python-arango==6.1.0
pinotdb>=0.4.5
pyarrow==10.0.0

View File

@ -34,7 +34,7 @@ const isDevelopment = !isProduction;
const isHotReloadingEnabled =
isDevelopment && process.env.HOT_RELOAD === "true";
const redashBackend = process.env.REDASH_BACKEND || "http://localhost:5000";
const redashBackend = process.env.REDASH_BACKEND || "http://localhost:5001";
const baseHref = CONFIG.baseHref || "/";
const staticPath = CONFIG.staticPath || "/static/";
const htmlTitle = CONFIG.title || "Redash";