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 b4d6016 Not needed ?
b4d6016 is described below
commit b4d6016adfd08e28551f4454136a33263b8e7485
Author: Sebb <[email protected]>
AuthorDate: Fri Aug 6 14:53:26 2021 +0100
Not needed ?
---
Rakefile | 35 ++++++++++++++++++-----------------
docker-compose.yaml | 6 ++++--
2 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/Rakefile b/Rakefile
index 715d8a6..3ce9de6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -389,24 +389,25 @@ namespace :docker do
# cannot depend on :config
# It runs in container, and needs to occur first
task :scaffold do
+ # https://github.com/apache/whimsy/issues/119 - not needed AFAICT
# set up symlinks from /root to user's home directory
- home = ENV['HOST_HOME']
- if home and File.exist? home
- %w(.ssh .subversion).each do |mount|
- root_mount = File.join("/root", mount)
- home_mount = File.join(home, mount)
- if File.exist? root_mount
- if File.symlink? root_mount
- next if File.realpath(root_mount) == home_mount
- rm_f root_mount
- else
- rm_rf root_mount
- end
- end
-
- symlink home_mount, root_mount
- end
- end
+ # home = ENV['HOST_HOME']
+ # if home and File.exist? home
+ # %w(.ssh .subversion).each do |mount|
+ # root_mount = File.join("/root", mount)
+ # home_mount = File.join(home, mount)
+ # if File.exist? root_mount
+ # if File.symlink? root_mount
+ # next if File.realpath(root_mount) == home_mount
+ # rm_f root_mount
+ # else
+ # rm_rf root_mount
+ # end
+ # end
+ #
+ # symlink home_mount, root_mount
+ # end
+ # end
# This should already exist, but just in case
mkdir_p? '/srv/whimsy/www/members'
diff --git a/docker-compose.yaml b/docker-compose.yaml
index e8daa0d..b61f118 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -9,5 +9,7 @@ services:
- "HOST_HOME=$HOME"
volumes:
- ..:/srv
- - $HOME/.subversion:/$HOME/.subversion
- - $HOME/.ssh:/$HOME/.ssh
+# https://github.com/apache/whimsy/issues/119
+# These don't appear to be needed
+# - $HOME/.subversion:/$HOME/.subversion
+# - $HOME/.ssh:/$HOME/.ssh
