From 1cb61f344aa788096024067d8cc97a92b369ab49 Mon Sep 17 00:00:00 2001
From: Alastair Weakley <alastair@interaction.net.au>
Date: Tue, 15 Oct 2024 13:35:32 +1100
Subject: [PATCH] Update `yq` version

---
 Dockerfile   | 3 +--
 bin/nginx.sh | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ad8746f..793acee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,14 +20,13 @@ RUN apk update \
         nginx \
         py3-pip \
         tini \
+        yq \
     && rm -rf /var/cache/apk/*
 
 # Do NOT use dockerize 0.6.1 due to https://github.com/jwilder/dockerize/issues/125
 ENV DOCKERIZE_VERSION=0.6.0
 RUN wget -nv -O - "https://github.com/jwilder/dockerize/releases/download/v${DOCKERIZE_VERSION}/dockerize-linux-${DOCKERIZE_ARCH}-v${DOCKERIZE_VERSION}.tar.gz" | tar -xz -C /usr/local/bin/ -f -
 
-RUN --mount=type=cache,id=nginx-proxy-redirect,target=/root/.cache/pip pip install --no-cache-dir yq
-
 ENV PATH="/opt/nginx-proxy-redirect/bin:$PATH"
 
 EXPOSE 80
diff --git a/bin/nginx.sh b/bin/nginx.sh
index c2f3315..1a70e50 100755
--- a/bin/nginx.sh
+++ b/bin/nginx.sh
@@ -6,6 +6,6 @@ if [[ ! -f /opt/nginx-proxy-redirect/data/config.yml ]]; then
 	cp /opt/nginx-proxy-redirect/config.yml.example /opt/nginx-proxy-redirect/data/config.yml
 fi
 
-export CONFIG="$(yq . /opt/nginx-proxy-redirect/data/config.yml)"
+export CONFIG="$(yq -oj . /opt/nginx-proxy-redirect/data/config.yml)"
 dockerize -template /opt/nginx-proxy-redirect/etc/nginx.tmpl.conf:/opt/nginx-proxy-redirect/data/nginx.conf
 exec nginx -c /opt/nginx-proxy-redirect/data/nginx.conf "$@"