diff --git a/README.md b/README.md index 350cc91..404ddcc 100644 --- a/README.md +++ b/README.md @@ -173,11 +173,15 @@ docker container exec lightningd-test lightning-cli --testnet summary - [x] standalone dockerfile for vlsd - [x] docker compose for vls -- [ ] standalone docker image for `lightning-storage-server` -- [ ] standalone docker image for `txood` -- [ ] standalone docker image for `lightningd` -- [ ] standalone docker image for `bitcoind` +- [x] standalone docker image for `txood` +- [x] standalone docker image for `lightningd` +- [x] standalone docker image for `bitcoind` - [ ] supporting signet +- [ ] Profile configuration to run `vls` +- [ ] Healthcheck for `txoo` +- [ ] Healthcheck for `vls` +- [ ] Lightning Storage Server Dockerfile and Compose Service +- [ ] Postgres Service for Lightning Storage Server ## References diff --git a/bitcoind/Dockerfile b/bitcoind/Dockerfile index 1dbc75c..ed23efd 100644 --- a/bitcoind/Dockerfile +++ b/bitcoind/Dockerfile @@ -114,12 +114,12 @@ COPY --from=bitcoin-core ${BITCOIN_PREFIX}/bin/bitcoin-cli /usr/bin/bitcoin-cli COPY --from=bitcoin-core ${BITCOIN_PREFIX}/bin/bitcoin-tx /usr/bin/bitcoin-tx COPY --from=bitcoin-core ${BITCOIN_PREFIX}/bin/bitcoind /usr/bin/bitcoind -COPY bitcoind/entrypoint.sh /entrypoint.sh +COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh -COPY assets/bitcoin.conf /bitcoin.conf +COPY bitcoin.conf /bitcoin.conf -COPY bitcoind/healthcheck.sh /healthcheck.sh +COPY healthcheck.sh /healthcheck.sh RUN chmod +x /healthcheck.sh RUN mkdir "${BITCOIN_DATA}" diff --git a/assets/bitcoin.conf b/bitcoind/bitcoin.conf similarity index 100% rename from assets/bitcoin.conf rename to bitcoind/bitcoin.conf diff --git a/docker-compose.yml b/docker-compose.yml index c55e8fc..7c2242b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,8 +2,7 @@ version: "3.8" services: bitcoin-core: build: - dockerfile: ./bitcoind/Dockerfile - context: . + context: ./bitcoind image: bitcoind container_name: bitcoind-test volumes: @@ -19,8 +18,7 @@ services: core-lightning: build: - dockerfile: ./lightningd/Dockerfile - context: . + context: ./lightningd image: lightningd container_name: lightningd-test command: @@ -46,8 +44,7 @@ services: txoo: build: - dockerfile: ./txood/Dockerfile - context: . + context: ./txood image: txood container_name: txood-test restart: unless-stopped diff --git a/lightningd/Dockerfile b/lightningd/Dockerfile index c3f040b..879ca72 100644 --- a/lightningd/Dockerfile +++ b/lightningd/Dockerfile @@ -118,12 +118,12 @@ RUN addgroup -S lightning && adduser -S lightning -G lightning && \ mkdir -p ${LIGHTNINGD_DATA} && \ chown -R lightning:lightning ${LIGHTNINGD_DATA} -COPY assets/bitcoin.conf "${BITCOIND_HOME}"/bitcoin.conf +COPY bitcoin.conf "${BITCOIND_HOME}"/bitcoin.conf -COPY lightningd/entrypoint.sh /entrypoint.sh +COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh -COPY lightningd/healthcheck.sh /healthcheck.sh +COPY healthcheck.sh /healthcheck.sh RUN chmod +x /healthcheck.sh VOLUME ["${LIGHTNINGD_DATA}"] @@ -131,9 +131,9 @@ VOLUME ["${LIGHTNINGD_DATA}"] RUN mkdir -p "${BITCOIND_HOME}" && \ chown -R lightning:lightning "${BITCOIND_HOME}" -COPY assets/bitcoin.conf "${BITCOIND_HOME}"/bitcoin.conf -COPY assets/testnet-config /testnet-config -COPY assets/regtest-config /regtest-config +COPY bitcoin.conf "${BITCOIND_HOME}"/bitcoin.conf +COPY testnet-config /testnet-config +COPY regtest-config /regtest-config USER lightning diff --git a/lightningd/bitcoin.conf b/lightningd/bitcoin.conf new file mode 120000 index 0000000..b1895bf --- /dev/null +++ b/lightningd/bitcoin.conf @@ -0,0 +1 @@ +../bitcoind/bitcoin.conf \ No newline at end of file diff --git a/assets/regtest-config b/lightningd/regtest-config similarity index 100% rename from assets/regtest-config rename to lightningd/regtest-config diff --git a/assets/testnet-config b/lightningd/testnet-config similarity index 100% rename from assets/testnet-config rename to lightningd/testnet-config diff --git a/txood/Dockerfile b/txood/Dockerfile index 5a1b18b..9611794 100644 --- a/txood/Dockerfile +++ b/txood/Dockerfile @@ -32,7 +32,7 @@ RUN apk update && \ COPY --from=builder /build/txoo/target/release/txood /usr/bin/txood -COPY txood/entrypoint.sh /entrypoint.sh +COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh VOLUME ["/root/.txoo/"]