Skip to content

Commit 65d0eb7

Browse files
authored
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.
1 parent 8487876 commit 65d0eb7

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

client/cypress/cypress.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ try {
1313
cypressConfigBaseUrl = cypressConfig.baseUrl;
1414
} catch (e) {}
1515

16-
const baseUrl = process.env.CYPRESS_baseUrl || cypressConfigBaseUrl || "http://localhost:5000";
16+
const baseUrl = process.env.CYPRESS_baseUrl || cypressConfigBaseUrl || "http://localhost:5001";
1717

1818
function seedDatabase(seedValues) {
1919
get(baseUrl + "/login", (_, { headers }) => {

cypress.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"baseUrl": "http://localhost:5000",
2+
"baseUrl": "http://localhost:5001",
33
"video": true,
44
"videoUploadOnPasses": false,
55
"fixturesFolder": "client/cypress/fixtures",

docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ services:
2828
- postgres
2929
- redis
3030
ports:
31-
- "5000:5000"
31+
- "5001:5000"
3232
- "5678:5678"
3333
environment:
3434
<<: *redash-environment
@@ -53,17 +53,17 @@ services:
5353
restart: unless-stopped
5454
postgres:
5555
image: postgres:9.5-alpine
56+
ports:
57+
- "15432:5432"
5658
# The following turns the DB into less durable, but gains significant performance improvements for the tests run (x3
5759
# improvement on my personal machine). We should consider moving this into a dedicated Docker Compose configuration for
5860
# tests.
59-
ports:
60-
- "15432:5432"
6161
command: "postgres -c fsync=off -c full_page_writes=off -c synchronous_commit=OFF"
6262
restart: unless-stopped
6363
environment:
6464
POSTGRES_HOST_AUTH_METHOD: "trust"
6565
email:
66-
image: djfarrelly/maildev
66+
image: maildev/maildev
6767
ports:
6868
- "1080:80"
6969
restart: unless-stopped

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"url": "git+https://github.com/getredash/redash.git"
3535
},
3636
"engines": {
37-
"node": "^14.16.1",
37+
"node": ">14.16.0 <17.0.0",
3838
"yarn": "^1.22.10"
3939
},
4040
"author": "Redash Contributors",

requirements_all_ds.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pyhive==0.6.1
99
pymongo[tls,srv]==3.9.0
1010
vertica-python==0.9.5
1111
td-client==1.0.0
12-
pymssql==2.1.4
12+
pymssql==2.1.5
1313
dql==0.5.26
1414
dynamo3==0.4.10
1515
boto3>=1.10.0,<1.11.0
@@ -24,7 +24,7 @@ simple_salesforce==0.74.3
2424
PyAthena>=1.5.0,<=1.11.5
2525
pymapd==0.19.0
2626
qds-sdk>=1.9.6
27-
ibm-db>=2.0.9
27+
# ibm-db>=2.0.9
2828
pydruid==0.5.7
2929
requests_aws_sign==0.1.5
3030
snowflake-connector-python==2.1.3
@@ -47,3 +47,4 @@ nzpy>=1.15
4747
nzalchemy
4848
python-arango==6.1.0
4949
pinotdb>=0.4.5
50+
pyarrow==10.0.0

webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const isDevelopment = !isProduction;
3434
const isHotReloadingEnabled =
3535
isDevelopment && process.env.HOT_RELOAD === "true";
3636

37-
const redashBackend = process.env.REDASH_BACKEND || "http://localhost:5000";
37+
const redashBackend = process.env.REDASH_BACKEND || "http://localhost:5001";
3838
const baseHref = CONFIG.baseHref || "/";
3939
const staticPath = CONFIG.staticPath || "/static/";
4040
const htmlTitle = CONFIG.title || "Redash";

0 commit comments

Comments
 (0)