mudhorn/docker-unifi-network-application
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-unifi-network-application.git synced 2025-03-05 20:59:58 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'main' into jre21

Browse source
This commit is contained in:
thespad 2025-01-16 23:06:35 +00:00
parent 759fb2d629 c2922e822e
commit 6a9e5961d0
No known key found for this signature in database
6 changed files with 49 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/external_trigger.yml vendored
View file

@ -23,7 +23,7 @@ jobs:
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY 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 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 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 echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY

5
Dockerfile
View file

@ -23,8 +23,9 @@ RUN \
unzip && \ unzip && \
echo "**** install unifi ****" && \ echo "**** install unifi ****" && \
if [ -z ${UNIFI_VERSION+x} ]; then \ if [ -z ${UNIFI_VERSION+x} ]; then \
UNIFI_VERSION=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \ UNIFI_VERSION=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages.gz \
|grep -A 7 -m 1 'Package: unifi' \ | gunzip \
| grep -A 7 -m 1 'Package: unifi' \
| awk -F ': ' '/Version/{print $2;exit}' \ | awk -F ': ' '/Version/{print $2;exit}' \
| awk -F '-' '{print $1}'); \ | awk -F '-' '{print $1}'); \
fi && \ fi && \

5
Dockerfile.aarch64
View file

@ -23,8 +23,9 @@ RUN \
unzip && \ unzip && \
echo "**** install unifi ****" && \ echo "**** install unifi ****" && \
if [ -z ${UNIFI_VERSION+x} ]; then \ if [ -z ${UNIFI_VERSION+x} ]; then \
UNIFI_VERSION=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \ UNIFI_VERSION=$(curl -sX GET https://dl.ui.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages.gz \
|grep -A 7 -m 1 'Package: unifi' \ | gunzip \
| grep -A 7 -m 1 'Package: unifi' \
| awk -F ': ' '/Version/{print $2;exit}' \ | awk -F ': ' '/Version/{print $2;exit}' \
| awk -F '-' '{print $1}'); \ | awk -F '-' '{print $1}'); \
fi && \ fi && \

2
Jenkinsfile vendored
View file

