Permalink
Browse files

Merge branch 'master' of https://github.com/hydroshare/hydroshare2

  • Loading branch information...
jeffersonheard committed Mar 12, 2014
2 parents fdd0018 + 0d86048 commit 4094a5683c292287abf9356e94898dcd1f1cbf3c
View
@@ -4,3 +4,4 @@
[submodule "dublincore"]
path = dublincore
url = https://github.com/hydroshare/django-dublincore.git
+ branch = apponly
View
@@ -7,7 +7,7 @@ docker run -t -i -name hydroshare-migrations \
-link hydroshare-redis:redis \
-link hydroshare-postgis:postgis \
-p 0.0.0.0:80:80 -expose 22 \
- -v $PWD:/home/docker/hydroshare
+ -v $PWD:/home/docker/hydroshare \
dev.hydroshare.org:5999/hydroshare /usr/bin/python /home/docker/hydroshare/manage.py schemamigration --auto
docker rm hydroshare-migrations
@@ -16,7 +16,7 @@ docker run -t -i -name hydroshare-migrations \
-link hydroshare-redis:redis \
-link hydroshare-postgis:postgis \
-p 0.0.0.0:80:80 -expose 22 \
- -v $PWD:/home/docker/hydroshare
+ -v $PWD:/home/docker/hydroshare \
dev.hydroshare.org:5999/hydroshare /usr/bin/python /home/docker/hydroshare/manage.py migrate
docker rm hydroshare-migrations
View
Binary file not shown.
View
Binary file not shown.
@@ -0,0 +1,12 @@
+The Public folder lets you easily share single files in your Dropbox. Any file you put in this folder gets its own Internet link that you can share with others -- even non-Dropbox users!
+
+Step 1: Drop a file into the Public folder.
+
+Step 2: Right-click this file, then choose Dropbox > Copy Public Link. This copies an Internet link to your file that you can paste anywhere: emails, instant messages, blogs, etc.
+
+That's it! To share your file, just send the link to a friend.
+
+Happy Dropboxing!
+- The Dropbox Team
+
+P.S. You can only link to actual files within your Public folder, not to folders. For help with sharing files visit http://www.dropbox.com/help/16
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+if [[ $PWD == *hydroshare ]]
+then
+
+docker run -t -i -name hydroshare-migrations \
+ -link hydroshare-redis:redis \
+ -link hydroshare-postgis:postgis \
+ -p 0.0.0.0:80:80 -expose 22 \
+ -v $PWD:/home/docker/hydroshare
+ dev.hydroshare.org:5999/hydroshare /usr/bin/python /home/docker/hydroshare/manage.py schemamigration --init $1
+
+docker rm hydroshare-migrations
+
+docker run -t -i -name hydroshare-migrations \
+ -link hydroshare-redis:redis \
+ -link hydroshare-postgis:postgis \
+ -p 0.0.0.0:80:80 -expose 22 \
+ -v $PWD:/home/docker/hydroshare
+ dev.hydroshare.org:5999/hydroshare /usr/bin/python /home/docker/hydroshare/manage.py migrate
+
+docker rm hydroshare-migrations
+
+else
+ echo "ERROR: Must run migrations from the hydroshare git repository root."
+fi
View
@@ -5,5 +5,5 @@
# ##########################################################
echo "initializing modules"
cd /home/docker/hydroshare
-cd dublincore
-python setup.py install
+#cd dublincore
+#python setup.py install
View
@@ -9,9 +9,9 @@ service nginx restart
/usr/sbin/sshd
cd /home/docker/hydroshare
-python manage.py syncdb
-python manage.py migrate
-python manage.py collectstatic --noinput
+su docker -c "python manage.py syncdb"
+su docker -c "python manage.py migrate"
+su docker -c "python manage.py collectstatic --noinput"
export PYTHONPATH=/home/docker/hydroshare
su docker -c "PYTHONPATH=/home/docker/hydroshare celery worker -A celeryworker -E -D"
-uwsgi --ini /home/docker/hydroshare/uwsgi.ini
+su docker -c "uwsgi --ini /home/docker/hydroshare/uwsgi.ini"
View
@@ -21,6 +21,6 @@ echo "createdb: pgsql password:"
createdb -U docker -h $POSTGIS_HOST docker
echo "psql password"
psql -U docker -h $POSTGIS_HOST -c 'create extension postgis;'
-python manage.py syncdb --migrate --noinput
+su docker -c "python manage.py syncdb --migrate --noinput"
echo "add superuser"
-python manage.py createsuperuser
+su docker -c "python manage.py createsuperuser"
View
@@ -7,7 +7,7 @@ docker run -t -i -name hydroshare-tests \
-link hydroshare-redis:redis \
-link hydroshare-postgis:postgis \
-p 0.0.0.0:80:80 -expose 22 \
- -v $PWD:/home/docker/hydroshare
+ -v $PWD:/home/docker/hydroshare \
dev.hydroshare.org:5999/hydroshare /usr/bin/python /home/docker/hydroshare/manage.py runserver 0.0.0.0:80
docker rm hydroshare-tests
View
@@ -7,7 +7,7 @@ docker run -t -i -name hydroshare-dev \
-link hydroshare-redis:redis \
-link hydroshare-postgis:postgis \
-p 0.0.0.0:80:80 -expose 22 \
- -v $PWD:/home/docker/hydroshare
+ -v $PWD:/home/docker/hydroshare \
dev.hydroshare.org:5999/hydroshare /usr/bin/python /home/docker/hydroshare/manage.py runserver 0.0.0.0:80
else
View
@@ -7,7 +7,7 @@ docker run -t -i -name hydroshare-dev \
-link hydroshare-redis:redis \
-link hydroshare-postgis:postgis \
-p 0.0.0.0:80:80 -expose 22 \
- -v $PWD:/home/docker/hydroshare
+ -v $PWD:/home/docker/hydroshare \
dev.hydroshare.org:5999/hydroshare /home/docker/hydroshare/init
else
View
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+docker start hydroshare-postgis
+docker start hydroshare-redis
+./create-migrations
+./run-testserver
View
@@ -7,7 +7,7 @@ docker run -t -i -name hydroshare-dev \
-link hydroshare-redis:redis \
-link hydroshare-postgis:postgis \
-p 0.0.0.0:80:80 -expose 22 \
- -v $PWD:/home/docker/hydroshare
+ -v $PWD:/home/docker/hydroshare \
dev.hydroshare.org:5999/hydroshare /bin/bash
else
View
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+docker stop hydroshare-dev
+docker stop hydroshare-postgis
+docker stop hydroshare-redis

0 comments on commit 4094a56

Please sign in to comment.