diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2026d5d..5f1f4c2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ on: env: NODE_VERSION: "25" - CRONET_GO_VERSION: "2faf34666c2cc8234f10f2ab6d4c4d6104d34ae2" + CRONET_GO_VERSION: "98d539ce67568fb911654e66a14cf4247ed833ec" CRONET_GO_REPO: https://github.com/sagernet/cronet-go.git BOOTLIN_BASE_URL: https://toolchains.bootlin.com/downloads/releases/toolchains @@ -164,6 +164,21 @@ jobs: echo "CGO_LDFLAGS=--sysroot=$SYSROOT -static" >> $GITHUB_ENV fi + - name: Download Go modules (with retry) + run: | + set -e + export GODEBUG=http2client=0 + for i in 1 2 3 4 5; do + if go mod download -x; then + echo "go mod download succeeded" + exit 0 + fi + echo "go mod download failed (attempt $i), retrying in $((i * 10))s..." + sleep $((i * 10)) + done + echo "go mod download failed after 5 attempts" >&2 + exit 1 + - name: Build s-ui run: | set -e diff --git a/Dockerfile b/Dockerfile index eb97d21..3775e27 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,8 @@ ENV CGO_ENABLED=1 ENV CGO_CFLAGS="-D_LARGEFILE64_SOURCE" ENV GOARCH=$TARGETARCH -RUN apk update && apk add --no-cache \ +RUN apk upgrade --no-cache --scripts=no apk-tools && \ + apk add --no-cache \ gcc \ musl-dev \ libc-dev \ @@ -42,7 +43,8 @@ FROM alpine LABEL org.opencontainers.image.authors="alireza7@gmail.com" ENV TZ=Asia/Tehran WORKDIR /app -RUN set -ex && apk add --no-cache --upgrade bash tzdata ca-certificates nftables +RUN set -ex && apk upgrade --no-cache --scripts=no apk-tools && \ + apk add --no-cache --upgrade bash tzdata ca-certificates nftables COPY --from=backend-builder /app/sui /app/libcronet.so /app/ COPY entrypoint.sh /app/ ENTRYPOINT [ "./entrypoint.sh" ] \ No newline at end of file diff --git a/Dockerfile.frontend-artifact b/Dockerfile.frontend-artifact index 434d49b..df536c5 100644 --- a/Dockerfile.frontend-artifact +++ b/Dockerfile.frontend-artifact @@ -6,7 +6,8 @@ ENV CGO_ENABLED=1 ENV CGO_CFLAGS="-D_LARGEFILE64_SOURCE" ENV GOARCH=$TARGETARCH -RUN apk update && apk add --no-cache \ +RUN apk upgrade --no-cache --scripts=no apk-tools && \ + apk add --no-cache \ gcc \ musl-dev \ libc-dev \ @@ -37,7 +38,8 @@ FROM alpine LABEL org.opencontainers.image.authors="alireza7@gmail.com" ENV TZ=Asia/Tehran WORKDIR /app -RUN set -ex && apk add --no-cache --upgrade bash tzdata ca-certificates nftables +RUN set -ex && apk upgrade --no-cache --scripts=no apk-tools && \ + apk add --no-cache --upgrade bash tzdata ca-certificates nftables COPY --from=backend-builder /app/sui /app/libcronet.so /app/ COPY entrypoint.sh /app/ ENTRYPOINT [ "./entrypoint.sh" ] \ No newline at end of file diff --git a/config/version b/config/version index c9929e3..3e1ad72 100644 --- a/config/version +++ b/config/version @@ -1 +1 @@ -1.4.2 \ No newline at end of file +1.5.0 \ No newline at end of file diff --git a/frontend b/frontend index a4b8816..2ae2569 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit a4b88165023003acd8f25c90d4cb395b7f996b50 +Subproject commit 2ae2569cd4eaf4f93b2bc708b14a0ba325fa96c9