create singbox archive improve

update version
latest docker compose
2024-09-29 13:48:26 +04:00 · 2024-09-23 23:44:32 +04:00 · 2024-09-23 23:11:02 +04:00
11 changed files with 13 additions and 18 deletions
@@ -4795,14 +4795,11 @@ DNS-over-HTTPS with IP:
                case 'w':
                    $link = htmlspecialchars($si, ENT_XML1, 'UTF-8');
                    file_put_contents('/singbox/winsw3.xml', preg_replace('#~url~#', $link, file_get_contents('/singbox/winsw3.xml')));
-                    $zip = new ZipArchive();
                    $n   = "singbox_$uid.zip";
-                    $zip->open($n, ZipArchive::CREATE | ZipArchive::OVERWRITE);
-                    foreach (scandir('/singbox') as $k => $v) {
-                        if (!empty(!in_array($v, ['.', '..']))) {
-                            $zip->addFile("/singbox/$v", $v);
-                        }
-                    }
+                    copy('/singbox/singbox.zip', $n);
+                    $zip = new ZipArchive();
+                    $zip->open($n, ZipArchive::CREATE);
+                    $zip->addFile('/singbox/winsw3.xml', 'winsw3.xml');
                    $zip->close();
                    header('Content-Disposition: attachment; filename="singbox.zip"');
                    echo file_get_contents($n);
@@ -16,7 +16,11 @@ echo \
  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') \
  $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
 apt update
-apt install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+apt install -y docker-ce docker-ce-cli containerd.io
+DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker}
+mkdir -p $DOCKER_CONFIG/cli-plugins
+curl -SL https://github.com/docker/compose/releases/download/v2.29.6/docker-compose-linux-x86_64 -o $DOCKER_CONFIG/cli-plugins/docker-compose
+chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose
 git clone https://github.com/mercurykd/vpnbot.git
 cd ./vpnbot
 echo "<?php
@@ -1,2 +0,0 @@
-winsw3.exe install
-pause
@@ -1,2 +0,0 @@
-winsw3.exe stop
-winsw3.exe start
@@ -1 +0,0 @@
-winsw3.exe start
@@ -1,2 +0,0 @@
-winsw3.exe status
-pause
@@ -1 +0,0 @@
-winsw3.exe stop
@@ -1,2 +0,0 @@
-winsw3.exe uninstall
-pause
@@ -1,3 +1,7 @@
+29.09.2024 v1.60
+- ускорение сборки архива sing-box windows
+23.09.2024 v1.59
+- docker compose v2.29.6 (при установке бота)
 22.09.2024 v1.58
 - фикс запуска бота с правильными параметрами после обновления
 22.09.2024 v1.57
Author	SHA1	Message	Date
mercury	e727f6552c	create singbox archive improve	2024-09-29 13:48:26 +04:00
mercury	cfd500d48a	update version	2024-09-23 23:44:32 +04:00
mercury	ff87ee1055	latest docker compose	2024-09-23 23:11:02 +04:00