archive/blender-cloud
0
1
Fork 1
Code Issues 24 Pull Requests Packages Projects Releases Wiki Activity
731 Commits 10 Branches 3 Tags
master
Commit Graph

49 Commits

Author SHA1 Message Date
Sybren A. Stüvel cbdcd04423 Fixed copy-paste bug in remoteip.conf 2020-04-17 15:15:16 +02:00
Sybren A. Stüvel c618e6cf17 Fixed typo in Dockerfile 2020-04-17 14:09:43 +02:00
Sybren A. Stüvel b8defe329e Apache: enabled & configured mod_remoteip 
This module makes it possible to do access control & logging based on
client's real IP address, rather than the internal IP address of HaProxy.
 2020-04-17 11:38:53 +02:00
Francesco Siddi 941ed4a0e0 Deploy: Add redirect for coffee-run and settlers 2020-04-09 16:28:19 +02:00
Sybren A. Stüvel fc986b0ab6 Renamed docker/4_run/deploy to docker/4_run/staging 
"Staging" covers the meaning of what is actually happening better than
"deploy". I want to keep "deploy" for actually deploying onto a production
server.
 2019-02-13 10:39:18 +01:00
Sybren A. Stüvel a674de4db5 Remove CELERY_BEAT_SCHEDULE from config_local 
CELERY_BEAT_SCHEDULE shouldn't need any changes in config_local for
production; the default should be production-ready.
 2018-10-10 14:58:52 +02:00
Sybren A. Stüvel 7f58be4568 Updated Blender Cloud add-on to 1.9.0 
Also change the config_local.py so that we only have to change one variable
for a new version.
 2018-09-05 13:40:24 +02:00
Sybren A. Stüvel 099984f97c Added #!/bin/sh at top of shell script 2018-08-30 12:53:34 +02:00
Sybren A. Stüvel 8bfb40ce54 Various Docker image upgrades, read the entire commit message! 
- Ubuntu 17.10 → 18.04.
- Python 3.6.3 → 3.6.6.
- Use `DEBIAN_FRONTEND=noninteractive` to prevent prompts during
  installation.
- Install `tzdata` in the base image as it's required by subimages.
- Correctly set maintainer in Dockerfile.
 2018-08-30 12:53:34 +02:00
Sybren A. Stüvel d60a65c9f0 End BLENDER_ID_ENDPOINT with a slash 2018-08-30 12:46:58 +02:00
Sybren A. Stüvel 4696d09fed Corrected rewrite rule for Caminandes 2018-07-06 14:56:40 +02:00
Francesco Siddi 4e8530478a Remove trailing slash from BLENDER_ID_ENDPOINT 2018-06-22 19:40:44 +02:00
Sybren A. Stüvel b153cae70e Increased WSGI thread count 32 → 64 2018-06-13 10:47:28 +02:00
Sybren A. Stüvel 6a698daaa0 Remove time from logs; timestamp is added by Apache anyway. 2018-03-27 16:42:43 +02:00
Sybren A. Stüvel 5f07c7ce17 Use new hashing of static file names. 
Every time the docker image is rebuilt a random hash is chosen.

Requires Pillar d560f89704e3a6f4490df57712525048c469bed2 or newer.
 2018-03-23 17:39:04 +01:00
Sybren A. Stüvel 5a42e2dcb8 Flip condition to unindent pretty much all the code 
No semantic changes.
 2018-03-23 17:24:36 +01:00
Sybren A. Stüvel d5a54b7cf1 Formatting 2018-03-23 16:37:58 +01:00
Sybren A. Stüvel 7cb4b37ae2 Renamed some docker files to Dockerfile 
This makes it simpler to manage by using the default name. It also helps
my editor to recognise the file and highlight it properly.
 2018-03-23 12:42:56 +01:00
Sybren A. Stüvel 1fca473257 Moved Apache files into separate subdir 2018-03-23 12:12:39 +01:00
Francesco Siddi 98698be7eb Add redirect for waking-the-forest project 
Waking the Forest was originally part of the Art Gallery, but was
moved to its own dedicated workshop to increase visibility.
 2018-03-19 11:17:45 +01:00
Francesco Siddi d4f072480c Add convenience redirect from /hero to /p/hero 2018-03-14 14:35:27 +01:00
Sybren A. Stüvel c3ddc831aa Stricter XSendFilePath in Apache config 2018-02-14 11:07:47 +01:00
Sybren A. Stüvel 6f73222dcd Add the most-changing files as last step for faster Docker rebuilds. 2018-02-02 12:09:16 +01:00
Sybren A. Stüvel 94ef616593 Placing code + assets directly into Docker image 
This radically changes the way we deploy to the production server, as a
Git checkout is no longer required there. All the necessary files are
now inside the docker image. As a result, /data/git should no longer be
mounted as a Docker volume.

- Renamed docker/build.sh → docker/full_rebuild.sh
  This makes it clearer that it performs a full rebuild of the Docker images.
