From 733abab0f953f219d9ff49710d5fa476b0c251fd Mon Sep 17 00:00:00 2001 From: "maksim.nabokikh" Date: Tue, 4 Mar 2025 10:43:01 +0100 Subject: [PATCH] Add debug Signed-off-by: maksim.nabokikh --- Dockerfile.openvpn | 3 ++- Dockerfile.ovpn-admin | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile.openvpn b/Dockerfile.openvpn index 7b69f1e..7853019 100644 --- a/Dockerfile.openvpn +++ b/Dockerfile.openvpn @@ -1,9 +1,10 @@ FROM alpine:3.21 ARG TARGETARCH +RUN echo ${TARGETARCH} RUN apk add --update bash openvpn easy-rsa iptables && \ ln -s /usr/share/easy-rsa/easyrsa /usr/local/bin && \ wget https://github.com/pashcovich/openvpn-user/releases/download/v1.0.4/openvpn-user-linux-${TARGETARCH}.tar.gz -O - | tar xz -C /usr/local/bin && \ rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/* RUN if [ -f "/usr/local/bin/openvpn-user-${TARGETARCH}" ]; then ln -s /usr/local/bin/openvpn-user-${TARGETARCH} /usr/local/bin/openvpn-user; fi COPY setup/ /etc/openvpn/setup -RUN chmod +x /etc/openvpn/setup/configure.sh \ No newline at end of file +RUN chmod +x /etc/openvpn/setup/configure.sh diff --git a/Dockerfile.ovpn-admin b/Dockerfile.ovpn-admin index 2d7f428..711e50f 100644 --- a/Dockerfile.ovpn-admin +++ b/Dockerfile.ovpn-admin @@ -1,5 +1,6 @@ FROM node:16-alpine3.15 AS frontend-builder COPY ../frontend /app +RUN echo ${TARGETARCH} RUN apk add --update python3 make g++ && cd /app && npm install && npm run build FROM golang:1.23.6-bullseye AS backend-builder @@ -7,12 +8,14 @@ RUN go install github.com/gobuffalo/packr/v2/packr2@latest COPY --from=frontend-builder /app/static /app/frontend/static COPY .. /app ARG TARGETARCH +RUN echo ${TARGETARCH} RUN cd /app && packr2 && env CGO_ENABLED=1 GOOS=linux GOARCH=${TARGETARCH} go build -a -tags netgo -ldflags '-linkmode external -extldflags -static -s -w' -o ovpn-admin && packr2 clean FROM alpine:3.21 WORKDIR /app COPY --from=backend-builder /app/ovpn-admin /app ARG TARGETARCH +RUN echo ${TARGETARCH} RUN apk add --update bash easy-rsa openssl openvpn coreutils && \ ln -s /usr/share/easy-rsa/easyrsa /usr/local/bin && \ wget https://github.com/pashcovich/openvpn-user/releases/download/v1.0.4/openvpn-user-linux-${TARGETARCH}.tar.gz -O - | tar xz -C /usr/local/bin && \