make fill_database

Makefile

@@ -11,9 +11,9 @@ MAKE_ROOT = $(shell pwd)
 SSJ_FILE = "$(MAKE_ROOT)/data/samples/ssj_example/ssj500k-sl.body.sample.xml"
 KRES_FOLDER = "$(MAKE_ROOT)/data/samples/kres_example"
 KRES_SRL_FOLDER = "$(MAKE_ROOT)/data/kres_srl"
-OUTPUT = "file"
+OUTPUT = "db"
 OUTDIR = "/home/voje/workdir/test_out"
-DBADDR = ""
+DBADDR = "0.0.0.0:27017"  # don't use localhost
 
 DB_ADM_USER = testadmin
 DB_ADM_PASS = testadminpass
@@ -21,25 +21,42 @@ DB_USR_USER = testuser
 DB_USR_PASS = testuserpass
 export
 
-.PHONY: dev-env preflight
+.PHONY: python-env fill_database
 
 all:
 	echo "Select an argument"
 
-# prereq (environment)
-dev-env:
-	cd dockerfiles/dev-env; $(MAKE)
+# create database (run from host):
+# !!! might need to run several times, so the containers come online
+# Successful if you see the lines:
+# Successfully added user: { "user" : "testuser", "roles" : [ "readWrite" ] }
+# bye
+database-service:
+	cd dockerfiles/database; $(MAKE) build_run
 
-# run these inside dev-env container
+database-users:
+	cd dockerfiles/database; $(MAKE) create_users
+
+# also useful, if we want to restart the db
+database-clean:
+	cd dockerfiles/database; $(MAKE) clean_stack
+
+# create python-env container
+python-env:
+	cd dockerfiles/python-env; $(MAKE)
+
+# inside the container, install our packages
+python-env-install:
+	pip3 install -e src/pkg/cjvt-corpusparser/.
+
+# from inside python-env container:
 data/samples:
 	cd data; tar xzvf samples.tar.gz
 
-# installs our python code as packages
-# when debugging, run this once, then run python3 ... by hand
-preflight: data/samples
-	pip3 install -e src/pkg/corpusparser/.
-	python3 src/pkg/corpusparser/corpusparser/main.py --kres-folder $(KRES_FOLDER) \
-		--ssj-file $(SSJ_FILE) --kres-srl-folder $(KRES_SRL_FOLDER) --output $(OUTPUT) --outdir $(OUTDIR) --dbaddr $(DBADDR)
+# from inside python-env container:
+fill_database: data/samples
+	python3 src/pkg/cjvt-corpusparser/corpusparser/main.py --kres-folder $(KRES_FOLDER) \
+		--ssj-file $(SSJ_FILE) --kres-srl-folder $(KRES_SRL_FOLDER) \
+		--output $(OUTPUT) --outdir $(OUTDIR) --dbaddr $(DBADDR) \
+		--dbuser $(DB_USR_USER) --dbpass $(DB_USR_PASS)
 
-database:
-	cd dockerfiles/database; $(MAKE)