@ -131,7 +131,7 @@ pipeline {
steps{ steps{
script{ script{
env.EXT_RELEASE = sh( 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() returnStdout: true).trim()
env.RELEASE_LINK = 'custom_command' env.RELEASE_LINK = 'custom_command'
} }

2
jenkins-vars.yml
View file

@ -3,7 +3,7 @@
# jenkins variables # jenkins variables
project_name: unifi-network-application project_name: unifi-network-application
external_type: na 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_type: stable
release_tag: latest release_tag: latest
ls_branch: main ls_branch: main

79
package_versions.txt
View file

@ -24,8 +24,8 @@ bcpkix-jdk18on 1.75 jav
bcprov-jdk18on 1.75 java-archive bcprov-jdk18on 1.75 java-archive
bcutil-jdk18on 1.75 java-archive bcutil-jdk18on 1.75 java-archive
bsdutils 1:2.39.3-9ubuntu6.1 deb bsdutils 1:2.39.3-9ubuntu6.1 deb
bson 4.11.2 java-archive bson 4.11.5 java-archive
bson-record-codec 4.11.2 java-archive bson-record-codec 4.11.5 java-archive
ca-certificates 20240203 deb ca-certificates 20240203 deb
ca-certificates-java 20240118 deb ca-certificates-java 20240118 deb
ca-certificates-java UNKNOWN java-archive ca-certificates-java UNKNOWN java-archive
@ -99,8 +99,8 @@ hostname 3.23+nmu2ubuntu2 deb
httpclient 4.5.5 java-archive httpclient 4.5.5 java-archive
httpclient5 5.2.3 java-archive httpclient5 5.2.3 java-archive
httpcore 4.4.16 java-archive httpcore 4.4.16 java-archive
httpcore5 5.2.4 java-archive httpcore5 5.2.5 java-archive
httpcore5-h2 5.2.4 java-archive httpcore5-h2 5.2.5 java-archive
imap 2.0.3 java-archive imap 2.0.3 java-archive
init-system-helpers 1.66ubuntu1 deb init-system-helpers 1.66ubuntu1 deb
istack-commons-runtime 4.1.2 java-archive istack-commons-runtime 4.1.2 java-archive
@ -132,7 +132,7 @@ jaxb-runtime 4.0.5 jav
jaxen 2.0.0 java-archive jaxen 2.0.0 java-archive
jbcrypt 0.4 java-archive jbcrypt 0.4 java-archive
jboss-logging 3.5.3.Final 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 jenetics 4.2.0 java-archive
jgrapht-core 1.0.1 java-archive jgrapht-core 1.0.1 java-archive
jgrapht-ext 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 jstl 1.2 java-archive
jstun 0.7.4 java-archive jstun 0.7.4 java-archive
jsvc 1.0.15-11build1 deb 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 keyboxd 2.4.4-2ubuntu17 deb
krb5-locales 1.20.1-6ubuntu2.2 deb krb5-locales 1.20.1-6ubuntu2.2 deb
lazysodium-java 5.1.4 java-archive 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 login 1:4.13+dfsg1-4ubuntu3.2 deb
logrotate 3.21.0-2build1 deb logrotate 3.21.0-2build1 deb
logsave 1.47.0-2.4~exp1ubuntu4.1 deb logsave 1.47.0-2.4~exp1ubuntu4.1 deb
mapstruct 1.6.2 java-archive
mawk 1.3.4.20240123-1build1 deb mawk 1.3.4.20240123-1build1 deb
micrometer-commons 1.12.7 java-archive micrometer-commons 1.12.13 java-archive
micrometer-observation 1.12.7 java-archive micrometer-observation 1.12.13 java-archive
minimal-json 0.9.5 java-archive minimal-json 0.9.5 java-archive
mongodb-driver-core 4.11.2 java-archive mongodb-driver-core 4.11.5 java-archive
mongodb-driver-sync 4.11.2 java-archive mongodb-driver-sync 4.11.5 java-archive
mount 2.39.3-9ubuntu6.1 deb mount 2.39.3-9ubuntu6.1 deb
ncurses-base 6.4+20240113-1ubuntu2 deb ncurses-base 6.4+20240113-1ubuntu2 deb
ncurses-bin 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 pull-parser 2.1.10 java-archive
radclient4 4.0 java-archive radclient4 4.0 java-archive
reactive-streams 1.0.4 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 readline-common 8.2-4build1 deb
relaxngDatatype 20020414 java-archive relaxngDatatype 20020414 java-archive
resource-loader 2.0.2 java-archive resource-loader 2.0.2 java-archive
sed 4.9-2build1 deb sed 4.9-2build1 deb
sensible-utils 0.0.22 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 smtp 2.0.3 java-archive
snakeyaml 2.2 java-archive snakeyaml 2.2 java-archive
snappy-java 1.1.10.5 java-archive snappy-java 1.1.10.5 java-archive
spring-aop 6.1.10 java-archive spring-aop 6.1.15 java-archive
spring-beans 6.1.10 java-archive spring-beans 6.1.15 java-archive
spring-boot 3.2.7 java-archive spring-boot 3.2.12 java-archive
spring-boot-autoconfigure 3.2.7 java-archive spring-boot-autoconfigure 3.2.12 java-archive
spring-boot-starter 3.2.7 java-archive spring-boot-starter 3.2.12 java-archive
spring-boot-starter-data-mongodb 3.2.7 java-archive spring-boot-starter-data-mongodb 3.2.12 java-archive
spring-boot-starter-json 3.2.7 java-archive spring-boot-starter-json 3.2.12 java-archive
spring-boot-starter-logging 3.2.7 java-archive spring-boot-starter-logging 3.2.12 java-archive
spring-boot-starter-tomcat 3.2.7 java-archive spring-boot-starter-tomcat 3.2.12 java-archive
spring-boot-starter-validation 3.2.7 java-archive spring-boot-starter-validation 3.2.12 java-archive
spring-boot-starter-web 3.2.7 java-archive spring-boot-starter-web 3.2.12 java-archive
spring-boot-starter-websocket 3.2.7 java-archive spring-boot-starter-websocket 3.2.12 java-archive
spring-context 6.1.10 java-archive spring-context 6.1.15 java-archive
spring-core 6.1.10 java-archive spring-core 6.1.15 java-archive
spring-data-commons 3.2.7 java-archive spring-data-commons 3.2.12 java-archive
spring-data-mongodb 4.2.7 java-archive spring-data-mongodb 4.2.12 java-archive
spring-expression 6.1.10 java-archive spring-expression 6.1.15 java-archive
spring-messaging 6.1.10 java-archive spring-messaging 6.1.15 java-archive
spring-tx 6.1.10 java-archive spring-tx 6.1.15 java-archive
spring-web 6.1.10 java-archive spring-web 6.1.15 java-archive
spring-webmvc 6.1.10 java-archive spring-webmvc 6.1.15 java-archive
spring-websocket 6.1.10 java-archive spring-websocket 6.1.15 java-archive
sshj 0.38.0 java-archive sshj 0.38.0 java-archive
stax-api 1.0-2 java-archive stax-api 1.0-2 java-archive
systemd-standalone-sysusers 255.4-1ubuntu8.4 deb systemd-standalone-sysusers 255.4-1ubuntu8.4 deb
sysvinit-utils 3.08-6ubuntu3 deb sysvinit-utils 3.08-6ubuntu3 deb
tar 1.35+dfsg-3build1 deb tar 1.35+dfsg-3build1 deb
tomcat-annotations-api 10.1.25 java-archive tomcat-annotations-api 10.1.33 java-archive
tomcat-embed-core 10.1.25 java-archive tomcat-embed-core 10.1.33 java-archive
tomcat-embed-el 10.1.25 java-archive tomcat-embed-el 10.1.33 java-archive
tomcat-embed-jasper 10.1.25 java-archive tomcat-embed-jasper 10.1.33 java-archive
tomcat-embed-websocket 10.1.25 java-archive tomcat-embed-websocket 10.1.33 java-archive
txw2 4.0.5 java-archive txw2 4.0.5 java-archive
tzdata 2024a-3ubuntu1.1 deb tzdata 2024a-3ubuntu1.1 deb
ubuntu-keyring 2023.11.28.1 deb ubuntu-keyring 2023.11.28.1 deb