diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index ec163ed..59d4ff4 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -18,7 +18,7 @@ jobs: fi echo "**** External trigger running off of main branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_PHPMYADMIN_MAIN\". ****" echo "**** Retrieving external version ****" - EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sX GET 'https://api.github.com/repos/phpmyadmin/phpmyadmin/releases/latest' | jq .name | sed -e 's/^"//' -e 's/"$//') + EXT_RELEASE=$(curl -u ${{ secrets.CR_USER }}:${{ secrets.CR_PAT }} -sX GET 'https://api.github.com/repos/phpmyadmin/phpmyadmin/releases' | jq -r 'first(.[] | select(.name | startswith("5"))) | .name') if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" FAILURE_REASON="Can't retrieve external version for phpmyadmin branch main" diff --git a/Dockerfile b/Dockerfile index 72cde4b..36fb3bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ ENV UPLOAD_LIMIT 8192K RUN \ apk add -U --upgrade --no-cache \ curl \ + jq \ php7-gd \ php7-bz2 \ php7-mysqli \ @@ -22,32 +23,32 @@ RUN \ php7-tokenizer \ php7-curl \ php7-zip && \ - { \ - echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=2'; \ - echo 'opcache.fast_shutdown=1'; \ - } > /etc/php7/conf.d/opcache-recommended.ini; \ - \ - { \ - echo 'session.cookie_httponly=1'; \ - echo 'session.use_strict_mode=1'; \ - } > /etc/php7/conf.d/session-strict.ini; \ - \ - { \ - echo 'allow_url_fopen=Off'; \ - echo 'max_execution_time=${MAX_EXECUTION_TIME}'; \ - echo 'max_input_vars=10000'; \ - echo 'memory_limit=${MEMORY_LIMIT}'; \ - echo 'post_max_size=${UPLOAD_LIMIT}'; \ - echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \ - } > /etc/php7/conf.d/phpmyadmin-misc.ini && \ + { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=2'; \ + echo 'opcache.fast_shutdown=1'; \ + } > /etc/php7/conf.d/opcache-recommended.ini; \ + \ + { \ + echo 'session.cookie_httponly=1'; \ + echo 'session.use_strict_mode=1'; \ + } > /etc/php7/conf.d/session-strict.ini; \ + \ + { \ + echo 'allow_url_fopen=Off'; \ + echo 'max_execution_time=${MAX_EXECUTION_TIME}'; \ + echo 'max_input_vars=10000'; \ + echo 'memory_limit=${MEMORY_LIMIT}'; \ + echo 'post_max_size=${UPLOAD_LIMIT}'; \ + echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \ + } > /etc/php7/conf.d/phpmyadmin-misc.ini && \ 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/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]' | cut -d'_' -f 2- | sed s/_/./g); \ + PHPMYADMIN_VERSION=$(curl -sX GET "https://api.github.com/repos/phpmyadmin/phpmyadmin/releases" \ + | jq -r 'first(.[] | select(.name | startswith("5"))) | .name'); \ fi && \ curl -s -o \ /tmp/phpmyadmin.tar.xz -L \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 0841cc1..38567bf 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -13,6 +13,7 @@ ENV UPLOAD_LIMIT 8192K RUN \ apk add -U --upgrade --no-cache \ curl \ + jq \ php7-gd \ php7-bz2 \ php7-mysqli \ @@ -22,32 +23,32 @@ RUN \ php7-tokenizer \ php7-curl \ php7-zip && \ - { \ - echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=2'; \ - echo 'opcache.fast_shutdown=1'; \ - } > /etc/php7/conf.d/opcache-recommended.ini; \ - \ - { \ - echo 'session.cookie_httponly=1'; \ - echo 'session.use_strict_mode=1'; \ - } > /etc/php7/conf.d/session-strict.ini; \ - \ - { \ - echo 'allow_url_fopen=Off'; \ - echo 'max_execution_time=${MAX_EXECUTION_TIME}'; \ - echo 'max_input_vars=10000'; \ - echo 'memory_limit=${MEMORY_LIMIT}'; \ - echo 'post_max_size=${UPLOAD_LIMIT}'; \ - echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \ - } > /etc/php7/conf.d/phpmyadmin-misc.ini && \ + { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=2'; \ + echo 'opcache.fast_shutdown=1'; \ + } > /etc/php7/conf.d/opcache-recommended.ini; \ + \ + { \ + echo 'session.cookie_httponly=1'; \ + echo 'session.use_strict_mode=1'; \ + } > /etc/php7/conf.d/session-strict.ini; \ + \ + { \ + echo 'allow_url_fopen=Off'; \ + echo 'max_execution_time=${MAX_EXECUTION_TIME}'; \ + echo 'max_input_vars=10000'; \ + echo 'memory_limit=${MEMORY_LIMIT}'; \ + echo 'post_max_size=${UPLOAD_LIMIT}'; \ + echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \ + } > /etc/php7/conf.d/phpmyadmin-misc.ini && \ 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/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]' | cut -d'_' -f 2- | sed s/_/./g); \ + PHPMYADMIN_VERSION=$(curl -sX GET "https://api.github.com/repos/phpmyadmin/phpmyadmin/releases" \ + | jq -r 'first(.[] | select(.name | startswith("5"))) | .name'); \ fi && \ curl -s -o \ /tmp/phpmyadmin.tar.xz -L \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index c23a666..fd6fed2 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -13,6 +13,7 @@ ENV UPLOAD_LIMIT 8192K RUN \ apk add -U --upgrade --no-cache \ curl \ + jq \ php7-gd \ php7-bz2 \ php7-mysqli \ @@ -22,32 +23,32 @@ RUN \ php7-tokenizer \ php7-curl \ php7-zip && \ - { \ - echo 'opcache.memory_consumption=128'; \ - echo 'opcache.interned_strings_buffer=8'; \ - echo 'opcache.max_accelerated_files=4000'; \ - echo 'opcache.revalidate_freq=2'; \ - echo 'opcache.fast_shutdown=1'; \ - } > /etc/php7/conf.d/opcache-recommended.ini; \ - \ - { \ - echo 'session.cookie_httponly=1'; \ - echo 'session.use_strict_mode=1'; \ - } > /etc/php7/conf.d/session-strict.ini; \ - \ - { \ - echo 'allow_url_fopen=Off'; \ - echo 'max_execution_time=${MAX_EXECUTION_TIME}'; \ - echo 'max_input_vars=10000'; \ - echo 'memory_limit=${MEMORY_LIMIT}'; \ - echo 'post_max_size=${UPLOAD_LIMIT}'; \ - echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \ - } > /etc/php7/conf.d/phpmyadmin-misc.ini && \ + { \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=8'; \ + echo 'opcache.max_accelerated_files=4000'; \ + echo 'opcache.revalidate_freq=2'; \ + echo 'opcache.fast_shutdown=1'; \ + } > /etc/php7/conf.d/opcache-recommended.ini; \ + \ + { \ + echo 'session.cookie_httponly=1'; \ + echo 'session.use_strict_mode=1'; \ + } > /etc/php7/conf.d/session-strict.ini; \ + \ + { \ + echo 'allow_url_fopen=Off'; \ + echo 'max_execution_time=${MAX_EXECUTION_TIME}'; \ + echo 'max_input_vars=10000'; \ + echo 'memory_limit=${MEMORY_LIMIT}'; \ + echo 'post_max_size=${UPLOAD_LIMIT}'; \ + echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \ + } > /etc/php7/conf.d/phpmyadmin-misc.ini && \ 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/latest" \ - | awk '/tag_name/{print $4;exit}' FS='[""]' | cut -d'_' -f 2- | sed s/_/./g); \ + PHPMYADMIN_VERSION=$(curl -sX GET "https://api.github.com/repos/phpmyadmin/phpmyadmin/releases" \ + | jq -r 'first(.[] | select(.name | startswith("5"))) | .name'); \ fi && \ curl -s -o \ /tmp/phpmyadmin.tar.xz -L \ diff --git a/Jenkinsfile b/Jenkinsfile index d249b52..770b643 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -107,7 +107,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' curl -sX GET 'https://api.github.com/repos/phpmyadmin/phpmyadmin/releases/latest' | jq .name | sed -e 's/^"//' -e 's/"$//' ''', + script: ''' curl -sX GET 'https://api.github.com/repos/phpmyadmin/phpmyadmin/releases' | jq -r 'first(.[] | select(.name | startswith("5"))) | .name' ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/README.md b/README.md index 1a6b25e..0652bc0 100644 --- a/README.md +++ b/README.md @@ -231,4 +231,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **23.01.22:** - Pin versions to 5.x.x. * **14.06.21:** - Initial Release. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 4d45a0e..ef40f5d 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/latest' | jq .name | sed -e 's/^\"//' -e 's/\"$//'" +custom_version_command: "curl -sX GET 'https://api.github.com/repos/phpmyadmin/phpmyadmin/releases' | jq -r 'first(.[] | select(.name | startswith(\"5\"))) | .name'" release_type: stable release_tag: latest ls_branch: main diff --git a/readme-vars.yml b/readme-vars.yml index 8a65c80..fd29643 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -45,4 +45,5 @@ app_setup_block: | # changelog changelogs: + - { date: "23.01.22:", desc: "Pin versions to 5.x.x." } - { date: "14.06.21:", desc: "Initial Release." } \ No newline at end of file