diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 2ebde07..699571e 100755 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -23,7 +23,7 @@ jobs: echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY echo "> External trigger running off of main branch. To disable this trigger, add \`unifi-network-application_main\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY - EXT_RELEASE=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages |grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}') + EXT_RELEASE=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages.gz | gunzip | grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}') echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY diff --git a/Dockerfile b/Dockerfile index 0caf513..4db1735 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,8 +23,9 @@ RUN \ unzip && \ echo "**** install unifi ****" && \ if [ -z ${UNIFI_VERSION+x} ]; then \ - UNIFI_VERSION=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \ - |grep -A 7 -m 1 'Package: unifi' \ + UNIFI_VERSION=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages.gz \ + | gunzip \ + | grep -A 7 -m 1 'Package: unifi' \ | awk -F ': ' '/Version/{print $2;exit}' \ | awk -F '-' '{print $1}'); \ fi && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 9d4f7a2..e3c1d8f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -23,8 +23,9 @@ RUN \ unzip && \ echo "**** install unifi ****" && \ if [ -z ${UNIFI_VERSION+x} ]; then \ - UNIFI_VERSION=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \ - |grep -A 7 -m 1 'Package: unifi' \ + UNIFI_VERSION=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages.gz \ + | gunzip \ + | grep -A 7 -m 1 'Package: unifi' \ | awk -F ': ' '/Version/{print $2;exit}' \ | awk -F '-' '{print $1}'); \ fi && \ diff --git a/Jenkinsfile b/Jenkinsfile index d8645db..37417d1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -131,7 +131,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' curl -sX GET https://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages |grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}' ''', + script: ''' curl -sX GET https://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages.gz | gunzip | grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}' ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index a5357ae..58b8f3d 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,7 +3,7 @@ # jenkins variables project_name: unifi-network-application external_type: na -custom_version_command: "curl -sX GET https://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages |grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}'" +custom_version_command: "curl -sX GET https://dl.ui.com/unifi/debian/dists/stable/ubiquiti/binary-amd64/Packages.gz | gunzip | grep -A 7 -m 1 'Package: unifi' | awk -F ': ' '/Version/{print $2;exit}' | awk -F '-' '{print $1}'" release_type: stable release_tag: latest ls_branch: main diff --git a/package_versions.txt b/package_versions.txt index 7bfc5c6..5994e3b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -24,8 +24,8 @@ bcpkix-jdk18on 1.75 jav bcprov-jdk18on 1.75 java-archive bcutil-jdk18on 1.75 java-archive bsdutils 1:2.39.3-9ubuntu6.1 deb -bson 4.11.2 java-archive -bson-record-codec 4.11.2 java-archive +bson 4.11.5 java-archive +bson-record-codec 4.11.5 java-archive ca-certificates 20240203 deb ca-certificates-java 20240118 deb ca-certificates-java UNKNOWN java-archive @@ -99,8 +99,8 @@ hostname 3.23+nmu2ubuntu2 deb httpclient 4.5.5 java-archive httpclient5 5.2.3 java-archive httpcore 4.4.16 java-archive -httpcore5 5.2.4 java-archive -httpcore5-h2 5.2.4 java-archive +httpcore5 5.2.5 java-archive +httpcore5-h2 5.2.5 java-archive imap 2.0.3 java-archive init-system-helpers 1.66ubuntu1 deb istack-commons-runtime 4.1.2 java-archive @@ -132,7 +132,7 @@ jaxb-runtime 4.0.5 jav jaxen 2.0.0 java-archive jbcrypt 0.4 java-archive jboss-logging 3.5.3.Final java-archive -jcl-over-slf4j 2.0.13 java-archive +jcl-over-slf4j 2.0.16 java-archive jenetics 4.2.0 java-archive jgrapht-core 1.0.1 java-archive jgrapht-ext 1.0.1 java-archive @@ -148,7 +148,7 @@ jsr305 3.0.2 jav jstl 1.2 java-archive jstun 0.7.4 java-archive jsvc 1.0.15-11build1 deb -jul-to-slf4j 2.0.13 java-archive +jul-to-slf4j 2.0.16 java-archive keyboxd 2.4.4-2ubuntu17 deb krb5-locales 1.20.1-6ubuntu2.2 deb lazysodium-java 5.1.4 java-archive @@ -248,12 +248,13 @@ logging-mailhandler 2.0.3 jav login 1:4.13+dfsg1-4ubuntu3.2 deb logrotate 3.21.0-2build1 deb logsave 1.47.0-2.4~exp1ubuntu4.1 deb +mapstruct 1.6.2 java-archive mawk 1.3.4.20240123-1build1 deb -micrometer-commons 1.12.7 java-archive -micrometer-observation 1.12.7 java-archive +micrometer-commons 1.12.13 java-archive +micrometer-observation 1.12.13 java-archive minimal-json 0.9.5 java-archive -mongodb-driver-core 4.11.2 java-archive -mongodb-driver-sync 4.11.2 java-archive +mongodb-driver-core 4.11.5 java-archive +mongodb-driver-sync 4.11.5 java-archive mount 2.39.3-9ubuntu6.1 deb ncurses-base 6.4+20240113-1ubuntu2 deb ncurses-bin 6.4+20240113-1ubuntu2 deb @@ -276,48 +277,48 @@ publicsuffix 20231001.0357-0.1 deb pull-parser 2.1.10 java-archive radclient4 4.0 java-archive reactive-streams 1.0.4 java-archive -reactor-core 3.6.7 java-archive +reactor-core 3.6.12 java-archive readline-common 8.2-4build1 deb relaxngDatatype 20020414 java-archive resource-loader 2.0.2 java-archive sed 4.9-2build1 deb sensible-utils 0.0.22 deb -slf4j-api 2.0.13 java-archive +slf4j-api 2.0.16 java-archive smtp 2.0.3 java-archive snakeyaml 2.2 java-archive snappy-java 1.1.10.5 java-archive -spring-aop 6.1.10 java-archive -spring-beans 6.1.10 java-archive -spring-boot 3.2.7 java-archive -spring-boot-autoconfigure 3.2.7 java-archive -spring-boot-starter 3.2.7 java-archive -spring-boot-starter-data-mongodb 3.2.7 java-archive -spring-boot-starter-json 3.2.7 java-archive -spring-boot-starter-logging 3.2.7 java-archive -spring-boot-starter-tomcat 3.2.7 java-archive -spring-boot-starter-validation 3.2.7 java-archive -spring-boot-starter-web 3.2.7 java-archive -spring-boot-starter-websocket 3.2.7 java-archive -spring-context 6.1.10 java-archive -spring-core 6.1.10 java-archive -spring-data-commons 3.2.7 java-archive -spring-data-mongodb 4.2.7 java-archive -spring-expression 6.1.10 java-archive -spring-messaging 6.1.10 java-archive -spring-tx 6.1.10 java-archive -spring-web 6.1.10 java-archive -spring-webmvc 6.1.10 java-archive -spring-websocket 6.1.10 java-archive +spring-aop 6.1.15 java-archive +spring-beans 6.1.15 java-archive +spring-boot 3.2.12 java-archive +spring-boot-autoconfigure 3.2.12 java-archive +spring-boot-starter 3.2.12 java-archive +spring-boot-starter-data-mongodb 3.2.12 java-archive +spring-boot-starter-json 3.2.12 java-archive +spring-boot-starter-logging 3.2.12 java-archive +spring-boot-starter-tomcat 3.2.12 java-archive +spring-boot-starter-validation 3.2.12 java-archive +spring-boot-starter-web 3.2.12 java-archive +spring-boot-starter-websocket 3.2.12 java-archive +spring-context 6.1.15 java-archive +spring-core 6.1.15 java-archive +spring-data-commons 3.2.12 java-archive +spring-data-mongodb 4.2.12 java-archive +spring-expression 6.1.15 java-archive +spring-messaging 6.1.15 java-archive +spring-tx 6.1.15 java-archive +spring-web 6.1.15 java-archive +spring-webmvc 6.1.15 java-archive +spring-websocket 6.1.15 java-archive sshj 0.38.0 java-archive stax-api 1.0-2 java-archive systemd-standalone-sysusers 255.4-1ubuntu8.4 deb sysvinit-utils 3.08-6ubuntu3 deb tar 1.35+dfsg-3build1 deb -tomcat-annotations-api 10.1.25 java-archive -tomcat-embed-core 10.1.25 java-archive -tomcat-embed-el 10.1.25 java-archive -tomcat-embed-jasper 10.1.25 java-archive -tomcat-embed-websocket 10.1.25 java-archive +tomcat-annotations-api 10.1.33 java-archive +tomcat-embed-core 10.1.33 java-archive +tomcat-embed-el 10.1.33 java-archive +tomcat-embed-jasper 10.1.33 java-archive +tomcat-embed-websocket 10.1.33 java-archive txw2 4.0.5 java-archive tzdata 2024a-3ubuntu1.1 deb ubuntu-keyring 2023.11.28.1 deb