mirror of
https://github.com/linuxserver/docker-yq.git
synced 2026-02-04 20:27:50 +08:00
Rebase to 3.17
This commit is contained in:
Eric Nemchik
parent
b46894d813
commit
10acf03946
21
Dockerfile
21
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}"
|
||||
|
||||
@ -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}"
|
||||
|
||||
@ -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}"
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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}" "$@"
|
||||
|
||||
@ -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}" "$@"
|
||||
|
||||
@ -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}" "$@"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user