From 57415949d9d01b5f82003b4035c8c56cd7199459 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Thu, 26 May 2022 15:56:22 +0100 Subject: [PATCH] Try and always get the latest version for the latest branch --- Dockerfile | 5 +++-- Dockerfile.aarch64 | 5 +++-- Dockerfile.armhf | 5 +++-- jenkins-vars.yml | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 03cb84c..54753da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,8 +47,9 @@ RUN \ echo "**** install phpmyadmin ****" && \ mkdir -p /app/phpmyadmin && \ if [ -z ${PHPMYADMIN_VERSION+x} ]; then \ - PHPMYADMIN_VERSION=$(curl -sX GET "https://api.github.com/repos/phpmyadmin/phpmyadmin/releases" \ - | jq -r 'first(.[] | select(.name | startswith("5.2")) | select (.prerelease==false)) | .name'); \ + PHPMYADMIN_VERSION=$(curl -sX GET 'https://api.github.com/repos/phpmyadmin/phpmyadmin/releases' \ + | jq -r '.[] | select (.prerelease==false)' \ + | jq -rs 'max_by(.name | split(".") | map(tonumber)) | .name'); \ fi && \ curl -s -o \ /tmp/phpmyadmin.tar.xz -L \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 115efe1..61cd838 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -47,8 +47,9 @@ RUN \ echo "**** install phpmyadmin ****" && \ mkdir -p /app/phpmyadmin && \ if [ -z ${PHPMYADMIN_VERSION+x} ]; then \ - PHPMYADMIN_VERSION=$(curl -sX GET "https://api.github.com/repos/phpmyadmin/phpmyadmin/releases" \ - | jq -r 'first(.[] | select(.name | startswith("5.2")) | select (.prerelease==false)) | .name'); \ + PHPMYADMIN_VERSION=$(curl -sX GET 'https://api.github.com/repos/phpmyadmin/phpmyadmin/releases' \ + | jq -r '.[] | select (.prerelease==false)' \ + | jq -rs 'max_by(.name | split(".") | map(tonumber)) | .name'); \ fi && \ curl -s -o \ /tmp/phpmyadmin.tar.xz -L \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 436c17a..b9b15a2 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -47,8 +47,9 @@ RUN \ echo "**** install phpmyadmin ****" && \ mkdir -p /app/phpmyadmin && \ if [ -z ${PHPMYADMIN_VERSION+x} ]; then \ - PHPMYADMIN_VERSION=$(curl -sX GET "https://api.github.com/repos/phpmyadmin/phpmyadmin/releases" \ - | jq -r 'first(.[] | select(.name | startswith("5.2")) | select (.prerelease==false)) | .name'); \ + PHPMYADMIN_VERSION=$(curl -sX GET 'https://api.github.com/repos/phpmyadmin/phpmyadmin/releases' \ + | jq -r '.[] | select (.prerelease==false)' \ + | jq -rs 'max_by(.name | split(".") | map(tonumber)) | .name'); \ fi && \ curl -s -o \ /tmp/phpmyadmin.tar.xz -L \ diff --git a/jenkins-vars.yml b/jenkins-vars.yml index a85b04d..cce248f 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,7 +3,7 @@ # jenkins variables project_name: docker-phpmyadmin external_type: na -custom_version_command: "curl -sX GET 'https://api.github.com/repos/phpmyadmin/phpmyadmin/releases' | jq -r 'first(.[] | select(.name | startswith(\"5.2\")) | select (.prerelease==false)) | .name'" +custom_version_command: "curl -sX GET 'https://api.github.com/repos/phpmyadmin/phpmyadmin/releases' | jq -r '.[] | select (.prerelease==false)' | jq -rs 'max_by(.name | split(\".\") | map(tonumber)) | .name'" release_type: stable release_tag: latest ls_branch: main