add openssh to arch-builder images

This reverts commit 6e489011a4.

.gitea/workflows/build-agentmail-mcp.yaml

@@ -0,0 +1,34 @@
+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-nginx.yaml

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

.gitea/workflows/build-opencode.yaml

@@ -24,16 +24,12 @@ jobs:
           builder: multiplatform-builder
           context: "{{defaultContext}}:opencode"
           build-args: |
-            OPENCODE_VERSION=1.2.26
+            OPENCODE_VERSION=1.14.48
-            ALPINE_VERSION=3.23
           platforms: |
             linux/amd64
-            linux/arm64
           push: true
           pull: true
           tags: |
-            "gitea.woggioni.net/woggioni/opencode:1.2.26"
+            "gitea.woggioni.net/woggioni/opencode:1.14.48"
-            "gitea.woggioni.net/woggioni/opencode:1.2.26-alpine3.23"
-            "gitea.woggioni.net/woggioni/opencode:1.2.26-alpine"
             "gitea.woggioni.net/woggioni/opencode:latest"
 

.gitea/workflows/build-pgvector.yaml

@@ -29,9 +29,9 @@ jobs:
             linux/arm64
           tags: |
             "gitea.woggioni.net/woggioni/pgvector:latest"
-            "gitea.woggioni.net/woggioni/pgvector:0.8.1-pg18.1-alpine3.23"
+            "gitea.woggioni.net/woggioni/pgvector:0.8.2-pg18.3-alpine3.23"
           build-args: |
-            PG_VERSION=18.1
+            PG_VERSION=18.3
             ALPINE_VERSION=3.23
-            PGVECTOR_VERSION=0.8.1
+            PGVECTOR_VERSION=0.8.2
 

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

@@ -1,7 +1,7 @@
 name: CI
 on:
   push:
-    branches: [ master ]
+    branches: [ dev ]
     paths:
       - 'shadowsocks-rust/*'
       - '.gitea/workflows/build-shadowsocks-rust.yaml'      
@@ -29,6 +29,5 @@ jobs:
           pull: false
           ssh: default=/home/luser/.ssh/id_ed25519
           tags: |
-            "gitea.woggioni.net/woggioni/sserver-rust:latest"
+            "gitea.woggioni.net/woggioni/sserver-rust:dev"
-            "gitea.woggioni.net/woggioni/sserver-rust:v1.24.0"
           build-args: "VERSION=1.24.0"

.gitea/workflows/build-wildfly.yaml

@@ -26,6 +26,6 @@ jobs:
           pull: true
           tags: |
             "gitea.woggioni.net/woggioni/wildfly:latest"
-            "gitea.woggioni.net/woggioni/wildfly:39.0.0"
+            "gitea.woggioni.net/woggioni/wildfly:39.0.1"
-          build-args: "VERSION=39.0.0"
+          build-args: "VERSION=39.0.1"
 

agentmail-mcp/Dockerfile

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,12 @@
+#!/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

@@ -16,6 +16,7 @@ RUN rm repository.key
 RUN --mount=type=cache,target=/var/cache/pacman pacman -Syu --noconfirm
 RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
     curl \
+    openssh \
     aarch64-unknown-linux-musl-gcc x86_64-unknown-linux-musl-gcc \
     arm-unknown-linux-musleabihf-gcc \
     arm-unknown-linux-musleabi-gcc \
@@ -70,7 +71,6 @@ RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
     imagemagick \
     python-sphinx \
     python-yaml \
-    openssh \
     rust \
     rust-src \
     rust-bindgen \

opencode/Dockerfile

@@ -1,32 +1,40 @@
-ARG ALPINE_VERSION=latest
+FROM archlinux:latest AS release
-FROM --platform=$BUILDPLATFORM alpine:${ALPINE_VERSION} AS base
+ARG OPENCODE_VERSION
-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 helix helix-tree-sitter-vendor
+COPY mirrorlist /etc/pacman.d/mirrolist
-RUN adduser -D -h /var/lib/opencode opencode
+
+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 
+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
-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
 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=hx
+ENV EDITOR=helix
 USER opencode
 WORKDIR /workspace
 ENTRYPOINT ["opencode"]
 VOLUME ["/var/lib/opencode", "/workspace"]
-

opencode/mirrorlist

@@ -0,0 +1,15 @@
+################################################################################
+################# 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/pacman-gitea-repository.conf

@@ -0,0 +1,4 @@
+
+[woggioni.gitea.woggioni.net]
+SigLevel = Required
+Server = https://gitea.woggioni.net/api/packages/woggioni/arch/default/x86_64

pgvector/Dockerfile

@@ -1,4 +1,4 @@
-ARG PG_VERSION=18.1 ALPINE_VERSION=3.23
+ARG PG_VERSION=18.3 ALPINE_VERSION=3.23
 FROM postgres:${PG_VERSION}-alpine${ALPINE_VERSION} AS build
 
 ARG PGVECTOR_VERSION
@@ -10,6 +10,6 @@ WORKDIR pgvector
 RUN make
 RUN make install
 
-FROM postgres:alpine AS release
+FROM postgres:${PG_VERSION}-alpine${ALPINE_VERSION} AS release
 RUN rm -rf /usr/local
 COPY --from=build /usr/local /usr/local

shadowsocks-rust/Dockerfile

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

shadowsocks-rust/download_xray.sh

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