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 fef8928  Add support for CLI aliases etc
fef8928 is described below

commit fef89289119e892a652c0d15087ec718ba29cafe
Author: Sebb <[email protected]>
AuthorDate: Fri Aug 6 21:28:45 2021 +0100

    Add support for CLI aliases etc
---
 DOCKER.md | 5 ++++-
 Rakefile  | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/DOCKER.md b/DOCKER.md
index 1f8d84d..a916f01 100644
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -62,6 +62,7 @@ Installation instructions
 * `echo ":root: ." >.whimsy`
 * `git clone [email protected]:apache/whimsy.git` OR
 * `git clone https://github.com/apache/whimsy.git` (whichever works best for 
you)
+* `create .bash_aliases` if required - this will be picked up by the root user
 * `cd whimsy`
 * Start Docker if necessary: `$ open /Applications/Docker.app`
 * `rake docker:update` # this runs docker:build and updates any Gems
@@ -88,7 +89,7 @@ The container does not automatically update these (unlike the 
live installation)
 so the step should be performed as necessary before starting the container to 
ensure the
 data is sufficiently up-to-date.
 
-This should be enough to get the board agenda tool to launch.  It is not
+This should be enough to get most of Whimsy working.  It is not
 known yet what functions work and what functions do not.
 
 Installation layout
@@ -97,6 +98,8 @@ The `docker/docker-compose.yml` has the following mounts:
 
 container path      host path
 /srv                directory chosen in step 1
+
+These are currently disabled, see https://github.com/apache/whimsy/issues/119
 /root/.subversion   $HOME/.subversion
 /root/.ssh          $HOME/.ssh
 
diff --git a/Rakefile b/Rakefile
index 3ce9de6..0ef9451 100644
--- a/Rakefile
+++ b/Rakefile
@@ -431,6 +431,11 @@ namespace :docker do
     mkdir_p? '/srv/mail/secretary'
     # there may be more
 
+    # add support for CLI use
+    unless File.exist? '/root/.bash_aliases'
+      ln_s '/srv/.bash_aliases', '/root/.bash_aliases'
+    end
+
   end
 
   # This is the entrypoint in the Dockerfile so runs in the container

Reply via email to