Skip to content

Commit

Permalink
Merge pull request #45 from data-catering/remove-persist
Browse files Browse the repository at this point in the history
Allow external data folders to be referenced via env vars
  • Loading branch information
pflooky authored Jun 20, 2024
2 parents 918e684 + 8811664 commit 19a5570
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion data/cassandra/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ total=0
for f in $(ls /tmp/data/*.cql);
do
total=$((total + 1))
cqlsh -u "${CASSANDRA_USER:-cassandra}" -p "${CASSANDRA_PASSWORD:-cassandra}" -f "${f}" cassandra 9042
cqlsh -u "${CASSANDRA_USER:-cassandra}" -p "${CASSANDRA_PASSWORD:-cassandra}" -f "${f}" cassandra-server 9042
if [[ $? -eq 0 ]];
then
count=$((count + 1))
Expand Down
10 changes: 5 additions & 5 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"image": "datacatering/dse-server:6.8.48"
"volumes":
- "./data/cassandra/init.sh:/tmp/scripts/init.sh"
- "./data/cassandra/data:/tmp/data"
- "${CASSANDRA_DATA:-./data/cassandra/data}:/tmp/data"
"cassandra-server":
"cap_add":
- "IPC_LOCK"
Expand Down Expand Up @@ -141,7 +141,7 @@
"user": "101:101"
"volumes":
- "./data/clickhouse/init.sh:/tmp/scripts/init.sh"
- "./data/clickhouse/data:/tmp/data"
- "${CLICKHOUSE_DATA:-./data/clickhouse/data}:/tmp/data"
"clickhouse-server":
"container_name": "clickhouse"
"depends_on":
Expand Down Expand Up @@ -546,7 +546,7 @@
"image": "marquezproject/marquez:${MARQUEZ_VERSION:-0.47.0}"
"volumes":
- "./data/marquez/init.sh:/tmp/scripts/init.sh"
- "./data/marquez/data:/tmp/data"
- "${MARQUEZ_DATA:-./data/marquez/data}:/tmp/data"
"marquez-server":
"container_name": "marquez"
"depends_on":
Expand Down Expand Up @@ -621,7 +621,7 @@
"image": "mysql:${MYSQL_VERSION:-8.4.0}"
"volumes":
- "./data/mysql/init.sh:/tmp/scripts/init.sh"
- "./data/mysql/data:/tmp/data"
- "${MYSQL_DATA:-./data/mysql/data}:/tmp/data"
"mysql-server":
"command": "--mysql-native-password=ON"
"container_name": "mysql"
Expand Down Expand Up @@ -717,7 +717,7 @@
"image": "postgres:${POSTGRES_VERSION:-16.3}"
"volumes":
- "./data/postgres/init.sh:/tmp/scripts/init.sh"
- "./data/postgres/data:/tmp/data"
- "${POSTGRES_DATA:-./data/postgres/data}:/tmp/data"
"postgres-server":
"container_name": "postgres"
"environment":
Expand Down

0 comments on commit 19a5570

Please sign in to comment.