diff --git a/Dockerfile b/Dockerfile index cfef181..d0dcc07 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ##### Build stage -FROM node:20-alpine3.20 AS builder +FROM node:24-alpine3.23 AS builder ENV NODE_ENV=production ENV APP_DIR=/home/node/app @@ -14,17 +14,17 @@ COPY ./samourai-dojo/. "$APP_DIR" # Install node modules RUN cd "$APP_DIR" && \ - npm install --omit=dev --build-from-source=false + npm install --omit=dev ##### Tor build -FROM alpine:3.22 AS torproject +FROM alpine:3.23.3 AS torproject -ENV TOR_GIT_URL=https://git.torproject.org/tor.git -ENV TOR_VERSION=tor-0.4.8.16 +ENV TOR_GIT_URL=https://gitlab.torproject.org/tpo/core/tor.git +ENV TOR_VERSION=tor-0.4.9.6 RUN apk --update --no-cache add ca-certificates -RUN apk --no-cache add alpine-sdk automake autoconf git +RUN apk --no-cache add alpine-sdk automake autoconf RUN apk --no-cache add openssl-dev libevent-dev zlib-dev RUN git clone $TOR_GIT_URL /tor -b $TOR_VERSION --depth 1 @@ -45,9 +45,9 @@ RUN cp /stage/etc/tor/torrc.sample /stage/.torrc ##### Soroban build -FROM golang:1.23-alpine3.22 AS soroban-build +FROM golang:1.25.6-alpine3.23 AS soroban-build -ENV SOROBAN_VERSION=0.4.1 +ENV SOROBAN_VERSION=0.4.2 ENV SOROBAN_URL=https://github.com/Dojo-Open-Source-Project/soroban/archive/refs/tags/v$SOROBAN_VERSION.tar.gz RUN apk --no-cache --update add ca-certificates @@ -68,7 +68,7 @@ RUN go build -a -tags netgo -o /stage/soroban-server ./cmd/server ##### Final stage -FROM node:20-alpine3.20 +FROM node:24-alpine3.23 ENV NODE_ENV=production ENV APP_DIR=/home/node/app @@ -148,3 +148,6 @@ COPY --chmod=755 ./check-pushtx.sh /usr/local/bin/ COPY --chmod=755 ./check-soroban.sh /usr/local/bin/ COPY --chmod=755 ./functions.sh /usr/local/bin/ COPY --chmod=755 ./samourai-dojo/docker/my-dojo/soroban/restart.sh /usr/local/bin/soroban-restart.sh + +# Remove /tmp clean since it errors out nodejs 24 +RUN sed -i 's|rm -rf /tmp/\*||' /usr/local/bin/soroban-restart.sh diff --git a/docker_entrypoint.sh b/docker_entrypoint.sh index f7670f4..eddc95f 100755 --- a/docker_entrypoint.sh +++ b/docker_entrypoint.sh @@ -133,7 +133,7 @@ version: 2 data: Pairing Code: type: string - value: '{"pairing":{"type":"dojo.api","version":"$DOJO_VERSION_TAG","apikey":"$NODE_API_KEY","url":"$PAIRING_URL"},"explorer":{"type":"explorer.btc_rpc_explorer","url":"http://$EXPLORER_ENDPOINT"}}' + value: '{"pairing":{"type":"dojo.api","version":"$DOJO_VERSION_TAG","apikey":"$NODE_API_KEY","url":"$PAIRING_URL"},"explorer":{"type":"explorer.mempool_space","url":"http://$EXPLORER_ENDPOINT"}}' description: Code for pairing your wallet with this Dojo copyable: true qr: true diff --git a/icon.png b/icon.png index b436ec4..1a986e9 100644 Binary files a/icon.png and b/icon.png differ diff --git a/manifest.yaml b/manifest.yaml index b46d99e..54e935b 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -1,12 +1,12 @@ id: dojo title: 'Dojo' -version: 1.28.2.0 -release-notes: Version v1.28.0 +version: 1.29.2.0 +release-notes: Version v1.29.2 license: AGPLv3 wrapper-repo: 'https://github.com/ericpp/dojo-startos' upstream-repo: 'https://github.com/Dojo-Open-Source-Project/samourai-dojo' -support-site: 'https://github.com/Dojo-Open-Source-Project/samourai-dojo' -marketing-site: 'https://github.com/Dojo-Open-Source-Project/samourai-dojo' +support-site: 'https://dojo-osp.org/' +marketing-site: 'https://dojo-osp.org/' build: ['make'] description: short: Your private backend server for Ashigaru, Samourai Wallet and other light wallets. diff --git a/samourai-dojo b/samourai-dojo index 8b4a1e7..46b1adf 160000 --- a/samourai-dojo +++ b/samourai-dojo @@ -1 +1 @@ -Subproject commit 8b4a1e7e9317389da16054bd653fea8be3371225 +Subproject commit 46b1adff422ee96ba7968fa909925b06fe45822d diff --git a/scripts/procedures/migrations.ts b/scripts/procedures/migrations.ts index 630cf3b..00ca24a 100644 --- a/scripts/procedures/migrations.ts +++ b/scripts/procedures/migrations.ts @@ -30,5 +30,5 @@ export const migration: T.ExpectedExports.migration = compat.migrations.fromMapp ), }, }, - '1.28.2.0', + '1.29.2.0', )