From 99b79f628220f130ef3ff51fed2c76007bddd724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnaro=CC=88k?= Date: Wed, 18 Aug 2021 11:38:25 -0700 Subject: [PATCH 1/2] Create script directory and and build and server scripts to upload. --- script/build | 3 +++ script/server | 3 +++ upload.bash => script/upload | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100755 script/build create mode 100755 script/server rename upload.bash => script/upload (77%) diff --git a/script/build b/script/build new file mode 100755 index 0000000..f406105 --- /dev/null +++ b/script/build @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec docker-compose run compile diff --git a/script/server b/script/server new file mode 100755 index 0000000..8a95ee6 --- /dev/null +++ b/script/server @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +exec docker-compose up diff --git a/upload.bash b/script/upload similarity index 77% rename from upload.bash rename to script/upload index 6465938..153e3b3 100755 --- a/upload.bash +++ b/script/upload @@ -1,4 +1,4 @@ #!/bin/bash -rsync -av --delete output/ ros1.osuosl.org:/var/www/beta.ros.org --exclude .well-known \ No newline at end of file +rsync -av --delete output/ ros1.osuosl.org:/var/www/beta.ros.org --exclude .well-known From d7d377b70f23c081b1ddc1d36596c37b859ecfb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnaro=CC=88k?= Date: Wed, 18 Aug 2021 11:44:17 -0700 Subject: [PATCH 2/2] Add separate compile and compile/watch commands. --- docker-compose.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 16cb789..0608e29 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,13 @@ version: '3' services: compile: &default + build: . + command: bundle exec nanoc compile + volumes: + - .:/usr/src/ros + + compilewatch: + <<: *default build: . command: bundle exec nanoc compile -W volumes: