diff --git a/docker/README.md b/docker/README.md index f21989d40..872255c68 100644 --- a/docker/README.md +++ b/docker/README.md @@ -177,7 +177,7 @@ Replace `` with the desired Tap version (ex: `0.2.0-alpha`). ### Tags -- `0.13.0-alpha.rc1` ([tap/Dockerfile](https://github.com/jamaljsr/polar/blob/master/docker/tapd/Dockerfile)) +- `0.13.99-alpha.rc4` ([tap/Dockerfile](https://github.com/jamaljsr/polar/blob/master/docker/tapd/Dockerfile)) **Building the image** diff --git a/docker/litd/Dockerfile b/docker/litd/Dockerfile index 9daf02910..964f03a06 100644 --- a/docker/litd/Dockerfile +++ b/docker/litd/Dockerfile @@ -1,44 +1,3 @@ -# Start with a NodeJS base image that also contains yarn. -FROM node:16.14.2-buster-slim as nodejsbuilder - -RUN apt-get update -y \ - && apt-get install -y git - -# Copy in the local repository to build from. -RUN git clone --branch 0-19-staging https://github.com/lightninglabs/lightning-terminal.git /go/src/github.com/lightninglabs/lightning-terminal/ - -RUN cd /go/src/github.com/lightninglabs/lightning-terminal/app \ - && yarn install \ - && yarn build - -# The first stage is already done and all static assets should now be generated -# in the app/build sub directory. -# If you change this value, please also update: -# /Dockerfile -# /.github/workflows/main.yml -FROM golang:1.22-bookworm as golangbuilder - -# Instead of checking out from git again, we just copy the whole working -# directory of the previous stage that includes the generated static assets. -COPY --from=nodejsbuilder /go/src/github.com/lightninglabs/lightning-terminal /go/src/github.com/lightninglabs/lightning-terminal - -# Force Go to use the cgo based DNS resolver. This is required to ensure DNS -# queries required to connect to linked containers succeed. -ENV GODEBUG netdns=cgo - -# Install dependencies and install/build lightning-terminal. -# RUN apk add --no-cache --update alpine-sdk \ -# make \ -# && cd /go/src/github.com/lightninglabs/lightning-terminal \ -# && make go-install \ -# && make go-install-cli - -RUN apt-get update -y \ - && apt-get install -y make \ - && cd /go/src/github.com/lightninglabs/lightning-terminal \ - && make go-install \ - && make go-install-cli - FROM debian:stable-slim ARG LITD_VERSION @@ -49,14 +8,12 @@ RUN apt-get update -y \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -# Copy the binaries and entrypoint from the builder image. -COPY --from=golangbuilder /go/bin/litd /bin/ -COPY --from=golangbuilder /go/bin/litcli /bin/ -COPY --from=golangbuilder /go/bin/lncli /bin/ -COPY --from=golangbuilder /go/bin/frcli /bin/ -COPY --from=golangbuilder /go/bin/loop /bin/ -COPY --from=golangbuilder /go/bin/pool /bin/ -COPY --from=golangbuilder /go/bin/tapcli /bin/ +RUN SYS_ARCH="$(dpkg --print-architecture)" \ + && curl -SLO https://github.com/lightninglabs/lightning-terminal/releases/download/v${LITD_VERSION}/lightning-terminal-linux-${SYS_ARCH}-v${LITD_VERSION}.tar.gz \ + && tar -xzf *.tar.gz \ + && mkdir /opt/litd \ + && mv ./lightning-terminal-linux-${SYS_ARCH}-v${LITD_VERSION}/* /opt/litd \ + && rm *.tar.gz COPY docker-entrypoint.sh /entrypoint.sh @@ -64,7 +21,7 @@ RUN chmod a+x /entrypoint.sh VOLUME ["/home/litd/.litd"] -EXPOSE 8443 10009 9735 +EXPOSE 9735 8080 10000 ENTRYPOINT ["/entrypoint.sh"] diff --git a/src/store/models/lit.ts b/src/store/models/lit.ts index f736e48e6..fec4ff7b8 100644 --- a/src/store/models/lit.ts +++ b/src/store/models/lit.ts @@ -117,7 +117,7 @@ const litModel: LitModel = { const assetsInChannels = actions .getAssetsInChannels({ nodeName: node.name }) .filter(a => a.asset.id === assetId) - .filter(a => BigInt(a.asset.remoteBalance) > BigInt(amount)); + .filter(a => BigInt(a.asset.remoteBalance) >= BigInt(amount)); if (assetsInChannels.length === 0) { throw new Error('Not enough assets in a channel to create the invoice'); diff --git a/src/utils/constants.ts b/src/utils/constants.ts index 9a8fb0462..042d15813 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -298,7 +298,7 @@ export const dockerConfigs: Record = { '--taproot-assets.universerpccourier.initialbackoff=300ms', '--taproot-assets.universerpccourier.maxbackoff=600ms', '--taproot-assets.experimental.rfq.priceoracleaddress=use_mock_price_oracle_service_promise_to_not_use_on_mainnet', - '--taproot-assets.experimental.rfq.mockoraclecentpersat=1000000', + '--taproot-assets.experimental.rfq.mockoracleassetsperbtc=1000000', '--lnd.trickledelay=50', '--lnd.gossip.sub-batch-delay=5ms', '--lnd.caches.rpc-graph-cache-duration=100ms', @@ -398,10 +398,10 @@ export const defaultRepoState: DockerRepoState = { }, }, litd: { - latest: '0.13.99-alpha.rc2', - versions: ['0.13.99-alpha.rc2'], + latest: '0.13.99-alpha.rc4', + versions: ['0.13.99-alpha.rc4'], compatibility: { - '0.13.99-alpha.rc2': '27.0', + '0.13.99-alpha.rc4': '27.0', }, }, },