Skip to content

Commit 7fb8a33

Browse files
goofball222goofball222
authored
Merge pull request #172 from goofball222/10.3-beta
10.3 beta
2 parents 07e3420 + 48b20c4 commit 7fb8a33

53 files changed

Lines changed: 1166 additions & 20 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build-beta.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
branches:
77
- main
88
paths:
9-
- 10.2/beta/**
9+
- 10.3/beta/**
1010
- .github/workflows/build-beta.yml
1111

1212
jobs:
@@ -19,7 +19,7 @@ jobs:
1919
-
2020
name: Set up dynamic build ARGs
2121
id: getargs
22-
run: echo "version=$(cat ./10.2/beta/VERSION)" >> $GITHUB_OUTPUT
22+
run: echo "version=$(cat ./10.3/beta/VERSION)" >> $GITHUB_OUTPUT
2323
-
2424
name: Set up Docker metadata for Alpine
2525
id: meta-alpine
@@ -30,7 +30,7 @@ jobs:
3030
ghcr.io/${{ github.repository }}
3131
tags: |
3232
type=raw,latest-alpine-beta
33-
type=raw,10.2-alpine-beta
33+
type=raw,10.3-alpine-beta
3434
labels: |
3535
org.opencontainers.image.vendor=The Goofball - goofball222@gmail.com
3636
org.opencontainers.image.title=UniFi Network Application
@@ -46,7 +46,7 @@ jobs:
4646
ghcr.io/${{ github.repository }}
4747
tags: |
4848
type=raw,latest-debian-beta
49-
type=raw,10.2-debian-beta
49+
type=raw,10.3-debian-beta
5050
labels: |
5151
org.opencontainers.image.vendor=The Goofball - goofball222@gmail.com
5252
org.opencontainers.image.title=UniFi Network Application
@@ -63,8 +63,8 @@ jobs:
6363
tags: |
6464
type=raw,latest-beta
6565
type=raw,latest-ubuntu-beta
66-
type=raw,10.2-beta
67-
type=raw,10.2-ubuntu-beta
66+
type=raw,10.3-beta
67+
type=raw,10.3-ubuntu-beta
6868
labels: |
6969
org.opencontainers.image.vendor=The Goofball - goofball222@gmail.com
7070
org.opencontainers.image.title=UniFi Network Application
@@ -80,7 +80,7 @@ jobs:
8080
ghcr.io/${{ github.repository }}
8181
tags: |
8282
type=raw,latest-debian-nomongo-beta
83-
type=raw,10.2-debian-nomongo-beta
83+
type=raw,10.3-debian-nomongo-beta
8484
labels: |
8585
org.opencontainers.image.vendor=The Goofball - goofball222@gmail.com
8686
org.opencontainers.image.title=UniFi Network Application
@@ -97,8 +97,8 @@ jobs:
9797
tags: |
9898
type=raw,latest-nomongo-beta
9999
type=raw,latest-ubuntu-nomongo-beta
100-
type=raw,10.2-nomongo-beta
101-
type=raw,10.2-ubuntu-nomongo-beta
100+
type=raw,10.3-nomongo-beta
101+
type=raw,10.3-ubuntu-nomongo-beta
102102
labels: |
103103
org.opencontainers.image.vendor=The Goofball - goofball222@gmail.com
104104
org.opencontainers.image.title=UniFi Network Application
@@ -127,8 +127,8 @@ jobs:
127127
name: Build and push Alpine Docker image
128128
uses: docker/build-push-action@v7
129129
with:
130-
context: ./10.2/beta
131-
file: ./10.2/beta/Dockerfile.alpine
130+
context: ./10.3/beta
131+
file: ./10.3/beta/Dockerfile.alpine
132132
platforms: linux/amd64,linux/arm64
133133
push: ${{ github.event_name != 'pull_request' }}
134134
tags: ${{ steps.meta-alpine.outputs.tags }}
@@ -138,8 +138,8 @@ jobs:
138138
name: Build and push Debian Docker image
139139
uses: docker/build-push-action@v7
140140
with:
141-
context: ./10.2/beta
142-
file: ./10.2/beta/Dockerfile.debian
141+
context: ./10.3/beta
142+
file: ./10.3/beta/Dockerfile.debian
143143
platforms: linux/amd64
144144
push: ${{ github.event_name != 'pull_request' }}
145145
tags: ${{ steps.meta-debian.outputs.tags }}
@@ -149,8 +149,8 @@ jobs:
149149
name: Build and push Ubuntu Docker image
150150
uses: docker/build-push-action@v7
151151
with:
152-
context: ./10.2/beta
153-
file: ./10.2/beta/Dockerfile
152+
context: ./10.3/beta
153+
file: ./10.3/beta/Dockerfile
154154
platforms: linux/amd64,linux/arm64
155155
push: ${{ github.event_name != 'pull_request' }}
156156
tags: ${{ steps.meta-ubuntu.outputs.tags }}
@@ -160,8 +160,8 @@ jobs:
160160
name: Build and push Debian Docker nomongo image
161161
uses: docker/build-push-action@v7
162162
with:
163-
context: ./10.2/beta
164-
file: ./10.2/beta/Dockerfile.debian.nomongo
163+
context: ./10.3/beta
164+
file: ./10.3/beta/Dockerfile.debian.nomongo
165165
platforms: linux/amd64
166166
push: ${{ github.event_name != 'pull_request' }}
167167
tags: ${{ steps.meta-debian-nomongo.outputs.tags }}
@@ -171,8 +171,8 @@ jobs:
171171
name: Build and push Ubuntu Docker nomongo image
172172
uses: docker/build-push-action@v7
173173
with:
174-
context: ./10.2/beta
175-
file: ./10.2/beta/Dockerfile.ubuntu.nomongo
174+
context: ./10.3/beta
175+
file: ./10.3/beta/Dockerfile.ubuntu.nomongo
176176
platforms: linux/amd64,linux/arm64
177177
push: ${{ github.event_name != 'pull_request' }}
178178
tags: ${{ steps.meta-ubuntu-nomongo.outputs.tags }}

‎10.3/beta/Dockerfile‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
FROM ubuntu:24.04
2+
3+
ARG BUILD_DATE
4+
ARG VCS_REF
5+
ARG VERSION
6+
7+
LABEL \
8+
org.opencontainers.image.vendor="The Goofball - goofball222@gmail.com" \
9+
org.opencontainers.image.url="https://github.com/goofball222/unifi" \
10+
org.opencontainers.image.title="UniFi Controller" \
11+
org.opencontainers.image.description="UniFi Controller" \
12+
org.opencontainers.image.version=${VERSION}-Ubuntu \
13+
org.opencontainers.image.source="https://github.com/goofball222/unifi" \
14+
org.opencontainers.image.revision=${VCS_REF} \
15+
org.opencontainers.image.created=${BUILD_DATE} \
16+
org.opencontainers.image.licenses="Apache-2.0"
17+
18+
ENV \
19+
BIND_PRIV=false \
20+
DEBIAN_FRONTEND=noninteractive \
21+
DEBUG=false \
22+
JVM_EXTRA_OPTS= \
23+
JVM_INIT_HEAP_SIZE= \
24+
JVM_MAX_HEAP_SIZE=1024M \
25+
PGID=999 \
26+
PUID=999 \
27+
RUN_CHOWN=true \
28+
RUNAS_UID0=false
29+
30+
WORKDIR /usr/lib/unifi
31+
32+
COPY root /
33+
34+
RUN set -x \
35+
&& groupadd -r unifi -g $PGID \
36+
&& useradd --no-log-init -r -u $PUID -g $PGID unifi \
37+
&& apt-get -y update \
38+
&& apt-get -y install apt-utils \
39+
&& apt-get -y --no-install-recommends install \
40+
binutils curl dirmngr \
41+
gnupg gosu libcap2 \
42+
libcap2-bin procps python3 \
43+
tzdata \
44+
&& apt-get -y --no-install-recommends install \
45+
ca-certificates-java \
46+
&& apt-get -y --no-install-recommends install \
47+
openjdk-25-jre-headless \
48+
&& curl -fsSL https://www.mongodb.org/static/pgp/server-8.0.asc | \
49+
gpg -o /usr/share/keyrings/mongodb-server-8.0.gpg \
50+
--dearmor \
51+
&& echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-8.0.gpg ] https://repo.mongodb.org/apt/ubuntu noble/mongodb-org/8.0 multiverse" \
52+
> /etc/apt/sources.list.d/mongodb-org-8.0.list \
53+
&& apt-get -y update \
54+
&& apt-get -y --no-install-recommends install \
55+
mongodb-org-server \
56+
&& curl -sSL https://dl.ui.com/unifi/${VERSION}/unifi_sysvinit_all.deb -o /tmp/unifi-${VERSION}.deb \
57+
&& apt-get -y purge \
58+
dirmngr \
59+
&& apt-get -y autoremove --purge \
60+
&& apt-get -y clean autoclean \
61+
&& dpkg --force-all -i /tmp/unifi-${VERSION}.deb \
62+
&& rm -rf data logs run \
63+
&& bash -c 'mkdir -p {data,logs,run,cert}' \
64+
&& chown -R unifi:unifi /usr/lib/unifi \
65+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/log/*
66+
67+
EXPOSE 3478/udp 6789/tcp 8080/tcp 8443/tcp 8843/tcp 8880/tcp 10001/udp
68+
69+
VOLUME ["/usr/lib/unifi/cert", "/usr/lib/unifi/data", "/usr/lib/unifi/logs"]
70+
71+
HEALTHCHECK --start-period=2m CMD /usr/local/bin/docker-healthcheck.sh
72+
73+
ENTRYPOINT ["docker-entrypoint.sh"]
74+
75+
CMD ["unifi"]

‎10.3/beta/Dockerfile.alpine‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
FROM alpine:latest
2+
3+
ARG BUILD_DATE
4+
ARG VCS_REF
5+
ARG VERSION
6+
7+
LABEL \
8+
org.opencontainers.image.vendor="The Goofball - goofball222@gmail.com" \
9+
org.opencontainers.image.url="https://github.com/goofball222/unifi" \
10+
org.opencontainers.image.title="UniFi Controller" \
11+
org.opencontainers.image.description="UniFi Controller" \
12+
org.opencontainers.image.version=${VERSION}-Alpine \
13+
org.opencontainers.image.source="https://github.com/goofball222/unifi" \
14+
org.opencontainers.image.revision=${VCS_REF} \
15+
org.opencontainers.image.created=${BUILD_DATE} \
16+
org.opencontainers.image.licenses="Apache-2.0"
17+
18+
ENV \
19+
BIND_PRIV=false \
20+
DEBUG=false \
21+
JVM_EXTRA_OPTS= \
22+
JVM_INIT_HEAP_SIZE= \
23+
JVM_MAX_HEAP_SIZE=1024M \
24+
PGID=999 \
25+
PUID=999 \
26+
RUN_CHOWN=true \
27+
RUNAS_UID0=false
28+
29+
WORKDIR /usr/lib/unifi
30+
31+
COPY root /
32+
33+
RUN set -x \
34+
&& delgroup ping \
35+
&& addgroup -g $PGID unifi \
36+
&& adduser -D -G unifi -u $PUID unifi \
37+
&& apk add -q --no-cache \
38+
gcompat libc6-compat \
39+
&& apk add -q --no-cache \
40+
bash binutils coreutils curl libcap \
41+
openjdk25-jre openssl python3 shadow \
42+
su-exec tzdata \
43+
&& curl -sSL https://dl.ui.com/unifi/${VERSION}/UniFi.unix.zip -o /tmp/UniFi.unix.${VERSION}.zip \
44+
&& unzip -q /tmp/UniFi.unix.${VERSION}.zip -d /tmp \
45+
&& mv /tmp/UniFi/* /usr/lib/unifi/ \
46+
&& bash -c 'mkdir -p {data,logs,run,cert}' \
47+
&& chown -R unifi:unifi /usr/lib/unifi \
48+
&& rm -rf /tmp/* /var/tmp/* /var/cache/apk/*
49+
50+
EXPOSE 3478/udp 6789/tcp 8080/tcp 8443/tcp 8843/tcp 8880/tcp 10001/udp
51+
52+
VOLUME ["/usr/lib/unifi/cert", "/usr/lib/unifi/data", "/usr/lib/unifi/logs"]
53+
54+
HEALTHCHECK --start-period=2m CMD /usr/local/bin/docker-healthcheck.sh
55+
56+
ENTRYPOINT ["docker-entrypoint.sh"]
57+
58+
CMD ["unifi"]

‎10.3/beta/Dockerfile.debian‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
FROM debian:trixie-slim
2+
3+
ARG BUILD_DATE
4+
ARG VCS_REF
5+
ARG VERSION
6+
7+
LABEL \
8+
org.opencontainers.image.vendor="The Goofball - goofball222@gmail.com" \
9+
org.opencontainers.image.url="https://github.com/goofball222/unifi" \
10+
org.opencontainers.image.title="UniFi Controller" \
11+
org.opencontainers.image.description="UniFi Controller" \
12+
org.opencontainers.image.version=${VERSION}-Debian \
13+
org.opencontainers.image.source="https://github.com/goofball222/unifi" \
14+
org.opencontainers.image.revision=${VCS_REF} \
15+
org.opencontainers.image.created=${BUILD_DATE} \
16+
org.opencontainers.image.licenses="Apache-2.0"
17+
18+
ENV \
19+
BIND_PRIV=false \
20+
DEBIAN_FRONTEND=noninteractive \
21+
DEBUG=false \
22+
JVM_EXTRA_OPTS= \
23+
JVM_INIT_HEAP_SIZE= \
24+
JVM_MAX_HEAP_SIZE=1024M \
25+
PGID=999 \
26+
PUID=999 \
27+
RUN_CHOWN=true \
28+
RUNAS_UID0=false
29+
30+
WORKDIR /usr/lib/unifi
31+
32+
COPY root /
33+
34+
RUN set -x \
35+
&& groupadd -r unifi -g $PGID \
36+
&& useradd --no-log-init -r -u $PUID -g $PGID unifi \
37+
&& mkdir -p /usr/share/man/man1 \
38+
&& apt-get -y update \
39+
&& apt-get -y install apt-utils \
40+
&& apt-get -y --no-install-recommends install \
41+
dirmngr gnupg2 \
42+
&& apt-get -y update \
43+
&& apt-get -y --no-install-recommends install \
44+
binutils curl gosu \
45+
libcap2 libcap2-bin procps \
46+
python3 tzdata \
47+
&& apt-get -y --no-install-recommends install \
48+
ca-certificates-java \
49+
&& apt-get -y --no-install-recommends install \
50+
openjdk-25-jre-headless \
51+
&& curl -fsSL https://www.mongodb.org/static/pgp/server-8.0.asc | \
52+
gpg -o /usr/share/keyrings/mongodb-server-8.0.gpg \
53+
--dearmor \
54+
&& echo "deb [ signed-by=/usr/share/keyrings/mongodb-server-8.0.gpg ] http://repo.mongodb.org/apt/debian bookworm/mongodb-org/8.0 main" \
55+
> /etc/apt/sources.list.d/mongodb-org-8.0.list \
56+
&& apt-get -y update \
57+
&& apt-get -y --no-install-recommends install \
58+
mongodb-org-server \
59+
&& curl -sSL https://dl.ui.com/unifi/${VERSION}/unifi_sysvinit_all.deb -o /tmp/unifi-${VERSION}.deb \
60+
&& apt-get -y purge \
61+
apt-utils dirmngr gnupg2 \
62+
&& apt-get -y autoremove --purge \
63+
&& apt-get -y clean autoclean \
64+
&& dpkg --force-all -i /tmp/unifi-${VERSION}.deb \
65+
&& rm -rf data logs run \
66+
&& bash -c 'mkdir -p {data,logs,run,cert}' \
67+
&& chown -R unifi:unifi /usr/lib/unifi \
68+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/log/*
69+
70+
EXPOSE 3478/udp 6789/tcp 8080/tcp 8443/tcp 8843/tcp 8880/tcp 10001/udp
71+
72+
VOLUME ["/usr/lib/unifi/cert", "/usr/lib/unifi/data", "/usr/lib/unifi/logs"]
73+
74+
HEALTHCHECK --start-period=2m CMD /usr/local/bin/docker-healthcheck.sh
75+
76+
ENTRYPOINT ["docker-entrypoint.sh"]
77+
78+
CMD ["unifi"]

0 commit comments

Comments
 (0)