Check upstream image every 6h.

.dockerignore

@@ -1,5 +1,3 @@
 .gitignore
 example/
-arch.txt
-buildx.sh
 readme.md

.gitignore

@@ -1,2 +1 @@
-arch.txt
+
-buildx.sh

Dockerfile

@@ -1,8 +1,8 @@
-FROM alpine:latest
+FROM nginx:alpine-perl
 
-RUN apk add --upgrade --no-cache nginx gettext inotify-tools \
+RUN apk add --upgrade --no-cache bash gettext inotify-tools
- && mv /etc/nginx /etc/nginx.tmpl \
+RUN mv /etc/nginx /etc/nginx.tmpl
- && touch /etc/envsubst.conf
+RUN touch /etc/envsubst.conf
 
 COPY start-nginx.sh /usr/local/bin/
 

ci/pipeline.yml

@@ -0,0 +1,85 @@
+---
+resources:
+- name: source
+  type: git
+  source:
+    uri: https://gitea.redxef.at/redxef/nginx-envsubst
+    branch: master
+    fetch_tags: true
+- name: upstream-image
+  type: registry-image
+  check_every: 6h
+  source:
+    repository: nginx
+    tag: alpine
+- name: image
+  type: oci-image
+  source:
+    repository: redxef/nginx-envsubst
+    tag: latest
+    username: ((docker.username))
+    password: ((docker.password))
+
+resource_types:
+- name: oci-image
+  type: registry-image
+  source:
+    repository: redxef/concourse-oci-resource
+    tag: latest
+
+jobs:
+- name: build-push
+  plan:
+  - get: source
+    trigger: true
+  - get: upstream-image
+    trigger: true
+  - task: compute-docker-tags
+    config:
+      platform: linux
+      image_resource:
+        type: registry-image
+        source:
+          repository: alpine/git
+      inputs:
+      - name: source
+        path: .
+      outputs:
+      - name: docker-tags
+      run:
+        path: sh
+        args:
+        - -c
+        - |
+          #!/usr/bin/env sh
+          git rev-parse --short HEAD > docker-tags/tags.txt
+          git show-ref --tags | \
+              sed -n "/$(git rev-parse HEAD)/ s|$(git rev-parse HEAD).refs/tags/||gp" \
+              >> docker-tags/tags.txt
+  - task: build
+    privileged: true
+    config:
+      platform: linux
+      image_resource:
+        type: registry-image
+        source:
+          repository: redxef/concourse-buildkit
+      inputs:
+      - name: source
+        path: .
+      - name: docker-tags
+      outputs:
+      - name: build-output
+      params:
+        dest: build-output/image.tar
+        platform: aarch64,arm,i386,ppc64le,s390x,x86_64
+      run:
+        path: build
+  - put: image
+    inputs:
+    - build-output
+    - docker-tags
+    params:
+      image: build-output/image.tar
+      additional_tags: docker-tags/tags.txt
+

readme.md

@@ -3,7 +3,7 @@
 A simple docker image for configuring nginx with environment variables.
 
 ## Usage
-Mount you whole nginx configuration into /etc/nginx.tmpl.
+Mount you whole nginx configuration into `/etc/nginx.tmpl/`.
 The configuration files can contain environment variables compatible
 with `envsubst`, list these variables in a file `/etc/envsubst.conf`.
 Additionally, the server gets reloaded when a update to one of the
@@ -15,7 +15,7 @@ referenced certificates happens.
 cd example
 docker run --rm -it \
     -e DOMAIN_NAME=localhost \
-    -p 80:80 -p 443:443
+    -p 80:80 -p 443:443 \
     -v "$PWD/nginx.conf:/etc/nginx.tmpl/nginx.conf" \
     -v "$PWD/envsubst.conf:/etc/envsubst.conf" \
     -v "$PWD/cert:/cert" \
@@ -24,4 +24,4 @@ docker run --rm -it \
 
 ## Source
 
-(gitea.redxef.at/redxef/nginx-envsubst)[https://gitea.redxef.at/redxef/nginx-envsubst]
+[gitea.redxef.at/redxef/nginx-envsubst](https://gitea.redxef.at/redxef/nginx-envsubst)

start-nginx.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 pids=""
 
@@ -36,10 +36,16 @@ run_nginx() {
 }
 
 run_inotifywait() {
-    while find "$dstdir" -type f -exec \
+    while :; do
-        sed -En '/ssl_certificate/ s/^\s*ssl_certificate(_key)? (.*);.*$/\2/p' {} \; | sort | uniq | \
+        wait_files="$(find "$dstdir" -type f -exec \
-        inotifywait --fromfile=-; do
+            sed -En '/ssl_certificate/ s/^\s*ssl_certificate(_key)? (.*);.*$/\2/p' {} \; | sort -u)"
+        wait_directories="$(echo "$wait_files" | xargs -n 1 dirname | sort -u)"
+        echo "monitoring the following files:"
+        echo "$wait_files"
+        matched_files="$(echo "$wait_directories" | inotifywait --fromfile=- -e close_write -e modify -e create)"
+        if [[ -n "$(comm -12 <(sort -u <<< "$matched_files") <(echo "$wait_files"))" ]]; then
             nginx -s reload
+        fi
     done
 }