universal OS version detection

.env

@@ -2,3 +2,5 @@ TZ=Europe/Samara
 WGADDRESS=10.0.1.1/24
 WGPORT=51820
 SSPORT=8388
+SYSTEM=ubuntu
+RELEASE=18.04

docker-compose.yml

@@ -77,6 +77,9 @@ services:
     proxy:
         build:
             dockerfile: dockerfile/shadowsocks.dockerfile
+            args:
+                RELEASE: ${RELEASE}
+                SYSTEM: ${SYSTEM}
         volumes:
             - ./config/.profile:/root/.bashrc:ro
             - ./config/sslocal.json:/config.json
@@ -96,6 +99,9 @@ services:
     wg:
         build:
             dockerfile: dockerfile/wireguard.dockerfile
+            args:
+                RELEASE: ${RELEASE}
+                SYSTEM: ${SYSTEM}
         volumes:
             - ./config/.profile:/root/.bashrc:ro
             - ./config/wg0.conf:/etc/wireguard/wg0.conf
@@ -121,6 +127,9 @@ services:
     ad:
         build:
             dockerfile: dockerfile/adguard.dockerfile
+            args:
+                RELEASE: ${RELEASE}
+                SYSTEM: ${SYSTEM}
         volumes:
             - ./config/.profile:/root/.bashrc:ro
             - type: volume
@@ -142,6 +151,9 @@ services:
     ss:
         build:
             dockerfile: dockerfile/shadowsocks.dockerfile
+            args:
+                RELEASE: ${RELEASE}
+                SYSTEM: ${SYSTEM}
         volumes:
             - ./config/.profile:/root/.bashrc:ro
             - ./config/ssserver.json:/config.json

docker-compose53.yml

@@ -79,6 +79,9 @@ services:
     proxy:
         build:
             dockerfile: dockerfile/shadowsocks.dockerfile
+            args:
+                RELEASE: ${RELEASE}
+                SYSTEM: ${SYSTEM}
         volumes:
             - ./config/.profile:/root/.bashrc:ro
             - ./config/sslocal.json:/config.json
@@ -98,6 +101,9 @@ services:
     wg:
         build:
             dockerfile: dockerfile/wireguard.dockerfile
+            args:
+                RELEASE: ${RELEASE}
+                SYSTEM: ${SYSTEM}
         volumes:
             - ./config/.profile:/root/.bashrc:ro
             - ./config/wg0.conf:/etc/wireguard/wg0.conf
@@ -123,6 +129,9 @@ services:
     ad:
         build:
             dockerfile: dockerfile/adguard.dockerfile
+            args:
+                RELEASE: ${RELEASE}
+                SYSTEM: ${SYSTEM}
         volumes:
             - ./config/.profile:/root/.bashrc:ro
             - type: volume
@@ -144,6 +153,9 @@ services:
     ss:
         build:
             dockerfile: dockerfile/shadowsocks.dockerfile
+            args:
+                RELEASE: ${RELEASE}
+                SYSTEM: ${SYSTEM}
         volumes:
             - ./config/.profile:/root/.bashrc:ro
             - ./config/ssserver.json:/config.json

dockerfile/adguard.dockerfile

@@ -1,4 +1,7 @@
-from ubuntu:18.04
+arg SYSTEM
+arg RELEASE
+from ${SYSTEM}:${RELEASE}
+ENV DEBIAN_FRONTEND noninteractive
 run apt update && \
 apt install -y git net-tools lsof ssh wget && \
 wget https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.23/AdGuardHome_linux_amd64.tar.gz && \

dockerfile/shadowsocks.dockerfile

@@ -1,4 +1,7 @@
-from ubuntu:18.04
+arg SYSTEM
+arg RELEASE
+from ${SYSTEM}:${RELEASE}
+ENV DEBIAN_FRONTEND noninteractive
 run apt update && \
 apt install -y ssh git net-tools
 run mkdir /root/.ssh && \

dockerfile/wireguard.dockerfile

@@ -1,4 +1,7 @@
-from ubuntu:18.04
+arg SYSTEM
+arg RELEASE
+from ${SYSTEM}:${RELEASE}
+ENV DEBIAN_FRONTEND noninteractive
 run apt update && \
 apt install -y wireguard \
 iproute2 \

makefile

@@ -5,7 +5,7 @@ hosts: unhosts # маппинг доменов на локалку
 unhosts:
 	sed -i '/test.ru/d' /mnt/c/Windows/System32/drivers/etc/hosts
 u: # запуск контейнеров
-	docker compose up -d --build --force-recreate
+	RELEASE=$(shell lsb_release -rs) SYSTEM=$(shell lsb_release -is | tr '[:upper:]' '[:lower:]') docker compose up -d --build --force-recreate
 # 	sleep 1
 # 	docker compose logs unit wg ss proxy
 d: # остановка контейнеров