Compare commits

..

1 Commits

Author SHA1 Message Date
woggioni ce53e5ea07 shadowsocks-rust to dev tag
CI / Build shadowsocks-rust docker images (push) Successful in 14s
2026-05-11 21:03:26 +08:00
10 changed files with 26 additions and 66 deletions
+3 -3
View File
@@ -101,7 +101,7 @@ jobs:
"gitea.woggioni.net/woggioni/arch-builder:rust-full-sccache" "gitea.woggioni.net/woggioni/arch-builder:rust-full-sccache"
target: rust-full-sccache target: rust-full-sccache
- -
name: Build and push arch-builder gitea-runner images name: Build and push arch-builder gitea_act_runner images
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
builder: multiplatform-builder builder: multiplatform-builder
@@ -110,5 +110,5 @@ jobs:
push: true push: true
pull: true pull: true
tags: | tags: |
"gitea.woggioni.net/woggioni/arch-builder:gitea-runner" "gitea.woggioni.net/woggioni/arch-builder:gitea_act_runner"
target: gitea-runner target: gitea_act_runner
+6 -8
View File
@@ -31,13 +31,12 @@ jobs:
ssh: default=/home/luser/.ssh/id_ed25519 ssh: default=/home/luser/.ssh/id_ed25519
tags: | tags: |
"gitea.woggioni.net/woggioni/nginx:latest" "gitea.woggioni.net/woggioni/nginx:latest"
"gitea.woggioni.net/woggioni/nginx:v1.31.1" "gitea.woggioni.net/woggioni/nginx:v1.30.0"
secrets: | secrets: |
GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }} GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }}
build-args: | build-args: |
LIBRESSL_VERSION=4.3.2 LIBRESSL_VERSION=4.2.1
NGINX_VERSION=1.31.1 NGINX_VERSION=1.30.0
NJS_VERSION=0.9.8
NGINX_BRANCH=vanilla NGINX_BRANCH=vanilla
- -
name: Build and push nginx custom images name: Build and push nginx custom images
@@ -54,11 +53,10 @@ jobs:
ssh: default=/home/luser/.ssh/id_ed25519 ssh: default=/home/luser/.ssh/id_ed25519
tags: | tags: |
"gitea.woggioni.net/woggioni/nginx:woggioni" "gitea.woggioni.net/woggioni/nginx:woggioni"
"gitea.woggioni.net/woggioni/nginx:v1.31.1-woggioni" "gitea.woggioni.net/woggioni/nginx:v1.30.0-woggioni"
secrets: | secrets: |
GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }} GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }}
build-args: | build-args: |
LIBRESSL_VERSION=4.3.2 LIBRESSL_VERSION=4.2.1
NGINX_VERSION=1.31.1 NGINX_VERSION=1.30.0
NJS_VERSION=0.9.8
NGINX_BRANCH=woggioni NGINX_BRANCH=woggioni
+2 -2
View File
@@ -24,12 +24,12 @@ jobs:
builder: multiplatform-builder builder: multiplatform-builder
context: "{{defaultContext}}:opencode" context: "{{defaultContext}}:opencode"
build-args: | build-args: |
OPENCODE_VERSION=1.17.4 OPENCODE_VERSION=1.14.48
platforms: | platforms: |
linux/amd64 linux/amd64
push: true push: true
pull: true pull: true
tags: | tags: |
"gitea.woggioni.net/woggioni/opencode:1.17.4" "gitea.woggioni.net/woggioni/opencode:1.14.48"
"gitea.woggioni.net/woggioni/opencode:latest" "gitea.woggioni.net/woggioni/opencode:latest"
+1 -1
View File
@@ -1,7 +1,7 @@
name: CI name: CI
on: on:
push: push:
branches: [ master ] branches: [ dev ]
paths: paths:
- 'shadowsocks-rust/*' - 'shadowsocks-rust/*'
- '.gitea/workflows/build-shadowsocks-rust.yaml' - '.gitea/workflows/build-shadowsocks-rust.yaml'
-34
View File
@@ -1,34 +0,0 @@
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"
+2 -2
View File
@@ -26,6 +26,6 @@ jobs:
pull: true pull: true
tags: | tags: |
"gitea.woggioni.net/woggioni/wildfly:latest" "gitea.woggioni.net/woggioni/wildfly:latest"
"gitea.woggioni.net/woggioni/wildfly:40.0.0" "gitea.woggioni.net/woggioni/wildfly:39.0.1"
build-args: "VERSION=40.0.0" build-args: "VERSION=39.0.1"
+4 -4
View File
@@ -16,7 +16,6 @@ RUN rm repository.key
RUN --mount=type=cache,target=/var/cache/pacman pacman -Syu --noconfirm RUN --mount=type=cache,target=/var/cache/pacman pacman -Syu --noconfirm
RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \ RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
curl \ curl \
openssh \
aarch64-unknown-linux-musl-gcc x86_64-unknown-linux-musl-gcc \ aarch64-unknown-linux-musl-gcc x86_64-unknown-linux-musl-gcc \
arm-unknown-linux-musleabihf-gcc \ arm-unknown-linux-musleabihf-gcc \
arm-unknown-linux-musleabi-gcc \ arm-unknown-linux-musleabi-gcc \
@@ -71,6 +70,7 @@ RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
imagemagick \ imagemagick \
python-sphinx \ python-sphinx \
python-yaml \ python-yaml \
openssh \
rust \ rust \
rust-src \ rust-src \
rust-bindgen \ rust-bindgen \
@@ -141,10 +141,10 @@ RUN rustup target add \
wasm32-unknown-unknown \ wasm32-unknown-unknown \
wasm32-wasip2 wasm32-wasip2
FROM base AS gitea-runner FROM base AS gitea_act_runner
RUN --mount=type=bind,source=woggioni.net.ca.pem,target=/root.pem trust anchor root.pem 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 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-runner jdk17-graalvm-ce-bin jdk17-graalvm-bin 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-act-runner jdk21-graalvm-bin jdk25-graalvm-bin jdk21-graalvm-ce-bin jdk25-graalvm-ce-bin go
RUN usermod -a luser -G docker RUN usermod -a luser -G docker
USER luser USER luser
WORKDIR /home/luser WORKDIR /home/luser
@@ -167,4 +167,4 @@ RUN cargo install worker-build
RUN cargo install wasm-bindgen-cli RUN cargo install wasm-bindgen-cli
RUN npm install -D wrangler RUN npm install -D wrangler
ENV PATH="/home/luser/.local/bin:/home/luser/.cargo/bin:${PATH}" ENV PATH="/home/luser/.local/bin:/home/luser/.cargo/bin:${PATH}"
CMD ["/usr/bin/gitea-runner", "daemon", "--config", "/var/lib/gitea/runner.yaml"] CMD ["/usr/lib/gitea/act_runner/act_runner", "daemon", "--config", "/var/lib/gitea/act_runner.yaml"]
+4 -3
View File
@@ -2,7 +2,7 @@ ARG NGINX_BRANCH=vanilla
FROM alpine:3.23 AS base FROM alpine:3.23 AS base
FROM base AS build_stage_1 FROM base AS build_stage_1
ARG NGINX_VERSION LIBRESSL_VERSION NJS_VERSION ARG NGINX_VERSION LIBRESSL_VERSION
RUN --mount=type=cache,target=/var/cache/apk apk update RUN --mount=type=cache,target=/var/cache/apk apk update
RUN --mount=type=cache,target=/var/cache/apk apk add \ RUN --mount=type=cache,target=/var/cache/apk apk add \
autoconf \ autoconf \
@@ -34,7 +34,8 @@ RUN --mount=type=cache,target=/var/cache/apk apk add \
tar \ tar \
tzdata \ tzdata \
zlib \ zlib \
zlib-dev zlib-dev \
mercurial
RUN adduser -D luser RUN adduser -D luser
USER luser USER luser
WORKDIR /home/luser WORKDIR /home/luser
@@ -68,7 +69,7 @@ ADD --chown=luser:luser https://github.com/google/ngx_brotli.git /ngx_brotli
USER root USER root
WORKDIR / WORKDIR /
ADD --chown=luser:luser git@github.com:nginx/njs.git#${NJS_VERSION} /njs RUN hg clone http://hg.nginx.org/njs /njs
RUN chown luser:luser -R /njs RUN chown luser:luser -R /njs
USER luser USER luser
WORKDIR /home/luser WORKDIR /home/luser
+4 -4
View File
@@ -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 -Syu --noconfirm
RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \ 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 \ rustup rust-analyzer jdtls python-pipx ripgrep git rustup gradle curl sccache openssh \
helix bash-language-server marksman python-lsp-server vscode-css-languageserver x86_64-unknown-linux-musl-zlib x86_64-unknown-linux-musl-gcc \ helix bash-language-server marksman python-lsp-server vscode-css-languageserver \
vscode-html-languageserver vscode-json-languageserver yaml-language-server base-devel docker less 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-bin RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed jdk25-graalvm-ce-bin
RUN useradd -m -d /var/lib/opencode opencode RUN useradd -m -d /var/lib/opencode opencode
RUN mkdir /workspace RUN mkdir /workspace
RUN chown opencode:opencode /workspace RUN chown opencode:opencode /workspace
@@ -31,7 +31,7 @@ RUN tar -xvf ./opencode.tgz -C /usr/bin
RUN rm opencode.tgz RUN rm opencode.tgz
ADD --chown=opencode:opencode ./opencode.json /etc/opencode/opencode.json ADD --chown=opencode:opencode ./opencode.json /etc/opencode/opencode.json
RUN mkdir -p /usr/lib/opencode/addons RUN mkdir -p /usr/lib/opencode/addons
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 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
ENV OPENCODE_CONFIG=/etc/opencode/opencode.json ENV OPENCODE_CONFIG=/etc/opencode/opencode.json
ENV EDITOR=helix ENV EDITOR=helix
USER opencode USER opencode
-5
View File
@@ -1,5 +0,0 @@
ARG VERSION
FROM matrixdotorg/synapse:v${VERSION}
USER root
RUN python -m pip install synapse-s3-storage-provider
USER 1000