Compare commits

...

20 Commits

Author SHA1 Message Date
047556f7a5 updated opencode version
All checks were successful
CI / Build opencode docker images (push) Successful in 13m17s
2026-02-09 15:53:11 +08:00
d830ee07ba updated nginx version
All checks were successful
CI / Build nginx docker images (push) Successful in 6m52s
2026-02-05 08:08:10 +08:00
73908fbbcb refactor opencode image for better caching
All checks were successful
CI / Build opencode docker images (push) Successful in 2m48s
2026-01-27 21:05:53 +08:00
20d29f3b0a updated opencode to 1.1.36
All checks were successful
CI / Build opencode docker images (push) Successful in 3m2s
2026-01-27 20:50:08 +08:00
c015821217 updated opencode to 1.1.34
All checks were successful
CI / Build opencode docker images (push) Successful in 3m11s
2026-01-24 12:27:41 +08:00
d5a19b1530 fixed path
Some checks failed
CI / Build opencode docker images (push) Has been cancelled
2026-01-24 12:25:16 +08:00
04fb3c2ccd added git and ripgrep 2026-01-24 12:18:57 +08:00
6fa2273851 updated wildfly to 39.0.0
All checks were successful
CI / Build wildfly docker images (push) Successful in 3m38s
2026-01-23 13:34:50 +08:00
74d7721bc9 simplified opencode image 2026-01-20 22:00:34 +08:00
7cc5ec4559 added opencode image
All checks were successful
CI / Build opencode docker images (push) Successful in 12m59s
2026-01-20 21:16:50 +08:00
5bc3b26965 added monerod docker image
All checks were successful
CI / Build monerod docker images (push) Successful in 18s
2026-01-13 18:19:11 +08:00
2f53a58607 updated pgvector
All checks were successful
CI / Build pgvector docker images (push) Successful in 15s
2026-01-01 08:00:33 +08:00
735fd1b674 fixed shadowsocks image
All checks were successful
CI / Build shadowsocks-rust docker images (push) Successful in 2m45s
2025-12-31 21:01:39 +08:00
7c1725427b updated arch builder 2025-12-31 21:01:39 +08:00
948ef1361e updated Jenkins agent to Java 25
All checks were successful
CI / Build jenkins-agent docker images (push) Successful in 40s
2025-12-24 10:24:26 +08:00
d5e4fad745 fix compatibility issue of Ganymede with Jupyter notebook
All checks were successful
CI / Build Jupyter Ganymede docker images (push) Successful in 5m31s
2025-12-24 09:09:39 +08:00
434452e17e updated sage build
Some checks failed
CI / Build Jupyter Sage docker images (push) Failing after 7s
2025-12-24 04:51:01 +08:00
6170b6a223 updated xmrig
All checks were successful
CI / Build xmrig docker images (push) Successful in 3m9s
2025-12-24 02:48:20 +08:00
eb1509ce4f added rtmp module to nginx image
All checks were successful
CI / Build nginx docker images (push) Successful in 6m31s
2025-12-23 22:39:32 +08:00
f724b5f0e3 try to fix ganymede build 2025-12-23 22:16:11 +08:00
35 changed files with 704 additions and 196 deletions

View File

@@ -7,13 +7,8 @@ on:
- '.gitea/workflows/build-arch-builder.yaml' - '.gitea/workflows/build-arch-builder.yaml'
jobs: jobs:
"Build arch-builder docker images": "Build arch-builder docker images":
runs-on: hostinger runs-on: woryzen
steps: steps:
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
driver: docker-container
- -
name: Login to Gitea container registry name: Login to Gitea container registry
uses: docker/login-action@v3 uses: docker/login-action@v3
@@ -25,64 +20,83 @@ jobs:
name: Build and push arch-builder base images name: Build and push arch-builder base images
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
builder: multiplatform-builder
context: "{{defaultContext}}:arch-builder" context: "{{defaultContext}}:arch-builder"
platforms: linux/amd64 platforms: linux/amd64
push: true push: true
pull: true pull: true
tags: | tags: |
"gitea.woggioni.net/woggioni/arch-builder:base" "gitea.woggioni.net/woggioni/arch-builder:base"
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:base-buildx
cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:base-buildx
target: base target: base
- -
name: Build and push arch-builder kernel images name: Build and push arch-builder kernel images
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
builder: multiplatform-builder
context: "{{defaultContext}}:arch-builder" context: "{{defaultContext}}:arch-builder"
platforms: linux/amd64 platforms: linux/amd64
push: true push: true
pull: true pull: true
tags: | tags: |
"gitea.woggioni.net/woggioni/arch-builder:kernel" "gitea.woggioni.net/woggioni/arch-builder:kernel"
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:kernel-buildx
cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:kernel-buildx
target: kernel target: kernel
- -
name: Build and push arch-builder rust images name: Build and push arch-builder rust images
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
builder: multiplatform-builder
context: "{{defaultContext}}:arch-builder" context: "{{defaultContext}}:arch-builder"
platforms: linux/amd64 platforms: linux/amd64
push: true push: true
pull: true pull: true
tags: | tags: |
"gitea.woggioni.net/woggioni/arch-builder:rust" "gitea.woggioni.net/woggioni/arch-builder:rust"
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:rust-buildx
cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:rust-buildx
target: rust target: rust
- -
name: Build and push arch-builder rust full images name: Build and push arch-builder rust full images
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
builder: multiplatform-builder
context: "{{defaultContext}}:arch-builder" context: "{{defaultContext}}:arch-builder"
platforms: linux/amd64 platforms: linux/amd64
push: true push: true
pull: true pull: true
tags: | tags: |
"gitea.woggioni.net/woggioni/arch-builder:rust-full" "gitea.woggioni.net/woggioni/arch-builder:rust-full"
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:rust-full-buildx
cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:rust-full-buildx
target: rust-full target: rust-full
-
name: Build and push arch-builder rust sccache images
uses: docker/build-push-action@v6
with:
builder: multiplatform-builder
context: "{{defaultContext}}:arch-builder"
platforms: linux/amd64
push: true
pull: true
tags: |
"gitea.woggioni.net/woggioni/arch-builder:rust-sccache"
target: rust-sccache
-
name: Build and push arch-builder rust full sccache images
uses: docker/build-push-action@v6
with:
builder: multiplatform-builder
context: "{{defaultContext}}:arch-builder"
platforms: linux/amd64
push: true
pull: true
tags: |
"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_act_runner images
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
builder: multiplatform-builder
context: "{{defaultContext}}:arch-builder" context: "{{defaultContext}}:arch-builder"
platforms: linux/amd64 platforms: linux/amd64
push: true push: true
pull: true pull: true
tags: | tags: |
"gitea.woggioni.net/woggioni/arch-builder:gitea_act_runner" "gitea.woggioni.net/woggioni/arch-builder:gitea_act_runner"
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:gitea-buildx
cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:gitea-buildx
target: gitea_act_runner target: gitea_act_runner

View File

