diff --git a/docker-compose.yml b/docker-compose.yml index 06d7e89..4cb5d24 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -432,7 +432,7 @@ services: ipv4_address: 10.10.0.12 logging: *default-logging wp: - image: mercurykd/vpnbot-wp:1.2 + image: mercurykd/vpnbot-wp:1.3 build: dockerfile: dockerfile/warp.dockerfile args: @@ -442,7 +442,7 @@ services: devices: - /dev/net/tun:/dev/net/tun volumes: - - ./config/.profile:/root/.ashrc:ro + - ./config/.profile:/root/.bashrc:ro - ./ssh:/ssh - ./config/sshd_config:/etc/ssh/sshd_config - ./config:/config diff --git a/dockerfile/warp.dockerfile b/dockerfile/warp.dockerfile index 650674b..069d57f 100644 --- a/dockerfile/warp.dockerfile +++ b/dockerfile/warp.dockerfile @@ -1,16 +1,6 @@ -FROM ubuntu:22.04 AS build -RUN apt update && apt install -y curl gpg lsb-release \ +FROM ubuntu:22.04 +RUN apt update && apt install -y curl gpg socat jq lsb-release openssh-server \ && curl -fsSL https://pkg.cloudflareclient.com/pubkey.gpg | gpg --yes --dearmor --output /usr/share/keyrings/cloudflare-warp-archive-keyring.gpg \ && echo "deb [signed-by=/usr/share/keyrings/cloudflare-warp-archive-keyring.gpg] https://pkg.cloudflareclient.com/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/cloudflare-client.list \ - && apt update && apt install -y cloudflare-warp - -FROM alpine:3.17 -ARG GLIBC_VERSION=2.34-r0 -COPY --from=build /usr/bin/warp-cli /usr/bin/warp-svc /usr/local/bin/ -RUN apk add --no-cache dbus-libs wget socat openssh-server jq curl \ - && mkdir /tmp/glibc-pkgs \ - && for PKG in glibc-$GLIBC_VERSION.apk glibc-bin-$GLIBC_VERSION.apk; do wget -q --directory-prefix /tmp/glibc-pkgs https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$GLIBC_VERSION/$PKG; done \ - && apk add --no-cache --allow-untrusted --force-overwrite /tmp/glibc-pkgs/* \ - && rm -rf /tmp/glibc-pkgs \ - && /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib \ + && apt update && apt install -y cloudflare-warp \ && mkdir /root/.ssh diff --git a/makefile b/makefile index a056eec..4bc6707 100644 --- a/makefile +++ b/makefile @@ -32,7 +32,7 @@ up: # консоль сервиса ad: # консоль сервиса docker compose exec ad /bin/sh wp: # консоль сервиса - docker compose exec wp /bin/sh + docker compose exec wp bash proxy: # консоль сервиса docker compose exec proxy /bin/sh tg: # консоль сервиса diff --git a/scripts/start_wp.sh b/scripts/start_wp.sh index 46f374e..73293d1 100755 --- a/scripts/start_wp.sh +++ b/scripts/start_wp.sh @@ -1,9 +1,10 @@ cat /ssh/key.pub > /root/.ssh/authorized_keys -ssh-keygen -A -exec /usr/sbin/sshd -D -e "$@" & +echo 'HostKeyAlgorithms +ssh-rsa' >> /etc/ssh/sshd_config +echo 'PubkeyAcceptedKeyTypes +ssh-rsa' >> /etc/ssh/sshd_config +service ssh start off=$(cat /config/pac.json | jq -r .warpoff) key=$(cat /config/pac.json | jq -r .warp) -if [ "$off" == 'null' ] +if [ "$off" = 'null' ] then warp-svc > /dev/null & sleep 3