preparing for v0.7

MI-DPLA · Apr 3, 2019 · 52adc01 · 52adc01
1 parent 8247ae6
commit 52adc01
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/.env b/.env
@@ -1,6 +1,6 @@
-COMBINE_BRANCH=v0.6.3
+COMBINE_BRANCH=master
 COMBINE_DJANGO_HOST_PORT=8000
-COMBINE_DOCKER_VERSION=v0.6.2
+COMBINE_DOCKER_VERSION=v0.7
 ELASTICSEARCH_HADOOP_CONNECTOR_VERSION=5.6.2
 HADOOP_VERSION=2.7.5
 HADOOP_VERSION_SHORT=2.7

diff --git a/combine/Dockerfile b/combine/Dockerfile
@@ -57,4 +57,9 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
 # installs to /opt/conda/envs/python2.7/bin/es2csv
 RUN /opt/conda/bin/conda create -n python2.7 python=2.7 --yes \
  && /opt/conda/envs/python2.7/bin/pip install git+https://github.com/WSULib/es2csv.git \
- && ln -s /opt/conda/envs/python2.7/bin/es2csv /usr/bin/es2csv
+ && ln -s /opt/conda/envs/python2.7/bin/es2csv /usr/bin/es2csv
+
+# install mongo tools
+RUN echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list \
+  && apt-get update \
+  && apt-get install -y mongodb-org-tools
diff --git a/combine/combine b/combine/combine
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -27,7 +27,7 @@ services:
     volumes:
       - mongodata:/data/db
     ports:
-      - 27017:27017
+      - 27018:27017
     command: "--config /etc/mongod.conf"
     networks:
       combinenet:
@@ -50,8 +50,8 @@ services:
 
   redis:
     image: redis:4.0
-    ports:
-      - 6379:6379
+    # ports:
+    #   - 6379:6379
     networks:
       combinenet:
         ipv4_address: 10.5.0.5