change

.gitignore

@@ -12,6 +12,7 @@
 !entrypoint.sh
 !pyinstaller.sh
 !README*.md
+tmp/*
 unbound
 v2board
 .github/workflows/other/*

tinyfec/Dockerfile

@@ -1,12 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM playn/alpine as builder
-RUN apk add --no-cache git build-base linux-headers && \
-    git clone --depth 1 --recursive https://github.com/wangyu-/tinyfecVPN.git  && \
-    cd tinyfecVPN && \
-    sed -i '11s/^/#define NOLIMIT/g' tun_dev.h && \
-    make nolimit
-
-FROM playn/alpine
-RUN apk add --no-cache iptables
-COPY --from=builder /tinyfecVPN/tinyvpn /usr/local/bin/tinyvpn
-ENTRYPOINT [ "/usr/local/bin/tinyvpn" ]

trojan-go/Dockerfile

@@ -1,17 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM golang:alpine AS builder
-WORKDIR /
-RUN apk add git make && \
-        git clone --depth 1 https://github.com/p4gefau1t/trojan-go.git && \
-        cd trojan-go && \
-        make && \
-        wget https://github.com/ngbs/rules-dat/blob/release/geosite.dat -O build/geosite.dat && \
-        wget https://github.com/ngbs/rules-dat/blob/release/geoip.dat -O build/geoip.dat
-
-FROM playn/alpine
-WORKDIR /
-COPY --from=builder /trojan-go/build /usr/local/bin/
-COPY --from=builder /trojan-go/example/server.json /etc/trojan-go/config.json
-
-ENTRYPOINT ["/usr/local/bin/trojan-go"]
-CMD ["-config", "/etc/trojan-go/config.json"]

trojan-go/Dockerfile.client

@@ -1,22 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM golang:alpine AS builder
-WORKDIR /
-RUN apk add git && \
-        git clone --depth 1 https://github.com/p4gefau1t/trojan-go.git && \
-        cd trojan-go && \
-        PACKAGE_NAME="github.com/p4gefau1t/trojan-go" && \
-        VERSION=$(git describe --dirty) && \
-        COMMIT=$(git rev-parse HEAD) && \
-        VAR_SETTING="-X ${PACKAGE_NAME}/constant.Version=${VERSION} -X ${PACKAGE_NAME}/constant.Commit=${COMMIT}" && \
-        go build -tags "client" -ldflags="-s -w ${VAR_SETTING}" && \
-        mkdir build && \
-        mv trojan-go build && \
-        wget https://github.com/ngbs/rules-dat/blob/release/geosite.dat -O build/geosite.dat && \
-        wget https://github.com/ngbs/rules-dat/blob/release/geoip.dat -O build/geoip.dat
-
-FROM playn/alpine
-COPY --from=builder /trojan-go/build /usr/bin/
-COPY --from=builder /trojan-go/example/client.json /etc/trojan-go/config.json
-
-ENTRYPOINT ["/usr/bin/trojan-go"]
-CMD ["-config", "/etc/trojan-go/config.json"]

trojan-go/Dockerfile.full

@@ -1,23 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM golang:alpine AS builder
-WORKDIR /
-RUN apk add git && \
-        git clone --depth 1 https://github.com/p4gefau1t/trojan-go.git && \
-        cd trojan-go && \
-        PACKAGE_NAME="github.com/p4gefau1t/trojan-go" && \
-        VERSION=$(git describe --dirty) && \
-        COMMIT=$(git rev-parse HEAD) && \
-        VAR_SETTING="-X ${PACKAGE_NAME}/constant.Version=${VERSION} -X ${PACKAGE_NAME}/constant.Commit=${COMMIT}" && \
-        go build -tags "full" -ldflags="-s -w ${VAR_SETTING}" && \
-        mkdir build && \
-        mv trojan-go build && \
-        wget https://github.com/ngbs/rules-dat/blob/release/geosite.dat -O build/geosite.dat && \
-        wget https://github.com/ngbs/rules-dat/blob/release/geoip.dat -O build/geoip.dat
-
-FROM playn/alpine
-COPY --from=builder /trojan-go/build /usr/bin/
-COPY --from=builder /trojan-go/example/server.json /etc/trojan-go/server.json
-COPY --from=builder /trojan-go/example/client.json /etc/trojan-go/client.json
-
-ENTRYPOINT ["/usr/bin/trojan-go"]
-CMD ["-config", "/etc/trojan-go/server.json"]

trojan-go/Dockerfile.server

@@ -1,18 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM golang:alpine AS builder
-WORKDIR /
-RUN apk add git && \
-        git clone --depth 1 https://github.com/p4gefau1t/trojan-go.git && \
-        cd trojan-go && \
-        PACKAGE_NAME="github.com/p4gefau1t/trojan-go" && \
-        VERSION=$(git describe --dirty) && \
-        COMMIT=$(git rev-parse HEAD) && \
-        VAR_SETTING="-X ${PACKAGE_NAME}/constant.Version=${VERSION} -X ${PACKAGE_NAME}/constant.Commit=${COMMIT}" && \
-        go build -tags "server" -ldflags="-s -w ${VAR_SETTING}"
-
-FROM playn/alpine
-COPY --from=builder /trojan-go/trojan-go /usr/bin/
-COPY --from=builder /trojan-go/example/server.json /etc/trojan-go/config.json
-
-ENTRYPOINT ["/usr/bin/trojan-go"]
-CMD ["-config", "/etc/trojan-go/config.json"]

v2board/Dockerfile

@@ -1,79 +0,0 @@
-# syntax=docker/dockerfile:1
-
-# ADD file:5d673d25da3a14ce1f6cf66e4c7fd4f4b85a3759a9d93efb3fd9ff852b5b56e4 in /
-# CMD ["/bin/sh"]
-# RUN /bin/sh -c apk update # buildkit
-# RUN /bin/sh -c apk add --no-cache bash php7 curl supervisor redis     php7-zlib php7-xml php7-phar php7-intl php7-dom php7-xmlreader php7-ctype php7-session     php7-mbstring php7-tokenizer php7-gd php7-redis php7-bcmath     php7-iconv php7-pdo php7-posix php7-gettext php7-simplexml php7-sodium php7-sysvsem     php7-fpm php7-mysqli php7-json php7-openssl php7-curl php7-sockets php7-zip php7-pdo_mysql     php7-xmlwriter php7-opcache php7-gmp php7-pdo_sqlite php7-sqlite3 php7-pcntl php7-fileinfo     git mailcap # buildkit
-# RUN /bin/sh -c mkdir /www # buildkit
-# RUN /bin/sh -c mkdir /wwwlogs # buildkit
-# RUN /bin/sh -c mkdir /rdb # buildkit
-# RUN /bin/sh -c mkdir -p /run/php # buildkit
-# RUN /bin/sh -c mkdir -p /run/caddy # buildkit
-# RUN /bin/sh -c mkdir -p /run/supervisor # buildkit
-# COPY config/php-fpm.conf /etc/php7/php-fpm.d/www.conf # buildkit
-# COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf # buildkit
-# COPY bin/caddy /usr/local/bin/caddy # buildkit
-# WORKDIR /www
-# EXPOSE map[443/tcp:{} 80/tcp:{}]
-# CMD ["/usr/bin/supervisord" "-c" "/etc/supervisor/conf.d/supervisord.conf"]
-FROM alpine
-
-RUN apk update && \
-    apk add --no-cache \
-    bash \
-    php7 \
-    curl \
-    supervisor \
-    redis \
-    php7-zlib \
-    php7-xml \
-    php7-phar \
-    php7-intl \
-    php7-dom \
-    php7-xmlreader \
-    php7-ctype \
-    php7-session \
-    php7-mbstring \
-    php7-tokenizer \
-    php7-gd php7-redis \
-    php7-bcmath \
-    php7-iconv \
-    php7-pdo \
-    php7-posix \
-    php7-gettext \
-    php7-simplexml \
-    php7-sodium \
-    php7-sysvsem \
-    php7-fpm \
-    php7-mysqli \
-    php7-json \
-    php7-openssl \
-    php7-curl \
-    php7-sockets \
-    php7-zip \
-    php7-pdo_mysql \
-    php7-xmlwriter \
-    php7-opcache \
-    php7-gmp \
-    php7-pdo_sqlite \
-    php7-sqlite3 \
-    php7-pcntl \
-    php7-fileinfo \
-    git \
-    mailcap && \
-    mkdir /www && \
-    mkdir /wwwlogs && \
-    mkdir /rdb && \
-    mkdir -p /run/php && \
-    mkdir -p /run/caddy && \
-    mkdir -p /run/supervisor
-
-COPY config/php-fpm.conf /etc/php7/php-fpm.d/www.conf
-COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY bin/caddy /usr/local/bin/caddy
-
-WORKDIR /www
-
-EXPOSE map[443/tcp:{} 80/tcp:{}]
-
-CMD ["/usr/bin/supervisord" "-c" "/etc/supervisor/conf.d/supervisord.conf"]

v2board/config/php-fpm.conf

@@ -1,19 +0,0 @@
-[global]
-pid = /tmp/php-fpm.pid
-error_log = /wwwlogs/php-fpm.log
-log_level = notice
-
-[www]
-listen = /tmp/php-cgi.sock
-listen.backlog = -1
-user = root
-group = root
-pm = dynamic
-pm.status_path = /phpfpm_status
-pm.max_children = 300
-pm.start_servers = 20
-pm.min_spare_servers = 20
-pm.max_spare_servers = 300
-request_terminate_timeout = 100
-request_slowlog_timeout = 30
-slowlog = /wwwlogs/php-slow.log

v2board/config/supervisord.conf

@@ -1,50 +0,0 @@
-[supervisord]
-nodaemon=true
-logfile=/dev/null
-logfile_maxbytes=0
-pidfile=/run/supervisord.pid
-minfds=50000
-minprocs=50000
-
-[program:php-fpm]
-command=php-fpm7 -RF
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-autostart=true
-autorestart=true
-startretries=10
-
-[program:caddy]
-command=caddy -conf /run/caddy/caddy.conf -agree=true -log-timestamps=false
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-autostart=true
-autorestart=true
-startretries=10
-
-[program:redis]
-command=redis-server --save "" --appendonly no
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-autostart=true
-autorestart=true
-startretries=10
-
-[program:cron]
-command=crond -f -l 8
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-autostart=true
-autorestart=true
-startretries=10
-
-[include]
-files = /run/supervisor/supervisord.conf