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 4d1e34a Docker fixes
4d1e34a is described below
commit 4d1e34a6e92739ad540be63e5205b48a2c0cdf0e
Author: Sam Ruby <[email protected]>
AuthorDate: Tue Feb 25 17:27:53 2020 -0500
Docker fixes
---
Rakefile | 2 +-
docker/Dockerfile | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Rakefile b/Rakefile
index 2218190..b7b2c2a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -111,7 +111,6 @@ task :config do
require 'whimsy/asf/config'
require 'whimsy/asf/git'
require 'whimsy/asf/svn'
- require 'whimsy/asf/ldap'
end
namespace :svn do
@@ -417,6 +416,7 @@ namespace :docker do
task :entrypoint => [:scaffold, :config] do
# requires :config
+ require 'whimsy/asf/ldap'
unless File.read(File.join(ASF::ETCLDAP,'ldap.conf')).include?
'asf-ldap-client.pem'
sh 'ruby -I lib -r whimsy/asf -e "ASF::LDAP.configure"'
end
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 042d09f..950f050 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -35,6 +35,7 @@ RUN apt-get update && \
apache2-dev \
libapr1-dev \
libaprutil1-dev && \
+ gem update --system &&\
gem install bundler passenger --install_dir=/var/lib/gems/2.5.0 && \
passenger-install-apache2-module --auto && \
passenger-install-apache2-module --snippet > \