- Full rebuilds should be done on a regular basis to pull in Ubuntu
  security updates.
- Removed rsync_ui.sh, we no longer need it. Other projects can also
  remove their rsync_ui.sh.
- Moved deploy.sh → deploy/2docker.sh and added deploy/2server.sh
 2018-02-02 12:01:17 +01:00
Sybren A. Stüvel 5efca08c13 Docker Apache: added svnman XSendFilePath 2017-12-08 17:06:56 +01:00
Sybren A. Stüvel 7dcc0d5ead Size-based Apache log rotation 2017-12-07 10:21:55 +01:00
Sybren A. Stüvel 9dfe75ed1e Include pillar-svnman in docker image 2017-11-14 16:28:52 +01:00
Francesco Siddi 97dff66159 Add rewrite rule for new project 2017-10-25 15:52:33 +02:00
Sybren A. Stüvel f2ad7b8868 Bumped thread count to 32, lowered proc count to 2 
We have 2 CPUs at our DigitalOcean droplet, hence the proc count.
 2017-09-14 17:17:45 +02:00
Sybren A. Stüvel 22b8ed0bc0 Added "celery beat" docker container 2017-09-14 15:58:03 +02:00
Sybren A. Stüvel 8df67bfeb5 After building the image, tell the user the image name 
This makes pushing easier, as you can copy-paste the name into the push
command.
 2017-09-12 12:10:32 +02:00
Francesco Siddi 7f65b77824 New redirect from /training to /courses 2017-07-26 16:51:35 +02:00
Sybren A. Stüvel a62d1e3d7d Updated celery-worker.sh to actually star the Celery worker. 2017-06-07 17:19:02 +02:00
Francesco Siddi 8b110df32a Convert all Redirects to RewriteRules in Apache conf 
This allows for more precise redirection. Using the correct code (301, permanently moved) and L (Last rule, prevent any further evaluation).
 2017-06-02 11:18:57 +02:00
Sybren A. Stüvel 9da841efc3 Added Celery worker docker container 
This docker container uses the Blender Cloud image, but a different entry
point. It is not intended to be network-reachable from the outside world.
All it needs are connections to the databases (mongo, redis, rabbit).
 2017-06-02 10:55:18 +02:00
Francesco Siddi 93edfb789f Add Blender Cloud specific redirects 
Originially hardcoded in Pillar, these redirects are rarely changed or added.
 2017-06-01 17:27:00 +02:00
Sybren A. Stüvel c775126cba Docker startup: create ${APACHE_LOG_DIR} if it doesn't exist yet 2017-05-17 10:34:13 +02:00
Sybren A. Stüvel b93448f682 Start cron when starting the Cloud docker 
This will regularly run logrotate, preventing the build-up of log files
of multiple gigabytes.
 2017-05-17 10:08:27 +02:00
Sybren A. Stüvel 2892a46a27 Docker: store Cloud container /var/log on host in /data/log 2017-05-17 10:07:40 +02:00
Francesco Siddi bd9265e4f1 Tag blender_cloud Docker image as latest 2017-04-11 12:52:44 +02:00
Sybren A. Stüvel 557ce1b922 Docker: add useful tail /var/log/apache2/access.log to bash_history 2017-03-09 15:30:45 +01:00
Sybren A. Stüvel 79b8194b2a Docker: exec single commands 
This replaces bash with the docker command, freeing memory and
automatically returning the exit code of the docker command as the exit
code of the shell script.
 2017-03-09 11:01:24 +01:00
Sybren A. Stüvel 2f6049edee Docker images: renamed pillar_py:3.6 to armadillica/pillar_py:3.6 
This allows us to push the Python image to Docker Hub.
 2017-03-08 13:55:02 +01:00
Sybren A. Stüvel 71a1a69f16 Updated paths for XSendFilePath 
Now that we use egg links, and not symlinks, to install our packages,
we can use the actual paths.
 2017-03-08 13:02:36 +01:00
Sybren A. Stüvel fab68aa802 Removed virtualenv from manage.sh, and using exec 2017-03-08 12:38:16 +01:00
Sybren A. Stüvel a332f627a4 Tweaked docker-entrypoint.sh to properly install packages. 2017-03-08 12:36:06 +01:00
Sybren A. Stüvel 9fe7d7fd2b WIP: More docker tweaks 2017-03-08 12:35:35 +01:00
Sybren A. Stüvel 6adf45a94a Be more selective in what we install on the production docker image. 2017-03-08 12:34:48 +01:00
Sybren A. Stüvel d7e4995cfa WIP: more work on the docker structure, still not finished with 4_run 
1_base: builds a base image, based on Ubuntu 16.10
2_buildpy: builds two images:
	2a: an image that can build Python 3.6
	2b: an image that contains the built Python 3.6 in /opt/python
3_buildwheels: builds an image to build wheel files, puts them in ../4_run
4_run: the production runtime image, which can't build anything and just runs.
 2017-03-07 22:41:05 +01:00