@@ -7,13 +7,8 @@ on:
- '.gitea/workflows/build-jenkins-agent.yaml' - '.gitea/workflows/build-jenkins-agent.yaml'
jobs: jobs:
"Build jenkins-agent docker images": "Build jenkins-agent docker images":
runs-on: hostinger runs-on: woryzen
steps: steps:
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.4.0
with:
driver: docker-container
- -
name: Login to Gitea container registry name: Login to Gitea container registry
uses: docker/login-action@v3 uses: docker/login-action@v3
@@ -25,11 +20,10 @@ jobs:
name: Build and push jenkins-agent images name: Build and push jenkins-agent images
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
builder: default
context: "{{defaultContext}}:jenkins-agent" context: "{{defaultContext}}:jenkins-agent"
push: true push: true
pull: true pull: true
tags: | tags: |
"gitea.woggioni.net/woggioni/jenkins-agent:latest" "gitea.woggioni.net/woggioni/jenkins-agent:latest"
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/jenkins-agent:buildx
cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/jenkins-agent:buildx

View File

@@ -9,16 +9,6 @@ jobs:
"Build Jupyter Ganymede docker images": "Build Jupyter Ganymede docker images":
runs-on: woryzen runs-on: woryzen
steps: steps:
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
name: multiplatform-builder
driver: docker-container
cleanup: false
platforms: |
linux/amd64
linux/arm64
- -
name: Login to Gitea container registry name: Login to Gitea container registry
uses: docker/login-action@v3 uses: docker/login-action@v3

View File

@@ -9,14 +9,6 @@ jobs:
"Build Jupyter Sage docker images": "Build Jupyter Sage docker images":
runs-on: woryzen runs-on: woryzen
steps: steps:
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
driver: docker-container
- -
name: Login to Gitea container registry name: Login to Gitea container registry
uses: docker/login-action@v3 uses: docker/login-action@v3
@@ -28,10 +20,12 @@ jobs:
name: Build and push jupyter-sage image name: Build and push jupyter-sage image
uses: docker/build-push-action@v5.3.0 uses: docker/build-push-action@v5.3.0
with: with:
builder: multiplatform-builder
context: "{{defaultContext}}:jupyter-sage" context: "{{defaultContext}}:jupyter-sage"
platforms: linux/amd64,linux/arm64 platforms: linux/amd64
push: true push: true
pull: true build-args: "VERSION=10.8"
tags: gitea.woggioni.net/woggioni/jupyter-sage:latest ssh: default=/home/luser/.ssh/id_ed25519
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/jupyter-sage:buildx tags: |
cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/jupyter-sage:buildx gitea.woggioni.net/woggioni/jupyter-sage:latest
gitea.woggioni.net/woggioni/jupyter-sage:10.8

View File

@@ -0,0 +1,35 @@
name: CI
on:
push:
branches: [ master ]
paths:
- 'monerod/*'
- '.gitea/workflows/build-monerod.yaml'
jobs:
"Build monerod 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 monerod images
uses: docker/build-push-action@v6
with:
context: "{{defaultContext}}:monerod"
builder: multiplatform-builder
platforms: |
linux/amd64
linux/arm64
push: true
pull: true
tags: |
"gitea.woggioni.net/woggioni/monerod:latest"
"gitea.woggioni.net/woggioni/monerod:0.18.4.5"

View File

@@ -9,14 +9,6 @@ jobs:
"Build nginx docker images": "Build nginx docker images":
runs-on: woryzen runs-on: woryzen
steps: steps:
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.4.0
with:
driver: docker-container
platforms: |
linux/amd64
linux/arm64
- -
name: Login to Gitea container registry name: Login to Gitea container registry
uses: docker/login-action@v3 uses: docker/login-action@v3
@@ -28,43 +20,43 @@ jobs:
name: Build and push nginx vanilla images name: Build and push nginx vanilla images
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
builder: multiplatform-builder
context: "{{defaultContext}}:nginx" context: "{{defaultContext}}:nginx"
platforms: | platforms: |
linux/amd64 linux/amd64
linux/arm64 linux/arm64
linux/arm/v7
push: true push: true
pull: true pull: true
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.29.4" "gitea.woggioni.net/woggioni/nginx:v1.29.5"
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.2.1 LIBRESSL_VERSION=4.2.1
NGINX_VERSION=1.29.4 NGINX_VERSION=1.29.5
NGINX_BRANCH=vanilla NGINX_BRANCH=vanilla
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/nginx:buildx-vanilla
cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/nginx:buildx-vanilla
- -
name: Build and push nginx custom images name: Build and push nginx custom images
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
builder: multiplatform-builder
context: "{{defaultContext}}:nginx" context: "{{defaultContext}}:nginx"
platforms: | platforms: |
linux/amd64 linux/amd64
linux/arm64 linux/arm64
linux/arm/v7
push: true push: true
pull: true pull: true
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.29.4-woggioni" "gitea.woggioni.net/woggioni/nginx:v1.29.5-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.2.1 LIBRESSL_VERSION=4.2.1
NGINX_VERSION=1.29.4 NGINX_VERSION=1.29.5
NGINX_BRANCH=woggioni NGINX_BRANCH=woggioni
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/nginx:buildx-woggioni
cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/nginx:buildx-woggioni

View File

@@ -0,0 +1,39 @@
name: CI
on:
push:
branches: [ master ]
paths:
- 'opencode/*'
- '.gitea/workflows/build-opencode.yaml'
jobs:
"Build opencode 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 opencode images
uses: docker/build-push-action@v6
with:
builder: multiplatform-builder
context: "{{defaultContext}}:opencode"
build-args: |
OPENCODE_VERSION=1.1.53
ALPINE_VERSION=3.23
platforms: |
linux/amd64
linux/arm64
push: true
pull: true
tags: |
"gitea.woggioni.net/woggioni/opencode:1.1.53"
"gitea.woggioni.net/woggioni/opencode:1.1.53-alpine3.23"
"gitea.woggioni.net/woggioni/opencode:1.1.53-alpine"
"gitea.woggioni.net/woggioni/opencode:latest"

View File

@@ -6,14 +6,9 @@ on:
- 'pgvector/**' - 'pgvector/**'
- '.gitea/workflows/build-pgvector.yaml' - '.gitea/workflows/build-pgvector.yaml'
jobs: jobs:
"Build wildfly docker images": "Build pgvector docker images":
runs-on: woryzen runs-on: woryzen
steps: steps:
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.4.0
with:
driver: docker-container
- -
name: Login to Gitea container registry name: Login to Gitea container registry
uses: docker/login-action@v3 uses: docker/login-action@v3
@@ -25,15 +20,18 @@ jobs:
name: Build and push pgvector images name: Build and push pgvector images
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
builder: multiplatform-builder
context: "{{defaultContext}}:pgvector" context: "{{defaultContext}}:pgvector"
push: true push: true
pull: true pull: true
platforms: |
linux/amd64
linux/arm64
tags: | tags: |
"gitea.woggioni.net/woggioni/pgvector:latest" "gitea.woggioni.net/woggioni/pgvector:latest"
"gitea.woggioni.net/woggioni/pgvector:0.8.1-pg17" "gitea.woggioni.net/woggioni/pgvector:0.8.1-pg18.1-alpine3.23"
build-args: | build-args: |
PG_VERSION=17 PG_VERSION=18.1
ALPINE_VERSION=3.23
PGVECTOR_VERSION=0.8.1 PGVECTOR_VERSION=0.8.1
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/pgvector:buildx
cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/pgvector:buildx

