Clean Old API out of the repostiory

.gitignore

@@ -3,6 +3,7 @@
 *.db
 .DS_Store
 .coverage
+/hydroshare/static
 /static
 .idea/
 celeryd.pid

Dockerfile

@@ -1,4 +1,4 @@
-FROM hs_base
+FROM mjstealey/hs_base
 
 ADD . /home/docker/hydroshare
 WORKDIR /home/docker
@@ -8,13 +8,6 @@ RUN npm install carto
 USER root
 WORKDIR /home/docker/hydroshare
 
-RUN apt-get install -y docker.io
-RUN easy_install pip
-RUN pip install django-autocomplete-light
-RUN pip install django-jsonfield
-RUN pip install docker-py
-RUN pip install suds-jurko
-
 RUN rm -rf /tmp/pip-build-root
 RUN mkdir -p /var/run/sshd
 RUN echo root:docker | chpasswd

Dockerfile.prod → Dockerfile.irods

@@ -1,4 +1,13 @@
-FROM mjstealey/hs_base_irods
+FROM mjstealey/hs_base
+
+WORKDIR /home/docker
+
+# Install iRODS packages
+RUN apt-get install -y libssl0.9.8 libfuse2
+RUN curl ftp://ftp.renci.org/pub/irods/releases/4.0.3/irods-runtime-4.0.3-64bit.deb -o irods-runtime-4.0.3-64bit.deb
+RUN curl ftp://ftp.renci.org/pub/irods/releases/4.0.3/irods-icommands-4.0.3-64bit.deb -o irods-icommands-4.0.3-64bit.deb
+RUN sudo dpkg -i irods-runtime-4.0.3-64bit.deb irods-icommands-4.0.3-64bit.deb
+RUN sudo apt-get -f install
 
 ADD . /home/docker/hydroshare
 WORKDIR /home/docker
@@ -8,13 +17,6 @@ RUN npm install carto
 USER root
 WORKDIR /home/docker/hydroshare
 
-RUN apt-get install -y docker.io
-RUN easy_install pip
-RUN pip install django-autocomplete-light
-RUN pip install django-jsonfield
-RUN pip install docker-py
-RUN pip install suds-jurko
-
 RUN rm -rf /tmp/pip-build-root
 RUN mkdir -p /var/run/sshd
 RUN echo root:docker | chpasswd
@@ -25,6 +27,11 @@ RUN chown -R docker:docker /home/docker
 RUN mkdir -p /tmp
 RUN chmod 777 /tmp
 
+# Cleanup iRODS install files
+WORKDIR /home/docker
+RUN rm irods-runtime-4.0.3-64bit.deb
+RUN rm irods-icommands-4.0.3-64bit.deb
+
 WORKDIR /home/docker/hydroshare
 
 CMD /bin/bash

Dockerfile.dev → Dockerfile.local

@@ -8,13 +8,6 @@ RUN npm install carto
 USER root
 WORKDIR /home/docker/hydroshare
 
-RUN apt-get install -y docker.io
-RUN easy_install pip
-RUN pip install django-autocomplete-light
-RUN pip install django-jsonfield
-RUN pip install docker-py
-RUN pip install suds-jurko
-
 RUN rm -rf /tmp/pip-build-root
 RUN mkdir -p /var/run/sshd
 RUN echo root:docker | chpasswd

deploy-hs

@@ -0,0 +1,43 @@
+#!/bin/sh
+
+# initiates a full build of hydroshare inlcuding hs_base if it does not already exist.
+
+# set current working directory as CWD
+CWD=$(pwd)
+
+# get submodules
+echo "### get git submodules ###"
+git submodule init && git submodule update
+
+# build hs_base if it does not exist
+IID=$(docker images | grep hs_base | tr -s ' ' | cut -d ' ' -f 3)
+if [ -z $IID ];
+    then
+        echo "### pull hs_base image from docker hub ###"
+        docker pull mjstealey/hs_base;
+        #echo "### build hs_base ###"
+        #pushd $CWD
+        #cd hs_docker_base
+        #docker build -t hs_base .
+        #popd;
+    else
+        echo "### hs_base already exists ###";
+fi
+
+# build docker contaiers defined by fig and bring them up
+echo "### build docker containers as defined in fig.yml ###"
+fig build
+echo "### bring up all docker containers as defined in fig.yml ###"
+fig up -d
+
+# load pg.development.sql into postgis database
+echo "### load clean pg.development.sql database from the running hydroshare container ###"
+CID=$(docker ps -a | grep hydroshare_hydroshare_1 | cut -d ' ' -f 1)
+docker exec $CID dropdb -U postgres -h postgis postgres
+docker exec $CID createdb -U postgres -h postgis postgres
+docker exec $CID psql -U postgres -h postgis -w -c 'create extension postgis;'
+docker exec $CID psql -U postgres -h postgis -f pg.development.sql
+docker exec $CID python manage.py makemigrations
+docker exec $CID python manage.py migrate
+
+echo "### complete ###"

fig.yml

@@ -1,10 +1,9 @@
 postgis:
   image: mjstealey/postgresql
-  #image: jamesbrink/postgresql
 redis:
-  image: dockerfile/redis
+  image: redis:2.8.19
 rabbitmq: 
-  image: dockerfile/rabbitmq
+  image: rabbitmq:3.4.4
 hydroshare:
   build: .
   environment:
@@ -19,10 +18,11 @@ hydroshare:
   volumes:
     # Use when NOT sharing the entire host hydroshare directory
     #- "media:/home/docker/hydroshare/hydroshare/static/media"
+    # for VM
     # Specific to hydro user on the hydrodev Xubuntu VM
     - "/home/hydro/hydroshare:/home/docker/hydroshare"
     # Specific to hydro user for pycharm debugging on hydrodev Xubuntu VM
-    #- "/home/hydro/pycharm-debug:/home/docker/pycharm-debug"
+    # - "/home/hydro/pycharm-debug:/home/docker/pycharm-debug"
   ports:
     - "1338:22"
     - "8000:8000"

fig.yml.dev

@@ -1,9 +1,9 @@
 postgis:
   image: mjstealey/postgresql
 redis:
-  image: dockerfile/redis
-rabbitmq: 
-  image: dockerfile/rabbitmq
+  image: redis:2.8.19
+rabbitmq:
+  image: rabbitmq:3.4.4
 hydroshare:
   build: .
   environment:
@@ -29,7 +29,7 @@ hydroshare:
     - postgis:postgis
     - redis:redis
     - rabbitmq:rabbitmq
-  command: python manage.py runserver 0.0.0.0:8000
+  command: /bin/bash init
 defaultworker:
   build: .
   environment:

fig.yml.prod

@@ -1,9 +1,9 @@
 postgis:
   image: mjstealey/postgresql
 redis:
-  image: dockerfile/redis
-rabbitmq: 
-  image: jamescarr/rabbitmq
+  image: redis:2.8.19
+rabbitmq:
+  image: rabbitmq:3.4.4
 hydroshare:
   build: .
   environment:
@@ -25,7 +25,7 @@ hydroshare:
     - postgis:postgis
     - redis:redis
     - rabbitmq:rabbitmq
-  command: python manage.py runserver 0.0.0.0:8000
+  command: /bin/bash init
 defaultworker:
   build: .
   environment: