Skip to content

Commit

Permalink
Docker development script
Browse files Browse the repository at this point in the history
  • Loading branch information
yayoiukai committed Jun 30, 2016
1 parent e38c056 commit e37c5ed
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 5 deletions.
4 changes: 4 additions & 0 deletions Dockerfile-alternate
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM django:onbuild
MAINTAINER Yayoi Ukai <yayoi.ukai@gmail.com>
RUN mkdir -p /var/signalserver/files
RUN useradd -ms /bin/bash signalserversadmin
6 changes: 6 additions & 0 deletions Dockerfile-frontend
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
FROM node
MAINTAINER Yayoi Ukai <yayoi.ukai@gmail.com>
RUN mkdir -p /var/build/
WORKDIR /var/build/
RUN npm install -g bower
CMD bower install --allow-root
7 changes: 7 additions & 0 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: '2.0'
services:
web:
build:
dockerfile: ./Dockerfile-alternate
volumes:
- ./frontend:/usr/src/app/frontend
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ services:
worker:
build:
context: .
dockerfile: ./Dockerfile-alternate
env_file: ./signalservers.env
user: signalserversadmin
command: celery -A signalserver worker --loglevel=info
Expand Down
5 changes: 5 additions & 0 deletions frontend.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#docker build -t my-nodejs-app -f /Users/yayoi/jan2016/signalserver/Dockerfile-alternate .
docker build -t signalserver-frontend -f /Users/yayoi/jan2016/signalserver/Dockerfile-frontend .

This comment has been minimized.

Copy link
@dericed

dericed Jan 6, 2017

Member

maybe sometimes people not named Yayoi want to run signalserver

This comment has been minimized.

Copy link
@yayoiukai

yayoiukai Jan 6, 2017

Author Contributor

oops but now you can too!

docker run -v `pwd`/frontend:/var/build signalserver-frontend
#docker run -v /foo --name="vtest" my-nodejs-app sh -c 'echo hello docker volume > /foo/testing.txt'

11 changes: 11 additions & 0 deletions frontend/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"name": "signalserver",
"version": "0.0.0",
"dependencies": {
"bootstrap": "~3.1.1",
"jquery": "~1.10.2",
"datetimepicker": "~2.5.4",
"d3":"~3.5.17"
},
"devDependencies": {}
}
1 change: 0 additions & 1 deletion quickstart.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ done
docker-compose up -d
echo ">> Application is running <<"
echo "http://${DOCKER_HOST:-localhost}" | sed 's/tcp:\/\///g' | sed -E 's/(\:[0-9]+)?$/:8000/'
docker-compose up -d rmq
16 changes: 16 additions & 0 deletions quickstartdev.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash
docker-machine create --driver virtualbox default
docker-machine start default
docker-machine env default
eval "$(docker-machine env default)"
docker-compose -f docker-compose.yml -f docker-compose.dev.yml build
docker-compose up -d db
migration=1
while [[ $migration != 0 ]]; do
sleep 2
docker-compose -f docker-compose.yml -f docker-compose.dev.yml run web python manage.py migrate
migration=$?
done
docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d
echo ">> Application is running <<"
echo "http://${DOCKER_HOST:-localhost}" | sed 's/tcp:\/\///g' | sed -E 's/(\:[0-9]+)?$/:8000/'
6 changes: 2 additions & 4 deletions signalserver/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,18 +150,16 @@

STATICFILES_DIRS = [
os.path.join(BASE_DIR, "static"),
'usr/src/app/bower_components/',

'usr/src/app/frontend/bower_components/',
]

MEDIA_ROOT = '/var/signalserver/files'

BOWER_COMPONENTS_ROOT = '/usr/src/app/bower_components/'
BOWER_COMPONENTS_ROOT = '/usr/src/app/frontend/bower_components/'

BOWER_COMPONENTS_URL = '/bower_components/'

STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
'djangobower.finders.BowerFinder',
)

0 comments on commit e37c5ed

Please sign in to comment.