View File

@@ -17,26 +17,13 @@ jobs:
username: woggioni username: woggioni
password: ${{ secrets.PUBLISHER_TOKEN }} password: ${{ secrets.PUBLISHER_TOKEN }}
- -
name: Build and push sserver-rust images amd64 name: Build and push sserver-rust images
uses: docker/build-push-action@v6
with:
context: "{{defaultContext}}:shadowsocks-rust"
platforms: |
linux/amd64
push: true
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"
build-args: "VERSION=1.24.0"
-
name: Build and push sserver-rust images aarch64
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
builder: multiplatform-builder builder: multiplatform-builder
context: "{{defaultContext}}:shadowsocks-rust" context: "{{defaultContext}}:shadowsocks-rust"
platforms: | platforms: |
linux/amd64
linux/arm64 linux/arm64
push: true push: true
pull: false pull: false

View File

@@ -7,7 +7,7 @@ on:
- '.gitea/workflows/build-wildfly.yaml' - '.gitea/workflows/build-wildfly.yaml'
jobs: jobs:
"Build wildfly docker images": "Build wildfly docker images":
runs-on: hostinger runs-on: woryzen
steps: steps:
- -
name: Login to Gitea container registry name: Login to Gitea container registry
@@ -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:38.0.1" "gitea.woggioni.net/woggioni/wildfly:39.0.0"
build-args: "VERSION=38.0.1" build-args: "VERSION=39.0.0"

View File

@@ -9,11 +9,6 @@ jobs:
"Build xmrig docker images": "Build xmrig docker images":
runs-on: woryzen runs-on: woryzen
steps: steps:
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3.4.0
with:
driver: docker-container
- -
name: Login to Gitea container registry name: Login to Gitea container registry
uses: docker/login-action@v3 uses: docker/login-action@v3
@@ -25,14 +20,16 @@ jobs:
name: Build and push xmrig images name: Build and push xmrig images
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
builder: multiplatform-builder
context: "{{defaultContext}}:xmrig" context: "{{defaultContext}}:xmrig"
platforms: |
linux/amd64
linux/arm64
push: true push: true
pull: true pull: true
ssh: default=/home/luser/.ssh/id_ed25519 ssh: default=/home/luser/.ssh/id_ed25519
tags: | tags: |
"gitea.woggioni.net/woggioni/xmrig:latest" "gitea.woggioni.net/woggioni/xmrig:latest"
"gitea.woggioni.net/woggioni/xmrig:6.24.0" "gitea.woggioni.net/woggioni/xmrig:6.25.0"
build-args: "VERSION=6.24.0" build-args: "VERSION=6.25.0"
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/xmrig:buildx
cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/xmrig:buildx

View File

@@ -81,6 +81,34 @@ WORKDIR /home/luser
FROM base AS rust FROM base AS rust
RUN mkdir -p /etc/cargo RUN mkdir -p /etc/cargo
COPY --chown=1000:1000 config.toml /home/luser/.cargo/config.toml COPY --chown=1000:1000 config.toml /home/luser/.cargo/config.toml
RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
rustup \
trunk \
llvm \
clang
FROM rust AS rust-full
RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
hidapi \
protobuf
USER luser
WORKDIR /home/luser
RUN rustup update
RUN rustup toolchain install stable-x86_64-unknown-linux-gnu --profile minimal
RUN rustup component add rustfmt
RUN rustup target add \
x86_64-unknown-linux-musl \
x86_64-unknown-linux-gnu \
armv7-unknown-linux-musleabihf \
arm-unknown-linux-musleabi \
aarch64-unknown-linux-musl \
aarch64-unknown-linux-gnu \
wasm32-unknown-unknown \
wasm32-wasip2
FROM base AS rust-sccache
RUN mkdir -p /etc/cargo
COPY --chown=1000:1000 config-sccache.toml /home/luser/.cargo/config.toml
COPY --chown=1000:1000 sccache_config.toml /home/luser/.config/sccache/config COPY --chown=1000:1000 sccache_config.toml /home/luser/.config/sccache/config
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 \ rustup \
@@ -89,7 +117,7 @@ RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
llvm \ llvm \
clang clang
FROM rust AS rust-full FROM rust-sccache AS rust-full-sccache
RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \ RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
hidapi \ hidapi \
protobuf protobuf

View File

@@ -0,0 +1,23 @@
[target.aarch64-unknown-linux-musl]
linker = "/opt/x-tools/aarch64-unknown-linux-musl/bin/aarch64-unknown-linux-musl-ld"
[target.x86_64-unknown-linux-musl]
linker = "/opt/x-tools/x86_64-unknown-linux-musl/bin/x86_64-unknown-linux-musl-ld"
[target.x86_64-pc-windows-gnu]
linker = "/opt/x-tools/x86_64-w64-mingw32/bin/x86_64-w64-mingw32-gcc"
[target.armv7-unknown-linux-musleabihf]
linker = "/opt/x-tools/arm-unknown-linux-musleabihf/bin/arm-unknown-linux-musleabihf-ld"
[registries.gitea]
global-credential-providers = ["cargo:token"]
index = "sparse+https://gitea.woggioni.net/api/packages/woggioni/cargo/"
[net]
git-fetch-with-cli = true
[profile.release]
opt-level = 3
lto = true
strip = true
[build]
rustc-wrapper = "/usr/bin/sccache"

View File

@@ -18,6 +18,3 @@ git-fetch-with-cli = true
opt-level = 3 opt-level = 3
lto = true lto = true
strip = true strip = true
[build]
rustc-wrapper = "/usr/bin/sccache"

View File

@@ -1,4 +1,4 @@
FROM jenkins/agent:3345.v03dee9b_f88fc-2-alpine3.22-jdk21 FROM jenkins/agent:3355.v388858a_47b_33-4-alpine3.23-jdk25
USER root USER root
RUN --mount=type=cache,target=/var/cache/apk apk add docker RUN --mount=type=cache,target=/var/cache/apk apk add docker
USER jenkins USER jenkins

View File

