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

Commit 3be4fdd

Browse files
authored
Merge pull request #191 from linuxserver/remove-armhf
2 parents 21a8d68 + b7669b7 commit 3be4fdd

File tree

10 files changed

+40
-101
lines changed

10 files changed

+40
-101
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ trim_trailing_whitespace = false
1515
indent_style = space
1616
indent_size = 2
1717

18-
[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
18+
[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
1919
indent_style = space
2020
indent_size = 4

.github/workflows/greetings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ jobs:
88
steps:
99
- uses: actions/first-interaction@v1
1010
with:
11-
issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-unifi-controller/blob/master/.github/ISSUE_TEMPLATE/issue.bug.yml) or [feature](https://github.com/linuxserver/docker-unifi-controller/blob/master/.github/ISSUE_TEMPLATE/issue.feature.yml) issue templates!'
11+
issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
1212
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-unifi-controller/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
1313
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/permissions.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: Permission check
2+
on:
3+
pull_request:
4+
paths:
5+
- '**/run'
6+
- '**/finish'
7+
jobs:
8+
permission_check:
9+
uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# syntax=docker/dockerfile:1
2+
13
FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
24

35
# set version label

Dockerfile.aarch64

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# syntax=docker/dockerfile:1
2+
13
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
24

35
# set version label

Dockerfile.armhf

Lines changed: 0 additions & 11 deletions
This file was deleted.

Jenkinsfile

Lines changed: 14 additions & 69 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ The architectures supported by this image are:
5656
| :----: | :----: | ---- |
5757
| x86-64 || amd64-\<version tag\> |
5858
| arm64 || arm64v8-\<version tag\> |
59-
| armhf|| |
59+
| armhf || |
6060

6161
## Application Setup
6262

@@ -75,6 +75,11 @@ The default device password is `ubnt`. `$address` is the IP address of the host
7575

7676
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.
7777

78+
### Strict reverse proxies
79+
80+
This image uses a self-signed certificate by default. This naturally means the scheme is `https`.
81+
If you are using a reverse proxy which validates certificates, you need to [disable this check for the container](https://docs.linuxserver.io/faq#strict-proxy).
82+
7883
## Usage
7984

8085
Here are some example snippets to help you get started creating a container.
@@ -91,7 +96,7 @@ services:
9196
environment:
9297
- PUID=1000
9398
- PGID=1000
94-
- TZ=Europe/London
99+
- TZ=Etc/UTC
95100
- MEM_LIMIT=1024 #optional
96101
- MEM_STARTUP=1024 #optional
97102
volumes:
@@ -116,7 +121,7 @@ docker run -d \
116121
--name=unifi-controller \
117122
-e PUID=1000 \
118123
-e PGID=1000 \
119-
-e TZ=Europe/London \
124+
-e TZ=Etc/UTC \
120125
-e MEM_LIMIT=1024 `#optional` \
121126
-e MEM_STARTUP=1024 `#optional` \
122127
-p 8443:8443 \
@@ -131,6 +136,7 @@ docker run -d \
131136
-v <path to data>:/config \
132137
--restart unless-stopped \
133138
lscr.io/linuxserver/unifi-controller:latest
139+
134140
```
135141

136142
## Parameters
@@ -150,7 +156,7 @@ Container images are configured using parameters passed at runtime (such as thos
150156
| `-p 5514/udp` | Remote syslog port |
151157
| `-e PUID=1000` | for UserID - see below for explanation |
152158
| `-e PGID=1000` | for GroupID - see below for explanation |
153-
| `-e TZ=Europe/London` | Specify a timezone to use (e.g. Europe/London) - [see list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones) |
159+
| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
154160
| `-e MEM_LIMIT=1024` | Optionally change the Java memory limit (in Megabytes). Set to `default` to reset to default |
155161
| `-e MEM_STARTUP=1024` | Optionally change the Java initial/minimum memory (in Megabytes). Set to `default` to reset to default |
156162
| `-v /config` | All Unifi data stored here |

jenkins-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ custom_version_command: "curl -sX GET http://dl-origin.ubnt.com/unifi/debian/dis
77
release_type: stable
88
release_tag: latest
99
ls_branch: master
10+
build_armhf: false
1011
repo_vars:
1112
- BUILD_VERSION_ARG = 'UNIFI_VERSION'
1213
- LS_USER = 'linuxserver'

root-armhf/etc/cont-init.d/50-armless

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)