AaronFiore/btcpayserver-docker
1
0
Fork 0
Code Activity

bump

Browse Source
This commit is contained in:
nicolas.dorier
2020-08-06 00:26:36 +09:00
parent f6c59e0389
commit f1f2016cdb
9 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -324,7 +324,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
| saubyk/c-lightning-rest | 0.3.0 | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.3.0/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.3.0/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/Ride-The-Lightning/c-lightning-REST/v0.3.0/arm64v8.Dockerfile) | [Github](https://github.com/Ride-The-Lightning/c-lightning-REST) - [DockerHub](https://hub.docker.com/r/saubyk/c-lightning-rest) |
| shahanafarooqui/rtl | 0.8.2 | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.8.2/Dockerfile) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.8.2/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/ShahanaFarooqui/RTL/v0.8.2/Dockerfile.arm64v8) | [Github](https://github.com/ShahanaFarooqui/RTL) - [DockerHub](https://hub.docker.com/r/shahanafarooqui/rtl) |
| btcpayserver/lnd | v0.10.2-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.10.2-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.10.2-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.10.2-beta/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) |
| btcpayserver/btcpayserver | 1.0.5.3 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.5.3/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.5.3/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.5.3/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) |
| btcpayserver/btcpayserver | 1.0.5.4$<BTCPAY_BUILD_CONFIGURATION> | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.5.4/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.5.4/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.5.4/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) |
| nicolasdorier/nbxplorer | 2.1.40 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.40/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.40/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.1.40/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) |
| nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) |
| btcpayserver/docker-gen | 0.7.7 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.7/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) |

3
contrib/DockerFileBuildHelper/Program.cs
View File

@@ -410,7 +410,8 @@ namespace DockerFileBuildHelper
dockerInfo.DockerFilePathARM32v7 = "arm32v7.Dockerfile";
dockerInfo.DockerFilePathARM64v8 = "arm64v8.Dockerfile";
dockerInfo.GitLink = "https://github.com/btcpayserver/btcpayserver";
dockerInfo.GitRef = $"v{image.Tag}";
// v1.0.5.4$<BTCPAY_BUILD_CONFIGURATION>
dockerInfo.GitRef = $"v{image.Tag.Substring(0, image.Tag.IndexOf('$'))}";
dockerInfo.SupportedByUs = true;
break;
case "rtl":

12
contrib/build-all-images.sh
View File

@@ -242,18 +242,18 @@ cd - && cd ..
# Build btcpayserver
# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.5.3/amd64.Dockerfile
# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.5.4/amd64.Dockerfile
DOCKERFILE="amd64.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.5.3/arm32v7.Dockerfile
# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.5.4/arm32v7.Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.5.3/arm64v8.Dockerfile
# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.5.4/arm64v8.Dockerfile
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="arm64v8.Dockerfile"
echo "Building btcpayserver/btcpayserver:1.0.5.3"
echo "Building btcpayserver/btcpayserver:1.0.5.4$<BTCPAY_BUILD_CONFIGURATION>"
git clone https://github.com/btcpayserver/btcpayserver btcpayserver
cd btcpayserver
git checkout v1.0.5.3
git checkout v1.0.5.4
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.0.5.3" .
docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.0.5.4$<BTCPAY_BUILD_CONFIGURATION>" .
cd - && cd ..

2
docker-compose-generator/docker-fragments/btcpayserver.yml
View File

@@ -4,7 +4,7 @@ services:
btcpayserver:
restart: unless-stopped
image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.5.3}
image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.5.4$<BTCPAY_BUILD_CONFIGURATION>?}
expose:
- "49392"
environment:

4
docker-compose-generator/linuxamd64.Dockerfile
View File

@@ -1,5 +1,5 @@
#
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.101 AS builder
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.202 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.1-buster-slim
FROM mcr.microsoft.com/dotnet/core/runtime:3.1.4-buster-slim
LABEL org.btcpayserver.image=docker-compose-generator
WORKDIR /datadir
WORKDIR /app

4
docker-compose-generator/linuxarm32v7.Dockerfile
View File

@@ -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.101 AS builder
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.202 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.1-buster-slim-arm32v7
FROM mcr.microsoft.com/dotnet/core/runtime:3.1.4-buster-slim-arm32v7
LABEL org.btcpayserver.image=docker-compose-generator
WORKDIR /datadir

4
docker-compose-generator/linuxarm64v8.Dockerfile
View File

@@ -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.101 AS builder
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.202 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.1-buster-slim-arm64v8
FROM mcr.microsoft.com/dotnet/core/runtime:3.1.4-buster-slim-arm64v8
LABEL org.btcpayserver.image=docker-compose-generator
WORKDIR /datadir

9
docker-compose-generator/src/Program.cs
View File

@@ -59,12 +59,16 @@ namespace DockerGenerator
}
fragments.Add("btcpayserver");
bool hasAltcoins = false;
foreach (var crypto in cryptoDefinitions)
{
if (!composition.SelectedCryptos.Contains(crypto.Crypto))
continue;
fragments.Add(crypto.CryptoFragment);
if (crypto.CryptoFragment != "bitcoin")
hasAltcoins = true;
if (composition.SelectedLN == "clightning" && crypto.CLightningFragment != null)
{
fragments.Add(crypto.CLightningFragment);
@@ -79,6 +83,11 @@ namespace DockerGenerator
}
}
if (hasAltcoins)
Environment.SetEnvironmentVariable("BTCPAY_BUILD_CONFIGURATION", "-altcoins");
else
Environment.SetEnvironmentVariable("BTCPAY_BUILD_CONFIGURATION", "");
foreach (var fragment in composition.AdditionalFragments)
{
fragments.Add(fragment);

4
docker-compose-generator/src/Properties/launchSettings.json
View File

@@ -6,12 +6,12 @@
"environmentVariables": {
"BTCPAY_HOST_SSHKEYFILE": "test.rsa",
"BTCPAYGEN_LIGHTNING": "clightning",
"BTCPAYGEN_ADDITIONAL_FRAGMENTS": "opt-save-storage",
"BTCPAYGEN_CRYPTO4": "ftc",
"BTCPAYGEN_CRYPTO3": "btg",
"BTCPAYGEN_CRYPTO2": "ltc",
"BTCPAYGEN_CRYPTO1": "btc",
"BTCPAYGEN_REVERSEPROXY": "nginx",
"BTCPAYGEN_ADDITIONAL_FRAGMENTS": "opt-save-storage;opt-txindex"
"BTCPAYGEN_REVERSEPROXY": "nginx"
}
}
}