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 remote-tracking branch 'origin/main' into replace-placeholers-in-proeprties

Browse source
This commit is contained in:
sturman 2024-06-04 15:27:21 +03:00
parent 96d3003d43 df46b10e82
commit 4ea124f871
3 changed files with 357 additions and 366 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
Jenkinsfile vendored
View file

@ -295,7 +295,7 @@ pipeline {
echo "Jenkinsfile is up to date."
fi
echo "Starting Stage 2 - Delete old templates"
OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
for i in ${OLD_TEMPLATES}; do
if [[ -f "${i}" ]]; then
TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@ -525,6 +525,7 @@ pipeline {
--label \"org.opencontainers.image.title=Unifi-network-application\" \
--label \"org.opencontainers.image.description=The [Unifi-network-application](https://ui.com/) software is a powerful, enterprise wireless software engine ideal for high-density client deployments requiring low latency and high uptime performance.\" \
--no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
--provenance=false --sbom=false \
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
}
}
@ -556,6 +557,7 @@ pipeline {
--label \"org.opencontainers.image.title=Unifi-network-application\" \
--label \"org.opencontainers.image.description=The [Unifi-network-application](https://ui.com/) software is a powerful, enterprise wireless software engine ideal for high-density client deployments requiring low latency and high uptime performance.\" \
--no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
--provenance=false --sbom=false \
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
}
}
@ -584,6 +586,7 @@ pipeline {
--label \"org.opencontainers.image.title=Unifi-network-application\" \
--label \"org.opencontainers.image.description=The [Unifi-network-application](https://ui.com/) software is a powerful, enterprise wireless software engine ideal for high-density client deployments requiring low latency and high uptime performance.\" \
--no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
--provenance=false --sbom=false \
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
retry(5) {
@ -707,7 +710,7 @@ pipeline {
--shm-size=1gb \
-v /var/run/docker.sock:/var/run/docker.sock \
-e IMAGE=\"${IMAGE}\" \
-e DELAY_START=\"${CI_DELAY}\" \
-e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
-e TAGS=\"${CI_TAGS}\" \
-e META_TAG=\"${META_TAG}\" \
-e PORT=\"${CI_PORT}\" \
@ -815,35 +818,13 @@ pipeline {
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
fi
docker manifest push --purge ${MANIFESTIMAGE}:latest || :
docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
done
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
if [ -n "${SEMVER}" ]; then
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
fi
token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
digest=$(curl -s \
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
--header "Authorization: Bearer ${token}" \
"https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest")
if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || :
docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest
fi
docker manifest push --purge ${MANIFESTIMAGE}:latest
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
if [ -n "${SEMVER}" ]; then
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
fi
done
'''

2
README.md
View file

@ -28,7 +28,7 @@ Find us at:
# [linuxserver/unifi-network-application](https://github.com/linuxserver/docker-unifi-network-application)
[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Funifi-network-application?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Funifi-network-application)
[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Funifi-network-application?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh)
[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-unifi-network-application.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-unifi-network-application)
[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-unifi-network-application.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-unifi-network-application/releases)
[![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-unifi-network-application/packages)

130
package_versions.txt
View file

@ -4,6 +4,9 @@ adduser 3.118ubuntu5
analytics-api 2.0.0 java-archive
analytics-client 2.0.0 java-archive
analytics-privacy 2.0.0 java-archive
angus-activation 2.0.2 java-archive
angus-core 2.0.3 java-archive
angus-mail 2.0.3 java-archive
annotations 3.0.1 java-archive
antlr4-runtime 4.5.3 java-archive
api-common 1.7.0 java-archive
@ -21,25 +24,25 @@ bcpkix-jdk18on 1.75
bcprov-jdk18on 1.75 java-archive
bcutil-jdk18on 1.75 java-archive
bsdutils 1:2.37.2-4ubuntu3.4 deb
bson 4.11.1 java-archive
bson-record-codec 4.11.1 java-archive
bson 4.11.2 java-archive
bson-record-codec 4.11.2 java-archive
ca-certificates 20230311ubuntu0.22.04.1 deb
ca-certificates-java java-archive
ca-certificates-java 20190909ubuntu1.2 deb
catatonit 0.1.7-1 deb
checker-qual 3.12.0 java-archive
checker-qual 3.42.0 java-archive
classmate 1.6.0 java-archive
coloring 1.0 java-archive
commons-beanutils 1.9.4 java-archive
commons-cli 1.4 java-archive
commons-codec 1.16.1 java-archive
commons-daemon 1.0.15 java-archive
commons-io 2.11.0 java-archive
commons-io 2.16.0 java-archive
commons-lang3 3.13.0 java-archive
commons-logging 1.2 java-archive
commons-logging 1.3.0 java-archive
commons-net 3.10.0 java-archive
commons-text 1.11.0 java-archive
commons-validator 1.7 java-archive
commons-validator 1.8.0 java-archive
compiler 0.9.6 java-archive
coreutils 8.32-4.1ubuntu1.2 deb
cron 3.0pl1-137ubuntu3 deb
@ -55,8 +58,8 @@ dpkg 1.21.1ubuntu2.3
e2fsprogs 1.46.5-2ubuntu1.1 deb
ecj 3.33.0 java-archive
eddsa 0.3.0 java-archive
error_prone_annotations 2.7.1 java-archive
failureaccess 1.0.1 java-archive
error_prone_annotations 2.26.1 java-archive
failureaccess 1.0.2 java-archive
findutils 4.8.0-1ubuntu3 deb
fontconfig-config 2.13.1-4.2ubuntu5 deb
fonts-dejavu-core 2.37-2build1 deb
@ -91,7 +94,7 @@ gpgsm 2.2.27-3ubuntu2.1
gpgv 2.2.27-3ubuntu2.1 deb
grep 3.7-1build1 deb
gson 2.9.0 java-archive
guava 31.0.1-jre java-archive
guava 33.1.0-jre java-archive
gzip 1.10-4ubuntu4.1 deb
hibernate-validator 8.0.1.Final java-archive
hostname 3.23ubuntu2 deb
@ -100,49 +103,53 @@ httpclient5 5.2.3
httpcore 4.4.16 java-archive
httpcore5 5.2.4 java-archive
httpcore5-h2 5.2.4 java-archive
imap 2.0.3 java-archive
init-system-helpers 1.62 deb
istack-commons-runtime 3.0.5 java-archive
j2objc-annotations 1.3 java-archive
istack-commons-runtime 4.1.2 java-archive
j2objc-annotations 1.1 java-archive
jackson-annotations 2.15.4 java-archive
jackson-core 2.15.4 java-archive
jackson-databind 2.15.4 java-archive
jackson-datatype-jdk8 2.15.4 java-archive
jackson-datatype-jsr310 2.15.4 java-archive
jackson-module-parameter-names 2.15.4 java-archive
jakarta.activation 2.0.1 java-archive
jakarta.activation-api 2.1.3 java-archive
jakarta.annotation-api 2.1.1 java-archive
jakarta.mail 2.0.1 java-archive
jakarta.mail 2.0.3 java-archive
jakarta.mail-api 2.1.3 java-archive (+1 duplicate)
jakarta.validation-api 3.0.2 java-archive
jakarta.xml.bind-api 4.0.2 java-archive
java-binme 2.0.0 java-archive
java-common 0.72build2 deb
java-ipv6 0.17 java-archive
java-semver 0.9.0 java-archive
java-ucp 1.1 java-archive
java-uuid-generator 4.0.1 java-archive
jaxb-api 2.3.0 java-archive
jaxb-core 2.3.0.1 java-archive
jaxb-impl 2.3.0.1 java-archive
jaxb-runtime 2.3.0.1 java-archive
java-uuid-generator 4.3.0 java-archive
java10-shim 20240325.1 java-archive
java8-shim 20240325.1 java-archive
jaxb-core 4.0.5 java-archive
jaxb-impl 4.0.5 java-archive
jaxb-runtime 4.0.5 java-archive
jbcrypt 0.4 java-archive
jboss-logging 3.5.3.Final java-archive
jcl-over-slf4j 2.0.12 java-archive
jcl-over-slf4j 2.0.13 java-archive
jenetics 4.2.0 java-archive
jgrapht-core 1.0.1 java-archive
jgrapht-ext 1.0.1 java-archive
jgraphx 2.0.0.1 java-archive
jmdns 3.4.1 java-archive
jna 5.9.0 java-archive
jna 5.12.1 java-archive
joda-time 2.10.4 java-archive
jq 1.6-2.1ubuntu3 deb
jrt-fs 17.0.10 java-archive
json 20190722 java-archive
json 20231013 java-archive
jsr305 3.0.1 java-archive
jsr305 3.0.2 java-archive
jstl 1.2 java-archive
jstun 0.7.4 java-archive
jsvc 1.0.15-8 deb
jul-to-slf4j 2.0.12 java-archive
lazysodium-java 5.1.2 java-archive
jul-to-slf4j 2.0.13 java-archive
lazysodium-java 5.1.4 java-archive
libacl1 2.3.1-1 deb
libapt-pkg6.0 2.4.12 deb
libasound2 1.2.6.1-1ubuntu1 deb
@ -254,17 +261,18 @@ log4j-to-slf4j 2.21.1
logback-access 1.4.14 java-archive
logback-classic 1.4.14 java-archive
logback-core 1.4.14 java-archive
logging-mailhandler 2.0.3 java-archive
login 1:4.8.1-2ubuntu2.2 deb
logrotate 3.19.0-1ubuntu1.1 deb
logsave 1.46.5-2ubuntu1.1 deb
lsb-base 11.1.0ubuntu4 deb
mawk 1.3.4.20200120-3 deb
micrometer-commons 1.12.3 java-archive
micrometer-observation 1.12.3 java-archive
micrometer-commons 1.12.5 java-archive
micrometer-observation 1.12.5 java-archive
minimal-json 0.9.5 java-archive
mongodb-driver-core 4.11.1 java-archive
mongodb-driver-legacy 4.11.1 java-archive
mongodb-driver-sync 4.11.1 java-archive
mongodb-driver-core 4.11.2 java-archive
mongodb-driver-legacy 4.11.2 java-archive
mongodb-driver-sync 4.11.2 java-archive
mount 2.37.2-4ubuntu3.4 deb
ncurses-base 6.3-2ubuntu0.1 deb
ncurses-bin 6.3-2ubuntu0.1 deb
@ -274,10 +282,11 @@ openjdk-17-jre-headless 17.0.10+7-1~22.04.1
openssh 1.0 java-archive
openssl 3.0.2-0ubuntu1.15 deb
org.eclipse.paho.client.mqttv3 1.1.0 java-archive
owasp-java-html-sanitizer 20190503.1 java-archive
owasp-java-html-sanitizer 20240325.1 java-archive
passwd 1:4.8.1-2ubuntu2.2 deb
perl-base 5.34.0-3ubuntu1.3 deb
pinentry-curses 1.1.1-1build2 deb
pop3 2.0.3 java-archive
procps 2:3.3.17-6ubuntu2.1 deb
proto-google-common-protos 1.12.0 java-archive
proto-google-iam-v1 0.12.0 java-archive
@ -286,45 +295,46 @@ protobuf-java-util 3.6.0
publicsuffix 20211207.1025-1 deb
radclient4 4.0 java-archive
reactive-streams 1.0.4 java-archive
reactor-core 3.6.3 java-archive
reactor-core 3.6.5 java-archive
readline-common 8.1.2-1 deb
resource-loader 2.0.2 java-archive
sed 4.8-1ubuntu2 deb
sensible-utils 0.0.17 deb
slf4j-api 2.0.12 java-archive
slf4j-api 2.0.13 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.4 java-archive
spring-beans 6.1.4 java-archive
spring-boot 3.2.3 java-archive
spring-boot-autoconfigure 3.2.3 java-archive
spring-boot-starter 3.2.3 java-archive
spring-boot-starter-data-mongodb 3.2.3 java-archive
spring-boot-starter-json 3.2.3 java-archive
spring-boot-starter-logging 3.2.3 java-archive
spring-boot-starter-tomcat 3.2.3 java-archive
spring-boot-starter-validation 3.2.3 java-archive
spring-boot-starter-web 3.2.3 java-archive
spring-boot-starter-websocket 3.2.3 java-archive
spring-context 6.1.4 java-archive
spring-core 6.1.4 java-archive
spring-data-commons 3.2.3 java-archive
spring-data-mongodb 4.2.3 java-archive
spring-expression 6.1.4 java-archive
spring-messaging 6.1.4 java-archive
spring-tx 6.1.4 java-archive
spring-web 6.1.4 java-archive
spring-webmvc 6.1.4 java-archive
spring-websocket 6.1.4 java-archive
sshj 0.37.0 java-archive
spring-aop 6.1.6 java-archive
spring-beans 6.1.6 java-archive
spring-boot 3.2.5 java-archive
spring-boot-autoconfigure 3.2.5 java-archive
spring-boot-starter 3.2.5 java-archive
spring-boot-starter-data-mongodb 3.2.5 java-archive
spring-boot-starter-json 3.2.5 java-archive
spring-boot-starter-logging 3.2.5 java-archive
spring-boot-starter-tomcat 3.2.5 java-archive
spring-boot-starter-validation 3.2.5 java-archive
spring-boot-starter-web 3.2.5 java-archive
spring-boot-starter-websocket 3.2.5 java-archive
spring-context 6.1.6 java-archive
spring-core 6.1.6 java-archive
spring-data-commons 3.2.5 java-archive
spring-data-mongodb 4.2.5 java-archive
spring-expression 6.1.6 java-archive
spring-messaging 6.1.6 java-archive
spring-tx 6.1.6 java-archive
spring-web 6.1.6 java-archive
spring-webmvc 6.1.6 java-archive
spring-websocket 6.1.6 java-archive
sshj 0.38.0 java-archive
sysvinit-utils 3.01-1ubuntu1 deb
tar 1.34+dfsg-1ubuntu0.1.22.04.2 deb
tomcat-annotations-api 10.1.19 java-archive
tomcat-embed-core 10.1.19 java-archive
tomcat-embed-el 10.1.19 java-archive
tomcat-embed-jasper 10.1.19 java-archive
tomcat-embed-websocket 10.1.19 java-archive
txw2 2.3.0.1 java-archive
tomcat-annotations-api 10.1.20 java-archive
tomcat-embed-core 10.1.20 java-archive
tomcat-embed-el 10.1.20 java-archive
tomcat-embed-jasper 10.1.20 java-archive
tomcat-embed-websocket 10.1.20 java-archive
txw2 4.0.5 java-archive
tzdata 2024a-0ubuntu0.22.04 deb
ubuntu-keyring 2021.03.26 deb
ucf 3.0043 deb