This is an automated email from the ASF dual-hosted git repository.
rubys 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 2272311 sync svn version with macOS
2272311 is described below
commit 2272311e7cbf192e6da59803d32292d78139ca2b
Author: Sam Ruby <[email protected]>
AuthorDate: Tue Nov 19 12:33:01 2019 -0500
sync svn version with macOS
---
DOCKER.md | 14 +++++++++++++-
docker/Dockerfile | 9 +++++++--
docker/docker-compose.yaml | 10 ++++++++--
3 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/DOCKER.md b/DOCKER.md
index 81e2076..a442b7f 100644
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -26,7 +26,19 @@ noticeably slower than a native (non-container) installation
of whimsy.
Installation instructions
-------------------------
-* Create an empty directory (do not use an existing checkout of Whimsy)
+* Create an empty directory. Note: while you _can_ use an existing clone of
+ Whimsy (and in particular, you _may_ be able to use the `/srv` directories
+ defined by the [macOS](MACOSX.md) instructions), be aware of the following:
+ * Files in the parent directory of the Whimsy clone may be created,
+ overwritten, or deleted by this process.
+ * Should the `svn` and `git` directories in this directory contain
+ checkouts/clones made by the host operating system, it is imperative that
+ the [file system
+ format](https://www.visualsvn.com/support/topic/00135/#FilesystemFormat)
+ of the repository manager format used by the host machine matches the
+ format used by the container. Currently macOS Catalina/Xcode provides
+ svn 1.10.4 and the Dockerfile downloads the latest 1.10 version
+ (currently 1.10.6).
* `cd` into that directory
* `git clone [email protected]:apache/whimsy.git` (or alternately
`git clone https://github.com/apache/whimsy.git`)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 75b1ef0..b2afcd9 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,8 +3,12 @@ ENV GEM_HOME="/srv/gems" \
LANG=C.UTF-8 \
LC_ALL=C.UTF-8
RUN apt-get update && \
- apt-get install -y curl && \
+ apt-get install -y curl software-properties-common apt-utils && \
curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
+ echo "deb http://opensource.wandisco.com/ubuntu bionic svn110" > \
+ /etc/apt/sources.list.d/subversion.list && \
+ curl -sL http://opensource.wandisco.com/wandisco-debian-new.gpg | \
+ apt-key add - &&\
apt-get update && \
DEBIAN_FRONTEND='noninteractive' apt-get install -y \
apache2 \
@@ -31,7 +35,8 @@ RUN apt-get update && \
libaprutil1-dev && \
gem install bundler passenger --install_dir=/var/lib/gems/2.5.0 && \
passenger-install-apache2-module --auto && \
- passenger-install-apache2-module --snippet >
/etc/apache2/conf-enabled/passenger.conf && \
+ passenger-install-apache2-module --snippet > \
+ /etc/apache2/conf-enabled/passenger.conf && \
pip3 install img2pdf && \
a2enmod cgi && \
a2enmod headers && \
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index d568bc6..2c098ce 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -5,10 +5,16 @@ services:
build: .
ports:
- "1999:80"
- networks:
- - default
volumes:
- ../..:/srv
- $HOME/.subversion:/root/.subversion
- $HOME/.gitconfig:/root/.gitconfig
- $HOME/.ssh:/root/.ssh
+ ws:
+ image: whimsy-web
+ build: .
+ volumes:
+ - ../..:/srv
+ command: /usr/bin/ruby /srv/whimsy/www/board/agenda/daemon/wss.rb
+ expose:
+ - "34234"
