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

Commit 13cf48a

Browse files
authored
Merge pull request #140 from linuxserver/deprecate-arm
2 parents 998ab95 + 9573af6 commit 13cf48a

File tree

8 files changed

+32
-47
lines changed

8 files changed

+32
-47
lines changed

Dockerfile.armhf

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

33
# set version label
44
ARG BUILD_DATE
@@ -7,42 +7,9 @@ ARG UNIFI_VERSION
77
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
88
LABEL maintainer="aptalca"
99

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

4513
# Volumes and Ports
4614
WORKDIR /usr/lib/unifi
47-
VOLUME /config
48-
EXPOSE 8080 8443 8843 8880
15+

README.md

Lines changed: 2 additions & 1 deletion
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| | arm32v7-\<version tag\> |
59+
| armhf| | |
6060

6161
## Application Setup
6262

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

262262
## Versions
263263

264+
* **01.06.22:** - Deprecate armhf.
264265
* **23.12.21:** - Move min/max memory config from run to system.properties.
265266
* **22.12.21:** - Move deb package install to first init to avoid overlayfs performance issues.
266267
* **13.12.21:** - Rebase 64 bit containers to Focal.

readme-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_
1111
available_architectures:
1212
- { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
1313
- { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
14-
- { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
1514

1615
# development version
1716
development_versions: false
@@ -64,6 +63,7 @@ app_setup_block: |
6463
6564
# changelog
6665
changelogs:
66+
- { date: "01.06.22:", desc: "Deprecate armhf."}
6767
- { date: "23.12.21:", desc: "Move min/max memory config from run to system.properties."}
6868
- { date: "22.12.21:", desc: "Move deb package install to first init to avoid overlayfs performance issues."}
6969
- { date: "13.12.21:", desc: "Rebase 64 bit containers to Focal."}

root/etc/cont-init.d/15-install

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#!/usr/bin/with-contenv bash
22

3+
if [[ "$(uname -m)" == "armv7l" ]]; then
4+
# We don't support armhf any more
5+
exit 0
6+
fi
7+
38
if [[ ! -d /usr/lib/unifi/bin ]]; then
49
echo "*** installing unifi packages ***"
510
export DEBIAN_FRONTEND=noninteractive

root/etc/cont-init.d/19-deprecate renamed to root/etc/cont-init.d/19-armless

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@ cat <<-EOF
66
********************************************************
77
* *
88
* !!!! *
9-
* This 32 bit ARM image will be deprecated *
10-
* in June 2022 due to lack of upstream support. *
11-
* *
12-
* For further information please visit *
13-
* https://info.linuxserver.io/issues/2021-11-25-unifi/ *
9+
* This Unifi-Controller image does not support *
10+
* 32 bit ARM due to lack of available OS packages *
1411
* *
1512
* *
1613
********************************************************

root/etc/cont-init.d/20-config

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
#!/usr/bin/with-contenv bash
22

3+
if [[ "$(uname -m)" == "armv7l" ]]; then
4+
# We don't support armhf any more
5+
exit 0
6+
fi
7+
38
# create our folders
49
mkdir -p \
5-
/config/{data,logs,run}
10+
/config/{data,logs,run}
611

712

813
# create symlinks for config

root/etc/cont-init.d/30-keygen

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
#!/usr/bin/with-contenv bash
22

3+
if [[ "$(uname -m)" == "armv7l" ]]; then
4+
# We don't support armhf any more
5+
exit 0
6+
fi
7+
38
# generate key
49
[[ ! -f /config/data/keystore ]] && \
5-
keytool -genkey -keyalg RSA -alias unifi -keystore /config/data/keystore \
6-
-storepass aircontrolenterprise -keypass aircontrolenterprise -validity 1825 \
7-
-keysize 4096 -dname "cn=unifi"
10+
keytool -genkey -keyalg RSA -alias unifi -keystore /config/data/keystore \
11+
-storepass aircontrolenterprise -keypass aircontrolenterprise -validity 1825 \
12+
-keysize 4096 -dname "cn=unifi"
813

914
# permissions
1015
chown abc:abc \
11-
/config/data/keystore
16+
/config/data/keystore

root/etc/services.d/unifi/run

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@
22

33
cd /config || exit
44

5+
if [[ "$(uname -m)" == "armv7l" ]]; then
6+
# We don't support armhf any more
7+
sleep infinity
8+
fi
9+
510
exec \
611
s6-setuidgid abc java -Dlog4j2.formatMsgNoLookups=true -jar /usr/lib/unifi/lib/ace.jar start;

0 commit comments

Comments
 (0)