소스 검색

Make it work with /app/code and migrations

Johannes Zellner 9 년 전
부모
커밋
833460c561
3개의 변경된 파일9개의 추가작업 그리고 6개의 파일을 삭제
  1. 2 0
      CloudronManifest.json
  2. 3 1
      Dockerfile
  3. 4 5
      start.sh

+ 2 - 0
CloudronManifest.json

@@ -11,6 +11,7 @@
   "addons": {
     "sendmail": {},
     "postgresql": {},
+    "localstorage": {},
     "ldap": {}
   },
   "tags": [
@@ -23,6 +24,7 @@
     "issue tracking",
     "bug tracking"
   ],
+  "memoryLimit": 314572800,
   "developmentMode": false,
   "minBoxVersion": "0.4.0",
   "manifestVersion": 1,

+ 3 - 1
Dockerfile

@@ -3,7 +3,7 @@ MAINTAINER Johannes Zellner <support@cloudron.io>
 
 EXPOSE 8000
 
-RUN mkdir -p /app/code
+RUN mkdir -p /app/code /app/data
 WORKDIR /app/code
 
 RUN apt-get update && apt-get install -y \
@@ -20,6 +20,8 @@ RUN cd /app/code/taiga-back && git checkout stable
 RUN git clone https://github.com/taigaio/taiga-front-dist.git taiga-front-dist
 RUN cd /app/code/taiga-front-dist && git checkout stable
 
+RUN rm -rf /app/code/taiga-back/media && mkdir /app/data/media && ln -s /app/data/media /app/code/taiga-back/media
+
 ## install all deps in a python virtual env
 ADD build.sh /app/code/build.sh
 RUN /app/code/build.sh

+ 4 - 5
start.sh

@@ -27,19 +27,18 @@ echo "--> Update nginx.conf"
 sed -e "s,##APP_DOMAIN##,${APP_DOMAIN}," /app/code/nginx.conf  > /run/nginx.conf
 
 echo "--> Setup taiga virtual env"
-cd /app/code
 source /app/code/taiga/bin/activate
 
-echo "--> Create taiga-back copy to work with"
-cp -rf /app/code/taiga-back /run/taiga-back
+mkdir -p /app/data/media/user
 
 echo "--> Run migration scripts"
-cd /run/taiga-back
+cd /app/code/taiga-back
 python manage.py migrate --noinput
 python manage.py loaddata initial_project_templates
 
 echo "--> Make cloudron own /run"
 chown -R cloudron:cloudron /run
+chown -R cloudron:cloudron /app/data
 
 echo "--> Start nginx"
 nginx -c /run/nginx.conf &
@@ -49,6 +48,6 @@ PATH=/app/code/taiga/bin:$PATH
 HOME=/app/code
 PYTHONPATH=/app/code/taiga/lib/python3.4/site-packages
 
-cd /run/taiga-back
+cd /app/code/taiga-back
 
 exec /usr/local/bin/gosu cloudron:cloudron gunicorn -w 1 -t 60 --pythonpath=. -b 127.0.0.1:8001 taiga.wsgi