added java 17 to gitea builder

This reverts commit 6e489011a4.

.gitea/workflows/build-arch-builder.yaml

@@ -101,7 +101,7 @@ jobs:
             "gitea.woggioni.net/woggioni/arch-builder:rust-full-sccache"
           target: rust-full-sccache
       -
-        name: Build and push arch-builder gitea_act_runner images
+        name: Build and push arch-builder gitea-runner images
         uses: docker/build-push-action@v6
         with:
           builder: multiplatform-builder
@@ -110,5 +110,5 @@ jobs:
           push: true
           pull: true
           tags: |
-            "gitea.woggioni.net/woggioni/arch-builder:gitea_act_runner"
-          target: gitea_act_runner
+            "gitea.woggioni.net/woggioni/arch-builder:gitea-runner"
+          target: gitea-runner

.gitea/workflows/build-nginx.yaml

@@ -31,12 +31,13 @@ jobs:
           ssh: default=/home/luser/.ssh/id_ed25519
           tags: |
             "gitea.woggioni.net/woggioni/nginx:latest"
-            "gitea.woggioni.net/woggioni/nginx:v1.30.0"
+            "gitea.woggioni.net/woggioni/nginx:v1.31.1"
           secrets: |
             GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }}
           build-args: |
-            LIBRESSL_VERSION=4.2.1
-            NGINX_VERSION=1.30.0
+            LIBRESSL_VERSION=4.3.2
+            NGINX_VERSION=1.31.1
+            NJS_VERSION=0.9.8
             NGINX_BRANCH=vanilla
       -
         name: Build and push nginx custom images
@@ -53,10 +54,11 @@ jobs:
           ssh: default=/home/luser/.ssh/id_ed25519
           tags: |
             "gitea.woggioni.net/woggioni/nginx:woggioni"
-            "gitea.woggioni.net/woggioni/nginx:v1.30.0-woggioni"
+            "gitea.woggioni.net/woggioni/nginx:v1.31.1-woggioni"
           secrets: |
             GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }}
           build-args: |
-            LIBRESSL_VERSION=4.2.1
-            NGINX_VERSION=1.30.0
+            LIBRESSL_VERSION=4.3.2
+            NGINX_VERSION=1.31.1
+            NJS_VERSION=0.9.8
             NGINX_BRANCH=woggioni

.gitea/workflows/build-opencode.yaml

@@ -24,12 +24,12 @@ jobs:
           builder: multiplatform-builder
           context: "{{defaultContext}}:opencode"
           build-args: |
-            OPENCODE_VERSION=1.14.39
+            OPENCODE_VERSION=1.16.2
           platforms: |
             linux/amd64
           push: true
           pull: true
           tags: |
-            "gitea.woggioni.net/woggioni/opencode:1.14.39"
+            "gitea.woggioni.net/woggioni/opencode:1.16.2"
             "gitea.woggioni.net/woggioni/opencode:latest"
 

.gitea/workflows/build-shadowsocks-rust.yaml

@@ -29,6 +29,5 @@ jobs:
           pull: false
           ssh: default=/home/luser/.ssh/id_ed25519
           tags: |
-            "gitea.woggioni.net/woggioni/sserver-rust:latest"
-            "gitea.woggioni.net/woggioni/sserver-rust:v1.24.0"
+            "gitea.woggioni.net/woggioni/sserver-rust:dev"
           build-args: "VERSION=1.24.0"

.gitea/workflows/build-synapse.yaml

@@ -0,0 +1,34 @@
+name: CI
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - 'synapse/*'
+      - '.gitea/workflows/build-synapse.yaml'      
+jobs:
+  "Build synapse docker images":
+    runs-on: woryzen
+    steps:
+      -
+        name: Login to Gitea container registry
+        uses: docker/login-action@v3
+        with:
+          registry: gitea.woggioni.net
+          username: woggioni
+          password: ${{ secrets.PUBLISHER_TOKEN }}
+      -
+        name: Build and push synapse images
+        uses: docker/build-push-action@v6
+        with:
+          builder: multiplatform-builder
+          context: "{{defaultContext}}:synapse"
+          build-args: |
+            VERSION=1.154.0
+          platforms: |
+            linux/amd64
+          push: true
+          pull: true
+          tags: |
+            "gitea.woggioni.net/woggioni/synapse:latest"
+            "gitea.woggioni.net/woggioni/synapse:1.154.0"
+

arch-builder/Dockerfile

@@ -16,6 +16,7 @@ RUN rm repository.key
 RUN --mount=type=cache,target=/var/cache/pacman pacman -Syu --noconfirm
 RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
     curl \
+    openssh \
     aarch64-unknown-linux-musl-gcc x86_64-unknown-linux-musl-gcc \
     arm-unknown-linux-musleabihf-gcc \
     arm-unknown-linux-musleabi-gcc \
