[whimsy] branch master updated: Simplify: move docker to top level

[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 d04a9cd  Simplify: move docker to top level
d04a9cd is described below

commit d04a9cd9135052c67bac73eed9f0ce1e112653bc
Author: Sebb <se...@apache.org>
AuthorDate: Wed Jul 28 13:38:56 2021 +0100

    Simplify: move docker to top level
---
 .dockerignore                                     |  6 ++++
 docker/Dockerfile => Dockerfile                   |  5 ++--
 Rakefile                                          | 34 +++++------------------
 docker/docker-compose.yaml => docker-compose.yaml |  2 +-
 4 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..512e8ef
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,6 @@
+# Ignore everything initially
+**
+
+# Allow what we want
+!config/whimsy.conf
+!config/25-authz_ldap_group_membership.conf
diff --git a/docker/Dockerfile b/Dockerfile
similarity index 90%
rename from docker/Dockerfile
rename to Dockerfile
index f42e4e1..9939573 100644
--- a/docker/Dockerfile
+++ b/Dockerfile
@@ -65,8 +65,9 @@ RUN DEBIAN_FRONTEND='noninteractive' apt-get install -y ldap-utils
 
 # This should be last, as the source is likely to change
 # It also takes very little time, so it does not matter if it has to be redone
-COPY work/whimsy.conf /etc/apache2/sites-enabled/000-default.conf
-COPY work/25-authz_ldap_group_membership.conf /etc/apache2/conf-enabled/25-authz_ldap_group_membership.conf
+# N.B. These files need to be allowed in the .dockerignore file
+COPY config/whimsy.conf /etc/apache2/sites-enabled/000-default.conf
+COPY config/25-authz_ldap_group_membership.conf /etc/apache2/conf-enabled/25-authz_ldap_group_membership.conf
 
 WORKDIR /srv/whimsy
 EXPOSE 80
diff --git a/Rakefile b/Rakefile
index a533dea..0bd383f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -372,30 +372,22 @@ end
 
 # Docker support
 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' # name 'web' must agree with services entry in docker-compose.yaml
-    end
+  task :build do
+    sh 'docker-compose build web' # name 'web' must agree with services entry in docker-compose.yaml
   end
 
   task :update => :build do
-    Dir.chdir File.join(__dir__, 'docker') do
-      sh 'docker-compose run  --entrypoint ' +
-        %('bash -c "rake docker:scaffold && rake update"') +
-        ' web'
-    end
+    sh 'docker-compose run  --entrypoint ' +
+      %('bash -c "rake docker:scaffold && rake update"') +
+      ' web'
   end
 
   task :up do
-    Dir.chdir File.join(__dir__, 'docker') do
-      sh 'docker-compose up'
-    end
+    sh 'docker-compose up'
   end
 
   task :exec do
-    Dir.chdir File.join(__dir__, 'docker') do
-      sh 'docker-compose exec web /bin/bash'
-    end
+    sh 'docker-compose exec web /bin/bash'
   end
 
   # cannot depend on :config
@@ -452,15 +444,3 @@ namespace :docker do
     sh 'apache2ctl -DFOREGROUND'
   end
 end
-
-file 'docker/work' do
-  mkdir_p 'docker/work'
-end
-
-file 'docker/work/whimsy.conf' => ['docker/work', 'config/whimsy.conf'] do
-  cp 'config/whimsy.conf', 'docker/work/whimsy.conf'
-end
-
-file 'docker/work/25-authz_ldap_group_membership.conf' => ['docker/work', 'config/25-authz_ldap_group_membership.conf'] do
-  cp 'config/25-authz_ldap_group_membership.conf', 'docker/work/25-authz_ldap_group_membership.conf'
-end
diff --git a/docker/docker-compose.yaml b/docker-compose.yaml
similarity index 93%
rename from docker/docker-compose.yaml
rename to docker-compose.yaml
index ed405ff..1602382 100644
--- a/docker/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -8,7 +8,7 @@ services:
     environment:
       - "HOST_HOME=$HOME"
     volumes:
-      - ../..:/srv
+      - ..:/srv
       - $HOME/.subversion:/$HOME/.subversion
       - $HOME/.gitconfig:/$HOME/.gitconfig
       - $HOME/.ssh:/$HOME/.ssh