From 54b45a36e124176fe05ff620ef43ff9fccbd2c3f Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <nethiuswork@gmail.com>
Date: Fri, 29 Sep 2023 18:41:00 +0500
Subject: [PATCH] test configuration using wg instead of wg-quick to configure
 the server

---
 client/server_scripts/amnezia_wireguard/Dockerfile         | 2 +-
 .../amnezia_wireguard/configure_container.sh               | 2 +-
 client/server_scripts/amnezia_wireguard/start.sh           | 7 ++++---
 client/server_scripts/build_container.sh                   | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/client/server_scripts/amnezia_wireguard/Dockerfile b/client/server_scripts/amnezia_wireguard/Dockerfile
index ed974dc6..8c536fc7 100644
--- a/client/server_scripts/amnezia_wireguard/Dockerfile
+++ b/client/server_scripts/amnezia_wireguard/Dockerfile
@@ -3,7 +3,7 @@ FROM amneziavpn/amnezia-wg:latest
 LABEL maintainer="AmneziaVPN"
 
 #Install required packages
-RUN apk add --no-cache curl wireguard-tools dumb-init
+RUN apk add --no-cache bash curl dumb-init
 RUN apk --update upgrade --no-cache
 
 RUN mkdir -p /opt/amnezia
diff --git a/client/server_scripts/amnezia_wireguard/configure_container.sh b/client/server_scripts/amnezia_wireguard/configure_container.sh
index 8653a932..fa7b09f9 100644
--- a/client/server_scripts/amnezia_wireguard/configure_container.sh
+++ b/client/server_scripts/amnezia_wireguard/configure_container.sh
@@ -12,7 +12,7 @@ echo $WIREGUARD_PSK > /opt/amnezia/amneziawireguard/wireguard_psk.key
 cat > /opt/amnezia/amneziawireguard/wg0.conf <<EOF
 [Interface]
 PrivateKey = $WIREGUARD_SERVER_PRIVATE_KEY
-Address = $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR
+# Address = $WIREGUARD_SUBNET_IP/$WIREGUARD_SUBNET_CIDR
 ListenPort = $AMNEZIAWIREGUARD_SERVER_PORT
 Jc = $JUNK_PACKET_COUNT
 Jmin = $JUNK_PACKET_MIN_SIZE
diff --git a/client/server_scripts/amnezia_wireguard/start.sh b/client/server_scripts/amnezia_wireguard/start.sh
index b371d5b5..505ce53e 100644
--- a/client/server_scripts/amnezia_wireguard/start.sh
+++ b/client/server_scripts/amnezia_wireguard/start.sh
@@ -6,10 +6,11 @@ echo "Container startup"
 #ifconfig eth0:0 $SERVER_IP_ADDRESS netmask 255.255.255.255 up
 
 # kill daemons in case of restart
-wg-quick down /opt/amnezia/amneziawireguard/wg0.conf
+# wg-quick down /opt/amnezia/amneziawireguard/wg0.conf
 
-# start daemons if configured
-if [ -f /opt/amnezia/amneziawireguard/wg0.conf ]; then (wg-quick up /opt/amnezia/amneziawireguard/wg0.conf); fi
+/usr/bin/amnezia-wg wg0 && /usr/bin/wg setconf wg0 /opt/amnezia/amneziawireguard/wg0.conf && ip address add dev wg0 10.8.1.1/24 && ip link set up dev wg0
+# # # start daemons if configured
+# # if [ -f /opt/amnezia/amneziawireguard/wg0.conf ]; then (wg-quick up /opt/amnezia/amneziawireguard/wg0.conf); fi
 
 # Allow traffic on the TUN interface.
 iptables -A INPUT -i wg0 -j ACCEPT
diff --git a/client/server_scripts/build_container.sh b/client/server_scripts/build_container.sh
index 2cda240c..3468ef6f 100644
--- a/client/server_scripts/build_container.sh
+++ b/client/server_scripts/build_container.sh
@@ -1 +1 @@
-sudo docker build -t $CONTAINER_NAME $DOCKERFILE_FOLDER --build-arg SERVER_ARCH=$(uname -m)
+sudo docker build --no-cache --pull -t $CONTAINER_NAME $DOCKERFILE_FOLDER --build-arg SERVER_ARCH=$(uname -m)