From 10acf0394621efea232dc05d5ac2e016127ff9cd Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Fri, 23 Dec 2022 16:29:55 -0600
Subject: [PATCH] Rebase to 3.17

---
 Dockerfile         | 21 ++++++++++-----------
 Dockerfile.aarch64 | 21 ++++++++++-----------
 Dockerfile.armhf   | 21 ++++++++++-----------
 readme-vars.yml    |  1 +
 run-jq.sh          |  6 +++---
 run-xq.sh          |  6 +++---
 run-yq.sh          |  6 +++---
 7 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7577e60..370028c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -7,20 +9,17 @@ ARG YQ_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="nemchik"
 
-ARG PIP_ARGS="-U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.15/"
-
 RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    jq \
-    py3-pip \
     python3 && \
   echo "**** install app ****" && \
   if [ -z ${YQ_VERSION+x} ]; then \
-    YQ="yq"; \
-  else \
-    YQ="yq==${YQ_VERSION}"; \
+    YQ_VERSION=$(curl -sL  https://pypi.python.org/pypi/yq/json |jq -r '. | .info.version'); \
   fi && \
-  pip3 install ${PIP_ARGS} pip setuptools wheel && \
-  pip install ${PIP_ARGS} \
-    ${YQ}
+  python3 -m ensurepip && \
+  pip3 install -U --no-cache-dir \
+    pip \
+    wheel && \
+  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
+    yq=="${YQ_VERSION}"
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index d65b63c..3f906e5 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -7,20 +9,17 @@ ARG YQ_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="nemchik"
 
-ARG PIP_ARGS="-U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.15/"
-
 RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    jq \
-    py3-pip \
     python3 && \
   echo "**** install app ****" && \
   if [ -z ${YQ_VERSION+x} ]; then \
-    YQ="yq"; \
-  else \
-    YQ="yq==${YQ_VERSION}"; \
+    YQ_VERSION=$(curl -sL  https://pypi.python.org/pypi/yq/json |jq -r '. | .info.version'); \
   fi && \
-  pip3 install ${PIP_ARGS} pip setuptools wheel && \
-  pip install ${PIP_ARGS} \
-    ${YQ}
+  python3 -m ensurepip && \
+  pip3 install -U --no-cache-dir \
+    pip \
+    wheel && \
+  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
+    yq=="${YQ_VERSION}"
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 320f9e2..a102187 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -7,20 +9,17 @@ ARG YQ_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="nemchik"
 
-ARG PIP_ARGS="-U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.15/"
-
 RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    jq \
-    py3-pip \
     python3 && \
   echo "**** install app ****" && \
   if [ -z ${YQ_VERSION+x} ]; then \
-    YQ="yq"; \
-  else \
-    YQ="yq==${YQ_VERSION}"; \
+    YQ_VERSION=$(curl -sL  https://pypi.python.org/pypi/yq/json |jq -r '. | .info.version'); \
   fi && \
-  pip3 install ${PIP_ARGS} pip setuptools wheel && \
-  pip install ${PIP_ARGS} \
-    ${YQ}
+  python3 -m ensurepip && \
+  pip3 install -U --no-cache-dir \
+    pip \
+    wheel && \
+  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
+    yq=="${YQ_VERSION}"
diff --git a/readme-vars.yml b/readme-vars.yml
index 3f951c0..cddf2d3 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -150,6 +150,7 @@ full_custom_readme: |
 
   ## Versions
 
+  * **19.09.22:** - Rebase to 3.17.
   * **19.09.22:** - Rebase to 3.15.
   * **18.05.21:** - Rebase to 3.13. add linuxserver wheel repo.
   * **09.10.20:** - Fix run scripts evaluating `$` in cases where they should not (ex: inside single quotes). Please rerun the [Recommended method](https://github.com/linuxserver/docker-yq#recommended-method) install/setup commands.
diff --git a/run-jq.sh b/run-jq.sh
index dbfdb04..a1b7dd3 100644
--- a/run-jq.sh
+++ b/run-jq.sh
@@ -9,8 +9,8 @@
 # You can add additional volumes (or any docker run options) using
 # the ${JQ_OPTIONS} environment variable.
 #
-# You can set a specific image and tag, such as "ghcr.io/linuxserver/yq:2.11.1-ls1"
-# using the $YQ_IMAGE_TAG environment variable (defaults to "ghcr.io/linuxserver/yq:latest")
+# You can set a specific image and tag, such as "lscr.io/linuxserver/yq:2.11.1-ls1"
+# using the $YQ_IMAGE_TAG environment variable (defaults to "lscr.io/linuxserver/yq:latest")
 #
 
 set -e
@@ -29,4 +29,4 @@ fi
 DOCKER_RUN_OPTIONS="${DOCKER_RUN_OPTIONS} -i"
 
 # shellcheck disable=SC2086
-exec docker run --rm ${DOCKER_RUN_OPTIONS} ${JQ_OPTIONS} ${VOLUMES} -w "${PWD}" --entrypoint jq "${YQ_IMAGE_TAG:-ghcr.io/linuxserver/yq:latest}" "$@"
+exec docker run --rm ${DOCKER_RUN_OPTIONS} ${JQ_OPTIONS} ${VOLUMES} -w "${PWD}" --entrypoint jq "${YQ_IMAGE_TAG:-lscr.io/linuxserver/yq:latest}" "$@"
diff --git a/run-xq.sh b/run-xq.sh
index 6121b14..f60a72f 100644
--- a/run-xq.sh
+++ b/run-xq.sh
@@ -9,8 +9,8 @@
 # You can add additional volumes (or any docker run options) using
 # the ${XQ_OPTIONS} environment variable.
 #
-# You can set a specific image and tag, such as "ghcr.io/linuxserver/yq:2.11.1-ls1"
-# using the $YQ_IMAGE_TAG environment variable (defaults to "ghcr.io/linuxserver/yq:latest")
+# You can set a specific image and tag, such as "lscr.io/linuxserver/yq:2.11.1-ls1"
+# using the $YQ_IMAGE_TAG environment variable (defaults to "lscr.io/linuxserver/yq:latest")
 #
 
 set -e
@@ -29,4 +29,4 @@ fi
 DOCKER_RUN_OPTIONS="${DOCKER_RUN_OPTIONS} -i"
 
 # shellcheck disable=SC2086
-exec docker run --rm ${DOCKER_RUN_OPTIONS} ${XQ_OPTIONS} ${VOLUMES} -w "${PWD}" --entrypoint xq "${YQ_IMAGE_TAG:-ghcr.io/linuxserver/yq:latest}" "$@"
+exec docker run --rm ${DOCKER_RUN_OPTIONS} ${XQ_OPTIONS} ${VOLUMES} -w "${PWD}" --entrypoint xq "${YQ_IMAGE_TAG:-lscr.io/linuxserver/yq:latest}" "$@"
diff --git a/run-yq.sh b/run-yq.sh
index 0367111..3f80f54 100644
--- a/run-yq.sh
+++ b/run-yq.sh
@@ -9,8 +9,8 @@
 # You can add additional volumes (or any docker run options) using
 # the ${YQ_OPTIONS} environment variable.
 #
-# You can set a specific image and tag, such as "ghcr.io/linuxserver/yq:2.11.1-ls1"
-# using the $YQ_IMAGE_TAG environment variable (defaults to "ghcr.io/linuxserver/yq:latest")
+# You can set a specific image and tag, such as "lscr.io/linuxserver/yq:2.11.1-ls1"
+# using the $YQ_IMAGE_TAG environment variable (defaults to "lscr.io/linuxserver/yq:latest")
 #
 
 set -e
@@ -29,4 +29,4 @@ fi
 DOCKER_RUN_OPTIONS="${DOCKER_RUN_OPTIONS} -i"
 
 # shellcheck disable=SC2086
-exec docker run --rm ${DOCKER_RUN_OPTIONS} ${YQ_OPTIONS} ${VOLUMES} -w "${PWD}" --entrypoint yq "${YQ_IMAGE_TAG:-ghcr.io/linuxserver/yq:latest}" "$@"
+exec docker run --rm ${DOCKER_RUN_OPTIONS} ${YQ_OPTIONS} ${VOLUMES} -w "${PWD}" --entrypoint yq "${YQ_IMAGE_TAG:-lscr.io/linuxserver/yq:latest}" "$@"