@@ -70,7 +71,6 @@ RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
     imagemagick \
     python-sphinx \
     python-yaml \
-    openssh \
     rust \
     rust-src \
     rust-bindgen \
@@ -141,10 +141,10 @@ RUN rustup target add \
     wasm32-unknown-unknown \
     wasm32-wasip2
 
-FROM base AS gitea_act_runner
+FROM base AS gitea-runner
 RUN --mount=type=bind,source=woggioni.net.ca.pem,target=/root.pem trust anchor root.pem
 RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed nodejs npm docker docker-buildx btrfs-progs hidapi protobuf rustup llvm clang trunk emscripten sccache
-RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed gitea-act-runner jdk21-graalvm-bin jdk25-graalvm-bin jdk21-graalvm-ce-bin jdk25-graalvm-ce-bin go
+RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed gitea-runner jdk17-graalvm-ce-bin jdk17-graalvm-bin jdk21-graalvm-bin jdk25-graalvm-bin jdk21-graalvm-ce-bin jdk25-graalvm-ce-bin go
 RUN usermod -a luser -G docker
 USER luser
 WORKDIR /home/luser
@@ -167,4 +167,4 @@ RUN cargo install worker-build
 RUN cargo install wasm-bindgen-cli
 RUN npm install -D wrangler
 ENV PATH="/home/luser/.local/bin:/home/luser/.cargo/bin:${PATH}"
-CMD ["/usr/lib/gitea/act_runner/act_runner", "daemon", "--config", "/var/lib/gitea/act_runner.yaml"]
+CMD ["/usr/bin/gitea-runner", "daemon", "--config", "/var/lib/gitea/runner.yaml"]

nginx/Dockerfile

@@ -2,7 +2,7 @@ ARG NGINX_BRANCH=vanilla
 FROM alpine:3.23 AS base
 
 FROM base AS build_stage_1
-ARG NGINX_VERSION LIBRESSL_VERSION
+ARG NGINX_VERSION LIBRESSL_VERSION NJS_VERSION
 RUN --mount=type=cache,target=/var/cache/apk apk update
 RUN --mount=type=cache,target=/var/cache/apk apk add \
 	autoconf \
@@ -34,8 +34,7 @@ RUN --mount=type=cache,target=/var/cache/apk apk add \
 	tar \
 	tzdata \
 	zlib \
-	zlib-dev \
-	mercurial
+	zlib-dev
 RUN adduser -D luser
 USER luser
 WORKDIR /home/luser
@@ -69,7 +68,7 @@ ADD --chown=luser:luser https://github.com/google/ngx_brotli.git /ngx_brotli
 
 USER root
 WORKDIR /
-RUN hg clone http://hg.nginx.org/njs /njs
+ADD --chown=luser:luser git@github.com:nginx/njs.git#${NJS_VERSION} /njs
 RUN chown luser:luser -R /njs
 USER luser
 WORKDIR /home/luser

opencode/Dockerfile

@@ -17,9 +17,9 @@ RUN rm repository.key
 RUN --mount=type=cache,target=/var/cache/pacman pacman -Syu --noconfirm
 RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
     rustup rust-analyzer jdtls python-pipx ripgrep git rustup gradle curl sccache openssh \
-    helix bash-language-server marksman python-lsp-server vscode-css-languageserver \
-    vscode-html-languageserver vscode-json-languageserver yaml-language-server base-devel 
-RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed jdk25-graalvm-ce-bin
+    helix bash-language-server marksman python-lsp-server vscode-css-languageserver x86_64-unknown-linux-musl-zlib x86_64-unknown-linux-musl-gcc \
+    vscode-html-languageserver vscode-json-languageserver yaml-language-server base-devel docker less
+RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed jdk25-graalvm-bin
 RUN useradd -m -d /var/lib/opencode opencode
 RUN mkdir /workspace
 RUN chown opencode:opencode /workspace
@@ -31,7 +31,7 @@ RUN tar -xvf ./opencode.tgz -C /usr/bin
 RUN rm opencode.tgz
 ADD --chown=opencode:opencode ./opencode.json /etc/opencode/opencode.json
 RUN mkdir -p /usr/lib/opencode/addons
-ADD --chmod=644 https://repo1.maven.org/maven2/org/projectlombok/lombok/1.18.44/lombok-1.18.44.jar /usr/lib/opencode/addons/lombok.jar
+ADD --chmod=644 https://repo1.maven.org/maven2/org/projectlombok/lombok/1.18.46/lombok-1.18.46.jar /usr/lib/opencode/addons/lombok.jar
 ENV OPENCODE_CONFIG=/etc/opencode/opencode.json
 ENV EDITOR=helix
 USER opencode

shadowsocks-rust/Dockerfile

