Merge pull request #140 from linuxserver/deprecate-arm

Author: thespad

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-xenial
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
 
 # set version label
 ARG BUILD_DATE
@@ -7,42 +7,9 @@ ARG UNIFI_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="aptalca"
 
-# environment settings
-ARG UNIFI_BRANCH="stable"
-ARG DEBIAN_FRONTEND="noninteractive"
-
-RUN \
-  echo "**** install packages ****" && \
-  apt-get update && \
-  apt-get install -y \
-    binutils \
-    jsvc \
-    logrotate \
-    mongodb-server \
-    openjdk-8-jre-headless \
-    wget && \
-  echo "**** install unifi ****" && \
-  if [ -z ${UNIFI_VERSION+x} ]; then \
-    UNIFI_VERSION=$(curl -sX GET http://dl-origin.ubnt.com/unifi/debian/dists/${UNIFI_BRANCH}/ubiquiti/binary-amd64/Packages \
-    |grep -A 7 -m 1 'Package: unifi' \
-    | awk -F ': ' '/Version/{print $2;exit}' \
-    | awk -F '-' '{print $1}'); \
-  fi && \
-  mkdir -p /app && \ 
-  curl -o \
-  /app/unifi.deb -L \
-    "https://dl.ui.com/unifi/${UNIFI_VERSION}/unifi_sysvinit_all.deb" && \ 
-  echo "**** cleanup ****" && \
-  apt-get clean && \
-  rm -rf \
-    /tmp/* \
-    /var/lib/apt/lists/* \
-    /var/tmp/*
-
 # add local files
 COPY root/ /
 
 # Volumes and Ports
 WORKDIR /usr/lib/unifi
-VOLUME /config
-EXPOSE 8080 8443 8843 8880
+

README.md

@@ -56,7 +56,7 @@ The architectures supported by this image are:
 | :----: | :----: | ---- |
 | x86-64 | ✅ | amd64-\<version tag\> |
 | arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf| ✅ | arm32v7-\<version tag\> |
+| armhf| ❌ | |
 
 ## Application Setup
 
@@ -261,6 +261,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **01.06.22:** - Deprecate armhf.
 * **23.12.21:** - Move min/max memory config from run to system.properties.
 * **22.12.21:** - Move deb package install to first init to avoid overlayfs performance issues.
 * **13.12.21:** - Rebase 64 bit containers to Focal.

readme-vars.yml

@@ -11,7 +11,6 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_
 available_architectures:
   - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
   - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-  - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
 
 # development version
 development_versions: false
@@ -64,6 +63,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "01.06.22:", desc: "Deprecate armhf."}
   - { date: "23.12.21:", desc: "Move min/max memory config from run to system.properties."}
   - { date: "22.12.21:", desc: "Move deb package install to first init to avoid overlayfs performance issues."}
   - { date: "13.12.21:", desc: "Rebase 64 bit containers to Focal."}

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

@@ -1,5 +1,10 @@
 #!/usr/bin/with-contenv bash
 
+if [[ "$(uname -m)" == "armv7l" ]]; then
+    # We don't support armhf any more
+    exit 0
+fi
+
 if [[ ! -d /usr/lib/unifi/bin ]]; then
     echo "*** installing unifi packages ***"
     export DEBIAN_FRONTEND=noninteractive

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

@@ -6,11 +6,8 @@ cat <<-EOF
     ********************************************************
     *                                                      *
     *                         !!!!                         *
-    *       This 32 bit ARM image will be deprecated       *
-    *     in June 2022 due to lack of upstream support.    *
-    *                                                      *
-    *         For further information please visit         *
-    * https://info.linuxserver.io/issues/2021-11-25-unifi/ *
+    *     This Unifi-Controller image does not support     *
+    *   32 bit ARM due to lack of available OS packages    *
     *                                                      *
     *                                                      *
     ********************************************************

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

@@ -1,8 +1,13 @@
 #!/usr/bin/with-contenv bash
 
+if [[ "$(uname -m)" == "armv7l" ]]; then
+    # We don't support armhf any more
+    exit 0
+fi
+
 # create our folders
 mkdir -p \
-	/config/{data,logs,run}
+    /config/{data,logs,run}
 
 
 # create symlinks for config

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

@@ -1,11 +1,16 @@
 #!/usr/bin/with-contenv bash
 
+if [[ "$(uname -m)" == "armv7l" ]]; then
+    # We don't support armhf any more
+    exit 0
+fi
+
 # generate key
 [[ ! -f /config/data/keystore ]] && \
-	keytool -genkey -keyalg RSA -alias unifi -keystore /config/data/keystore \
-	-storepass aircontrolenterprise -keypass aircontrolenterprise -validity 1825 \
-	-keysize 4096 -dname "cn=unifi"
+    keytool -genkey -keyalg RSA -alias unifi -keystore /config/data/keystore \
+    -storepass aircontrolenterprise -keypass aircontrolenterprise -validity 1825 \
+    -keysize 4096 -dname "cn=unifi"
 
 # permissions
 chown abc:abc \
-	/config/data/keystore
+    /config/data/keystore

root/etc/services.d/unifi/run

@@ -2,5 +2,10 @@
 
 cd /config || exit
 
+if [[ "$(uname -m)" == "armv7l" ]]; then
+    # We don't support armhf any more
+    sleep infinity
+fi
+
 exec \
     s6-setuidgid abc java -Dlog4j2.formatMsgNoLookups=true -jar /usr/lib/unifi/lib/ace.jar start;