Commit Graph

605 Commits

Author SHA1 Message Date
9a2647dcb5 Install nano, vim and curl on docker image 2016-10-20 14:45:33 +02:00
7213368736 Added docker-compose.yml 2016-10-20 14:45:23 +02:00
d82d5ec93e Replaced markdown with commonmark module 2016-10-20 13:06:29 +02:00
12f1afa57f Moar forgotten stuff 2016-10-19 17:19:27 +02:00
1249f274a6 Added new Pillar requirements here too. 2016-10-19 17:18:33 +02:00
ff0fa36ce9 favicons 2016-10-10 17:30:12 +02:00
2604aacc82 More deployment instructions in README.md 2016-09-30 12:08:55 +02:00
a36ad0c1ec Add static path for Attract to Apache vhost config 2016-09-29 18:10:11 +02:00
db7472a54e Added Attract to our deploy script 2016-09-29 17:59:33 +02:00
7deba632ed Start Attract in our wsgi container too 2016-09-29 17:59:33 +02:00
3937dcebc5 Add attract to docker-entrypoint 2016-09-29 17:11:29 +02:00
dc77de8623 Requirements clean up a little. 2016-09-29 10:08:38 +02:00
06de76d247 Merge branch 'master' into with-attract 2016-09-27 15:19:25 +02:00
5f65f222f8 Added vrview_loading.gif 2016-09-27 15:00:12 +02:00
5e6a6214f1 Removed executable bits from images 2016-09-27 14:57:02 +02:00
c8da654fc5 Images should not have their executable permission bit set 2016-09-20 12:22:12 +02:00
970f6f3ae9 attract_server -> attract 2016-09-20 12:20:15 +02:00
33c9acd95b Background image for Agent 327 2016-09-12 18:08:35 +02:00
fd36c078f2 attract_server → attract 2016-09-07 12:29:10 +02:00
50cab99202 Switched SVN module to Sybren's branch.
This is necessary until pull request #43 is merged:
https://github.com/dsoprea/PySvn/pull/43
2016-09-07 12:28:35 +02:00
2c323f580a Enable loading of Attract. 2016-09-07 12:28:35 +02:00
2a8bd98fdc Add static images for Blender Cloud 2016-09-05 16:18:01 +02:00
6dd509851f Removed loading of Attract server from the master branch.
Development of Cloud with Attract enabled has been moved to the
'with-attract' branch, so that we can deploy onto production without
Attract enabled.
Once we decide it's time to deploy together with Attract, we can merge
the 'with-attract' branch back to master.
2016-08-31 11:40:42 +02:00
ae17068ab4 Moved Attract stuff to Attract-Server project 2016-08-31 11:36:27 +02:00
67724b3cff Updated requirements.txt with some missing requirements.
This should pin all versions of all packages we depend on.
2016-08-31 11:35:48 +02:00
f159b14b14 Moved Attract node types from Pillar to bcloud.attract module.
Also added a tuple bcloud.attract.node_types.NODE_TYPES that contains
all Attract node types, for easy reference.
2016-08-30 14:29:24 +02:00
57674502ea Using Pillar's CLI user when updating project. 2016-08-30 14:24:57 +02:00
abd458c599 deploy.sh: disabled updating the virtualenv.
The new docker image doesn't have enough packages to rebuild binary
modules. This should be handled by the docker build scripts, and thus
we can't just upgrade the virtualenv from within the docker image.
2016-08-30 13:58:00 +02:00
11d6f888a1 Added Attract extension.
For now it just contains a management command, but I ensured it is
registered properly through the Pillar extension system.
2016-08-30 13:52:28 +02:00
f2b1e5f561 gitignore tweaks
static/asset/img/: removed because it isn't generated by anything.
docker/3_run/wheelhouse/: made the path absolute (wrt git workdir).
config_local.py: made the path absolute (wrt git workdir).
2016-08-30 13:51:44 +02:00
cd07e5c708 Clear redis cache after server restart, not before. 2016-08-26 15:59:12 +02:00
4267f313ab Refuse deploy early when Pillar can't be found or isn't on production
Without this, it will only block the deploy mid-way when we try to
rsync_ui. Now it just stops early before doing anything server-side.
2016-08-26 14:33:22 +02:00
c388a62b1b Let manage.sh (in docker image) cd to the proper directory 2016-08-24 18:23:24 +02:00
a600f30b1f Added apache2.conf to the docker image.
There are two settings I've changed:

-Timeout 300
+Timeout 3600
+ServerName cloud.blender.org
2016-08-24 17:12:43 +02:00
380c5387b5 Include log rotation in the base docker image 2016-08-24 11:34:07 +02:00
ba9d3e708d Docker image WSGI: use multi-processing rather than multi-threading.
Also set a max number of requests a process is allowed to handle before
it is restarted. This limits the scope of possible memory leaks, etc.
2016-08-24 11:17:50 +02:00
5864654244 Use apache2ctl instead of kill -HUP 2016-08-23 14:57:55 +02:00
e335aa5306 Delete cached front page from Redis when deploying 2016-08-23 14:51:57 +02:00
1f230a84e4 Do rsync_ui in deploy.sh 2016-08-23 12:50:53 +02:00
343d603869 rsync_ui now finds Pillar by itself, no longer requires PILLAR_DIR 2016-08-23 12:50:53 +02:00
2039e4b87c Added deploy.sh script.
This script does NOT run rsync_ui.sh yet. Once we've decided where
to put the images, this behaviour can be changed.
2016-08-23 12:37:29 +02:00
9d6ba00115 Introducing rsync.ui 2016-08-22 23:15:37 +02:00
36feb2e68c Fix for not loaded config when in dev mode 2016-08-18 12:13:09 +02:00
1d2bc0607f Template for maintenance mode 2016-08-18 12:08:26 +02:00
b9d266db03 Add redis to requirements.txt 2016-08-18 10:22:40 +02:00
fdb63b3137 Initial README.md 2016-08-17 15:17:47 +02:00
f29b9eb700 Fix for typo 2016-08-17 08:30:31 +02:00
cd67b5d03a Add more XSendFilePath, plus url rewrite to support legacy address
We are going to deprecate cloudapi.blender.org in favour of
cloud.blender.org/api in the future.
2016-08-17 08:30:26 +02:00
91aedf1a89 Dev server should listen to all hosts when in doker 2016-08-16 11:41:51 +02:00
e471690a63 Merge remote-tracking branch 'origin/master' 2016-08-10 18:27:34 +02:00