From 6f09a1e9caddc6235fe1aaf1b55e5fe2391ed072 Mon Sep 17 00:00:00 2001
From: mercury <mercury.kd@gmail.com>
Date: Sun, 10 Sep 2023 01:50:16 +0400
Subject: [PATCH] fix certbot dependency

---
 dockerfile/php.dockerfile | 29 ++++++++++++++---------------
 scripts/start_xray.sh     |  2 +-
 version                   |  3 +++
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/dockerfile/php.dockerfile b/dockerfile/php.dockerfile
index b6b0f0a..16f001f 100644
--- a/dockerfile/php.dockerfile
+++ b/dockerfile/php.dockerfile
@@ -1,16 +1,16 @@
-from alpine:3.18.2
-run apk add --no-cache --update php82 \
-    php82-mbstring \
-    php82-session \
-    php82-curl \
-    php82-opcache \
-    php82-openssl \
-    php82-iconv \
-    php82-intl \
-    php82-pecl-ssh2 \
-    php82-pecl-yaml \
+FROM alpine:3.17
+RUN apk add --no-cache --update php81 \
+    php81-mbstring \
+    php81-session \
+    php81-curl \
+    php81-opcache \
+    php81-openssl \
+    php81-iconv \
+    php81-intl \
+    php81-pecl-ssh2 \
+    php81-pecl-yaml \
     unit \
-    unit-php82 \
+    unit-php81 \
     xxd \
     certbot \
     libqrencode \
@@ -21,6 +21,5 @@ run apk add --no-cache --update php82 \
     && 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 ENV="/root/.ashrc"
\ No newline at end of file
+    && rm -rf /linux-amd64
+ENV ENV="/root/.ashrc"
diff --git a/scripts/start_xray.sh b/scripts/start_xray.sh
index 254b066..b0e7dc4 100644
--- a/scripts/start_xray.sh
+++ b/scripts/start_xray.sh
@@ -3,6 +3,6 @@ ssh-keygen -A
 exec /usr/sbin/sshd -D -e "$@" &
 if [ $(cat /xray.json | jq -r '.inbounds[0].settings.clients[0].id' | wc -c) -gt 1 ]
 then
-    xray run -config /xray.json &
+    xray run -config /xray.json > /dev/null &
 fi
 tail -f /dev/null
diff --git a/version b/version
index 99dd87d..13a8c95 100644
--- a/version
+++ b/version
@@ -1,3 +1,6 @@
+10.09.2023 фикс сертбота
+<code>git pull</code>
+<code>make r</code>
 09.09.2023 AdGuardHome v0.107.37
 <code>git pull</code>
 <code>make r</code>