Docker: use Postgres 9.6 and named volumes

Dockerfile

@@ -24,4 +24,4 @@ RUN pip install -e '.[vectors]'
 # a Docker volume
 ENV CONCEPTNET_DATA /conceptnet_data
 
-RUN /bin/bash
+CMD ["/bin/bash"]

TODO.txt

@@ -1,30 +1,15 @@
 Design of ConceptNet 5.5:
 
-- [x] link the API responses (fix Pygments order)
-- [x] Don't stem things on the way in
-- [x] Figure out how to keep more Verbosity
-- [x] Coarsen Wiktionary using etymologies
-- [x] Handle 'sw-maps' correctly, no proliferation of N-triples, no double-escaping
-- [x] Store the index in a reasonable constant database
-- [x] Use the blacklist when making assertions
-- [x] Build ConceptNet vectors in build process
-- [x] include word2vec and GloVe inputs in raw/
-- [x] Automatically test ConceptNet vectors
-- [x] Build vectors using less than 16 GB RAM
-- [x] fix 'FormOf' links to self
-- [x] Try new lemmatizer as part of Numberbatch
-- [x] Break down the and-or trees into more machine-readable structures
-- [x] Use symmetrical relations
 - [ ] Use standardized language codes in Wiktionary forms, or maybe remove that database?
-- [x] Remove "obsolete", "archaic", "dated", "rare", "archaïque" contexts
-- [ ] Higher weights on monolingual things, lower weights on uncommon languages
-- [ ] Fix dependencies for conceptnet5.vectors: sklearn? pandas?
+- [x] Fix dependencies for conceptnet5.vectors: sklearn? pandas?
 - [ ] Querying an assertion gives an 'edges' list that links to itself -- remove '@id' from the top level?
-- [ ] Wiktionary links should be ExternalURLs, not sources
+- [x] Wiktionary links should be ExternalURLs, not sources
 - [ ] better API example on front page
+- [ ] Remove "archaïque" context
 
 ConceptNet 5.6 perhaps:
 
 - [ ] Nodes should have labels that are stored separately from their edges
 - [ ] Relabel vague nodes like "someone" and "something"
 - [ ] Infer things from verb phrases
+- [ ] Higher weights on monolingual things, lower weights on uncommon languages

docker-compose.yml

@@ -1,21 +1,25 @@
-db:
-  restart: always
-  image: sameersbn/postgresql:9.5-2
-  expose:
-    - "5432"
-  environment:
-    - DEBUG=false
-    - PG_TRUST_LOCALNET=true
-    - DB_NAME=conceptnet5
-  volumes:
-    - /bigdrive/conceptnet5.5/postgresql:/var/lib/postgresql
+version: '2'
+services:
+  db:
+    restart: always
+    image: postgres:9.6.0
+    expose:
+      - "5432"
+    environment:
+      - POSTGRES_DB=conceptnet5
+    volumes:
+      - psql:/var/lib/postgresql
 
-conceptnet:
-  build: '.'
-  links:
-    - db
-  environment:
-    - CONCEPTNET_DB_HOSTNAME=db
-    - CONCEPTNET_BUILD_DATA=/conceptnet_data
-  volumes:
-    - /bigdrive/conceptnet5.5/data:/conceptnet_data
+  conceptnet:
+    build: '.'
+    links:
+      - db
+    environment:
+      - CONCEPTNET_DB_HOSTNAME=db
+      - CONCEPTNET_BUILD_DATA=/conceptnet_data
+    volumes:
+      - cn5data:/conceptnet_data
+
+volumes:
+  psql:
+  cn5data:

scripts/build-in-docker.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+docker-compose build conceptnet && \
+docker-compose run conceptnet scripts/build.sh