diff --git a/.github/workflows/publish-tag.yaml b/.github/workflows/publish-tag.yaml index 48d7fa6..aceed9b 100644 --- a/.github/workflows/publish-tag.yaml +++ b/.github/workflows/publish-tag.yaml @@ -11,7 +11,7 @@ on: env: WERF_STAGED_DOCKERFILE_VERSION: v2 - WERF_BUILDAH_MODE: auto + # WERF_BUILDAH_MODE: auto jobs: build: diff --git a/Dockerfile.openvpn b/Dockerfile.openvpn index 7853019..e4a86cb 100644 --- a/Dockerfile.openvpn +++ b/Dockerfile.openvpn @@ -1,6 +1,5 @@ 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 && \ diff --git a/Dockerfile.ovpn-admin b/Dockerfile.ovpn-admin index 711e50f..2d7f428 100644 --- a/Dockerfile.ovpn-admin +++ b/Dockerfile.ovpn-admin @@ -1,6 +1,5 @@ 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 @@ -8,14 +7,12 @@ 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 && \