From 7582dc50c2d48d7ad10682c71e0311afaa894dfe Mon Sep 17 00:00:00 2001 From: mercury Date: Mon, 29 Apr 2024 23:13:27 +0400 Subject: [PATCH 1/2] Revert "added sing-box from repo (#12)" This reverts commit 256e43352a4c70bd72e6d6159db4bd77354dce1f. --- dockerfile/php.dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dockerfile/php.dockerfile b/dockerfile/php.dockerfile index c876c0a..d01c18a 100644 --- a/dockerfile/php.dockerfile +++ b/dockerfile/php.dockerfile @@ -23,10 +23,14 @@ RUN apk add --no-cache --update php81 \ curl \ git \ py3-qt5 \ - sing-box \ && 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 + && rm -rf /linux-amd64 \ + && wget https://github.com/SagerNet/sing-box/releases/download/v1.8.11/sing-box-1.8.11-linux-amd64.tar.gz \ + && tar -xf sing-box-1.8.11-linux-amd64.tar.gz \ + && mv sing-box-1.8.11-linux-amd64/sing-box /usr/bin \ + && rm sing-box-1.8.11-linux-amd64.tar.gz \ + && rm -rf /sing-box-1.8.11-linux-amd64 ENV ENV="/root/.ashrc" From 45e1455d48a8205e7b97c1709815cfa3545b189a Mon Sep 17 00:00:00 2001 From: mercury Date: Mon, 29 Apr 2024 23:13:47 +0400 Subject: [PATCH 2/2] Revert "edge repo for sing-box (#13)" This reverts commit bb1ac60accf9b7c7f97d9f1144a44f981b725e6c. --- dockerfile/php.dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/dockerfile/php.dockerfile b/dockerfile/php.dockerfile index d01c18a..711aa43 100644 --- a/dockerfile/php.dockerfile +++ b/dockerfile/php.dockerfile @@ -1,6 +1,5 @@ ARG image FROM $image -RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories RUN apk add --no-cache --update php81 \ php81-mbstring \ php81-session \