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 da537a16 Give docker its own config directory
da537a16 is described below
commit da537a161d1bd2114adc457345898fd70b70d970
Author: Sebb <[email protected]>
AuthorDate: Wed Apr 20 00:36:57 2022 +0100
Give docker its own config directory
---
.dockerignore | 4 +---
Dockerfile | 6 +++---
{config => docker-config}/25-authz_ldap_group_membership.conf | 0
docker-config/README.txt | 5 +++++
{config => docker-config}/gitconfig-www | 0
{config => docker-config}/whimsy.conf | 0
6 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/.dockerignore b/.dockerignore
index 3ed07bd5..9084bda8 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,6 +2,4 @@
**
# Allow what we want
-!config/whimsy.conf
-!config/25-authz_ldap_group_membership.conf
-!config/gitconfig-www
+!docker-config/**
diff --git a/Dockerfile b/Dockerfile
index 0b34c4bc..465fd6f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -81,11 +81,11 @@ 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
# 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
+COPY docker-config/whimsy.conf /etc/apache2/sites-enabled/000-default.conf
+COPY docker-config/25-authz_ldap_group_membership.conf
/etc/apache2/conf-enabled/25-authz_ldap_group_membership.conf
# Allow www-data user to use Git repo owned by root
-COPY config/gitconfig-www /var/www/.gitconfig
+COPY docker-config/gitconfig-www /var/www/.gitconfig
# disable security check and telemetry
RUN sed -i -e '$i PassengerDisableSecurityUpdateCheck on'
/etc/apache2/conf-enabled/passenger.conf
diff --git a/config/25-authz_ldap_group_membership.conf
b/docker-config/25-authz_ldap_group_membership.conf
similarity index 100%
rename from config/25-authz_ldap_group_membership.conf
rename to docker-config/25-authz_ldap_group_membership.conf
diff --git a/docker-config/README.txt b/docker-config/README.txt
new file mode 100644
index 00000000..f6eb7311
--- /dev/null
+++ b/docker-config/README.txt
@@ -0,0 +1,5 @@
+This directory is for files to be copied into the Docker build.
+
+Other non-Docker config files remain in the config directory.
+
+This should reduce the need to update the .dockerignore file
diff --git a/config/gitconfig-www b/docker-config/gitconfig-www
similarity index 100%
rename from config/gitconfig-www
rename to docker-config/gitconfig-www
diff --git a/config/whimsy.conf b/docker-config/whimsy.conf
similarity index 100%
rename from config/whimsy.conf
rename to docker-config/whimsy.conf
