Use lib instead of src

diff --git a/.dockerignore b/.dockerignore
index f97a75b48384f8c01f3e035274bc0d06be91f1c0..b6d6fc74cfa87c9e4f9bedde59a717d9e2c26b84 100644 (file)
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,6 +3,8 @@
 *.egg-info
 **/build
 **/dist
-data
-tmp
-var
+data/
+env/
+etc/
+tmp/
+var/

diff --git a/Dockerfile b/Dockerfile
index 9d7d5e42938116372ed06abbb9f24962ffc16b22..66651cb5a2e749cadd03b02d6bf64d949d9705c6 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,9 +17,10 @@ FROM parisson/timeside:latest-dev
 
 MAINTAINER Guillaume Pellerin <yomguy@parisson.com>, Thomas fillon <thomas@parisson.com>
 
-RUN mkdir -p /srv/src/
+RUN mkdir -p /srv/lib/
 RUN mkdir -p /srv/app
-RUN mkdir -p /srv/src/telemeta
+RUN mkdir -p /srv/media
+RUN mkdir -p /srv/lib/telemeta
 
 RUN apt-get update && apt-get install -y apt-transport-https
 RUN apt-get install -y --force-yes mysql-client
@@ -28,22 +29,18 @@ ENV PYTHON_EGG_CACHE=/srv/.python-eggs
 RUN mkdir -p $PYTHON_EGG_CACHE
 RUN chown www-data:www-data $PYTHON_EGG_CACHE
 
-COPY . /srv/src/telemeta
-WORKDIR /srv/src/telemeta
+COPY . /srv/lib/telemeta
+WORKDIR /srv/lib/telemeta
 
 # Install Timeside and plugins from ./lib
 COPY ./app/scripts/setup_plugins.sh /srv/app/scripts/setup_plugins.sh
-COPY ./lib/ /srv/src/plugins/
+COPY ./lib/ /srv/lib/plugins/
 RUN /bin/bash /srv/app/scripts/setup_plugins.sh
 
 # Install Telemeta
 RUN pip install -r requirements.txt
-RUN pip install -r requirements-dev.txt --src /srv/src
+RUN pip install -r requirements-dev.txt --src /srv/lib
 RUN pip uninstall -y South
 
-RUN mkdir -p /srv/media
-
-RUN mkdir -p /srv/media
-
 WORKDIR /srv/app
 EXPOSE 8000

diff --git a/app/scripts/app.sh b/app/scripts/app.sh
index 0d70c0c0e339874e5dfd7551b0e55e30f3d4bb07..31bf488df9c5a65e0ec86e8cad39e9905755af40 100755 (executable)
--- a/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@ -6,7 +6,7 @@ manage=$app'/manage.py'
 wsgi=$app'/wsgi.py'
 static='/srv/static/'
 media='/srv/media/'
-src='/srv/src/'
+lib='/srv/lib/'
 log='/var/log/uwsgi/app.log'
 
 # uwsgi params
@@ -40,7 +40,7 @@ python $manage telemeta-setup-enumerations
 
 
 # Delete Timeside database if it exists
-cat /srv/src/telemeta/scripts/sql/drop_timeside.sql | python $manage dbshell
+cat /srv/lib/telemeta/scripts/sql/drop_timeside.sql | python $manage dbshell
 
 if [ $REINDEX = "True" ]; then
     python $manage rebuild_index --noinput
@@ -52,7 +52,7 @@ if [ "$1" = "--runserver" ]; then
 else
     # static files auto update
     # watchmedo shell-command --patterns="$patterns" --recursive \
-    #     --command='python '$manage' collectstatic --noinput' $src &
+    #     --command='python '$manage' collectstatic --noinput' $lib &
     python $manage collectstatic --noinput
 
     # fix media access rights

diff --git a/app/scripts/install_plugins.sh b/app/scripts/install_plugins.sh
index ddd5d0cc6bd0f0456dd74b699ec4ecee97d4d173..b0315e9f26ad063fe9ca45e1d4efbc342bfa5a77 100755 (executable)
--- a/app/scripts/install_plugins.sh
+++ b/app/scripts/install_plugins.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-plugins=/srv/src/plugins
+plugins=/srv/lib/plugins
 
 for dir in $(ls $plugins); do
     if [ -f $plugins/$dir/setup.py ]; then

diff --git a/app/scripts/setup_plugins.sh b/app/scripts/setup_plugins.sh
index 2d9b3c5029686f3ba7fd71ae7488e7e038891a75..de55f84109fd6fe351d52c7dedd60ceb37f90dd2 100755 (executable)
--- a/app/scripts/setup_plugins.sh
+++ b/app/scripts/setup_plugins.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-plugins=/srv/src/plugins
+plugins=/srv/lib/plugins
 
 apt-get update
 

diff --git a/docker-compose.yml b/docker-compose.yml
index 67b991e1f3e76d0c6340055162b6f9dc2cd2748f..9cd72c9946559a0275f3604261f2315faca9ffb0 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -54,7 +54,7 @@ app:
   image: parisson/telemeta:1.6
   volumes:
     - ./app:/srv/app
-    - ./telemeta:/srv/src/telemeta/telemeta
+    - ./telemeta:/srv/lib/telemeta/telemeta
   volumes_from:
     - data
   env_file: