Skip to content
This repository was archived by the owner on Jan 7, 2024. It is now read-only.

Commit bab7394

Browse files
thespadthespad
authored
Merge pull request #109 from linuxserver/focal
2 parents 6ab303f + 875cf88 commit bab7394

File tree

5 files changed

+76
-94
lines changed

5 files changed

+76
-94
lines changed

‎Dockerfile‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic
1+
FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
22

33
# set version label
44
ARG BUILD_DATE
@@ -12,33 +12,33 @@ ARG UNIFI_BRANCH="stable"
1212
ARG DEBIAN_FRONTEND="noninteractive"
1313

1414
RUN \
15-
echo "**** install packages ****" && \
16-
apt-get update && \
17-
apt-get install -y \
18-
binutils \
19-
jsvc \
20-
libcap2 \
21-
logrotate \
22-
mongodb-server \
23-
openjdk-8-jre-headless \
24-
wget && \
25-
echo "**** install unifi ****" && \
26-
if [ -z ${UNIFI_VERSION+x} ]; then \
27-
UNIFI_VERSION=$(curl -sX GET http://dl-origin.ubnt.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \
28-
|grep -A 7 -m 1 'Package: unifi' \
29-
| awk -F ': ' '/Version/{print $2;exit}' \
30-
| awk -F '-' '{print $1}'); \
31-
fi && \
32-
curl -o \
33-
/tmp/unifi.deb -L \
34-
"https://dl.ui.com/unifi/${UNIFI_VERSION}/unifi_sysvinit_all.deb" && \
35-
dpkg -i /tmp/unifi.deb && \
36-
echo "**** cleanup ****" && \
37-
apt-get clean && \
38-
rm -rf \
39-
/tmp/* \
40-
/var/lib/apt/lists/* \
41-
/var/tmp/*
15+
echo "**** install packages ****" && \
16+
apt-get update && \
17+
apt-get install -y \
18+
binutils \
19+
jsvc \
20+
libcap2 \
21+
logrotate \
22+
mongodb-server \
23+
openjdk-8-jre-headless \
24+
wget && \
25+
echo "**** install unifi ****" && \
26+
if [ -z ${UNIFI_VERSION+x} ]; then \
27+
UNIFI_VERSION=$(curl -sX GET http://dl-origin.ubnt.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \
28+
|grep -A 7 -m 1 'Package: unifi' \
29+
| awk -F ': ' '/Version/{print $2;exit}' \
30+
| awk -F '-' '{print $1}'); \
31+
fi && \
32+
curl -o \
33+
/tmp/unifi.deb -L \
34+
"https://dl.ui.com/unifi/${UNIFI_VERSION}/unifi_sysvinit_all.deb" && \
35+
dpkg -i /tmp/unifi.deb && \
36+
echo "**** cleanup ****" && \
37+
apt-get clean && \
38+
rm -rf \
39+
/tmp/* \
40+
/var/lib/apt/lists/* \
41+
/var/tmp/*
4242

4343
# add local files
4444
COPY root/ /

‎Dockerfile.aarch64‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-bionic
1+
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
22

33
# set version label
44
ARG BUILD_DATE
@@ -12,33 +12,33 @@ ARG UNIFI_BRANCH="stable"
1212
ARG DEBIAN_FRONTEND="noninteractive"
1313

1414
RUN \
15-
echo "**** install packages ****" && \
16-
apt-get update && \
17-
apt-get install -y \
18-
binutils \
19-
jsvc \
20-
libcap2 \
21-
logrotate \
22-
mongodb-server \
23-
openjdk-8-jre-headless \
24-
wget && \
25-
echo "**** install unifi ****" && \
26-
if [ -z ${UNIFI_VERSION+x} ]; then \
27-
UNIFI_VERSION=$(curl -sX GET http://dl-origin.ubnt.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \
28-
|grep -A 7 -m 1 'Package: unifi' \
29-
| awk -F ': ' '/Version/{print $2;exit}' \
30-
| awk -F '-' '{print $1}'); \
31-
fi && \
32-
curl -o \
33-
/tmp/unifi.deb -L \
34-
"https://dl.ui.com/unifi/${UNIFI_VERSION}/unifi_sysvinit_all.deb" && \
35-
dpkg -i /tmp/unifi.deb && \
36-
echo "**** cleanup ****" && \
37-
apt-get clean && \
38-
rm -rf \
39-
/tmp/* \
40-
/var/lib/apt/lists/* \
41-
/var/tmp/*
15+
echo "**** install packages ****" && \
16+
apt-get update && \
17+
apt-get install -y \
18+
binutils \
19+
jsvc \
20+
libcap2 \
21+
logrotate \
22+
mongodb-server \
23+
openjdk-8-jre-headless \
24+
wget && \
25+
echo "**** install unifi ****" && \
26+
if [ -z ${UNIFI_VERSION+x} ]; then \
27+
UNIFI_VERSION=$(curl -sX GET http://dl-origin.ubnt.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \
28+
|grep -A 7 -m 1 'Package: unifi' \
29+
| awk -F ': ' '/Version/{print $2;exit}' \
30+
| awk -F '-' '{print $1}'); \
31+
fi && \
32+
curl -o \
33+
/tmp/unifi.deb -L \
34+
"https://dl.ui.com/unifi/${UNIFI_VERSION}/unifi_sysvinit_all.deb" && \
35+
dpkg -i /tmp/unifi.deb && \
36+
echo "**** cleanup ****" && \
37+
apt-get clean && \
38+
rm -rf \
39+
/tmp/* \
40+
/var/lib/apt/lists/* \
41+
/var/tmp/*
4242

4343
# add local files
4444
COPY root/ /

‎Jenkinsfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ pipeline {
457457
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
458458
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
459459
--label \"org.opencontainers.image.title=Unifi-controller\" \
460-
--label \"org.opencontainers.image.description=The [Unifi-controller](https://www.ubnt.com/enterprise/#unifi) Controller software is a powerful, enterprise wireless software engine ideal for high-density client deployments requiring low latency and high uptime performance. \" \
460+
--label \"org.opencontainers.image.description=The [Unifi-controller](https://www.ubnt.com/enterprise/#unifi) software is a powerful, enterprise wireless software engine ideal for high-density client deployments requiring low latency and high uptime performance.\" \
461461
--no-cache --pull -t ${IMAGE}:${META_TAG} \
462462
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
463463
}
@@ -487,7 +487,7 @@ pipeline {
487487
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
488488
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
489489
--label \"org.opencontainers.image.title=Unifi-controller\" \
490-
--label \"org.opencontainers.image.description=The [Unifi-controller](https://www.ubnt.com/enterprise/#unifi) Controller software is a powerful, enterprise wireless software engine ideal for high-density client deployments requiring low latency and high uptime performance. \" \
490+
--label \"org.opencontainers.image.description=The [Unifi-controller](https://www.ubnt.com/enterprise/#unifi) software is a powerful, enterprise wireless software engine ideal for high-density client deployments requiring low latency and high uptime performance.\" \
491491
--no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
492492
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
493493
}
@@ -514,7 +514,7 @@ pipeline {
514514
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
515515
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
516516
--label \"org.opencontainers.image.title=Unifi-controller\" \
517-
--label \"org.opencontainers.image.description=The [Unifi-controller](https://www.ubnt.com/enterprise/#unifi) Controller software is a powerful, enterprise wireless software engine ideal for high-density client deployments requiring low latency and high uptime performance. \" \
517+
--label \"org.opencontainers.image.description=The [Unifi-controller](https://www.ubnt.com/enterprise/#unifi) software is a powerful, enterprise wireless software engine ideal for high-density client deployments requiring low latency and high uptime performance.\" \
518518
--no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
519519
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
520520
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
@@ -548,7 +548,7 @@ pipeline {
548548
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
549549
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
550550
--label \"org.opencontainers.image.title=Unifi-controller\" \
551-
--label \"org.opencontainers.image.description=The [Unifi-controller](https://www.ubnt.com/enterprise/#unifi) Controller software is a powerful, enterprise wireless software engine ideal for high-density client deployments requiring low latency and high uptime performance. \" \
551+
--label \"org.opencontainers.image.description=The [Unifi-controller](https://www.ubnt.com/enterprise/#unifi) software is a powerful, enterprise wireless software engine ideal for high-density client deployments requiring low latency and high uptime performance.\" \
552552
--no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
553553
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
554554
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"

‎README.md‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Find us at:
3939
[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-unifi-controller%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-unifi-controller/job/master/)
4040
[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Funifi-controller%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/unifi-controller/latest/index.html)
4141

42-
The [Unifi-controller](https://www.ubnt.com/enterprise/#unifi) Controller software is a powerful, enterprise wireless software engine ideal for high-density client deployments requiring low latency and high uptime performance.
42+
The [Unifi-controller](https://www.ubnt.com/enterprise/#unifi) software is a powerful, enterprise wireless software engine ideal for high-density client deployments requiring low latency and high uptime performance.
4343

4444
[![unifi-controller](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/unifi-banner.png)](https://www.ubnt.com/enterprise/#unifi)
4545

@@ -72,6 +72,8 @@ set-inform http://$address:8080/inform
7272

7373
The default device password is `ubnt`. `$address` is the IP address of the host you are running this container on and `$AP-IP` is the Access Point IP address.
7474

75+
When using a Security Gateway (router) it could be that network connected devices are unable to obtain an ip address. This can be fixed by setting "DHCP Gateway IP", under Settings > Networks > network_name, to a correct (and accessable) ip address.
76+
7577
## Usage
7678

7779
Here are some example snippets to help you get started creating a container.
@@ -128,17 +130,6 @@ docker run -d \
128130
lscr.io/linuxserver/unifi-controller
129131
```
130132

131-
### Version Tags
132-
133-
This image provides various versions that are available via tags. `latest` tag provides the latest stable build from Unifi, but if this is a permanent setup you might consider using the LTS tag.
134-
135-
| Tag | Description |
136-
| :----: | -------------------------------------------- |
137-
| latest | releases from the latest stable branch. |
138-
139-
## Common problems
140-
When using a Security Gateway (router) it could be that network connected devices are unable to obtain an ip address. This can be fixed by setting "DHCP Gateway IP", under Settings > Networks > network_name, to a correct (and accessable) ip address.
141-
142133
## Parameters
143134

144135
Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
@@ -269,6 +260,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
269260

270261
## Versions
271262

263+
* **13.12.20:** - Rebase 64 bit containers to Focal.
272264
* **11.12.21:** - Add java opts to mitigate CVE-2021-44228.
273265
* **11.06.21:** - Allow for changing Java initial mem via new optional environment variable.
274266
* **12.01.21:** - Deprecate the `LTS` tag as Unifi no longer releases LTS stable builds. Existing users can switch to the `latest` tag. Direct upgrade from 5.6.42 (LTS) to 6.0.42 (latest) tested successfully.

‎readme-vars.yml‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
project_name: unifi-controller
55
project_url: "https://www.ubnt.com/enterprise/#unifi"
66
project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/unifi-banner.png"
7-
project_blurb: |
8-
The [{{ project_name|capitalize }}]({{ project_url }}) Controller software is a powerful, enterprise wireless software engine ideal for high-density client deployments requiring low latency and high uptime performance.
7+
project_blurb: "The [{{ project_name|capitalize }}]({{ project_url }}) software is a powerful, enterprise wireless software engine ideal for high-density client deployments requiring low latency and high uptime performance."
98
project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
109

1110
# supported architectures
@@ -14,33 +13,21 @@ available_architectures:
1413
- { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
1514
- { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
1615

17-
# optional container parameters
18-
opt_param_usage_include_env: true
19-
opt_param_env_vars:
20-
- { env_var: "MEM_LIMIT", env_value: "1024M", desc: "Optionally change the Java memory limit (-Xmx) (default is 1024M)." }
21-
- { env_var: "MEM_STARTUP", env_value: "1024M", desc: "Optionally change the Java initial memory (-Xms) (default is 1024M)." }
22-
23-
# Optional Block
24-
optional_block_1: true
25-
optional_block_1_items:
26-
- |
27-
### Version Tags
28-
29-
This image provides various versions that are available via tags. `latest` tag provides the latest stable build from Unifi, but if this is a permanent setup you might consider using the LTS tag.
30-
31-
| Tag | Description |
32-
| :----: | -------------------------------------------- |
33-
| latest | releases from the latest stable branch. |
34-
35-
## Common problems
36-
When using a Security Gateway (router) it could be that network connected devices are unable to obtain an ip address. This can be fixed by setting "DHCP Gateway IP", under Settings > Networks > network_name, to a correct (and accessable) ip address.
16+
# development version
17+
development_versions: false
3718

3819
# container parameters
3920
param_container_name: "{{ project_name }}"
4021
param_usage_include_vols: true
4122
param_volumes:
4223
- { vol_path: "/config", vol_host_path: "<path to data>", desc: "All Unifi data stored here" }
4324

25+
# optional container parameters
26+
opt_param_usage_include_env: true
27+
opt_param_env_vars:
28+
- { env_var: "MEM_LIMIT", env_value: "1024M", desc: "Optionally change the Java memory limit (-Xmx) (default is 1024M)." }
29+
- { env_var: "MEM_STARTUP", env_value: "1024M", desc: "Optionally change the Java initial memory (-Xms) (default is 1024M)." }
30+
4431
param_usage_include_ports: true
4532
param_ports:
4633
- { external_port: "3478", internal_port: "3478/udp", port_desc: "Unifi STUN port" }
@@ -73,8 +60,11 @@ app_setup_block: |
7360
7461
The default device password is `ubnt`. `$address` is the IP address of the host you are running this container on and `$AP-IP` is the Access Point IP address.
7562
63+
When using a Security Gateway (router) it could be that network connected devices are unable to obtain an ip address. This can be fixed by setting "DHCP Gateway IP", under Settings > Networks > network_name, to a correct (and accessable) ip address.
64+
7665
# changelog
7766
changelogs:
67+
- { date: "13.12.20:", desc: "Rebase 64 bit containers to Focal."}
7868
- { date: "11.12.21:", desc: "Add java opts to mitigate CVE-2021-44228."}
7969
- { date: "11.06.21:", desc: "Allow for changing Java initial mem via new optional environment variable."}
8070
- { date: "12.01.21:", desc: "Deprecate the `LTS` tag as Unifi no longer releases LTS stable builds. Existing users can switch to the `latest` tag. Direct upgrade from 5.6.42 (LTS) to 6.0.42 (latest) tested successfully."}

0 commit comments

Comments
 (0)