Skip to content

Commit 4d98eaf

Browse files
committed
[fix] armv7 issue
1 parent 8dbd714 commit 4d98eaf

File tree

2 files changed

+373
-10
lines changed

2 files changed

+373
-10
lines changed

arch.dockerfile

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
1+
ARG APP_UID=1000
2+
ARG APP_GID=1000
3+
14
# :: Util
25
FROM 11notes/util AS util
36

47
# :: Build / adguard
58
FROM golang:1.24-alpine AS build
69
ARG TARGETARCH
10+
ARG TARGETPLATFORM
11+
ARG TARGETVARIANT
712
ARG APP_ROOT
813
ARG APP_VERSION
914
ENV CGO_ENABLED=0
1015
ENV BUILD_DIR=/go/AdGuardHome
11-
ENV BUILD_BIN=${BUILD_DIR}/dist/AdGuardHome_linux_${TARGETARCH}/AdGuardHome/AdGuardHome
16+
ENV BUILD_BIN=${BUILD_DIR}/dist/AdGuardHome_linux_${TARGETARCH}${TARGETVARIANT}/AdGuardHome/AdGuardHome
1217

1318
USER root
1419

@@ -43,14 +48,15 @@
4348

4449
RUN set -ex; \
4550
cd ${BUILD_DIR}; \
51+
eleven printenv; \
4652
make \
47-
build-release \
53+
OS=linux \
54+
ARCH=${TARGETARCH} \
4855
CHANNEL="release" \
4956
VERSION=${APP_VERSION} \
50-
ARCH=${TARGETARCH} \
51-
OS=linux \
5257
SIGN=0 \
53-
VERBOSE=2;
58+
VERBOSE=3 \
59+
build-release;
5460

5561
RUN set -ex; \
5662
mkdir -p /distroless/usr/local/bin; \
@@ -103,10 +109,10 @@
103109
ENV APP_ROOT=${APP_ROOT}
104110

105111
# :: multi-stage
106-
COPY --from=distroless --chown=1000:1000 / /
107-
COPY --from=distroless-fs --chown=1000:1000 / /
108-
COPY --from=distroless-dnslookup --chown=1000:1000 / /
109-
COPY --from=distroless-adguard --chown=1000:1000 / /
112+
COPY --from=distroless --chown=${APP_UID}:${APP_GID} / /
113+
COPY --from=distroless-fs --chown=${APP_UID}:${APP_GID} / /
114+
COPY --from=distroless-dnslookup --chown=${APP_UID}:${APP_GID} / /
115+
COPY --from=distroless-adguard --chown=${APP_UID}:${APP_GID} / /
110116

111117
# :: Volumes
112118
VOLUME ["${APP_ROOT}/etc", "${APP_ROOT}/var"]
@@ -115,6 +121,6 @@
115121
HEALTHCHECK --interval=5s --timeout=2s CMD ["/usr/local/bin/dnslookup", ".", "NS", "127.0.0.1"]
116122

117123
# :: Start
118-
USER 1000
124+
USER ${APP_UID}:${APP_GID}
119125
ENTRYPOINT ["/usr/local/bin/AdGuardHome"]
120126
CMD ["-c", "/adguard/etc/config.yaml", "--pidfile", "/adguard/run/adguard.pid", "--work-dir", "/adguard/var", "--no-check-update"]

0 commit comments

Comments
 (0)