@@ -39,8 +39,8 @@ FROM busybox:musl AS sslocal
 COPY --from=builder --chown=root:root /home/luser/shadowsocks-rust/target/release/sslocal /usr/bin/
 COPY --from=builder --chown=root:root /home/luser/shadowsocks-rust/examples/config.json /etc/shadowsocks-rust/
 COPY --from=builder --chown=root:root /home/luser/shadowsocks-rust/docker/docker-entrypoint.sh /usr/bin/
-COPY --from=builder --chown=root:root /tmp/v2ray-plugin /usr/bin/v2ray-plugin
-COPY --from=builder --chown=root:root /tmp/xray-plugin /usr/bin/xray-plugin
+COPY --from=builder --chown=root:root --chmod=755 /tmp/v2ray-plugin /usr/bin/v2ray-plugin
+COPY --from=builder --chown=root:root --chmod=755 /tmp/xray-plugin /usr/bin/xray-plugin
 
 ENTRYPOINT [ "docker-entrypoint.sh" ]
 CMD [ "sslocal", "--log-without-time", "-c", "/etc/shadowsocks-rust/config.json" ]
@@ -50,8 +50,8 @@ FROM busybox:musl AS ssserver
 COPY --from=builder --chown=root:root /home/luser/shadowsocks-rust/target/release/ssserver /usr/bin/
 COPY --from=builder --chown=root:root /home/luser/shadowsocks-rust/examples/config.json /etc/shadowsocks-rust/
 COPY --from=builder --chown=root:root /home/luser/shadowsocks-rust/docker/docker-entrypoint.sh /usr/bin/
-COPY --from=builder /tmp/v2ray-plugin /usr/bin/v2ray-plugin
-COPY --from=builder /tmp/xray-plugin /usr/bin/xray-plugin
+COPY --from=builder --chown=root:root --chmod=755 /tmp/v2ray-plugin /usr/bin/v2ray-plugin
+COPY --from=builder --chown=root:root --chmod=755 /tmp/xray-plugin /usr/bin/xray-plugin
 
 ENTRYPOINT [ "docker-entrypoint.sh" ]
 

shadowsocks-rust/download_xray.sh

@@ -1,25 +1,25 @@
 #!/usr/bin/env sh
+set -e
 TARGETPLATFORM=$1
-PLUGIN_VERSION=1.8.24
+PLUGIN_VERSION=1.260327.0
 mkdir /tmp/xray_plugin.d
 cd /tmp/xray_plugin.d
 case "$TARGETPLATFORM" in
     "linux/386")
-        url="https://gitea.woggioni.net/api/packages/woggioni/generic/xray-plugin-386-linux/1.8.24/xray-plugin-linux-386-v1.8.24.tar.gz"
+        url="https://gitea.woggioni.net/api/packages/woggioni/generic/shadowsocks-xray-plugin/${PLUGIN_VERSION}/shadowsocks-xray-plugin-linux-i386"
     ;;
     "linux/amd64")
-        url="https://gitea.woggioni.net/api/packages/woggioni/generic/xray-plugin-amd64-linux/1.8.24/xray-plugin-linux-amd64-v1.8.24.tar.gz"
+        url="https://gitea.woggioni.net/api/packages/woggioni/generic/shadowsocks-xray-plugin/${PLUGIN_VERSION}/shadowsocks-xray-plugin-linux-x86_64"
     ;;
     "linux/arm64")
-        url="https://gitea.woggioni.net/api/packages/woggioni/generic/xray-plugin-arm64-linux/1.8.24/xray-plugin-linux-arm64-v1.8.24.tar.gz"
+        url="https://gitea.woggioni.net/api/packages/woggioni/generic/shadowsocks-xray-plugin/${PLUGIN_VERSION}/shadowsocks-xray-plugin-linux-aarch64"
     ;;
     "linux/arm/v7")
-        url="https://gitea.woggioni.net/api/packages/woggioni/generic/xray-plugin-arm-linux/1.8.24/xray-plugin-linux-arm-v1.8.24.tar.gz"
+        url="https://gitea.woggioni.net/api/packages/woggioni/generic/shadowsocks-xray-plugin/${PLUGIN_VERSION}/shadowsocks-xray-plugin-linux-armv7h"
     ;;
     *)
         echo "Doesn't support $TARGETPLATFORM architecture"
         exit 1
     ;;
 esac
-curl --retry 3 "$url" | tar -xvz
-mv xray-plugin* /tmp/xray-plugin
+curl --fail -L --retry 3 "$url" -o /tmp/xray-plugin

synapse/Dockerfile

@@ -0,0 +1,5 @@
+ARG VERSION
+FROM matrixdotorg/synapse:v${VERSION}
+USER root
+RUN python -m pip install synapse-s3-storage-provider
+USER 1000