From 98b2ce1cb7ca636abf39df4e33683845e07c870f Mon Sep 17 00:00:00 2001 From: itdoginfo Date: Sat, 12 Oct 2024 14:17:12 +0300 Subject: [PATCH] Some updates --- .github/workflows/build.yml | 22 ++----- Dockerfile | 5 +- luci-app-podkop/Makefile | 2 +- podkop/Makefile | 2 +- .../podkop/sing-box-shadowsocks-template.json | 48 +++++++------- .../etc/podkop/sing-box-vless-template.json | 66 +++++++++---------- 6 files changed, 71 insertions(+), 74 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 552fa2c..240c144 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,28 +1,26 @@ -name: Test Build +name: Build packages on: push: - branches: - - main tags: - v* jobs: build: - name: test build + name: Build podkop and luci-app-podkop runs-on: ubuntu-latest steps: - uses: actions/checkout@v4.2.1 - name: Build and push - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v6.9.0 with: context: . - tags: podkop:0.1 + tags: podkop:ci - name: Create Docker container - run: docker create --name podkop podkop:0.1 + run: docker create --name podkop podkop:ci - name: Copy file from Docker container run: docker cp podkop:/builder/bin/packages/x86_64/utilites ./bin/ @@ -30,13 +28,7 @@ jobs: - name: Remove Docker container run: docker rm podkop - # - name: Upload copied file as artifact - # uses: actions/upload-artifact@v4.4.3 - # with: - # name: packages - # path: ./bin/*.ipk - - name: Release - uses: softprops/action-gh-release@v2 + uses: softprops/action-gh-release@v2.0.8 with: - files: ./bin/*.ipk \ No newline at end of file + files: ./bin/*.ipk diff --git a/Dockerfile b/Dockerfile index e8b9a91..8012f38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ FROM openwrt/sdk:x86_64-v23.05.5 -RUN mkdir -p /builder/package/feeds/utilites/ +RUN ./scripts/feeds update -a && mkdir -p /builder/package/feeds/utilites/ && mkdir -p /builder/package/feeds/luci/ COPY ./podkop /builder/package/feeds/utilites/podkop +COPY ./luci-app-podkop /builder/package/feeds/luci/luci-app-podkop -RUN make defconfig && make package/podkop/compile V=s -j4 \ No newline at end of file +RUN make defconfig && make package/podkop/compile && make package/luci-app-podkop/compile V=s -j4 \ No newline at end of file diff --git a/luci-app-podkop/Makefile b/luci-app-podkop/Makefile index 1bfac6e..f07399c 100644 --- a/luci-app-podkop/Makefile +++ b/luci-app-podkop/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-podkop -PKG_VERSION:=1.0.1 +PKG_VERSION:=0.1.0 PKG_RELEASE:=1 LUCI_TITLE:=LuCI podkop app diff --git a/podkop/Makefile b/podkop/Makefile index 461a43d..99c9708 100644 --- a/podkop/Makefile +++ b/podkop/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=podkop -PKG_VERSION:=1.0.3 +PKG_VERSION:=0.1.0 PKG_RELEASE:=1 PKG_MAINTAINER:=ITDog diff --git a/podkop/files/etc/podkop/sing-box-shadowsocks-template.json b/podkop/files/etc/podkop/sing-box-shadowsocks-template.json index 6d4e6eb..da5999f 100644 --- a/podkop/files/etc/podkop/sing-box-shadowsocks-template.json +++ b/podkop/files/etc/podkop/sing-box-shadowsocks-template.json @@ -1,25 +1,29 @@ { - "log": { - "level": "warn" - }, - "inbounds": [ - { - "type": "tproxy", - "listen": "::", - "listen_port": 1602, - "sniff": false - } - ], - "outbounds": [ - { - "type": "shadowsocks", - "server": "$HOST", - "server_port": "$PORT", - "method": "$METHOD", - "password": "$PASS" - } - ], - "route": { - "auto_detect_interface": true + "log": { + "level": "warn" + }, + "inbounds": [ + { + "type": "tproxy", + "listen": "::", + "listen_port": 1602, + "sniff": false } + ], + "outbounds": [ + { + "type": "shadowsocks", + "server": "$HOST", + "server_port": "$PORT", + "method": "$METHOD", + "password": "$PASS", + "udp_over_tcp": { + "enabled": true, + "version": 2 + } + } + ], + "route": { + "auto_detect_interface": true + } } \ No newline at end of file diff --git a/podkop/files/etc/podkop/sing-box-vless-template.json b/podkop/files/etc/podkop/sing-box-vless-template.json index cb945ed..17c9913 100644 --- a/podkop/files/etc/podkop/sing-box-vless-template.json +++ b/podkop/files/etc/podkop/sing-box-vless-template.json @@ -1,39 +1,39 @@ { - "log": { - "level": "warn" - }, - "inbounds": [ - { - "type": "tproxy", - "listen": "::", - "listen_port": 1602, - "sniff": false - } - ], - "outbounds": [ - { - "type": "vless", - "server": "$HOST", - "server_port": "$PORT", - "uuid": "$UUID", - "flow": "xtls-rprx-vision", - "tls": { + "log": { + "level": "warn" + }, + "inbounds": [ + { + "type": "tproxy", + "listen": "::", + "listen_port": 1602, + "sniff": false + } + ], + "outbounds": [ + { + "type": "vless", + "server": "$HOST", + "server_port": "$PORT", + "uuid": "$UUID", + "flow": "xtls-rprx-vision", + "tls": { + "enabled": true, + "insecure": false, + "server_name": "$FAKE_SERVER", + "utls": { "enabled": true, - "insecure": false, - "server_name": "$FAKE_SERVER", - "utls": { - "enabled": true, - "fingerprint": "chrome" - }, - "reality": { - "enabled": true, - "public_key": "$PUBLIC_KEY", - "short_id": "$SHORT_ID" - } + "fingerprint": "chrome" + }, + "reality": { + "enabled": true, + "public_key": "$PUBLIC_KEY", + "short_id": "$SHORT_ID" } } - ], - "route": { - "auto_detect_interface": true } + ], + "route": { + "auto_detect_interface": true + } } \ No newline at end of file