Skip to content

Commit e139b0f

Browse files
committed
Update changelog date.
1 parent 6a9e596 commit e139b0f

16 files changed

+50
-17
lines changed

.editorconfig

100755100644
File mode changed.

.github/CONTRIBUTING.md

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Read, and fill the Pull Request template
77
* If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
88
* If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
9-
* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
9+
* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://linuxserver.io/discord)
1010

1111
## Common files
1212

.github/FUNDING.yml

100755100644
File mode changed.

.github/ISSUE_TEMPLATE/config.yml

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: Discord chat support
4-
url: https://discord.gg/YWrKVTn
4+
url: https://linuxserver.io/discord
55
about: Realtime support / chat with the community and the team.
66

77
- name: Discourse discussion forum

.github/ISSUE_TEMPLATE/issue.bug.yml

100755100644
File mode changed.

.github/ISSUE_TEMPLATE/issue.feature.yml

100755100644
File mode changed.

.github/workflows/call_issue_pr_tracker.yml

100755100644
File mode changed.

.github/workflows/call_issues_cron.yml

100755100644
File mode changed.

.github/workflows/external_trigger.yml

100755100644
Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ jobs:
1515
SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
1616
run: |
1717
printf "# External trigger for docker-unifi-network-application\n\n" >> $GITHUB_STEP_SUMMARY
18-
if grep -q "^unifi-network-application_main" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
18+
if grep -q "^unifi-network-application_main_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
19+
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
20+
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`unifi-network-application_main_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
21+
elif grep -q "^unifi-network-application_main" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
1922
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
2023
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`unifi-network-application_main\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
2124
exit 0
@@ -25,6 +28,11 @@ jobs:
2528
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
2629
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}')
2730
echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
31+
if grep -q "^unifi-network-application_main_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
32+
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
33+
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
34+
exit 0
35+
fi
2836
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
2937
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
3038
echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY

.github/workflows/external_trigger_scheduler.yml

100755100644
File mode changed.

.github/workflows/greetings.yml

100755100644
File mode changed.

.github/workflows/package_trigger_scheduler.yml

100755100644
File mode changed.

Jenkinsfile

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,23 @@ pipeline {
5656
steps{
5757
echo "Running on node: ${NODE_NAME}"
5858
sh '''#! /bin/bash
59-
containers=$(docker ps -aq)
59+
echo "Pruning builder"
60+
docker builder prune -f --builder container || :
61+
containers=$(docker ps -q)
6062
if [[ -n "${containers}" ]]; then
61-
docker stop ${containers}
63+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
64+
for container in ${containers}; do
65+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
66+
echo "skipping buildx container in docker stop"
67+
else
68+
echo "Stopping container ${container}"
69+
docker stop ${container}
70+
fi
71+
done
6272
fi
63-
docker system prune -af --volumes || : '''
73+
docker system prune -f --volumes || :
74+
docker image prune -af || :
75+
'''
6476
script{
6577
env.EXIT_STATUS = ''
6678
env.LS_RELEASE = sh(
@@ -741,7 +753,8 @@ pipeline {
741753
if [[ -n "${containers}" ]]; then
742754
docker stop ${containers}
743755
fi
744-
docker system prune -af --volumes || :
756+
docker system prune -f --volumes || :
757+
docker image prune -af || :
745758
'''
746759
}
747760
}
@@ -1152,12 +1165,22 @@ EOF
11521165
}
11531166
cleanup {
11541167
sh '''#! /bin/bash
1155-
echo "Performing docker system prune!!"
1156-
containers=$(docker ps -aq)
1168+
echo "Pruning builder!!"
1169+
docker builder prune -f --builder container || :
1170+
containers=$(docker ps -q)
11571171
if [[ -n "${containers}" ]]; then
1158-
docker stop ${containers}
1172+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
1173+
for container in ${containers}; do
1174+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
1175+
echo "skipping buildx container in docker stop"
1176+
else
1177+
echo "Stopping container ${container}"
1178+
docker stop ${container}
1179+
fi
1180+
done
11591181
fi
1160-
docker system prune -af --volumes || :
1182+
docker system prune -f --volumes || :
1183+
docker image prune -af || :
11611184
'''
11621185
cleanWs()
11631186
}

LICENSE

100755100644
File mode changed.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
44

