Skip to content

Commit adbd89e

Browse files
committed
Update docs
1 parent 3174f22 commit adbd89e

8 files changed

Lines changed: 21 additions & 20 deletions

File tree

.env.example

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#main
22
DEKART_PORT=8080
3+
# Dekart database for storing metadata
4+
# alternatively just use DEKART_POSTGRES_URL=postgres://dekart:dekart@localhost:5432/dekart
35
DEKART_POSTGRES_DB=dekart
46
DEKART_POSTGRES_USER=dekart
57
DEKART_POSTGRES_PASSWORD=
@@ -39,20 +41,17 @@ DEKART_BIGQUERY_PROJECT_ID=
3941
DEKART_UX_DATA_DOCUMENTATION=
4042
DEKART_BIGQUERY_MAX_BYTES_BILLED=1099511627776
4143

42-
# aws athena
44+
# aws athena datasource
4345
DEKART_ATHENA_S3_OUTPUT_LOCATION=my-bucket
4446
DEKART_ATHENA_CATALOG=AwsDataCatalog
4547
DEKART_ATHENA_WORKGROUP=
4648

47-
# snowflake
49+
# snowflake datasource
4850
DEKART_SNOWFLAKE_ACCOUNT_ID=
4951
DEKART_SNOWFLAKE_USER=
5052
DEKART_SNOWFLAKE_PASSWORD=
5153

52-
# postgres like
53-
DEKART_DATA_POSTGRES_PASSWORD=
54-
DEKART_DATA_POSTGRES_USER=
55-
DEKART_DATA_POSTGRES_LIKE_DB=
54+
# postgres datasource
5655
# postgres like data source connection string (e.g. postgres://user:password@host:port/db)
5756
DEKART_POSTGRES_DATA_CONNECTION=
5857

@@ -61,6 +60,9 @@ DEKART_UX_HOMEPAGE=
6160
DEKART_UX_ACCESS_ERROR_INFO_HTML=
6261
DEKART_HTML_CUSTOM_CODE=
6362
DEKART_DISABLE_USAGE_STATS=
63+
DEKART_UX_ACCESS_ERROR_INFO_HTML=
64+
DEKART_UX_NOT_FOUND_ERROR_INFO_HTML=
65+
DEKART_UX_SAMPLE_QUERY_SQL=
6466

6567
#dev
6668
DEKART_LOG_DEBUG=1

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,6 @@ version:
189189
minor: version
190190
patch: version
191191
patch: version
192-
release:
193-
git push origin HEAD --tags
194192

195193
test:
196194
go test -v -count=1 ./src/server/**/

install/app-engine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM dekartxyz/dekart:0.15
1+
FROM dekartxyz/dekart:0.16

install/docker-compose/docker-compose.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
POSTGRES_USER: "dekart"
1010
POSTGRES_DB: "dekart"
1111
dekart-bigquery:
12-
image: dekartxyz/dekart:0.15
12+
image: dekartxyz/dekart:0.16
1313
restart: always
1414
ports:
1515
- 8080:8080
@@ -30,7 +30,7 @@ services:
3030
GOOGLE_APPLICATION_CREDENTIALS: "${GOOGLE_APPLICATION_CREDENTIALS}"
3131
DEKART_CORS_ORIGIN: "${DEKART_CORS_ORIGIN}"
3232
dekart-athena:
33-
image: dekartxyz/dekart:0.15
33+
image: dekartxyz/dekart:0.16
3434
restart: always
3535
ports:
3636
- 8080:8080
@@ -54,7 +54,7 @@ services:
5454
AWS_SECRET_ACCESS_KEY: "${AWS_SECRET_ACCESS_KEY}"
5555
DEKART_CORS_ORIGIN: "${DEKART_CORS_ORIGIN}"
5656
dekart-snowflake:
57-
image: dekartxyz/dekart:0.15
57+
image: dekartxyz/dekart:0.16
5858
restart: always
5959
ports:
6060
- 8080:8080

