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

Commit 6fe0c81

Browse files
committed
Bring armless handling in line with newer images
1 parent eb15e2c commit 6fe0c81

File tree

5 files changed

+4
-24
lines changed

5 files changed

+4
-24
lines changed

Dockerfile.armhf

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,4 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="aptalca"
99

1010
# add local files
11-
COPY root/ /
12-
13-
# Volumes and Ports
14-
WORKDIR /usr/lib/unifi
15-
11+
COPY root-armhf/ /
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
#!/usr/bin/with-contenv bash
2+
# shellcheck shell=bash
23

3-
if [[ "$(uname -m)" == "armv7l" ]]; then
44
cat <<-EOF
55
********************************************************
66
********************************************************
77
* *
88
* !!!! *
9-
* This Unifi-Controller image does not support *
10-
* 32 bit ARM due to lack of available OS packages *
9+
* This Unif-Controller image does not support *
10+
* 32 bit ARM due to a lack of OS packages *
1111
* *
1212
* *
1313
********************************************************
1414
********************************************************
1515
EOF
16-
fi

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
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-
83
if [[ ! -d /usr/lib/unifi/bin ]]; then
94
echo "*** installing unifi packages ***"
105
export DEBIAN_FRONTEND=noninteractive

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
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-
83
# create our folders
94
mkdir -p \
105
/config/{data,logs,run}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
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-
83
# generate key
94
[[ ! -f /config/data/keystore ]] && \
105
keytool -genkey -keyalg RSA -alias unifi -keystore /config/data/keystore \

0 commit comments

Comments
 (0)