55
[![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
6-
[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
6+
[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://linuxserver.io/discord "realtime support / chat with the community and the team.")
77
[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.")
88
[![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
99
[![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.")
@@ -20,7 +20,7 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container r
2020
Find us at:
2121

2222
* [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
23-
* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
23+
* [Discord](https://linuxserver.io/discord) - realtime support / chat with the community and the team.
2424
* [Discourse](https://discourse.linuxserver.io) - post on our community forum.
2525
* [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images.
2626
* [GitHub](https://github.com/linuxserver) - view the source for all of our repositories.
@@ -64,7 +64,7 @@ After setup, the web UI is available at https://ip:8443. The application can be
6464

6565
### Setting Up Your External Database
6666

67-
Starting with version 8.1 of Unifi Network Application, mongodb 3.6 through 7.0 are supported. Starting with version 9.0 of Unifi Network Application, mongodb 8.0 is supported.
67+
Starting with version 8.1 of Unifi Network Application, mongodb 3.6 through 7.0 are supported. Starting with version 9.0 of Unifi Network Application, mongodb 8.0 is also supported.
6868

6969
**Make sure you pin your database image version and do not use `latest`, as mongodb does not support automatic upgrades between major versions.**
7070

@@ -418,7 +418,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
418418

419419
## Versions
420420

421-
* **06.01.25:** - Bump JRE to 21.
421+
* **12.02.25:** - Bump JRE to 21.
422422
* **11.08.24:** - **Important**: The mongodb init instructions have been updated to enable auth ([RBAC](https://www.mongodb.com/docs/manual/core/authorization/#role-based-access-control)). We have been notified that if RBAC is not enabled, the official mongodb container allows remote access to the db contents over port 27017 without credentials. If you set up the mongodb container with the old instructions we provided, you should not map or expose port 27017. If you would like to enable auth, the easiest way is to create new instances of both unifi and mongodb with the new instructions and restore unifi from a backup.
423423
* **11.08.24:** - Rebase to Ubuntu Noble.
424424
* **04.03.24:** - Install from zip package instead of deb.

readme-vars.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ opt_param_ports:
4242
- {external_port: "8880", internal_port: "8880", port_desc: "Unifi guest portal HTTP redirect port"}
4343
- {external_port: "6789", internal_port: "6789", port_desc: "For mobile throughput test"}
4444
- {external_port: "5514", internal_port: "5514/udp", port_desc: "Remote syslog port"}
45+
readonly_supported: false
46+
nonroot_supported: false
4547
# application setup block
4648
app_setup_block_enabled: true
4749
app_setup_block: |
@@ -51,7 +53,7 @@ app_setup_block: |
5153
5254
### Setting Up Your External Database
5355
54-
Starting with version 8.1 of Unifi Network Application, mongodb 3.6 through 7.0 are supported. Starting with version 9.0 of Unifi Network Application, mongodb 8.0 is supported.
56+
Starting with version 8.1 of Unifi Network Application, mongodb 3.6 through 7.0 are supported. Starting with version 9.0 of Unifi Network Application, mongodb 8.0 is also supported.
5557
5658
**Make sure you pin your database image version and do not use `latest`, as mongodb does not support automatic upgrades between major versions.**
5759
@@ -175,7 +177,7 @@ init_diagram: |
175177
"unifi-network-application:latest" <- Base Images
176178
# changelog
177179
changelogs:
178-
- {date: "06.01.25:", desc: "Bump JRE to 21."}
180+
- {date: "12.02.25:", desc: "Bump JRE to 21."}
179181
- {date: "11.08.24:", desc: "**Important**: The mongodb init instructions have been updated to enable auth ([RBAC](https://www.mongodb.com/docs/manual/core/authorization/#role-based-access-control)). We have been notified that if RBAC is not enabled, the official mongodb container allows remote access to the db contents over port 27017 without credentials. If you set up the mongodb container with the old instructions we provided, you should not map or expose port 27017. If you would like to enable auth, the easiest way is to create new instances of both unifi and mongodb with the new instructions and restore unifi from a backup."}
180182
- {date: "11.08.24:", desc: "Rebase to Ubuntu Noble."}
181183
- {date: "04.03.24:", desc: "Install from zip package instead of deb."}

0 commit comments

Comments
 (0)