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

Commit bca18eb

Browse files
authored
Merge pull request #118 from linuxserver/install-on-init
2 parents f0e88a5 + c0503cf commit bca18eb

File tree

5 files changed

+38
-30
lines changed

5 files changed

+38
-30
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ RUN \
2929
| awk -F ': ' '/Version/{print $2;exit}' \
3030
| awk -F '-' '{print $1}'); \
3131
fi && \
32+
mkdir -p /app && \
3233
curl -o \
33-
/tmp/unifi.deb -L \
34+
/app/unifi.deb -L \
3435
"https://dl.ui.com/unifi/${UNIFI_VERSION}/unifi_sysvinit_all.deb" && \
35-
dpkg -i /tmp/unifi.deb && \
3636
echo "**** cleanup ****" && \
3737
apt-get clean && \
3838
rm -rf \

Dockerfile.aarch64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ RUN \
2929
| awk -F ': ' '/Version/{print $2;exit}' \
3030
| awk -F '-' '{print $1}'); \
3131
fi && \
32+
mkdir -p /app && \
3233
curl -o \
33-
/tmp/unifi.deb -L \
34+
/app/unifi.deb -L \
3435
"https://dl.ui.com/unifi/${UNIFI_VERSION}/unifi_sysvinit_all.deb" && \
35-
dpkg -i /tmp/unifi.deb && \
3636
echo "**** cleanup ****" && \
3737
apt-get clean && \
3838
rm -rf \

Dockerfile.armhf

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,32 @@ 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-
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-
curl -o \
32-
/tmp/unifi.deb -L \
33-
"https://dl.ui.com/unifi/${UNIFI_VERSION}/unifi_sysvinit_all.deb" && \
34-
dpkg -i /tmp/unifi.deb && \
35-
echo "**** cleanup ****" && \
36-
apt-get clean && \
37-
rm -rf \
38-
/tmp/* \
39-
/var/lib/apt/lists/* \
40-
/var/tmp/*
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/*
4141

4242
# add local files
4343
COPY root/ /

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ app_setup_block: |
6464
6565
# changelog
6666
changelogs:
67+
- { date: "22.12.21:", desc: "Move deb package install to first init to avoid overlayfs performance issues."}
6768
- { date: "13.12.21:", desc: "Rebase 64 bit containers to Focal."}
6869
- { date: "11.12.21:", desc: "Add java opts to mitigate CVE-2021-44228."}
6970
- { date: "11.06.21:", desc: "Allow for changing Java initial mem via new optional environment variable."}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/with-contenv bash
2+
3+
if [[ ! -d /usr/lib/unifi/bin ]]; then
4+
echo "*** installing unifi packages ***"
5+
export DEBIAN_FRONTEND=noninteractive
6+
dpkg -i /app/unifi.deb
7+
fi

0 commit comments

Comments
 (0)