diff --git a/docker-compose-generator/crypto-definitions.json b/docker-compose-generator/crypto-definitions.json index 28a8597..e229afb 100644 --- a/docker-compose-generator/crypto-definitions.json +++ b/docker-compose-generator/crypto-definitions.json @@ -1,11 +1,4 @@ [ - { - "Crypto": "ltc", - "CryptoFragment": "litecoin", - "CLightningFragment": "litecoin-clightning", - "LNDFragment": "litecoin-lnd", - "EclairFragment": null - }, { "Crypto": "btc", "CryptoFragment": "bitcoin", diff --git a/docker-compose-generator/docker-fragments/litecoin-clightning.yml b/docker-compose-generator/docker-fragments/litecoin-clightning.yml deleted file mode 100644 index 7bd5db8..0000000 --- a/docker-compose-generator/docker-fragments/litecoin-clightning.yml +++ /dev/null @@ -1,34 +0,0 @@ -version: "3" - -services: - clightning_litecoin: - image: btcpayserver/lightning:v0.9.0-1 - container_name: btcpayserver_clightning_litecoin - restart: unless-stopped - environment: - LIGHTNINGD_NETWORK: ${NBITCOIN_NETWORK:-regtest} - LIGHTNINGD_CHAIN: ltc - LIGHTNINGD_ALIAS: ${LIGHTNING_ALIAS} - LIGHTNINGD_ANNOUNCEADDR: ${BTCPAY_ANNOUNCEABLE_HOST} - LIGHTNINGD_PORT: 9735 - LIGHTNINGD_READY_FILE: /root/.nbxplorer/ltc_fully_synched - LIGHTNINGD_OPT: | - bitcoin-datadir=/etc/litecoin - bitcoin-rpcconnect=litecoind - volumes: - - "clightning_litecoin_datadir:/root/.lightning" - - "litecoin_datadir:/etc/litecoin" - - "nbxplorer_datadir:/root/.nbxplorer" - ports: - - "9736:9735" - links: - - litecoind - btcpayserver: - environment: - BTCPAY_LTCLIGHTNING: "type=clightning;server=unix://etc/clightning_litecoin/lightning-rpc" - volumes: - - "clightning_litecoin_datadir:/etc/clightning_litecoin" - links: - - clightning_litecoin -volumes: - clightning_litecoin_datadir: diff --git a/docker-compose-generator/docker-fragments/litecoin-lnd.yml b/docker-compose-generator/docker-fragments/litecoin-lnd.yml deleted file mode 100644 index 290fd24..0000000 --- a/docker-compose-generator/docker-fragments/litecoin-lnd.yml +++ /dev/null @@ -1,52 +0,0 @@ -version: "3" - -services: - lnd_litecoin: - image: btcpayserver/lnd:v0.11.0-beta - container_name: btcpayserver_lnd_litecoin - restart: unless-stopped - environment: - LND_CHAIN: "ltc" - LND_EXTERNALIP: ${BTCPAY_ANNOUNCEABLE_HOST} - LND_PORT: 9736 - LND_ALIAS: ${LIGHTNING_ALIAS} - LND_ENVIRONMENT: "${NBITCOIN_NETWORK:-regtest}" - LND_READY_FILE: /root/.nbxplorer/ltc_fully_synched - LND_EXTRA_ARGS: | - restlisten=0.0.0.0:8080 - rpclisten=127.0.0.1:10008 - rpclisten=0.0.0.0:10009 - litecoin.node=litecoind - litecoind.rpchost=litecoind:43782 - litecoind.zmqpubrawblock=tcp://litecoind:28332 - litecoind.zmqpubrawtx=tcp://litecoind:28333 - adminmacaroonpath=/data/admin.macaroon - invoicemacaroonpath=/data/invoice.macaroon - readonlymacaroonpath=/data/readonly.macaroon - notls=1 - ports: - - "9736:9736" - expose: - - "8080" - - "9736" - volumes: - - "lnd_litecoin_datadir:/data" - - "litecoin_datadir:/deps/.litecoin" - - "nbxplorer_datadir:/root/.nbxplorer" - links: - - litecoind - - btcpayserver: - environment: - BTCPAY_LTCLIGHTNING: "type=lnd-rest;server=http://lnd_litecoin:8080/;macaroonfilepath=/etc/lnd_litecoin/admin.macaroon;allowinsecure=true" - BTCPAY_LTCEXTERNALLNDSEEDBACKUP: "/etc/lnd_litecoin/data/chain/litecoin/${NBITCOIN_NETWORK:-regtest}/walletunlock.json" - volumes: - - "lnd_litecoin_datadir:/etc/lnd_litecoin" - links: - - lnd_litecoin - -volumes: - lnd_litecoin_datadir: - -required: - - "opt-add-zmq" diff --git a/docker-compose-generator/linuxamd64.Dockerfile b/docker-compose-generator/linuxamd64.Dockerfile index 0ce178b..2a37690 100644 --- a/docker-compose-generator/linuxamd64.Dockerfile +++ b/docker-compose-generator/linuxamd64.Dockerfile @@ -1,5 +1,5 @@ # -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.202 AS builder +FROM mcr.microsoft.com/dotnet/sdk:6.0.401-bullseye-slim AS builder WORKDIR /source COPY src/docker-compose-generator.csproj docker-compose-generator.csproj # Cache some dependencies @@ -8,7 +8,7 @@ COPY src/. . RUN dotnet publish --output /app/ --configuration Release # -FROM mcr.microsoft.com/dotnet/core/runtime:3.1.4-buster-slim +FROM mcr.microsoft.com/dotnet/runtime:6.0.9-bullseye-slim LABEL org.btcpayserver.image=docker-compose-generator WORKDIR /datadir WORKDIR /app diff --git a/docker-compose-generator/linuxarm32v7.Dockerfile b/docker-compose-generator/linuxarm32v7.Dockerfile index c8ffaca..ee54ae0 100644 --- a/docker-compose-generator/linuxarm32v7.Dockerfile +++ b/docker-compose-generator/linuxarm32v7.Dockerfile @@ -1,5 +1,5 @@ # This is a manifest image, will pull the image with the same arch as the builder machine -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.202 AS builder +FROM mcr.microsoft.com/dotnet/sdk:6.0.401-bullseye-slim AS builder WORKDIR /source COPY src/docker-compose-generator.csproj docker-compose-generator.csproj # Cache some dependencies @@ -8,7 +8,7 @@ COPY src/. . RUN dotnet publish --output /app/ --configuration Release # Force the builder machine to take make an arm runtime image. This is fine as long as the builder does not run any program -FROM mcr.microsoft.com/dotnet/core/runtime:3.1.4-buster-slim-arm32v7 +FROM mcr.microsoft.com/dotnet/runtime:6.0.9-bullseye-slim-arm32v7 LABEL org.btcpayserver.image=docker-compose-generator WORKDIR /datadir diff --git a/docker-compose-generator/linuxarm64v8.Dockerfile b/docker-compose-generator/linuxarm64v8.Dockerfile index 37ba4b5..f6b88fa 100644 --- a/docker-compose-generator/linuxarm64v8.Dockerfile +++ b/docker-compose-generator/linuxarm64v8.Dockerfile @@ -1,5 +1,5 @@ # This is a manifest image, will pull the image with the same arch as the builder machine -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.202 AS builder +FROM mcr.microsoft.com/dotnet/sdk:6.0.401-bullseye-slim AS builder WORKDIR /source COPY src/docker-compose-generator.csproj docker-compose-generator.csproj # Cache some dependencies @@ -8,7 +8,7 @@ COPY src/. . RUN dotnet publish --output /app/ --configuration Release # Force the builder machine to take make an arm runtime image. This is fine as long as the builder does not run any program -FROM mcr.microsoft.com/dotnet/core/runtime:3.1.4-buster-slim-arm64v8 +FROM mcr.microsoft.com/dotnet/runtime:6.0.9-bullseye-slim-arm64v8 LABEL org.btcpayserver.image=docker-compose-generator WORKDIR /datadir diff --git a/docker-compose-generator/src/docker-compose-generator.csproj b/docker-compose-generator/src/docker-compose-generator.csproj index 831e3b6..d26d8be 100644 --- a/docker-compose-generator/src/docker-compose-generator.csproj +++ b/docker-compose-generator/src/docker-compose-generator.csproj @@ -2,13 +2,13 @@ Exe - 7.3 - netcoreapp3.1 + 10.0 + net6.0 $(TargetFrameworkOverride) DockerGenerator - +