@@ -15,7 +15,9 @@ RUN apt-get update -qq && \
         libtool \
         postgresql-server-dev-11 \
         libmongoc-1.0.0 \
-        libmongoc-dev 
+        libmongoc-dev \
+        protobuf-c-compiler \
+        libprotobuf-c0-dev
 
 RUN wget https://dev.mysql.com/get/mysql-apt-config_0.8.12-1_all.deb
 RUN echo mysql-apt-config mysql-apt-config/select-server  select  mysql-8.0 | debconf-set-selections && \
@@ -26,6 +28,8 @@ RUN apt-get update -qq && apt-get install -y libmysqlclient-dev && rm -rf /var/l
 RUN mkdir -p /build_scripts
 COPY build_scripts /build_scripts/
 
+# cstore_fdw
+RUN ./build_scripts/fdws/cstore_fdw/build_cstore_fdw.sh
 # Mongo FDW
 RUN ./build_scripts/fdws/mongo_fdw/build_mongo_fdw.sh
 # MySQL FDW
@@ -42,10 +46,18 @@ COPY etc /etc/
 
 # Splitgraph core libraries (required for the layered querying FDW)
 # Git submodule
+
+RUN apt-get update -qq && apt-get install -y zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev
+
+# splitgraph requires python 3.6
+RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
+
 COPY splitgraph /splitgraph
 RUN ./build_scripts/build_splitgraph.sh
 
 # Splitgraph init scripts
 COPY init_scripts /docker-entrypoint-initdb.d/
+RUN mkdir -p /var/lib/splitgraph/objects
+RUN chmod 777 /var/lib/splitgraph/objects
 
 CMD ["postgres", "-c", "config_file=/etc/postgresql/postgresql.conf"]
@@ -1,17 +1,19 @@
 #!/bin/bash
 
+export PATH="~/.pyenv/bin:$PATH"
+eval "$(pyenv init -)"
+eval "$(pyenv virtualenv-init -)"
+
+pyenv install 3.6.8
+pyenv virtualenv 3.6.8 splitgraph
+pyenv activate splitgraph
+
 # Install the Splitgraph library and the layered querying foreign data wrapper.
 # We could use the Postgres entrypoint system instead but it's run as the non-root user
 # and this container isn't for the sgr tool anyway.
 
 cd /splitgraph
 
-ln -s /usr/bin/pip3 /usr/bin/pip
-
-# Dirty but we use python 3 system-wide
-mv /usr/bin/python /usr/bin/python2
-ln -s /usr/bin/python3 /usr/bin/python
-
 curl -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python
 # Install globally (otherwise we'll need to find a way to get Multicorn to see the venv)
 source $HOME/.poetry/env
 
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+git clone https://github.com/citusdata/cstore_fdw.git
+cd cstore_fdw
+
+make
+make install
@@ -4,3 +4,4 @@ listen_addresses = '*'
 port = 5432
 
 hba_file = '/etc/postgresql/pg_hba.conf'
+shared_preload_libraries = 'cstore_fdw'
@@ -1,4 +1,6 @@
 CREATE EXTENSION postgres_fdw;
 CREATE EXTENSION mongo_fdw;
 CREATE EXTENSION mysql_fdw;
-CREATE EXTENSION multicorn;
+CREATE EXTENSION multicorn;
+CREATE EXTENSION cstore_fdw;
+CREATE SERVER cstore_server FOREIGN DATA WRAPPER cstore_fdw;
Original file line number	Diff line number	Diff line change
@@ -4,3 +4,4 @@ listen_addresses = '*'
4	4	port = 5432
5	5
6	6	hba_file = '/etc/postgresql/pg_hba.conf'
	7	+ shared_preload_libraries = 'cstore_fdw'