install/docker/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ athena:
1717
-e DEKART_MAPBOX_TOKEN=${DEKART_MAPBOX_TOKEN} \
1818
-e DEKART_CORS_ORIGIN=${DEKART_CORS_ORIGIN} \
1919
-p 8080:8080 \
20-
dekartxyz/dekart:0.15
20+
dekartxyz/dekart:0.16
2121

2222
bigquery:
2323
docker run -it --rm \
@@ -36,7 +36,7 @@ bigquery:
3636
-e DEKART_MAPBOX_TOKEN=${DEKART_MAPBOX_TOKEN} \
3737
-e DEKART_CORS_ORIGIN=${DEKART_CORS_ORIGIN} \
3838
-p 8080:8080 \
39-
dekartxyz/dekart:0.15
39+
dekartxyz/dekart:0.16
4040

4141
snowflake:
4242
docker run -it --rm \
@@ -57,5 +57,5 @@ snowflake:
5757
-e DEKART_MAPBOX_TOKEN=${DEKART_MAPBOX_TOKEN} \
5858
-e DEKART_CORS_ORIGIN=${DEKART_CORS_ORIGIN} \
5959
-p 8080:8080 \
60-
dekartxyz/dekart:0.15
60+
dekartxyz/dekart:0.16
6161

install/docker/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ docker run \
5050
-e DEKART_MAPBOX_TOKEN=${DEKART_MAPBOX_TOKEN} \
5151
-e DEKART_CORS_ORIGIN=${DEKART_CORS_ORIGIN} \
5252
-p 8080:8080 \
53-
dekartxyz/dekart:0.15
53+
dekartxyz/dekart:0.16
5454
```
5555

5656
### BigQuery
@@ -71,7 +71,7 @@ docker run \
7171
-e DEKART_MAPBOX_TOKEN=${DEKART_MAPBOX_TOKEN} \
7272
-e DEKART_CORS_ORIGIN=${DEKART_CORS_ORIGIN} \
7373
-p 8080:8080 \
74-
dekartxyz/dekart:0.15
74+
dekartxyz/dekart:0.16
7575
```
7676

7777
### Snowflake
@@ -95,7 +95,7 @@ docker run -it --rm \
9595
-e DEKART_MAPBOX_TOKEN=${DEKART_MAPBOX_TOKEN} \
9696
-e DEKART_CORS_ORIGIN=${DEKART_CORS_ORIGIN} \
9797
-p 8080:8080 \
98-
dekartxyz/dekart:0.15
98+
dekartxyz/dekart:0.16
9999
```
100100

101101
[Documentation](https://dekart.xyz/docs/?ref=dokerhub)

install/ecs/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ variable "dekart_deployment_name" {
1616
description = "prefix for your deployment resource names"
1717
}
1818
variable "dekart_version" {
19-
default = "0.15"
19+
default = "0.16"
2020
description = "dekart version, see releases https://github.com/dekart-xyz/dekart/releases/"
2121
}
2222
variable "dekart_rds_db_name" {

src/server/pgjob/pgjob.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"dekart/src/proto"
1212
"dekart/src/server/job"
1313
"dekart/src/server/storage"
14+
1415
_ "github.com/lib/pq" // postgres driver
1516
"github.com/rs/zerolog/log"
1617
)
@@ -27,7 +28,7 @@ type Store struct {
2728
}
2829

2930
func NewStore() *Store {
30-
dbConnStr := os.Getenv("DEKART_POSTGRES_DATA_CONNECTION")
31+
dbConnStr := os.Getenv("DEKART_POSTGRES_DATASOURCE_CONNECTION")
3132
db, err := sql.Open("postgres", dbConnStr)
3233
if err != nil {
3334
log.Fatal().Err(err).Msg("failed to connect to postgres")

0 commit comments

Comments
 (0)