From d3427bb73a7ca9491c20bd520d0ba17d39822a54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Tue, 7 Mar 2017 13:59:43 +0100 Subject: [PATCH] Updated README for Python 3.6 Also mentioned Flamenco, made the "mkdir" command a bit more efficient, and used Python 3's pip. --- README.md | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 0d7a976..ad51be8 100644 --- a/README.md +++ b/README.md @@ -4,28 +4,29 @@ Welcome to the [Blender Cloud](https://cloud.blender.org/) code repo! Blender Cloud runs on the [Pillar](https://pillarframework.org/) framework. ## Quick setup -Set up a node with these commands. Note that that script is already outdated... +Set up a node with these commands. ``` #!/usr/bin/env bash -mkdir -p /data/git -mkdir -p /data/storage -mkdir -p /data/config -mkdir -p /data/certs - +sudo mkdir -p /data/{git,storage,config,certs} sudo apt-get update -sudo apt-get -y install python-pip -pip install docker-compose +sudo apt-get -y install python3-pip +pip3 install docker-compose cd /data/git git clone git://git.blender.org/pillar-python-sdk.git -git clone git://git.blender.org/pillar-server.git pillar -git clone git://git.blender.org/attract.git -git clone git://git.blender.org/flamenco.git -git clone git://git.blender.org/blender-cloud.git +git clone git://git.blender.org/pillar.git -b py36 +git clone git://git.blender.org/attract.git -b py36 +git clone git://git.blender.org/flamenco.git -b py36 +git clone git://git.blender.org/blender-cloud.git -b py36 + ``` +After these commands, run `deploy.sh` to build the static files and deploy +those too (see below). + + ## Deploying to production server First of all, add those aliases to the `[alias]` section of your `~/.gitconfig` @@ -71,8 +72,8 @@ Now follow the above receipe on the Blender Cloud project as well. Contrary to the subprojects, `git pp` will actually perform the deploy for real. -Now you can press `[ENTER]` in the Pillar and Attract terminals that -were still waiting for it. +Now you can press `[ENTER]` in the Pillar, Attract, and Flamenco terminals +that were still waiting for it. After everything is done, your (sub)projects should all be back on the master branch.