@@ -4,13 +4,12 @@ RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \
apk add python3 python3-dev pipx gcc g++ musl-dev linux-headers which curl libffi-dev git apk add python3 python3-dev pipx gcc g++ musl-dev linux-headers which curl libffi-dev git
RUN adduser jovyan -u 1000 --system -s /bin/sh -h /home/jovyan RUN adduser jovyan -u 1000 --system -s /bin/sh -h /home/jovyan
FROM --platform=$BUILDPLATFORM alpine:3.23 AS build-base-native FROM --platform=$BUILDPLATFORM alpine:3.22 AS java-build
RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \ RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \
apk update &&\ apk update &&\
apk add python3 python3-dev pipx gcc g++ musl-dev linux-headers which curl libffi-dev git apk add python3 python3-dev pipx gcc g++ musl-dev linux-headers which curl libffi-dev git
RUN adduser jovyan -u 1000 --system -s /bin/sh -h /home/jovyan RUN adduser jovyan -u 1000 --system -s /bin/sh -h /home/jovyan
FROM build-base-native AS java-build
RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \ RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \
apk add openjdk11-jdk maven apk add openjdk11-jdk maven
USER jovyan USER jovyan
@@ -19,7 +18,7 @@ WORKDIR /home/jovyan
ADD --chown=jovyan:jovyan git@github.com:allen-ball/ganymede.git#trunk ganymede ADD --chown=jovyan:jovyan git@github.com:allen-ball/ganymede.git#trunk ganymede
#RUN git clone https://github.com/allen-ball/ganymede.git ganymede #RUN git clone https://github.com/allen-ball/ganymede.git ganymede
WORKDIR /home/jovyan/ganymede WORKDIR /home/jovyan/ganymede
RUN --mount=type=cache,target=/home/jovyan/.m2/,uid=1000,gid=1000,sharing=locked mvn -T 16 -Dmaven.test.skip=true -q package RUN --mount=type=cache,target=/home/jovyan/.m2/,uid=1000,gid=1000,sharing=locked mvn -Dmaven.test.skip=true -q package
FROM build-base AS python-build FROM build-base AS python-build
RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \ RUN --mount=type=cache,target=/var/cache/apk/,sharing=locked \
@@ -28,7 +27,7 @@ USER jovyan
WORKDIR /home/jovyan WORKDIR /home/jovyan
RUN python -m venv venv RUN python -m venv venv
RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install jupyter-core RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install jupyter-core
RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install notebook jupyterlab RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install "notebook<7" jupyterlab
ENV PATH="/home/jovyan/venv/bin/:$PATH" ENV PATH="/home/jovyan/venv/bin/:$PATH"
RUN --mount=type=bind,from=java-build,src=/home/jovyan/ganymede/ganymede/target/ganymede-2.1.3-SNAPSHOT.jar,target=/home/jovyan/ganymede.jar\ RUN --mount=type=bind,from=java-build,src=/home/jovyan/ganymede/ganymede/target/ganymede-2.1.3-SNAPSHOT.jar,target=/home/jovyan/ganymede.jar\
java -jar /home/jovyan/ganymede.jar -i --copy-jar=true java -jar /home/jovyan/ganymede.jar -i --copy-jar=true

View File

@@ -1,36 +1,44 @@
FROM debian:latest FROM debian:stable AS build
RUN apt-get update && apt-get upgrade RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
RUN apt-get install -y bc binutils bzip2 ca-certificates cliquer cmake curl \ --mount=type=cache,target=/var/lib/apt,sharing=locked \
ecl eclib-tools fflas-ffpack g++ gap gcc gengetopt gfan gfortran \ apt update &&\
glpk-utils gmp-ecm lcalc libatomic-ops-dev libboost-dev \ apt install -y python3 python3-dev pipx gcc g++ libffi-dev cargo cmake autoconf swig ninja-build patchelf meson python3-faiss adduser
libbraiding-dev libbrial-dev libbrial-groebner-dev libbz2-dev \ RUN adduser -u 1000 --system --shell /bin/sh --home /home/jovyan jovyan
libcdd-dev libcdd-tools libcliquer-dev libcurl4-openssl-dev libec-dev \
libecm-dev libffi-dev libflint-dev libfplll-dev libfreetype-dev \
libgap-dev libgc-dev libgd-dev libgf2x-dev libgiac-dev libgivaro-dev \
libglpk-dev libgmp-dev libgsl-dev libhomfly-dev libiml-dev \
liblfunction-dev liblinbox-dev liblrcalc-dev liblzma-dev libm4ri-dev \
libm4rie-dev libmpc-dev libmpfi-dev libmpfr-dev libncurses5-dev \
libntl-dev libopenblas-dev libpari-dev libplanarity-dev libppl-dev \
libprimesieve-dev libpython3-dev libqhull-dev libreadline-dev \
librw-dev libsingular4-dev libsqlite3-dev libssl-dev \
libsuitesparse-dev libsymmetrica2-dev libz-dev libzmq3-dev m4 make \
maxima maxima-sage meson nauty ninja-build openssl palp pari-doc \
pari-elldata pari-galdata pari-galpol pari-gp2c pari-seadata patch \
patchelf perl pkg-config planarity ppl-dev python3 python3-setuptools \
python3-venv singular singular-doc sqlite3 sympow tachyon tar texinfo \
tox xcas xz-utils git
RUN apt-get install -y default-jdk dvipng ffmpeg fonts-freefont-otf \
imagemagick latexmk libavdevice-dev libjpeg-dev pandoc tex-gyre \
texlive-fonts-recommended texlive-lang-cyrillic texlive-lang-english \
texlive-lang-european texlive-lang-french texlive-lang-german \
texlive-lang-italian texlive-lang-japanese texlive-lang-polish \
texlive-lang-portuguese texlive-lang-spanish texlive-latex-extra \
texlive-luatex texlive-xetex xindy
RUN useradd jovyan -u 1000 -s /bin/bash -m -h /home/jovyan
USER jovyan USER jovyan
WORKDIR /home/jovyan WORKDIR /home/jovyan
COPY build.sh build.sh RUN python3 -m venv venv
RUN git clone -c core.symlinks=true --filter blob:none \ RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install sagemath
--origin upstream --branch master --tags \ RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install jupyter-core
https://github.com/sagemath/sage.git RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install jupyterhub
RUN export srcdir=/home/jovyan/sage source build.sh && prepare && build RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install jupyterlab
RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install notebook
RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install ipywidgets
RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install jupyterlab-lsp
RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install python-lsp-server[yapf,rope,pyflakes]
RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install jupyter-ai
RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install langchain-openai langchain_ollama
ENV PATH="/home/jovyan/venv/bin/:$PATH"
FROM debian:stable
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt,sharing=locked \
apt update &&\
apt install -y python3 adduser
RUN adduser -u 1000 --system --shell /bin/sh --home /home/jovyan jovyan
USER jovyan
COPY --from=build /home/jovyan /home/jovyan
COPY jupyter_server_config.py docker_healthcheck.py /etc/jupyter/
COPY start-notebook.py start-singleuser.py /usr/local/bin/
RUN mkdir /home/jovyan/work
WORKDIR /home/jovyan/work
ENV JUPYTER_PORT=8888
EXPOSE $JUPYTER_PORT
ENV PATH="/home/jovyan/venv/bin/:$PATH"
CMD ["start-notebook.py"]
# HEALTHCHECK documentation: https://docs.docker.com/engine/reference/builder/#healthcheck
# This healtcheck works well for `lab`, `notebook`, `nbclassic`, `server`, and `retro` jupyter commands
# https://github.com/jupyter/docker-stacks/issues/915#issuecomment-1068528799
HEALTHCHECK --interval=3s --timeout=1s --start-period=3s --retries=3 \
CMD /etc/jupyter/docker_healthcheck.py || exit 1

View File

