[whimsy] branch master updated: Docco

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new ab6b000  Docco
ab6b000 is described below

commit ab6b000afec5eb91ffeccc481664ed113347a9f0
Author: Sebb <se...@apache.org>
AuthorDate: Sat Oct 24 17:25:07 2020 +0100

    Docco
---
 Rakefile                   | 2 +-
 docker/docker-compose.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index a5fd7cd..c74edf2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -372,7 +372,7 @@ end
 namespace :docker do
   task :build => ['docker/work/whimsy.conf', 'docker/work/25-authz_ldap_group_membership.conf'] do
     Dir.chdir File.join(__dir__, 'docker') do
-      sh 'docker-compose build web'
+      sh 'docker-compose build web' # name 'web' must agree with services entry in docker-compose.yaml
     end
   end
 
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 175d71b..ed405ff 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -1,6 +1,6 @@
 version: '3'
 services:
-  web:
+  web: # must agree with Rakefile
     image: whimsy-web
     build: .
     ports: