v2.0.0 (#13)

Major updates
* Using latest base image
* Simplifying Dockerfile and using bcg-install with install script
* Moving templates directory
* Using new BCG_E
* Namespacing environment variables

Minor updates
* Consolidating attributes files

Documentation updates
* Making comments more consistent
* Updates to README

Build updates
* Updating build definitions

Author: bfren

.github/workflows/build-dev.yml

@@ -2,10 +2,15 @@ name: build-dev
 
 on:
   push:
-    branches:
-      - '**'
+    branches-ignore:
+      - 'main'
     tags-ignore:
       - '**'
+    paths:
+      - '.github/workflows/build-dev.yml'
+      - 'overlay/**'
+      - 'Dockerfile'
+      - 'VERSION'
 
 jobs:
   main:
@@ -14,6 +19,12 @@ jobs:
       -
         name: Checkout code
         uses: actions/checkout@v2
+      -
+        name: Read image version
+        uses: bencgreen/read-file-action@v1
+        with:
+          path: ./VERSION
+        id: version
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -35,6 +46,7 @@ jobs:
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |
             bcgdesign/nginx-webdav:dev
+            bcgdesign/nginx-webdav:${{ steps.version.outputs.content }}
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/build-main.yml

@@ -9,6 +9,7 @@ on:
     paths:
       - '.github/workflows/build-main.yml'
       - 'overlay/**'
+      - 'Dockerfile'
       - 'VERSION'
 
 jobs:

Dockerfile

@@ -1,23 +1,18 @@
-FROM bcgdesign/nginx:alpine-3.13-1.4.2
+FROM bcgdesign/nginx:alpine-3.13-2.0.0
 
 LABEL maintainer="Ben Green <[email protected]>" \
     org.label-schema.name="Nginx WebDAV" \
     org.label-schema.version="latest" \
     org.label-schema.vendor="Ben Green" \
     org.label-schema.schema-version="1.0"
 
-ARG NGINX_VERSION
-
 ENV \
     # set to "r" or "rw" to enable read-only / read-write access
-    DAV_ACCESS="r" \
+    WEBDAV_ACCESS="r" \
     # set to "PUT DELETE MKCOL COPY MOVE" (or any variation) to enable full write access
-    DAV_METHODS="off"
-
-ARG NGINX_VERSION=1.18.0-r13
-RUN apk -U upgrade \
-    && apk add \
-        nginx-mod-http-dav-ext=${NGINX_VERSION} \
-    && rm -rf /var/cache/apk/* /www/* /tmp/*
+    WEBDAV_METHODS="off"
 
 COPY ./overlay /
+COPY ./NGINX_BUILD /tmp/VERSION
+
+RUN bcg-install

Dockerfile-automated

@@ -10,9 +10,9 @@ ARG NGINX_VERSION
 
 ENV \
     # set to "r" or "rw" to enable read-only / read-write access
-    DAV_ACCESS="r" \
+    WEBDAV_ACCESS="r" \
     # set to "PUT DELETE MKCOL COPY MOVE" (or any variation) to enable full write access
-    DAV_METHODS="off"
+    WEBDAV_METHODS="off"
 
 ARG NGINX_VERSION=1.18.0-r13
 RUN apk -U upgrade \

NGINX_BUILD

@@ -0,0 +1 @@
+1.18.0-r13

README.md

@@ -20,10 +20,10 @@ By default files are served read-only - change two environment variables to enab
 
 ## Environment Variables
 
-| Variable      | Values      | Description                                                | Default |
-| ------------- | ----------- | ---------------------------------------------------------- | ------- |
-| `DAV_ACCESS`  | 'r' or 'rw' | Set to 'r' for read-only or 'rw' for read/write access.    | r       |
-| `DAV_METHODS` | string      | For full write access set to 'PUT DELETE MKCOL COPY MOVE'. | off     |
+| Variable         | Values      | Description                                                | Default |
+| ---------------- | ----------- | ---------------------------------------------------------- | ------- |
+| `WEBDAV_ACCESS`  | 'r' or 'rw' | Set to 'r' for read-only or 'rw' for read/write access.    | r       |
+| `WEBDAV_METHODS` | string      | For full write access set to 'PUT DELETE MKCOL COPY MOVE'. | off     |
 
 ## Authors
 

VERSION

@@ -1 +1 @@
-1.4.1
+2.0.0

overlay/etc/templates/localhost.conf.esh renamed to overlay/etc/bcg/templates/localhost.conf.esh

@@ -2,13 +2,13 @@ server {
     listen                          80;
     listen                          [::]:80;
 
-    root                            /www;
+    root                            <%= ${NGINX_WWW} %>;
 
     autoindex                       on;
 
-    dav_access                      all:<%= "${DAV_ACCESS}" %>;
-    dav_methods                     <%= "${DAV_METHODS}" %>;
-    dav_ext_methods                 PROPFIND OPTIONS;
+    dav_access                      all:<%= "${WEBDAV_ACCESS}" %>;
+    dav_methods                     <%= "${WEBDAV_METHODS}" %>;
+    dav_ext_methods                 <%= "${WEBDAV_EXT_METHODS}" %>;
 
     client_body_temp_path           /tmp;
 

overlay/etc/cont-init.d/20-env

@@ -0,0 +1,11 @@
+#!/usr/bin/with-contenv sh
+
+set -euo pipefail
+export BCG_E=`basename ${0}`
+
+
+#======================================================================================================================
+# Add environment variables.
+#======================================================================================================================
+
+bcg-env "WEBDAV_EXT_METHODS" "PROPFIND OPTIONS"

overlay/etc/cont-init.d/20-config renamed to overlay/etc/cont-init.d/21-config

@@ -1,13 +1,14 @@
 #!/usr/bin/with-contenv sh
 
 set -euo pipefail
+export BCG_E=`basename ${0}`
 
 
 #======================================================================================================================
-# Config is re-written every time in case environment variables have been changed
+# Config is re-written every time in case environment variables have been changed.
 #======================================================================================================================
 
 bcg-echo "Writing Nginx WebDAV config..."
-esh -o /etc/nginx/sites/localhost.conf \
-    /etc/templates/localhost.conf.esh
+esh -o ${NGINX_LOCALHOST_CONF} \
+    ${BCG_TEMPLATES}/localhost.conf.esh
 bcg-done

overlay/etc/fix-attrs.d/12-www renamed to overlay/etc/fix-attrs.d/11-nginx-www

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -euo pipefail
+export BCG_E=`basename ${0}`
+
+
+#======================================================================================================================
+# Get Nginx Version.
+#======================================================================================================================
+
+cd /tmp
+
+VERSION=$(cat VERSION)
+bcg-debug "Nginx version ${VERSION}."
+
+
+#======================================================================================================================
+# Install Nginx WebDAV extension and dependencies.
+#======================================================================================================================
+
+bcg-echo "Installing Nginx v${VERSION} WebDAV extension..."
+apk add --no-cache \
+    nginx-mod-http-dav-ext=${VERSION}
+bcg-done