diff --git a/docker-compose.yml b/docker-compose.yml index 8485046..0473b91 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,6 +17,7 @@ volumes: services: up: + image: mercurykd/vpnbot-up:1.1 build: context: dockerfile dockerfile: nginx.dockerfile @@ -49,6 +50,7 @@ services: ipv4_address: 10.10.0.10 logging: *default-logging ng: + image: mercurykd/vpnbot-ng:1.1 build: context: dockerfile dockerfile: nginx.dockerfile @@ -81,6 +83,7 @@ services: ipv4_address: 10.10.0.2 logging: *default-logging php: + image: mercurykd/vpnbot-php:1.1 build: dockerfile: dockerfile/php.dockerfile args: @@ -123,6 +126,7 @@ services: timeout: 5s retries: 5 proxy: + image: mercurykd/vpnbot-ss:1.1 build: dockerfile: dockerfile/shadowsocks.dockerfile args: @@ -148,6 +152,7 @@ services: command: ["/bin/sh", "/start_proxy.sh"] logging: *default-logging wg: + image: mercurykd/vpnbot-wg:1.1 build: dockerfile: dockerfile/wireguard.dockerfile args: @@ -186,6 +191,7 @@ services: ipv4_address: 10.10.0.4 logging: *default-logging ad: + image: mercurykd/vpnbot-ad:1.1 build: dockerfile: dockerfile/adguard.dockerfile args: @@ -219,6 +225,7 @@ services: entrypoint: ["/bin/sh", "/start_ad.sh"] logging: *default-logging ss: + image: mercurykd/vpnbot-ss:1.1 build: dockerfile: dockerfile/shadowsocks.dockerfile args: @@ -247,6 +254,7 @@ services: ipv4_address: 10.10.0.6 logging: *default-logging tg: + image: mercurykd/vpnbot-tg:1.1 build: dockerfile: dockerfile/telegram.dockerfile volumes: @@ -273,6 +281,7 @@ services: ipv4_address: 10.10.0.8 logging: *default-logging xr: + image: mercurykd/vpnbot-xr:1.1 build: dockerfile: dockerfile/xray.dockerfile args: @@ -297,6 +306,7 @@ services: ipv4_address: 10.10.0.9 logging: *default-logging oc: + image: mercurykd/vpnbot-oc:1.1 build: dockerfile: dockerfile/ocserv.dockerfile args: @@ -327,6 +337,7 @@ services: ipv4_address: 10.10.0.11 logging: *default-logging np: + image: mercurykd/vpnbot-np:1.1 build: dockerfile: dockerfile/naive.dockerfile args: diff --git a/makefile b/makefile index 1addbbd..30b8301 100644 --- a/makefile +++ b/makefile @@ -1,7 +1,7 @@ b: docker compose build u: # запуск контейнеров - IP=$(shell ip -4 addr | sed -ne 's|^.* inet \([^/]*\)/.* scope global.*$$|\1|p' | awk '{print $1}' | head -1) VER=$(shell git describe --tags) docker compose up -d --build --force-recreate + IP=$(shell ip -4 addr | sed -ne 's|^.* inet \([^/]*\)/.* scope global.*$$|\1|p' | awk '{print $1}' | head -1) VER=$(shell git describe --tags) docker compose up -d --force-recreate d: # остановка контейнеров docker compose down dv: # остановка контейнеров @@ -40,8 +40,8 @@ cleanf: docker image prune -f > /dev/null docker builder prune -f > /dev/null cleanall: - docker image prune -a - docker builder prune -a + docker image prune -a -f + docker builder prune -a -f p: git stash git pull @@ -49,3 +49,5 @@ p: update: p r cn: docker compose exec ng nginx -t +push: + docker compose push diff --git a/version b/version index a72a912..b7acb01 100644 --- a/version +++ b/version @@ -1,3 +1,5 @@ +29.02.2024 образы теперь будут скачиваться с docker hub +- git pull && make d cleanall u 28.02.2024 v1.1 добавлен раздел "зеркало" - git pull && make r 27.02.2024 оптимизация размеров образов, сборка naive из исходников