improve building image

dockerfile/naive.dockerfile

@@ -1,9 +1,8 @@
 ARG image
+FROM golang:alpine as go
+RUN go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest \
+    && /go/bin/xcaddy build --with github.com/caddyserver/forwardproxy@caddy2=github.com/klzgrad/forwardproxy@naive
 FROM $image
+COPY --from=go /go/caddy /usr/local/bin/
 RUN apk add openssh \
-    && mkdir /root/.ssh \
-    && wget https://github.com/klzgrad/forwardproxy/releases/download/v2.7.6-naive/caddy-forwardproxy-naive.tar.xz -O naive.tar.xz \
-    && tar -xf naive.tar.xz \
-    && mv caddy-forwardproxy-naive/caddy /usr/local/bin \
-    && rm naive.tar.xz \
-    && rm -rf caddy-forwardproxy-naive
+    && mkdir /root/.ssh

dockerfile/ocserv.dockerfile

@@ -1,8 +1,7 @@
 ARG image
 FROM $image
-RUN apk add --update \
-    openssh \
-    iptables \
+RUN apk add --update openssh iptables \
+    && apk add --no-cache --virtual .build-deps \
     curl \
     g++ \
     gnutls-dev \
@@ -28,4 +27,5 @@ RUN apk add --update \
     && ./configure \
     && make \
     && make install \
+    && apk del .build-deps \
     && mkdir /root/.ssh

dockerfile/wireguard.dockerfile

@@ -1,11 +1,14 @@
 ARG image
 FROM $image
-RUN apk add iproute2 linux-headers iptables xtables-addons openssh wireguard-tools jq alpine-sdk git go bash htop \
+RUN apk add --no-cache --virtual .build-deps alpine-sdk git go \
+    && apk add iproute2 linux-headers iptables xtables-addons openssh wireguard-tools jq bash htop \
+    && git clone https://github.com/amnezia-vpn/amneziawg-go \
+    && git clone https://github.com/amnezia-vpn/amneziawg-tools.git \
+    && cd /amneziawg-go \
+    && make install \
+    && cd /amneziawg-tools/src \
+    && make install WITH_WGQUICK=yes \
+    && apk del .build-deps \
+    && rm -rf /amneziawg-go \
+    && rm -rf /amneziawg-tools \
     && mkdir /root/.ssh
-RUN git clone https://github.com/amnezia-vpn/amneziawg-go \
-    && git clone https://github.com/amnezia-vpn/amneziawg-tools.git
-RUN cd amneziawg-go \
-    && make install
-RUN cd amneziawg-tools/src \
-    && make install WITH_WGQUICK=yes
-ENV ENV="/root/.ashrc"

makefile

@@ -6,7 +6,7 @@ d: # остановка контейнеров
 	docker compose down
 dv: # остановка контейнеров
 	docker compose down -v
-r: d u
+r: cleanf d u cleanf
 ps: # список контейнеров
 	docker compose ps
 l: # логи из контейнеров
@@ -36,6 +36,9 @@ oc: # консоль сервиса
 clean:
 	docker image prune
 	docker builder prune
+cleanf:
+	docker image prune -f > /dev/null
+	docker builder prune -f > /dev/null
 cleanall:
 	docker image prune -a
 	docker builder prune -a

version

@@ -1,3 +1,5 @@
+27.02.2024 оптимизация размеров образов, сборка naive из исходников
+- <code>git pull && make r</code>
 19.02.2024 добавлен NaiveProxy
 - сделать бэкап
 - <code>git reset --hard && git pull && make r</code>