diff --git a/app/bot.php b/app/bot.php index f5600cb..fd654d1 100644 --- a/app/bot.php +++ b/app/bot.php @@ -338,7 +338,7 @@ class Bot $this->ssh('pkill mtproto-proxy', 'tg'); if (preg_match('~^\w{32}$~', $secret)) { $p = getenv('TGPORT'); - $this->ssh("/MTProxy/mtproto-proxy -u nobody -H $p --nat-info 10.10.0.8:{$this->ip} -S $secret --aes-pwd /proxy-secret /proxy-multi.conf -M 1 >/dev/null 2>&1 &", 'tg'); + $this->ssh("mtproto-proxy -u nobody -H $p --nat-info 10.10.0.8:{$this->ip} -S $secret --aes-pwd /proxy-secret /proxy-multi.conf -M 1 >/dev/null 2>&1 &", 'tg'); } } @@ -461,8 +461,8 @@ class Bot $c['password'] = $l['password'] = $pass; file_put_contents('/config/ssserver.json', json_encode($c, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)); file_put_contents('/config/sslocal.json', json_encode($l, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)); - $this->ssh('/ss/ssserver -v -d -c /config.json', 'ss'); - $this->ssh('/ss/sslocal -v -d -c /config.json', 'proxy'); + $this->ssh('ssserver -v -d -c /config.json', 'ss'); + $this->ssh('sslocal -v -d -c /config.json', 'proxy'); $this->menu('ss'); } @@ -492,8 +492,8 @@ class Bot } file_put_contents('/config/ssserver.json', json_encode($c, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)); file_put_contents('/config/sslocal.json', json_encode($l, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)); - $this->ssh('/ss/ssserver -v -d -c /config.json', 'ss'); - $this->ssh('/ss/sslocal -v -d -c /config.json', 'proxy'); + $this->ssh('ssserver -v -d -c /config.json', 'ss'); + $this->ssh('sslocal -v -d -c /config.json', 'proxy'); $this->menu('ss'); } @@ -811,7 +811,7 @@ class Bot $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out)); $this->ssh('pkill ssserver', 'ss'); file_put_contents('/config/ssserver.json', json_encode($json['ss'], JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)); - $this->ssh('/ss/ssserver -v -d -c /config.json', 'ss'); + $this->ssh('ssserver -v -d -c /config.json', 'ss'); } // sl if (!empty($json['sl'])) { @@ -819,7 +819,7 @@ class Bot $this->update($this->input['chat'], $this->input['message_id'], implode("\n", $out)); $this->ssh('pkill sslocal', 'proxy'); file_put_contents('/config/sslocal.json', json_encode($json['sl'], JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)); - $this->ssh('/ss/sslocal -v -d -c /config.json', 'proxy'); + $this->ssh('sslocal -v -d -c /config.json', 'proxy'); } // mtproto if (!empty($json['mtproto'])) { diff --git a/dockerfile/adguard.dockerfile b/dockerfile/adguard.dockerfile index 5fd4b99..805c87b 100644 --- a/dockerfile/adguard.dockerfile +++ b/dockerfile/adguard.dockerfile @@ -1,11 +1,8 @@ from alpine:latest -run apk add --no-cache --update openssh && \ -wget https://github.com/ameshkov/dnslookup/releases/download/v1.8.1/dnslookup-linux-amd64-v1.8.1.tar.gz && \ -tar -xf dnslookup-linux-amd64-v1.8.1.tar.gz && \ -wget https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_amd64.tar.gz && \ -tar -xf AdGuardHome_linux_amd64.tar.gz && \ -mkdir -p /opt/adguardhome && \ -mkdir /root/.ssh +run apk add --no-cache --update openssh \ + && wget https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.32/AdGuardHome_linux_amd64.tar.gz \ + && tar -xf AdGuardHome_linux_amd64.tar.gz \ + && mkdir -p /opt/adguardhome \ + && mkdir /root/.ssh copy config/AdGuardHome.yaml /opt/adguardhome/AdGuardHome.yaml -env PATH="$PATH:/linux-amd64" env ENV="/root/.ashrc" diff --git a/dockerfile/php.dockerfile b/dockerfile/php.dockerfile index f03af95..c628041 100644 --- a/dockerfile/php.dockerfile +++ b/dockerfile/php.dockerfile @@ -16,9 +16,10 @@ run apk add --no-cache --update php82 \ libqrencode \ openssh \ curl \ - && wget https://github.com/ameshkov/dnslookup/releases/download/v1.8.1/dnslookup-linux-amd64-v1.8.1.tar.gz \ - && tar -xf dnslookup-linux-amd64-v1.8.1.tar.gz \ - && rm dnslookup-linux-amd64-v1.8.1.tar.gz \ + && wget https://github.com/ameshkov/dnslookup/releases/download/v1.9.1/dnslookup-linux-amd64-v1.9.1.tar.gz \ + && tar -xf dnslookup-linux-amd64-v1.9.1.tar.gz \ + && mv linux-amd64/dnslookup /usr/bin \ + && rm dnslookup-linux-amd64-v1.9.1.tar.gz \ + && rm -rf /linux-amd64 \ && ln -s /usr/bin/php82 /usr/bin/php -env PATH="$PATH:/linux-amd64" env ENV="/root/.ashrc" \ No newline at end of file diff --git a/dockerfile/shadowsocks.dockerfile b/dockerfile/shadowsocks.dockerfile index 8468aae..c57fa7a 100644 --- a/dockerfile/shadowsocks.dockerfile +++ b/dockerfile/shadowsocks.dockerfile @@ -1,18 +1,16 @@ from alpine:latest run apk add openssh git xz \ && mkdir /root/.ssh \ - && mkdir /ss \ - && wget https://github.com/shadowsocks/shadowsocks-rust/releases/download/v1.15.2/shadowsocks-v1.15.2.x86_64-unknown-linux-musl.tar.xz \ - && tar -xf shadowsocks-v1.15.2.x86_64-unknown-linux-musl.tar.xz \ - && wget https://github.com/teddysun/v2ray-plugin/releases/download/v5.2.0/v2ray-plugin-linux-amd64-v5.2.0.tar.gz \ - && tar -xf v2ray-plugin-linux-amd64-v5.2.0.tar.gz \ - && mv sslocal /ss/ \ - && mv ssserver /ss/ \ - && mv ssmanager /ss/ \ - && mv ssservice /ss/ \ - && mv ssurl /ss/ \ - && mv v2ray-plugin_linux_amd64 /ss/v2ray-plugin \ - && rm v2ray-plugin-linux-amd64-v5.2.0.tar.gz\ - && rm shadowsocks-v1.15.2.x86_64-unknown-linux-musl.tar.xz + && wget https://github.com/shadowsocks/shadowsocks-rust/releases/download/v1.15.3/shadowsocks-v1.15.3.x86_64-unknown-linux-musl.tar.xz \ + && tar -xf shadowsocks-v1.15.3.x86_64-unknown-linux-musl.tar.xz \ + && wget https://github.com/teddysun/v2ray-plugin/releases/download/v5.7.0/v2ray-plugin-linux-amd64-v5.7.0.tar.gz \ + && tar -xf v2ray-plugin-linux-amd64-v5.7.0.tar.gz \ + && mv sslocal /usr/bin/ \ + && mv ssserver /usr/bin/ \ + && mv ssmanager /usr/bin/ \ + && mv ssservice /usr/bin/ \ + && mv ssurl /usr/bin/ \ + && mv v2ray-plugin_linux_amd64 /usr/bin/v2ray-plugin \ + && rm v2ray-plugin-linux-amd64-v5.7.0.tar.gz\ + && rm shadowsocks-v1.15.3.x86_64-unknown-linux-musl.tar.xz env ENV="/root/.ashrc" -env PATH="$PATH:/ss" diff --git a/dockerfile/telegram.dockerfile b/dockerfile/telegram.dockerfile index 0e603d5..91df741 100644 --- a/dockerfile/telegram.dockerfile +++ b/dockerfile/telegram.dockerfile @@ -4,12 +4,10 @@ run apk add --no-cache --virtual .build-deps alpine-sdk linux-headers openssl-de && mkdir /mtproxy/patches && wget -P /mtproxy/patches https://raw.githubusercontent.com/alexdoesh/mtproxy/master/patches/randr_compat.patch \ && cd /mtproxy/sources && patch -p0 -i /mtproxy/patches/randr_compat.patch \ && make \ - && mkdir /MTProxy \ && mkdir /root/.ssh \ - && cp /mtproxy/sources/objs/bin/mtproto-proxy /MTProxy \ + && cp /mtproxy/sources/objs/bin/mtproto-proxy /usr/bin \ && rm -rf /mtproxy \ && apk del .build-deps\ && apk add --no-cache --update curl openssh \ && ln -s /usr/lib/libcrypto.so.41 /usr/lib/libcrypto.so.1.0.0 -env PATH="$PATH:/MTProxy" env ENV="/root/.ashrc" diff --git a/dockerfile/wireguard.dockerfile b/dockerfile/wireguard.dockerfile index 19b4911..d6ec9dc 100644 --- a/dockerfile/wireguard.dockerfile +++ b/dockerfile/wireguard.dockerfile @@ -1,3 +1,4 @@ from alpine:latest run apk add iproute2 linux-headers iptables xtables-addons wireguard-tools openssh \ && mkdir /root/.ssh +env ENV="/root/.ashrc" \ No newline at end of file