Skip to content

Commit b285729

Browse files
jamaljsrjamaljsr
committed
feat(images): bump to litd v0.13.99 and tapd v0.4.0
1 parent 55255df commit b285729

File tree

8 files changed

+83
-33
lines changed

8 files changed

+83
-33
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ Supported Network Node Versions:
4242
- [Core Lightning](https://github.com/ElementsProject/lightning) - v24.05, v24.02.2, v23.11.2
4343
- [Eclair](https://github.com/ACINQ/eclair/) - v0.10.0, v0.9.0, v0.8.0, v0.7.0, v0.6.2, v0.5.0
4444
- [Bitcoin Core](https://github.com/bitcoin/bitcoin) - v27.0, v26.0, v25.0, v24.0, v23.0, v22.0, v0.21.1
45-
- [Taproot Assets](https://github.com/lightninglabs/taproot-assets) - v0.3.3, v0.3.2
46-
- [Terminal](https://github.com/lightninglabs/lightning-terminal) - v0.13.0
45+
- [Taproot Assets](https://github.com/lightninglabs/taproot-assets) - v0.4.0, v0.3.3, v0.3.2
46+
- [Terminal](https://github.com/lightninglabs/lightning-terminal) - v0.13.99
4747

4848
## Dependencies
4949

‎docker/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ Replace `<version>` with the desired Eclair version (ex: `0.3.3`).
156156

157157
### Tags
158158

159-
- `0.4.0-alpha.rc4` ([tap/Dockerfile](https://github.com/jamaljsr/polar/blob/master/docker/tapd/Dockerfile))
159+
- `0.4.0-alpha` ([tap/Dockerfile](https://github.com/jamaljsr/polar/blob/master/docker/tapd/Dockerfile))
160160
- `0.3.3-alpha` ([tap/Dockerfile](https://github.com/jamaljsr/polar/blob/master/docker/tapd/Dockerfile))
161161
- `0.3.2-alpha` ([tap/Dockerfile](https://github.com/jamaljsr/polar/blob/master/docker/tapd/Dockerfile))
162162
- `0.3.1-alpha` ([tap/Dockerfile](https://github.com/jamaljsr/polar/blob/master/docker/tapd/Dockerfile))
@@ -178,7 +178,7 @@ Replace `<version>` with the desired Tap version (ex: `0.2.0-alpha`).
178178

179179
### Tags
180180

181-
- `0.13.99-alpha.rc4` ([tap/Dockerfile](https://github.com/jamaljsr/polar/blob/master/docker/tapd/Dockerfile))
181+
- `0.13.99-alpha` ([tap/Dockerfile](https://github.com/jamaljsr/polar/blob/master/docker/tapd/Dockerfile))
182182

183183
**Building the image**
184184

‎docker/litd/src.Dockerfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
# Start with a NodeJS base image that also contains yarn.
22
FROM node:16.14.2-buster-slim as nodejsbuilder
33

4+
ARG LITD_VERSION
5+
46
RUN apt-get update -y \
57
&& apt-get install -y git
68

79
# Copy in the local repository to build from.
8-
RUN git clone --branch 0-19-staging https://github.com/lightninglabs/lightning-terminal.git /go/src/github.com/lightninglabs/lightning-terminal/
10+
RUN git clone --branch ${LITD_VERSION} https://github.com/lightninglabs/lightning-terminal.git /go/src/github.com/lightninglabs/lightning-terminal/
911

1012
RUN cd /go/src/github.com/lightninglabs/lightning-terminal/app \
1113
&& yarn install \
@@ -41,7 +43,6 @@ RUN apt-get update -y \
4143

4244
FROM debian:stable-slim
4345

44-
ARG LITD_VERSION
4546
ENV PATH=/opt/litd:$PATH
4647

4748
RUN apt-get update -y \

‎docker/tapd/src.Dockerfile

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
FROM golang:1.22-bookworm as golangbuilder
2+
3+
# Force Go to use the cgo based DNS resolver. This is required to ensure DNS
4+
# queries required to connect to linked containers succeed.
5+
ENV GODEBUG netdns=cgo
6+
7+
# Pass a tag, branch or a commit using build-arg. This allows a docker
8+
# image to be built from a specified Git state. The default image
9+
# will use the Git tip of master by default.
10+
ARG checkout="main"
11+
ARG git_url="https://github.com/lightninglabs/taproot-assets"
12+
13+
# Install dependencies and build the binaries.
14+
RUN apt-get update -y \
15+
&& apt-get install -y make \
16+
&& git clone $git_url /go/src/github.com/lightninglabs/taproot-assets \
17+
&& cd /go/src/github.com/lightninglabs/taproot-assets \
18+
&& git checkout $checkout \
19+
&& make release-install
20+
21+
FROM debian:stable-slim
22+
23+
ARG TAPD_VERSION
24+
ENV PATH=/opt/taproot-assets:$PATH
25+
26+
RUN apt-get update -y \
27+
&& apt-get install -y curl gosu wait-for-it \
28+
&& apt-get clean \
29+
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
30+
31+
# RUN SYS_ARCH="$(dpkg --print-architecture)" \
32+
# && curl -SLO https://github.com/lightninglabs/taproot-assets/releases/download/v${TAPD_VERSION}/taproot-assets-linux-${SYS_ARCH}-v${TAPD_VERSION}.tar.gz \
33+
# && tar -xzf *.tar.gz \
34+
# && mkdir /opt/taproot-assets \
35+
# && mv ./taproot-assets-linux-${SYS_ARCH}-v${TAPD_VERSION}/* /opt/taproot-assets \
36+
# && rm *.tar.gz
37+
38+
COPY --from=golangbuilder /go/bin/tapd /bin/
39+
COPY --from=golangbuilder /go/bin/tapcli /bin/
40+
41+
COPY docker-entrypoint.sh /entrypoint.sh
42+
43+
RUN chmod a+x /entrypoint.sh
44+
45+
VOLUME ["/home/tap/.tapd"]
46+
47+
EXPOSE 8089 10029
48+
49+
ENTRYPOINT ["/entrypoint.sh"]
50+
51+
CMD ["tapd"]

‎src/store/models/designer.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ describe('Designer model', () => {
624624
expect.objectContaining({
625625
message: 'Failed to add node',
626626
error: new Error(
627-
'This network does not contain a LND v0.16.0-beta (or higher) ' +
627+
'This network does not contain a LND v0.18.0-beta (or higher) ' +
628628
`node which is required for tapd v${tapdLatest}`,
629629
),
630630
}),

‎src/utils/constants.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ export const REPO_STATE_URL =
331331
* are pushed to Docker Hub, this list should be updated along with the /docker/nodes.json file.
332332
*/
333333
export const defaultRepoState: DockerRepoState = {
334-
version: 61,
334+
version: 62,
335335
images: {
336336
LND: {
337337
latest: '0.18.2-beta',
@@ -371,21 +371,21 @@ export const defaultRepoState: DockerRepoState = {
371371
versions: [],
372372
},
373373
tapd: {
374-
latest: '0.3.3-alpha',
375-
versions: ['0.4.0-alpha.rc4', '0.3.3-alpha', '0.3.2-alpha'],
374+
latest: '0.4.0-alpha',
375+
versions: ['0.4.0-alpha', '0.3.3-alpha', '0.3.2-alpha'],
376376
// Not all tapd versions are compatible with all LND versions.
377377
// This mapping specifies the minimum compatible LND for each tapd version
378378
compatibility: {
379-
'0.4.0-alpha.rc4': '0.18.0-beta',
379+
'0.4.0-alpha': '0.18.0-beta',
380380
'0.3.3-alpha': '0.16.0-beta',
381381
'0.3.2-alpha': '0.16.0-beta',
382382
},
383383
},
384384
litd: {
385-
latest: '0.13.99-alpha.b801',
386-
versions: ['0.13.99-alpha.b801'],
385+
latest: '0.13.99-alpha',
386+
versions: ['0.13.99-alpha'],
387387
compatibility: {
388-
'0.13.99-alpha.b801': '27.0',
388+
'0.13.99-alpha': '27.0',
389389
},
390390
},
391391
},

‎src/utils/network.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ describe('Network Utils', () => {
323323
it('should add a tap node linked to the exact minimum LND version', async () => {
324324
const lnd = createLndNetworkNode(
325325
network,
326-
'0.16.0-beta',
326+
'0.18.0-beta',
327327
defaultRepoState.images.LND.compatibility,
328328
{ image: '', command: '' },
329329
Status.Stopped,

‎src/utils/tests/helpers.ts

+16-18
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,12 @@ export const testRepoState: DockerRepoState = {
6262
version: 49,
6363
images: {
6464
LND: {
65-
latest: '0.17.5-beta',
65+
latest: '0.18.2-beta',
6666
versions: [
67+
'0.18.2-beta',
68+
'0.18.1-beta',
69+
'0.18.0-beta',
70+
'0.17.5-beta',
6771
'0.17.5-beta',
6872
'0.17.4-beta',
6973
'0.17.3-beta',
@@ -100,6 +104,9 @@ export const testRepoState: DockerRepoState = {
100104
// not all LND versions are compatible with all bitcoind versions.
101105
// this mapping specifies the highest compatible bitcoind for each LND version
102106
compatibility: {
107+
'0.18.2-beta': '27.0',
108+
'0.18.1-beta': '27.0',
109+
'0.18.0-beta': '27.0',
103110
'0.17.5-beta': '27.0',
104111
'0.17.4-beta': '27.0',
105112
'0.17.3-beta': '27.0',
@@ -164,30 +171,21 @@ export const testRepoState: DockerRepoState = {
164171
versions: [],
165172
},
166173
tapd: {
167-
latest: '0.3.3-alpha',
168-
versions: [
169-
'0.3.3-alpha',
170-
'0.3.2-alpha',
171-
'0.3.1-alpha',
172-
'0.2.3-alpha',
173-
'0.2.2-alpha',
174-
'0.2.0-alpha',
175-
],
174+
latest: '0.4.0-alpha',
175+
versions: ['0.4.0-alpha', '0.3.3-alpha', '0.3.2-alpha'],
176+
// Not all tapd versions are compatible with all LND versions.
177+
// This mapping specifies the minimum compatible LND for each tapd version
176178
compatibility: {
179+
'0.4.0-alpha': '0.18.0-beta',
177180
'0.3.3-alpha': '0.16.0-beta',
178181
'0.3.2-alpha': '0.16.0-beta',
179-
'0.3.1-alpha': '0.16.0-beta',
180-
'0.3.0-alpha': '0.16.0-beta',
181-
'0.2.3-alpha': '0.16.0-beta',
182-
'0.2.2-alpha': '0.16.0-beta',
183-
'0.2.0-alpha': '0.16.0-beta',
184182
},
185183
},
186184
litd: {
187-
latest: '0.12.5-alpha',
188-
versions: ['0.12.5-alpha'],
185+
latest: '0.13.99-alpha',
186+
versions: ['0.13.99-alpha'],
189187
compatibility: {
190-
'0.12.5-alpha': '27.0',
188+
'0.13.99-alpha': '27.0',
191189
},
192190
},
193191
},

0 commit comments

Comments
 (0)