@@ -1,15 +1,18 @@
#!/usr/bin/env sh #!/usr/bin/env sh
set -e
pkgs=(standard # pkgs=(
bliss # standard
coxeter3 # bliss
mcqd # coxeter3
meataxe # mcqd
sirocco # meataxe
tdlib) # sirocco
# tdlib
# )
prepare(){ prepare() {
cd sage cd "${srcdir}"
# use correct latte-count binary name # use correct latte-count binary name
# patch -p1 -i ../latte-count.patch # patch -p1 -i ../latte-count.patch
# update to tdlib 0.9 (Fedora) # update to tdlib 0.9 (Fedora)
@@ -23,29 +26,17 @@ prepare(){
} }
build() { build() {
export SAGE_NUM_THREADS=$(($(nproc)/2)) #export SAGE_NUM_THREADS=$(($(nproc)/2))
export PYTHONPATH="$PWD"/sage/pkgs/sage-setup #export PYTHONPATH="$PWD"/sage/pkgs/sage-setup
python3 -m build --wheel --no-isolation -C setup-args=-Dbuild-docs=false
for _pkg in ${_pkgs[@]}; do
cd "$srcdir"/sage/pkgs/sagemath-$_pkg
python setup.py build
done
} }
package() { package() {
for _pkg in ${_pkgs[@]}; do python -m installer dist/*.whl
cd "$srcdir"/sage/pkgs/sagemath-$_pkg
python setup.py install --root="$pkgdir" --optimize=1
done
# fix symlinks to assets
# _pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"`
# for _i in $(ls "$srcdir"/sage/src/sage/ext_data/notebook-ipython); do
# rm "$pkgdir"/usr/share/jupyter/kernels/sagemath/$_i
# ln -s $_pythonpath/sage/ext_data/notebook-ipython/$_i "$pkgdir"/usr/share/jupyter/kernels/sagemath/
# done
# adjust threejs version
# rm "$pkgdir"$_pythonpath/sage/ext_data/threejs/threejs-version.txt
# ln -s /usr/share/threejs-sage/version "$pkgdir"$_pythonpath/sage/ext_data/threejs/threejs-version.txt
} }
# prepare
build
package

44
jupyter-sage/start-notebook.py Executable file
View File

@@ -0,0 +1,44 @@
#!/usr/bin/env python
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
import os
import shlex
import sys
# If we are in a JupyterHub, we pass on to `start-singleuser.py` instead so it does the right thing
if "JUPYTERHUB_API_TOKEN" in os.environ:
print(
"WARNING: using start-singleuser.py instead of start-notebook.py to start a server associated with JupyterHub."
)
command = ["/usr/local/bin/start-singleuser.py"] + sys.argv[1:]
os.execvp(command[0], command)
# Entrypoint is start.sh
command = []
# If we want to survive restarts, launch the command using `run-one-constantly`
if os.environ.get("RESTARTABLE") == "yes":
command.append("run-one-constantly")
# We always launch a jupyter subcommand from this script
command.append("jupyter")
# Launch the configured subcommand.
# Note that this should be a single string, so we don't split it.
# We default to `lab`.
jupyter_command = os.environ.get("DOCKER_STACKS_JUPYTER_CMD", "lab")
command.append(jupyter_command)
# Append any optional NOTEBOOK_ARGS we were passed in.
# This is supposed to be multiple args passed on to the notebook command,
# so we split it correctly with shlex
if "NOTEBOOK_ARGS" in os.environ:
command += shlex.split(os.environ["NOTEBOOK_ARGS"])
# Pass through any other args we were passed on the command line
command += sys.argv[1:]
# Execute the command!
print("Executing: " + " ".join(command))
os.execvp(command[0], command)

70
monerod/APKBUILD Normal file
View File

@@ -0,0 +1,70 @@
# Contributor: André Klitzing <aklitzing@gmail.com>
# Maintainer: André Klitzing <aklitzing@gmail.com>
pkgname=monero
pkgver=0.18.4.5
pkgrel=0
_ver_randomx=10494476d6236b177733224123747201dec180bb
_ver_supercop=633500ad8c8759995049ccd022107d1fa8a1bbc9
pkgdesc="Secure, private, untraceable cryptocurrency"
url="https://getmonero.org/"
arch="all !riscv64" # build failure
license="BSD-3-Clause"
makedepends="
boost-dev
cmake
cppzmq
hidapi-dev
libsodium-dev
miniupnpc-dev
openssl-dev>3
rapidjson-dev
readline-dev
samurai
unbound-dev
zeromq-dev
"
options="!check"
source="$pkgname-$pkgver.tar.gz::https://github.com/monero-project/monero/archive/refs/tags/v$pkgver.tar.gz
$pkgname-randomx-$_ver_randomx.tar.gz::https://github.com/tevador/RandomX/archive/$_ver_randomx.tar.gz
$pkgname-supercop-$_ver_supercop.tar.gz::https://github.com/monero-project/supercop/archive/$_ver_supercop.tar.gz
easylogging.patch
gcc13.patch
system-miniupnpc.patch
version-string.patch
loongarch64.patch
miniupnpc.patch
"
prepare() {
default_prepare
rm -fr external/randomx external/supercop
ln -s $srcdir/RandomX-$_ver_randomx external/randomx
ln -s $srcdir/supercop-$_ver_supercop external/supercop
}
build() {
cmake -B build -G Ninja \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr \
-DSTACK_TRACE=OFF \
-DMANUAL_SUBMODULES=1 \
-DARCH=default
cmake --build build
}
package() {
DESTDIR="$pkgdir" cmake --install build
}
sha512sums="
9899c53e79fad57fd66a77b2053fd2d9856b1834a041800826337110b9f8188300b67c78d5c93dbd01510f7bf6b9c682f19f154ceb9ecad6adf818474b517cfa monero-0.18.4.5.tar.gz
41ab097ec43b79844f4e9f2143ead381bcda228e6eae6fe082f078846ca2e3e50e2800f645355f879dc14ef7980c98a4019da9f9aaa2175b59c80e099d5be3fc monero-randomx-10494476d6236b177733224123747201dec180bb.tar.gz
06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648 monero-supercop-633500ad8c8759995049ccd022107d1fa8a1bbc9.tar.gz
c149f1e6a6968115f95213d512116457b36665ff1159c5137dda45fa27712ce6f088b908663fb429b8e5f74e41d6cd57669db79d596564ddaca481dbdc63393e easylogging.patch
9d1ae2b057d49abb1fcd04744069bc3898f8822db2ecf259bc6f0f8b20c4871ba9947356c548e43d2fc20aa4aa03aaf02e0052d53056028d334638c0a360842a gcc13.patch
15aacc364c0877bce1113c65c40daf33287bc9f26d94e0d8841940eb9fa7a9abf3c25f6ab37a9f91cdb093668e2a345a59b0a6a0e3f06dbad1078530f216dc72 system-miniupnpc.patch
411d041754bf801a4dcff6eb52d0d7fa29ad07ce673f956764b2d4b8c8252233b5f09f8833f8461be0f9b0c922748db71fecad04ae755c61ebe50113e2648485 version-string.patch
f71bace84a4569cf6c7e094303bb98ba7472d8e8f35b5ece4d5d1e60b3c6a75fb212cbf88a3bc5a5b0ef28a645c7b1c32520f940fa935e42421885cfb0268f74 loongarch64.patch
c7e143b31906e1b08f8c04374a8ec5285d83bb8f5a958e2bbd1c2d4fc78645e3a43f456eb321810998ff4c147a85d9617188eb68b3287e7279b2495805645939 miniupnpc.patch
"

46
monerod/Dockerfile Normal file
View File

@@ -0,0 +1,46 @@
FROM alpine:3.23 AS base
FROM base AS builder
RUN --mount=type=cache,target=/var/cache/apk apk update
RUN --mount=type=cache,target=/var/cache/apk apk add \
abuild \
build-base \
boost-dev \
cmake \
cppzmq \
hidapi-dev \
libsodium-dev \
miniupnpc-dev \
openssl-dev \
rapidjson-dev \
readline-dev \
samurai \
unbound-dev \
zeromq-dev
RUN adduser -D -G abuild luser
USER luser
WORKDIR /home/luser
ADD --chown=luser:luser ./APKBUILD .
ADD --chown=luser:luser ./easylogging.patch .
ADD --chown=luser:luser ./gcc13.patch .
ADD --chown=luser:luser ./system-miniupnpc.patch .
ADD --chown=luser:luser ./version-string.patch .
ADD --chown=luser:luser ./loongarch64.patch .
ADD --chown=luser:luser ./miniupnpc.patch .
RUN abuild-keygen -a -n
USER root
RUN cp /home/luser/.abuild/*.pub /etc/apk/keys/
USER luser
RUN abuild
FROM base AS release
RUN adduser -D -h /var/lib/monero monero
RUN --mount=type=bind,from=builder,source=/home/luser/.abuild,target=/.abuild cp /.abuild/*.pub /etc/apk/keys
RUN --mount=type=bind,from=builder,source=/home/luser/packages,target=/packages apk add /packages/*/*/*.apk
USER monero
WORKDIR /var/lib/monero
ENTRYPOINT /usr/bin/monerod

11
monerod/easylogging.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/external/easylogging++/easylogging++.h
+++ b/external/easylogging++/easylogging++.h
@@ -221,7 +221,7 @@
# define ELPP_INTERNAL_INFO(lvl, msg)
#endif // (defined(ELPP_DEBUG_INFO))
#if (defined(ELPP_FEATURE_ALL)) || (defined(ELPP_FEATURE_CRASH_LOG))
-# if (ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD && !ELPP_OS_NETBSD && !ELPP_OS_ANDROID && !ELPP_OS_EMSCRIPTEN)
+# if (__has_include(<execinfo.h>) && ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD && !ELPP_OS_NETBSD && !ELPP_OS_ANDROID && !ELPP_OS_EMSCRIPTEN)
# define ELPP_STACKTRACE 1
# else
# define ELPP_STACKTRACE 0

24
monerod/gcc13.patch Normal file
View File

@@ -0,0 +1,24 @@
diff --git a/contrib/epee/src/file_io_utils.cpp b/contrib/epee/src/file_io_utils.cpp
index c0798a5..4549ead 100644
--- a/contrib/epee/src/file_io_utils.cpp
+++ b/contrib/epee/src/file_io_utils.cpp
@@ -26,6 +26,7 @@
#include "file_io_utils.h"
+#include <cstdint>
#include <fstream>
#include <boost/filesystem/path.hpp>
#include <boost/filesystem/operations.hpp>
diff --git a/src/common/combinator.cpp b/src/common/combinator.cpp
index 72b1397..c98e3da 100644
--- a/src/common/combinator.cpp
+++ b/src/common/combinator.cpp
@@ -29,6 +29,7 @@
//
// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
+#include <cstdint>
#include "combinator.h"
namespace tools {

34
monerod/loongarch64.patch Normal file
View File

@@ -0,0 +1,34 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fb03ba..3fbd9cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -335,6 +335,11 @@ set(RISCV 1)
set(RISCV32 1)
endif()
+if(ARCH_ID STREQUAL "loongarch64")
+set(LOONGARCH 1)
+set(LOONGARCH64 1)
+endif()
+
if(WIN32 OR ARM OR PPC64LE OR PPC64 OR PPC)
set(OPT_FLAGS_RELEASE "-O2")
else()
@@ -748,7 +753,7 @@ else()
message(STATUS "AES support explicitly disabled")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNO_AES")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNO_AES")
- elseif(NOT ARM AND NOT PPC64LE AND NOT PPC64 AND NOT PPC AND NOT S390X AND NOT RISCV)
+ elseif(NOT ARM AND NOT PPC64LE AND NOT PPC64 AND NOT PPC AND NOT S390X AND NOT RISCV AND NOT LOONGARCH64)
message(STATUS "AES support enabled")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
@@ -762,6 +767,8 @@ else()
message(STATUS "AES support not available on ARMv6")
elseif(ARM7)
message(STATUS "AES support not available on ARMv7")
+ elseif(LOONGARCH64)
+ message(STATUS "AES support not available on LoongArch64")
elseif(ARM8)
CHECK_CXX_ACCEPTS_FLAG("-march=${ARCH}+crypto" ARCH_PLUS_CRYPTO)
if(ARCH_PLUS_CRYPTO)

22
monerod/miniupnpc.patch Normal file
View File

@@ -0,0 +1,22 @@
API changed in miniupnpc 2.2.8
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -2989,7 +2989,7 @@
UPNPUrls urls;
IGDdatas igdData;
char lanAddress[64];
- result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress);
+ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress, nullptr, 0);
freeUPNPDevlist(deviceList);
if (result > 0) {
if (result == 1) {
@@ -3057,7 +3057,7 @@
UPNPUrls urls;
IGDdatas igdData;
char lanAddress[64];
- result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress);
+ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress, nullptr, 0);
freeUPNPDevlist(deviceList);
if (result > 0) {
if (result == 1) {

View File

@@ -0,0 +1,100 @@
--- monero-0.18.4.1/CMakeLists.txt
+++ monero-0.18.4.1.final/CMakeLists.txt
@@ -676,6 +676,14 @@
include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
add_subdirectory(external)
+# Final setup for miniupnpc
+if(UPNP_STATIC OR IOS)
+ add_definitions("-DUPNP_STATIC")
+else()
+ add_definitions("-DUPNP_DYNAMIC")
+ include_directories(${UPNP_INCLUDE})
+endif()
+
# Final setup for libunbound
include_directories(${UNBOUND_INCLUDE_DIR})
--- monero-0.18.4.1/external/CMakeLists.txt
+++ monero-0.18.4.1.final/external/CMakeLists.txt
@@ -34,25 +34,45 @@
# We always compile if we are building statically to reduce static dependency issues...
# ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with
# others.
+if(NOT IOS)
+ find_package(Miniupnpc QUIET)
+endif()
-find_package(Miniupnpc REQUIRED)
-
-message(STATUS "Using in-tree miniupnpc")
-set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE)
-set(UPNPC_BUILD_SHARED OFF CACHE BOOL "Disable building shared library" FORCE)
-add_subdirectory(miniupnp/miniupnpc)
-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
-set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON)
-if(MSVC)
- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
-elseif(NOT MSVC)
- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
+# If we have the correct shared version and we're not building static, use it
+if(STATIC OR IOS)
+ set(USE_SHARED_MINIUPNPC false)
+elseif(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER)
+ set(USE_SHARED_MINIUPNPC true)
endif()
if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE")
endif()
-set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
+if(USE_SHARED_MINIUPNPC)
+ message(STATUS "Using shared miniupnpc found at ${MINIUPNP_INCLUDE_DIR}")
+
+ set(UPNP_STATIC false PARENT_SCOPE)
+ set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE)
+ set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE)
+else()
+ if(STATIC)
+ message(STATUS "Using miniupnpc from local source tree for static build")
+ else()
+ message(STATUS "Using miniupnpc from local source tree (/external/miniupnp/miniupnpc)")
+ endif()
+ add_subdirectory(miniupnp/miniupnpc)
+
+ set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
+ if(MSVC)
+ set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
+ elseif(NOT MSVC)
+ set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
+ endif()
+
+ set(UPNP_STATIC true PARENT_SCOPE)
+ set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
+endif()
+
find_package(Unbound)
--- monero-0.18.4.1/src/p2p/net_node.inl
+++ monero-0.18.4.1.final/src/p2p/net_node.inl
@@ -60,9 +60,16 @@
#include "cryptonote_core/cryptonote_core.h"
#include "net/parse.h"
-#include <miniupnp/miniupnpc/miniupnpc.h>
-#include <miniupnp/miniupnpc/upnpcommands.h>
-#include <miniupnp/miniupnpc/upnperrors.h>
+// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
+#ifdef UPNP_STATIC
+ #include <miniupnp/miniupnpc/miniupnpc.h>
+ #include <miniupnp/miniupnpc/upnpcommands.h>
+ #include <miniupnp/miniupnpc/upnperrors.h>
+#else
+ #include "miniupnpc.h"
+ #include "upnpcommands.h"
+ #include "upnperrors.h"
+#endif
#undef MONERO_DEFAULT_LOG_CATEGORY
#define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"

View File

@@ -0,0 +1,13 @@
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index 3677e80..490de2c 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -32,7 +32,7 @@ function (write_static_version_header hash)
endfunction ()
find_package(Git QUIET)
-if ("$Format:$" STREQUAL "")
+if ("$Format:$" STREQUAL "" OR NOT EXISTS .git)
# We're in a tarball; use hard-coded variables.
set(VERSION_IS_RELEASE "true")
write_version("release")

View File

@@ -1,5 +1,5 @@
ARG NGINX_BRANCH=vanilla ARG NGINX_BRANCH=vanilla
FROM alpine:3.22 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 ARG NGINX_VERSION LIBRESSL_VERSION
@@ -29,6 +29,7 @@ RUN --mount=type=cache,target=/var/cache/apk apk add \
pcre \ pcre \
pcre-dev \ pcre-dev \
perl-dev \ perl-dev \
quickjs-dev \
su-exec \ su-exec \
tar \ tar \
tzdata \ tzdata \
@@ -65,6 +66,7 @@ ADD --chown=luser:luser git@github.com:woggioni/nginx.git#release-${NGINX_VERSIO
FROM build_stage_2_${NGINX_BRANCH} AS build FROM build_stage_2_${NGINX_BRANCH} AS build
ADD --chown=luser:luser https://github.com/openresty/headers-more-nginx-module.git /ngx_headers_more ADD --chown=luser:luser https://github.com/openresty/headers-more-nginx-module.git /ngx_headers_more
ADD --chown=luser:luser https://github.com/google/ngx_brotli.git /ngx_brotli ADD --chown=luser:luser https://github.com/google/ngx_brotli.git /ngx_brotli
USER root USER root
WORKDIR / WORKDIR /
RUN hg clone http://hg.nginx.org/njs /njs RUN hg clone http://hg.nginx.org/njs /njs
@@ -74,6 +76,12 @@ WORKDIR /home/luser
ADD --chown=luser:luser --chmod=755 ./build.sh ./build.sh ADD --chown=luser:luser --chmod=755 ./build.sh ./build.sh
RUN ./build.sh RUN ./build.sh
FROM build_stage_2_${NGINX_BRANCH} AS build-rtmp
ADD --chown=luser:luser https://github.com/arut/nginx-rtmp-module.git /ngx-rtmp-module
USER luser
WORKDIR /home/luser
ADD --chown=luser:luser --chmod=755 ./build-rtmp.sh ./build-rtmp.sh
RUN ./build-rtmp.sh
FROM base AS release FROM base AS release
ARG VERSION ARG VERSION
@@ -91,7 +99,7 @@ RUN --mount=type=cache,target=/var/cache/apk \
--mount=type=bind,source=install.sh,target=/install.sh \ --mount=type=bind,source=install.sh,target=/install.sh \
(cd nginx && sh /install.sh) (cd nginx && sh /install.sh)
RUN --mount=type=cache,target=/var/cache/apk apk del .install_deps RUN --mount=type=cache,target=/var/cache/apk apk del .install_deps
COPY --from=build-rtmp --chown=root:root /nginx/objs/ngx_rtmp_module.so /usr/lib/nginx/modules/
COPY --from=build /home/luser/libressl/openssl.cnf /etc/ssl/openssl.cnf COPY --from=build /home/luser/libressl/openssl.cnf /etc/ssl/openssl.cnf
COPY conf/nginx.conf /etc/nginx/nginx.conf COPY conf/nginx.conf /etc/nginx/nginx.conf
COPY conf/dhparam /etc/nginx/dhparam COPY conf/dhparam /etc/nginx/dhparam

30
nginx/build-rtmp.sh Normal file
View File

@@ -0,0 +1,30 @@
#!/usr/bin/env sh
set -e
CONFIG='
--prefix=/etc/nginx
--sbin-path=/usr/sbin/nginx
--modules-path=/usr/lib/nginx/modules
--conf-path=/etc/nginx/nginx.conf
--error-log-path=/var/log/nginx/error.log
--http-log-path=/var/log/nginx/access.log
--pid-path=/var/run/nginx.pid
--lock-path=/var/run/nginx.lock
--http-client-body-temp-path=/var/cache/nginx/client_temp
--http-proxy-temp-path=/var/cache/nginx/proxy_temp
--http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp
--http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp
--http-scgi-temp-path=/var/cache/nginx/scgi_temp
--user=nginx
--group=nginx
--with-http_ssl_module
--add-dynamic-module=/ngx-rtmp-module
'
cd /nginx
auto/configure $CONFIG \
--with-cc-opt="-I/home/luser/libressl/build/include" \
--with-ld-opt="-lstdc++ -L/home/luser/libressl/build/ssl -L/home/luser/libressl/build/crypto"
make -j$(nproc)

View File

@@ -18,6 +18,7 @@ CONFIG='
--http-scgi-temp-path=/var/cache/nginx/scgi_temp --http-scgi-temp-path=/var/cache/nginx/scgi_temp
--user=nginx --user=nginx
--group=nginx --group=nginx
--with-pcre
--with-http_ssl_module --with-http_ssl_module
--with-http_realip_module --with-http_realip_module
--with-http_addition_module --with-http_addition_module
@@ -25,6 +26,8 @@ CONFIG='
--with-http_dav_module --with-http_dav_module
--with-http_flv_module --with-http_flv_module
--with-http_mp4_module --with-http_mp4_module
--with-http_degradation_module
--with-http_slice_module
--with-http_gunzip_module --with-http_gunzip_module
--with-http_gzip_static_module --with-http_gzip_static_module
--with-http_random_index_module --with-http_random_index_module
@@ -40,14 +43,14 @@ CONFIG='
--with-stream_realip_module --with-stream_realip_module
--with-stream_geoip_module=dynamic --with-stream_geoip_module=dynamic
--with-http_slice_module --with-http_slice_module
--with-mail --with-mail=dynamic
--with-mail_ssl_module --with-mail_ssl_module
--with-compat --with-compat
--with-file-aio --with-file-aio
--with-http_v2_module --with-http_v2_module
--with-http_v3_module --with-http_v3_module
--add-dynamic-module=/ngx_headers_more --add-dynamic-module=/ngx_headers_more
--add-dynamic-module=/ngx_brotli --add-module=/ngx_brotli
--add-dynamic-module=/njs/nginx --add-dynamic-module=/njs/nginx
' '

View File

@@ -1,13 +1,4 @@
include /etc/nginx/conf.d/modules/*.conf;
load_module modules/ngx_http_xslt_filter_module.so;
#load_module modules/ngx_http_image_filter_module.so;
load_module modules/ngx_http_geoip_module.so;
#load_module modules/ngx_http_perl_module.so;
load_module modules/ngx_stream_geoip_module.so;
load_module modules/ngx_http_headers_more_filter_module.so;
load_module modules/ngx_http_brotli_static_module.so;
load_module modules/ngx_http_brotli_filter_module.so;
#load_module modules/ngx_http_js_module.so;
user nginx; user nginx;
worker_processes 1; worker_processes 1;

27
opencode/Dockerfile Normal file
View File

@@ -0,0 +1,27 @@
ARG ALPINE_VERSION=latest
FROM --platform=$BUILDPLATFORM alpine:${ALPINE_VERSION} AS base
RUN --mount=type=cache,target=/var/cache/apk apk update
RUN --mount=type=cache,target=/var/cache/apk apk add rust-analyzer openjdk25-jdk jdtls pipx ripgrep git
RUN adduser -D -h /var/lib/opencode opencode
RUN mkdir /workspace
RUN chown opencode:opencode /workspace
USER opencode
RUN pipx install pyright
USER root
ARG TARGETPLATFORM BUILDPLATFORM OPENCODE_VERSION
FROM base AS builder-linux_arm64
ADD https://github.com/anomalyco/opencode/releases/download/v${OPENCODE_VERSION}/opencode-linux-arm64-musl.tar.gz ./opencode.tgz
FROM base AS builder-linux_amd64
ADD https://github.com/anomalyco/opencode/releases/download/v${OPENCODE_VERSION}/opencode-linux-x64-musl.tar.gz ./opencode.tgz
FROM builder-${TARGETPLATFORM//\//_} AS release
RUN tar -xvf ./opencode.tgz -C /usr/bin
RUN rm opencode.tgz
USER opencode
WORKDIR /workspace
ENTRYPOINT ["opencode"]
VOLUME ["/var/lib/opencode", "/workspace"]

View File

@@ -1,5 +1,5 @@
ARG PG_VERSION=17 ARG PG_VERSION=18.1 ALPINE_VERSION=3.23
FROM postgres:${PG_VERSION}-alpine AS build FROM postgres:${PG_VERSION}-alpine${ALPINE_VERSION} AS build
ARG PGVECTOR_VERSION ARG PGVECTOR_VERSION
WORKDIR / WORKDIR /

View File

@@ -1,10 +1,9 @@
FROM --platform=$BUILDPLATFORM gitea.woggioni.net/woggioni/arch-builder:rust-full AS base FROM --platform=$BUILDPLATFORM gitea.woggioni.net/woggioni/arch-builder:rust-full AS base
ARG VERSION TARGETPLATFORM BUILDPLATFORM ARG VERSION TARGETPLATFORM BUILDPLATFORM
WORKDIR /home/luser/shadowsocks-rust WORKDIR /home/luser/shadowsocks-rust
#ADD --chown=luser:luser git@github.com:shadowsocks/shadowsocks-rust.git#v${VERSION} .
ADD --chown=luser:luser git@github.com:shadowsocks/shadowsocks-rust.git#v${VERSION} . RUN git clone --depth 1 --branch "v${VERSION}" https://github.com/shadowsocks/shadowsocks-rust.git .
FROM base AS builder-linux_386 FROM base AS builder-linux_386
ENV RUST_TARGET="i686-unknown-linux-musl" ENV RUST_TARGET="i686-unknown-linux-musl"
@@ -24,7 +23,7 @@ ENV RUST_TARGET="arm-unknown-linux-musleabihf"
ENV CC_armv7_unknown_linux_musleabihf=/opt/x-tools/arm-unknown-linux-musleabi/bin/arm-unknown-linux-musleabi-gcc ENV CC_armv7_unknown_linux_musleabihf=/opt/x-tools/arm-unknown-linux-musleabi/bin/arm-unknown-linux-musleabi-gcc
ENV CXX_armv7_unknown_linux_musleabihf=/opt/x-tools/arm-unknown-linux-musleabi/bin/arm-unknown-linux-musleabi-g++ ENV CXX_armv7_unknown_linux_musleabihf=/opt/x-tools/arm-unknown-linux-musleabi/bin/arm-unknown-linux-musleabi-g++
FROM builder-${TARGETPLATFORM/\//_} AS builder FROM builder-${TARGETPLATFORM//\//_} AS builder
RUN rustup target add $RUST_TARGET RUN rustup target add $RUST_TARGET
RUN cargo +stable build --locked --target "$RUST_TARGET" --release --features "full,aead-cipher-extra,aead-cipher-2022-extra,security-replay-attack-detect" \ RUN cargo +stable build --locked --target "$RUST_TARGET" --release --features "full,aead-cipher-extra,aead-cipher-2022-extra,security-replay-attack-detect" \
&& mv target/$RUST_TARGET/release/ss* target/release/ && mv target/$RUST_TARGET/release/ss* target/release/

View File

@@ -1,8 +1,8 @@
FROM alpine:3.22 AS base FROM alpine:3.23 AS base
FROM base AS build FROM base AS build
ARG VERSION ARG VERSION
RUN --mount=type=cache,target=/var/cache/apk apk add gcc g++ musl-dev cmake ninja hwloc-dev libuv-dev openssl-dev git upx RUN --mount=type=cache,target=/var/cache/apk apk add gcc g++ musl-dev cmake ninja hwloc-dev libuv-dev openssl-dev git upx linux-headers
RUN adduser -D -S -h /home/luser luser RUN adduser -D -S -h /home/luser luser
WORKDIR /home/luser WORKDIR /home/luser
USER luser USER luser