Skip to content

Commit fd0e89d

Browse files
committed
script nit, don't rely on relative path
1 parent 1cd3277 commit fd0e89d

File tree

2 files changed

+15
-36
lines changed

2 files changed

+15
-36
lines changed

apps/local-docker/compose-landscape-graph.yml

-33
This file was deleted.

apps/local-docker/local-docker-neo.sh

+15-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ function docker-stop-rm-if-exists()
3838
#
3939
# Variables
4040
#
41-
LANDSCAPE_BASE=$HOME/landscape/neo4j
41+
LANDSCAPE_ROOT=$HOME/landscape
42+
LANDSCAPE_BASE=$LANDSCAPE_ROOT/neo4j
4243
CONTAINER_NAME=landscape-graph
4344
NEO4J_USERNAME=neo4j
4445
NEO4J_PASSWORD=landscape
@@ -52,7 +53,9 @@ docker-stop-rm-if-exists "$CONTAINER_NAME"
5253
docker-ps-pretty
5354

5455
# nuke anything left in mounted dirs
56+
sudo chown $USER:$USER -R ~/landscape/neo4j
5557
rm -rf $LANDSCAPE_BASE
58+
tree-pretty $LANDSCAPE_ROOT
5659

5760
# create mount points
5861
mkdir -p $LANDSCAPE_BASE/data
@@ -61,7 +64,8 @@ mkdir -p $LANDSCAPE_BASE/import
6164
mkdir -p $LANDSCAPE_BASE/plugins
6265

6366
# copy cleaned up landscape json --> import directory
64-
cp -fv ../../landscape-items-clean.json $LANDSCAPE_BASE/import
67+
export LANDSCAPE_GIT_REPO_ROOT=$(git rev-parse --show-toplevel)
68+
cp -fv $LANDSCAPE_GIT_REPO_ROOT/landscape-items-clean.json $LANDSCAPE_BASE/import
6569
tree-pretty "$LANDSCAPE_BASE"
6670

6771
echo "presently running in docker:"
@@ -94,6 +98,7 @@ docker run \
9498
--env NEO4J_apoc_import_file_enabled=true \
9599
--env NEO4J_apoc_export_file_enabled=true \
96100
--env NEO4J_dbms_security_procedures_unrestricted=apoc.\\\*,gds.\\\* \
101+
--env NEO4J_dbms_logs_debug_level=INFO \
97102
neo4j:latest
98103

99104
docker-ps-pretty
@@ -104,12 +109,19 @@ do \
104109
echo "waiting 1s for bolt to appear"; \
105110
sleep 1; \
106111
done
107-
echo '*** neo4j online!'
112+
echo "*** neo4j online!"
108113

109114
# launch Cypher Shell in container, execute cypher
110115
cat load-clean-landscape.cypher \
111116
| docker exec --interactive landscape-graph cypher-shell -u $NEO4J_USERNAME -p $NEO4J_PASSWORD
112117

118+
echo ""
119+
echo "open http://localhost:7474 ($NEO4J_USERNAME/$NEO4J_PASSWORD)"
120+
echo ""
121+
122+
#
123+
# TODO Nuke this
124+
#
113125
# docker run \
114126
# --user $(id -u):$(id -g) \
115127
# --name "${CONTAINER}" \

0 commit comments

Comments
 (0)