Merge branch 'webdav'

.gitlab-ci.yml

@@ -116,3 +116,19 @@ push-sleep:
   needs:
     - job: build-sleep
       artifacts: true
+
+# webdav image:
+
+build-webdav:
+  extends: .container-build
+  variables:
+    CONTEXT: webdav
+
+push-webdav:
+  extends: .container-push
+  variables:
+    CONTEXT: webdav
+    IMAGE: webdav
+  needs:
+    - job: build-webdav
+      artifacts: true

httpd/bullseye/Dockerfile

 FROM registry.hub.docker.com/library/debian:bullseye-slim
+ENV APACHE_RUN_DIR=/run/apache2 \
+    APACHE_LOCK_DIR=/var/lock/apache2 \
+    APACHE_LOG_DIR=/var/log/apache2 \
+    APACHE_RUN_USER=www-data \
+    APACHE_RUN_GROUP=www-data \
+    APACHE_PID_FILE=/run/apache2/apache2.pid
 # hadolint ignore=DL3008,DL3015
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
@@ -9,17 +15,13 @@ RUN apt-get update && \
     setcap CAP_NET_BIND_SERVICE=+ep /usr/sbin/apache2 && \
     DEBIAN_FRONTEND=noninteractive apt-get purge --auto-remove -y libcap2-bin && \
     a2enmod status && \
-    install -d -o www-data -g www-data -m 755 /run/apache2 && \
-    install -d -o www-data -g www-data -m 755 /var/log/apache2 && \
-    ln -sf /dev/stdout /var/log/apache2/access.log && \
-    ln -sf /dev/stderr /var/log/apache2/error.log && \
-    ln -sf /dev/stdout /var/log/apache2/other_vhosts_access.log && \
+    install -d -o "$APACHE_RUN_USER" -g "$APACHE_RUN_GROUP" -m 755 "$APACHE_RUN_DIR" && \
+    install -d -o "$APACHE_RUN_USER" -g "$APACHE_RUN_GROUP" -m 755 "$APACHE_LOCK_DIR" && \
+    install -d -o "$APACHE_RUN_USER" -g "$APACHE_RUN_GROUP" -m 755 "$APACHE_LOG_DIR" && \
+    ln -sf /dev/stdout "$APACHE_LOG_DIR/access.log" && \
+    ln -sf /dev/stderr "$APACHE_LOG_DIR/error.log" && \
+    ln -sf /dev/stdout "$APACHE_LOG_DIR/other_vhosts_access.log" && \
     rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/*
-ENV APACHE_RUN_DIR=/run/apache2 \
-    APACHE_LOG_DIR=/var/log/apache2 \
-    APACHE_RUN_USER=www-data \
-    APACHE_RUN_GROUP=www-data \
-    APACHE_PID_FILE=/run/apache2/apache2.pid
 RUN apache2 -t
 EXPOSE 80
 CMD [ "apache2", "-DFOREGROUND" ]

httpd/buster/Dockerfile

 FROM registry.hub.docker.com/library/debian:buster-slim
+ENV APACHE_RUN_DIR=/run/apache2 \
+    APACHE_LOCK_DIR=/var/lock/apache2 \
+    APACHE_LOG_DIR=/var/log/apache2 \
+    APACHE_RUN_USER=www-data \
+    APACHE_RUN_GROUP=www-data \
+    APACHE_PID_FILE=/run/apache2/apache2.pid
 # hadolint ignore=DL3008,DL3015
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
@@ -9,17 +15,13 @@ RUN apt-get update && \
     setcap CAP_NET_BIND_SERVICE=+ep /usr/sbin/apache2 && \
     DEBIAN_FRONTEND=noninteractive apt-get purge --auto-remove -y libcap2-bin && \
     a2enmod status && \
-    install -d -o www-data -g www-data -m 755 /run/apache2 && \
-    install -d -o www-data -g www-data -m 755 /var/log/apache2 && \
-    ln -sf /dev/stdout /var/log/apache2/access.log && \
-    ln -sf /dev/stderr /var/log/apache2/error.log && \
-    ln -sf /dev/stdout /var/log/apache2/other_vhosts_access.log && \
+    install -d -o "$APACHE_RUN_USER" -g "$APACHE_RUN_GROUP" -m 755 "$APACHE_RUN_DIR" && \
+    install -d -o "$APACHE_RUN_USER" -g "$APACHE_RUN_GROUP" -m 755 "$APACHE_LOCK_DIR" && \
+    install -d -o "$APACHE_RUN_USER" -g "$APACHE_RUN_GROUP" -m 755 "$APACHE_LOG_DIR" && \
+    ln -sf /dev/stdout "$APACHE_LOG_DIR/access.log" && \
+    ln -sf /dev/stderr "$APACHE_LOG_DIR/error.log" && \
+    ln -sf /dev/stdout "$APACHE_LOG_DIR/other_vhosts_access.log" && \
     rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* /var/cache/apt/archives/*
-ENV APACHE_RUN_DIR=/run/apache2 \
-    APACHE_LOG_DIR=/var/log/apache2 \
-    APACHE_RUN_USER=www-data \
-    APACHE_RUN_GROUP=www-data \
-    APACHE_PID_FILE=/run/apache2/apache2.pid
 RUN apache2 -t
 EXPOSE 80
 CMD [ "apache2", "-DFOREGROUND" ]

webdav/.dockerignore

+*
+!webdav.conf
+!webdav-readonly.conf

webdav/Dockerfile

+FROM registry.shore.co.il/httpd:bullseye
+USER root
+RUN a2enmod dav && \
+    a2enmod dav_fs && \
+    a2enmod dav_lock && \
+    install -d -m 750 -o root -g www-data /var/www/webdav && \
+    rm -rf /tmp/* /var/tmp/*
+COPY --chown=root:root webdav.conf /etc/apache2/conf-enabled/
+COPY --chown=root:root webdav-readonly.conf /etc/apache2/conf-enabled/
+USER www-data
+RUN apache2 -t

webdav/README.md

+# WebDAV container image
+
+Apache2 with WebDAV enabled and configured.
+
+## Usage
+
+The directory that is shared is `/var/www/webdav`, so mount something there.
+
+```
+docker run -v '/mnt/foo:/var/www/webdav' -p 80:80 registry.shore.co.il/webdav
+```
+
+This image allows read-only access by default. If you want to change that build
+your own image and delete `/etc/apache2/conf-enabled/webdav-readonly.conf` like
+so:
+
+```
+FROM registry.shore.co.il/webdav
+USER root
+RUN rm /etc/apache2/conf-enabled/webdav-readonly.conf
+USER www-data
+```

webdav/webdav-readonly.conf

+# vim: ft=apache
+<Directory /var/www/webdav>
+    Require method GET OPTIONS PROPFIND
+</Directory>

webdav/webdav.conf

+# vim: ft=apache
+
+Alias /webdav /var/www/webdav
+RedirectMatch "^/$" /webdav
+
+<Location /webdav>
+    Dav On
+</Location>