woggioni/docker-images
1
0
Fork 0
Code Actions Packages Releases Activity

Compare commits

base: woggioni/docker-images:master
Branches Tags
woggioni/docker-images:master woggioni/docker-images:dev
..
compare: woggioni/docker-images:96a32e13a87e568b2276d0662391bfa22c6c90e9
Branches Tags
woggioni/docker-images:master woggioni/docker-images:dev

3 Commits
master .. 96a32e13a8

Author SHA1 Message Date
woggioni 96a32e13a8 updated arch builder
CI / Build arch-builder docker images (push) Has been cancelled
Details
2025-12-31 20:13:05 +08:00
woggioni 6708b8e3ec try to fix the build
CI / Build shadowsocks-rust docker images (push) Failing after 2m46s
Details
2025-12-31 19:00:52 +08:00
woggioni 23608384c6 fixed shadowsocks image
CI / Build shadowsocks-rust docker images (push) Failing after 4m58s
Details
2025-12-31 18:06:13 +08:00
27 changed files with 41 additions and 597 deletions
Expand all files Collapse all files
.gitea/workflows/build-agentmail-mcp.yaml
-34
View File
@@ -1,34 +0,0 @@
name: CI
on:
push:
branches: [ master ]
paths:
- 'agentmail-mcp/*'
- '.gitea/workflows/build-agentmail-mcp.yaml'
jobs:
"Build agentmail-mcp 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 agentmail-mcp images
uses: docker/build-push-action@v6
with:
builder: multiplatform-builder
context: "{{defaultContext}}:agentmail-mcp"
build-args: |
VERSION=0.3.0
platforms: |
linux/amd64
push: true
pull: true
tags: |
"gitea.woggioni.net/woggioni/agentmail-mcp:latest"
"gitea.woggioni.net/woggioni/agentmail-mcp:0.3.0"
.gitea/workflows/build-arch-builder.yaml
-12
View File
@@ -28,18 +28,6 @@ jobs:
tags: | tags: |
"gitea.woggioni.net/woggioni/arch-builder:base" "gitea.woggioni.net/woggioni/arch-builder:base"
target: base target: base
-
name: Build and push arch-builder openwrt-builder 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:openwrt-builder"
target: openwrt-builder
- -
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
.gitea/workflows/build-monerod.yaml
-35
View File
@@ -1,35 +0,0 @@
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"
.gitea/workflows/build-nginx.yaml
+4 -6
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.30.0" "gitea.woggioni.net/woggioni/nginx:v1.29.4"
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.30.0 NGINX_VERSION=1.29.4
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.30.0-woggioni" "gitea.woggioni.net/woggioni/nginx:v1.29.4-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.30.0 NGINX_VERSION=1.29.4
NJS_VERSION=0.9.8
NGINX_BRANCH=woggioni NGINX_BRANCH=woggioni
.gitea/workflows/build-opencode.yaml
-35
View File
@@ -1,35 +0,0 @@
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.15.5
platforms: |
linux/amd64
push: true
pull: true
tags: |
"gitea.woggioni.net/woggioni/opencode:1.15.5"
"gitea.woggioni.net/woggioni/opencode:latest"
.gitea/workflows/build-pgvector.yaml
+11 -9
View File
@@ -6,9 +6,14 @@ on:
- 'pgvector/**' - 'pgvector/**'
- '.gitea/workflows/build-pgvector.yaml' - '.gitea/workflows/build-pgvector.yaml'
jobs: jobs:
"Build pgvector docker images": "Build wildfly 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
@@ -20,18 +25,15 @@ 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.2-pg18.3-alpine3.23" "gitea.woggioni.net/woggioni/pgvector:0.8.1-pg17"
build-args: | build-args: |
PG_VERSION=18.3 PG_VERSION=17
ALPINE_VERSION=3.23 PGVECTOR_VERSION=0.8.1
PGVECTOR_VERSION=0.8.2 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
.gitea/workflows/build-shadowsocks-rust.yaml
+3 -1
View File
@@ -25,9 +25,11 @@ jobs:
platforms: | platforms: |
linux/amd64 linux/amd64
linux/arm64 linux/arm64
linux/arm/v7
push: true push: true
pull: false pull: false
ssh: default=/home/luser/.ssh/id_ed25519 ssh: default=/home/luser/.ssh/id_ed25519
tags: | tags: |
"gitea.woggioni.net/woggioni/sserver-rust:dev" "gitea.woggioni.net/woggioni/sserver-rust:latest"
"gitea.woggioni.net/woggioni/sserver-rust:v1.24.0"
build-args: "VERSION=1.24.0" build-args: "VERSION=1.24.0"
.gitea/workflows/build-wildfly.yaml
+3 -3
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: woryzen runs-on: hostinger
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:39.0.1" "gitea.woggioni.net/woggioni/wildfly:38.0.1"
build-args: "VERSION=39.0.1" build-args: "VERSION=38.0.1"
agentmail-mcp/Dockerfile
-14
View File
@@ -1,14 +0,0 @@
FROM alpine:3.23
ARG VERSION
RUN --mount=type=cache,target=/var/cache/apk apk add python3 pipx
ADD --chmod=755 ./entrypoint.sh /usr/local/bin/entrypoint.sh
RUN addgroup -S agentmail
RUN adduser -D -S -h /var/lib/agentmail -G agentmail agentmail
WORKDIR /var/lib/agentmail
USER agentmail
RUN pipx install mcp-streamablehttp-proxy
RUN pipx install agentmail-mcp==${VERSION}
ENV SERVER_HOST="0.0.0.0"
ENV SERVER_PORT="8080"
ENTRYPOINT ["entrypoint.sh"]
agentmail-mcp/entrypoint.sh
-12
View File
@@ -1,12 +0,0 @@
#!/usr/bin/env sh
if [ -z "${SERVER_HOST}" ]
then
SERVER_HOST="0.0.0.0"
fi
if [ -z "${AGENTMAIL_API_KEY}" ]
then
echo "You need to specify an API key setting the environmental variable 'AGENTMAIL_API_KEY'"
false
else
exec .local/bin/mcp-streamablehttp-proxy --host ${SERVER_HOST} --port ${SERVER_PORT} .local/bin/agentmail-mcp --api-key ${AGENTMAIL_API_KEY}
fi
arch-builder/Dockerfile
+2 -7
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 \
@@ -78,11 +78,6 @@ RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
USER luser USER luser
WORKDIR /home/luser WORKDIR /home/luser
FROM base AS openwrt-builder
RUN mkdir -p /etc/cargo
COPY --chown=1000:1000 config.toml /home/luser/.cargo/config.toml
RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed rustup go rsync wget unzip swig python-setuptools python-pyelftools
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
@@ -144,7 +139,7 @@ RUN rustup target add \
FROM base AS gitea_act_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-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-act-runner jdk21-graalvm-bin jdk25-graalvm-bin jdk21-graalvm-ce-bin jdk25-graalvm-ce-bin
RUN usermod -a luser -G docker RUN usermod -a luser -G docker
USER luser USER luser
WORKDIR /home/luser WORKDIR /home/luser
monerod/APKBUILD
-70
View File
@@ -1,70 +0,0 @@
# 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
"
monerod/Dockerfile
-46
View File
@@ -1,46 +0,0 @@
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
monerod/easylogging.patch
-11
View File
@@ -1,11 +0,0 @@
--- 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
monerod/gcc13.patch
-24
View File
@@ -1,24 +0,0 @@
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 {
monerod/loongarch64.patch
-34
View File
@@ -1,34 +0,0 @@
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)
monerod/miniupnpc.patch
-22
View File
@@ -1,22 +0,0 @@
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) {
monerod/system-miniupnpc.patch
-100
View File
@@ -1,100 +0,0 @@
--- 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"
monerod/version-string.patch
-13
View File
@@ -1,13 +0,0 @@
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")
nginx/Dockerfile
+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
opencode/Dockerfile
-40
View File
@@ -1,40 +0,0 @@
FROM archlinux:latest AS release
ARG OPENCODE_VERSION
COPY mirrorlist /etc/pacman.d/mirrolist
RUN pacman-key --init
#RUN pacman-key --refresh-keys
ADD https://gitea.woggioni.net/api/packages/woggioni/arch/repository.key ./repository.key
RUN pacman-key --add repository.key
RUN pacman-key --lsign-key 0D28BF66FDB45D18D8EBEE5D4C91DADCD00B3F77
RUN --mount=type=bind,source=pacman-gitea-repository.conf,target=pacman-gitea-repository.conf cat pacman-gitea-repository.conf >> /etc/pacman.conf
RUN echo PATH DEFAULT=${HOME}/.local/bin:/usr/local/bin:/bin >> /etc/security/pam_env.conf
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 docker
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 mkdir /workspace
RUN chown opencode:opencode /workspace
USER opencode
RUN pipx install pyright
USER root
ADD https://github.com/anomalyco/opencode/releases/download/v${OPENCODE_VERSION}/opencode-linux-x64.tar.gz ./opencode.tgz
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
ENV OPENCODE_CONFIG=/etc/opencode/opencode.json
ENV EDITOR=helix
USER opencode
WORKDIR /workspace
ENTRYPOINT ["opencode"]
VOLUME ["/var/lib/opencode", "/workspace"]
opencode/mirrorlist
-15
View File
@@ -1,15 +0,0 @@
################################################################################
################# Arch Linux mirrorlist generated by Reflector #################
################################################################################
# With: reflector @/etc/xdg/reflector/reflector.conf
# When: 2024-07-09 04:16:31 UTC
# From: https://archlinux.org/mirrors/status/json/
# Retrieved: 2024-07-09 04:16:31 UTC
# Last Check: 2024-07-09 03:46:09 UTC
Server = https://archlinux.thaller.ws/$repo/os/$arch
Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch
Server = https://mirror.qctronics.com/archlinux/$repo/os/$arch
Server = https://mirrors.neusoft.edu.cn/archlinux/$repo/os/$arch
Server = https://arch.phinau.de/$repo/os/$arch
opencode/opencode.json
-33
View File
@@ -1,33 +0,0 @@
{
"$schema": "https://opencode.ai/config.json",
"lsp": {
"java": {
"command": [
"jdtls"
],
"extensions": [
".java"
],
"env": {
"JAVA_TOOL_OPTIONS": "-javaagent:/usr/lib/opencode/addons/lombok.jar"
}
},
"python": {
"command": [
"pyright"
],
"extensions": [
".py",
"pyi"
]
},
"rust": {
"command": [
"rust-analyzer"
],
"extensions": [
".rs"
]
}
}
}
opencode/pacman-gitea-repository.conf
-4
View File
@@ -1,4 +0,0 @@
[woggioni.gitea.woggioni.net]
SigLevel = Required
Server = https://gitea.woggioni.net/api/packages/woggioni/arch/default/x86_64
pgvector/Dockerfile
+3 -3
View File
@@ -1,5 +1,5 @@
ARG PG_VERSION=18.3 ALPINE_VERSION=3.23 ARG PG_VERSION=17
FROM postgres:${PG_VERSION}-alpine${ALPINE_VERSION} AS build FROM postgres:${PG_VERSION}-alpine AS build
ARG PGVECTOR_VERSION ARG PGVECTOR_VERSION
WORKDIR / WORKDIR /
@@ -10,6 +10,6 @@ WORKDIR pgvector
RUN make RUN make
RUN make install RUN make install
FROM postgres:${PG_VERSION}-alpine${ALPINE_VERSION} AS release FROM postgres:alpine AS release
RUN rm -rf /usr/local RUN rm -rf /usr/local
COPY --from=build /usr/local /usr/local COPY --from=build /usr/local /usr/local
shadowsocks-rust/Dockerfile
+4 -4
View File
@@ -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/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/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 /home/luser/shadowsocks-rust/docker/docker-entrypoint.sh /usr/bin/
COPY --from=builder --chown=root:root --chmod=755 /tmp/v2ray-plugin /usr/bin/v2ray-plugin COPY --from=builder --chown=root:root /tmp/v2ray-plugin /usr/bin/v2ray-plugin
COPY --from=builder --chown=root:root --chmod=755 /tmp/xray-plugin /usr/bin/xray-plugin COPY --from=builder --chown=root:root /tmp/xray-plugin /usr/bin/xray-plugin
ENTRYPOINT [ "docker-entrypoint.sh" ] ENTRYPOINT [ "docker-entrypoint.sh" ]
CMD [ "sslocal", "--log-without-time", "-c", "/etc/shadowsocks-rust/config.json" ] 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/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/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 /home/luser/shadowsocks-rust/docker/docker-entrypoint.sh /usr/bin/
COPY --from=builder --chown=root:root --chmod=755 /tmp/v2ray-plugin /usr/bin/v2ray-plugin COPY --from=builder /tmp/v2ray-plugin /usr/bin/v2ray-plugin
COPY --from=builder --chown=root:root --chmod=755 /tmp/xray-plugin /usr/bin/xray-plugin COPY --from=builder /tmp/xray-plugin /usr/bin/xray-plugin
ENTRYPOINT [ "docker-entrypoint.sh" ] ENTRYPOINT [ "docker-entrypoint.sh" ]
shadowsocks-rust/download_xray.sh
+7 -7
View File
@@ -1,25 +1,25 @@
#!/usr/bin/env sh #!/usr/bin/env sh
set -e
TARGETPLATFORM=$1 TARGETPLATFORM=$1
PLUGIN_VERSION=1.260327.0 PLUGIN_VERSION=1.8.24
mkdir /tmp/xray_plugin.d mkdir /tmp/xray_plugin.d
cd /tmp/xray_plugin.d cd /tmp/xray_plugin.d
case "$TARGETPLATFORM" in case "$TARGETPLATFORM" in
"linux/386") "linux/386")
url="https://gitea.woggioni.net/api/packages/woggioni/generic/shadowsocks-xray-plugin/${PLUGIN_VERSION}/shadowsocks-xray-plugin-linux-i386" 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"
;; ;;
"linux/amd64") "linux/amd64")
url="https://gitea.woggioni.net/api/packages/woggioni/generic/shadowsocks-xray-plugin/${PLUGIN_VERSION}/shadowsocks-xray-plugin-linux-x86_64" 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"
;; ;;
"linux/arm64") "linux/arm64")
url="https://gitea.woggioni.net/api/packages/woggioni/generic/shadowsocks-xray-plugin/${PLUGIN_VERSION}/shadowsocks-xray-plugin-linux-aarch64" 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"
;; ;;
"linux/arm/v7") "linux/arm/v7")
url="https://gitea.woggioni.net/api/packages/woggioni/generic/shadowsocks-xray-plugin/${PLUGIN_VERSION}/shadowsocks-xray-plugin-linux-armv7h" 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"
;; ;;
*) *)
echo "Doesn't support $TARGETPLATFORM architecture" echo "Doesn't support $TARGETPLATFORM architecture"
exit 1 exit 1
;; ;;
esac esac
curl --fail -L --retry 3 "$url" -o /tmp/xray-plugin curl --retry 3 "$url" | tar -xvz
mv xray-plugin* /tmp/xray-plugin