fix merge conflict
This commit is contained in:
@@ -3,7 +3,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.26124.0
|
||||
MinimumVisualStudioVersion = 15.0.26124.0
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "docker-compose-generator", "src/docker-compose-generator.csproj", "{0900AF35-48E8-46E2-85B3-BA3847EE0844}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "docker-compose-generator", "src\docker-compose-generator.csproj", "{0900AF35-48E8-46E2-85B3-BA3847EE0844}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{8C1C711D-DEF1-474C-A9F6-AAE142412528}"
|
||||
ProjectSection(SolutionItems) = preProject
|
||||
..\.circleci\config.yml = ..\.circleci\config.yml
|
||||
linuxamd64.Dockerfile = linuxamd64.Dockerfile
|
||||
linuxarm32v7.Dockerfile = linuxarm32v7.Dockerfile
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
@@ -14,9 +21,6 @@ Global
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{0900AF35-48E8-46E2-85B3-BA3847EE0844}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{0900AF35-48E8-46E2-85B3-BA3847EE0844}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
@@ -31,4 +35,10 @@ Global
|
||||
{0900AF35-48E8-46E2-85B3-BA3847EE0844}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{0900AF35-48E8-46E2-85B3-BA3847EE0844}.Release|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {CADA76A8-7F2E-4132-900B-330F0D2D722B}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
||||
@@ -4,13 +4,13 @@ services:
|
||||
bitcoind:
|
||||
restart: unless-stopped
|
||||
container_name: btcpayserver_bitcoind
|
||||
image: nicolasdorier/docker-bitcoin:0.17.0
|
||||
image: btcpayserver/bitcoin:0.17.0
|
||||
environment:
|
||||
BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest}
|
||||
BITCOIN_EXTRA_ARGS: |
|
||||
deprecatedrpc=signrawtransaction
|
||||
rpcport=43782
|
||||
port=39388
|
||||
disablewallet=1
|
||||
whitelist=0.0.0.0/0
|
||||
expose:
|
||||
- "43782"
|
||||
|
||||
@@ -4,7 +4,7 @@ services:
|
||||
|
||||
btcpayserver:
|
||||
restart: unless-stopped
|
||||
image: nicolasdorier/btcpayserver:1.0.3.8
|
||||
image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.0.3.22}
|
||||
expose:
|
||||
- "49392"
|
||||
environment:
|
||||
|
||||
43
docker-compose-generator/docker-fragments/dogecoin.yml
Normal file
43
docker-compose-generator/docker-fragments/dogecoin.yml
Normal file
@@ -0,0 +1,43 @@
|
||||
version: "3"
|
||||
|
||||
services:
|
||||
dogecoind:
|
||||
restart: unless-stopped
|
||||
container_name: btcpayserver_dogecoind
|
||||
image: rockstardev/dogecoin:1.10.0
|
||||
environment:
|
||||
DOGECOIN_EXTRA_ARGS: |
|
||||
rpcuser=ceiwHEbqWI83
|
||||
rpcpassword=DwubwWsoo3
|
||||
${NBITCOIN_NETWORK:-regtest}=1
|
||||
server=1
|
||||
rpcport=22555
|
||||
port=22556
|
||||
whitelist=0.0.0.0/0
|
||||
# Reducing memory usage of dogecoind. Don't try running this container without at least 2 GB of memory
|
||||
# https://www.reddit.com/r/dogecoin/comments/5wynqe/reducing_memory_usage_of_dogecoind/
|
||||
dbcache=50
|
||||
ports:
|
||||
- "22555:22555"
|
||||
expose:
|
||||
- "22555" # RPC
|
||||
- "22556" # P2P
|
||||
volumes:
|
||||
- "dogecoin_datadir:/data"
|
||||
nbxplorer:
|
||||
environment:
|
||||
NBXPLORER_CHAINS: "doge"
|
||||
NBXPLORER_DOGERPCURL: http://dogecoind:22555/
|
||||
NBXPLORER_DOGENODEENDPOINT: dogecoind:22556
|
||||
NBXPLORER_DOGERPCUSER: ceiwHEbqWI83
|
||||
NBXPLORER_DOGERPCPASSWORD: DwubwWsoo3
|
||||
links:
|
||||
- dogecoind
|
||||
volumes:
|
||||
- "dogecoin_datadir:/root/.dogecoin"
|
||||
btcpayserver:
|
||||
environment:
|
||||
BTCPAY_CHAINS: "doge"
|
||||
BTCPAY_DOGEEXPLORERURL: http://nbxplorer:32838/
|
||||
volumes:
|
||||
dogecoin_datadir:
|
||||
34
docker-compose-generator/docker-fragments/monacoin.yml
Normal file
34
docker-compose-generator/docker-fragments/monacoin.yml
Normal file
@@ -0,0 +1,34 @@
|
||||
version: "3"
|
||||
|
||||
services:
|
||||
monacoind:
|
||||
restart: unless-stopped
|
||||
container_name: btcpayserver_monacoind
|
||||
image: wakiyamap/docker-monacoin:0.16.3
|
||||
environment:
|
||||
BITCOIN_EXTRA_ARGS: |
|
||||
rpcport=43782
|
||||
${NBITCOIN_NETWORK:-regtest}=1
|
||||
port=39388
|
||||
whitelist=0.0.0.0/0
|
||||
expose:
|
||||
- "43782"
|
||||
- "39388"
|
||||
volumes:
|
||||
- "monacoin_datadir:/data"
|
||||
nbxplorer:
|
||||
environment:
|
||||
NBXPLORER_CHAINS: "mona"
|
||||
NBXPLORER_MONARPCURL: http://monacoind:43782/
|
||||
NBXPLORER_MONANODEENDPOINT: monacoind:39388
|
||||
links:
|
||||
- monacoind
|
||||
volumes:
|
||||
- "monacoin_datadir:/root/.monacoin"
|
||||
btcpayserver:
|
||||
environment:
|
||||
BTCPAY_MONAEXPLORERURL: http://nbxplorer:32838/
|
||||
BTCPAY_CHAINS: "mona"
|
||||
|
||||
volumes:
|
||||
monacoin_datadir:
|
||||
@@ -4,7 +4,7 @@ services:
|
||||
|
||||
nbxplorer:
|
||||
restart: unless-stopped
|
||||
image: nicolasdorier/nbxplorer:1.1.0.12
|
||||
image: nicolasdorier/nbxplorer:2.0.0.1
|
||||
expose:
|
||||
- "32838"
|
||||
environment:
|
||||
|
||||
@@ -18,7 +18,7 @@ services:
|
||||
|
||||
nginx-gen:
|
||||
restart: unless-stopped
|
||||
image: jwilder/docker-gen
|
||||
image: btcpayserver/docker-gen:0.7.4
|
||||
container_name: nginx-gen
|
||||
volumes:
|
||||
- "/var/run/docker.sock:/tmp/docker.sock:ro"
|
||||
@@ -33,7 +33,7 @@ services:
|
||||
|
||||
letsencrypt-nginx-proxy-companion:
|
||||
restart: unless-stopped
|
||||
image: jrcs/letsencrypt-nginx-proxy-companion
|
||||
image: btcpayserver/letsencrypt-nginx-proxy-companion:1.10.0
|
||||
container_name: letsencrypt-nginx-proxy-companion
|
||||
volumes:
|
||||
- "/var/run/docker.sock:/var/run/docker.sock:ro"
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
version: "3"
|
||||
# If your machine has less than 1GB of memory, use this
|
||||
|
||||
services:
|
||||
bitcoind:
|
||||
environment:
|
||||
BITCOIN_EXTRA_ARGS: |
|
||||
dbcache=150
|
||||
maxmempool=100
|
||||
bgoldd:
|
||||
environment:
|
||||
BITCOIN_EXTRA_ARGS: |
|
||||
dbcache=150
|
||||
maxmempool=100
|
||||
feathercoind:
|
||||
environment:
|
||||
BITCOIN_EXTRA_ARGS: |
|
||||
dbcache=150
|
||||
maxmempool=100
|
||||
groestlcoind:
|
||||
environment:
|
||||
BITCOIN_EXTRA_ARGS: |
|
||||
dbcache=150
|
||||
maxmempool=100
|
||||
litecoind:
|
||||
environment:
|
||||
BITCOIN_EXTRA_ARGS: |
|
||||
dbcache=150
|
||||
maxmempool=100
|
||||
viacoind:
|
||||
environment:
|
||||
BITCOIN_EXTRA_ARGS: |
|
||||
dbcache=150
|
||||
maxmempool=100
|
||||
monacoind:
|
||||
environment:
|
||||
BITCOIN_EXTRA_ARGS: |
|
||||
dbcache=150
|
||||
maxmempool=100
|
||||
@@ -20,4 +20,10 @@ services:
|
||||
BITCOIN_EXTRA_ARGS: prune=50000
|
||||
viacoind:
|
||||
environment:
|
||||
BITCOIN_EXTRA_ARGS: prune=50000
|
||||
BITCOIN_EXTRA_ARGS: prune=50000
|
||||
dogecoind:
|
||||
environment:
|
||||
DOGECOIN_EXTRA_ARGS: prune=50000
|
||||
monacoind:
|
||||
environment:
|
||||
BITCOIN_EXTRA_ARGS: prune=50000
|
||||
|
||||
@@ -20,4 +20,10 @@ services:
|
||||
BITCOIN_EXTRA_ARGS: prune=25000
|
||||
viacoind:
|
||||
environment:
|
||||
BITCOIN_EXTRA_ARGS: prune=25000
|
||||
BITCOIN_EXTRA_ARGS: prune=25000
|
||||
dogecoind:
|
||||
environment:
|
||||
DOGECOIN_EXTRA_ARGS: prune=25000
|
||||
monacoind:
|
||||
environment:
|
||||
BITCOIN_EXTRA_ARGS: prune=25000
|
||||
|
||||
@@ -20,4 +20,10 @@ services:
|
||||
BITCOIN_EXTRA_ARGS: prune=5000
|
||||
viacoind:
|
||||
environment:
|
||||
BITCOIN_EXTRA_ARGS: prune=5000
|
||||
BITCOIN_EXTRA_ARGS: prune=5000
|
||||
dogecoind:
|
||||
environment:
|
||||
DOGECOIN_EXTRA_ARGS: prune=5000
|
||||
monacoind:
|
||||
environment:
|
||||
BITCOIN_EXTRA_ARGS: prune=5000
|
||||
|
||||
@@ -20,4 +20,10 @@ services:
|
||||
BITCOIN_EXTRA_ARGS: prune=100000
|
||||
viacoind:
|
||||
environment:
|
||||
BITCOIN_EXTRA_ARGS: prune=100000
|
||||
BITCOIN_EXTRA_ARGS: prune=100000
|
||||
dogecoind:
|
||||
environment:
|
||||
DOGECOIN_EXTRA_ARGS: prune=100000
|
||||
monacoind:
|
||||
environment:
|
||||
BITCOIN_EXTRA_ARGS: prune=100000
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
FROM microsoft/dotnet:2.1.403-sdk-alpine3.7 AS builder
|
||||
#
|
||||
FROM microsoft/dotnet:2.1.500-sdk-alpine3.7 AS builder
|
||||
WORKDIR /source
|
||||
COPY src/docker-compose-generator.csproj docker-compose-generator.csproj
|
||||
# Cache some dependencies
|
||||
@@ -6,10 +7,11 @@ RUN dotnet restore
|
||||
COPY src/. .
|
||||
RUN dotnet publish --output /app/ --configuration Release
|
||||
|
||||
FROM microsoft/dotnet:2.1.5-runtime-alpine3.7
|
||||
WORKDIR /app
|
||||
#
|
||||
FROM microsoft/dotnet:2.1.6-runtime-alpine3.7
|
||||
WORKDIR /datadir
|
||||
|
||||
RUN mkdir /datadir
|
||||
WORKDIR /app
|
||||
ENV APP_DATADIR=/datadir
|
||||
VOLUME /datadir
|
||||
|
||||
22
docker-compose-generator/linuxarm32v7.Dockerfile
Normal file
22
docker-compose-generator/linuxarm32v7.Dockerfile
Normal file
@@ -0,0 +1,22 @@
|
||||
# This is a manifest image, will pull the image with the same arch as the builder machine
|
||||
FROM microsoft/dotnet:2.1.500-sdk AS builder
|
||||
WORKDIR /source
|
||||
COPY src/docker-compose-generator.csproj docker-compose-generator.csproj
|
||||
# Cache some dependencies
|
||||
RUN dotnet restore
|
||||
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 microsoft/dotnet:2.1.6-aspnetcore-runtime-stretch-slim-arm32v7
|
||||
WORKDIR /datadir
|
||||
|
||||
WORKDIR /app
|
||||
ENV APP_DATADIR=/datadir
|
||||
VOLUME /datadir
|
||||
|
||||
ENV INSIDE_CONTAINER=1
|
||||
|
||||
COPY --from=builder "/app" .
|
||||
|
||||
ENTRYPOINT ["dotnet", "docker-compose-generator.dll"]
|
||||
@@ -66,10 +66,20 @@ namespace DockerGenerator
|
||||
Crypto = "via",
|
||||
CryptoFragment = "viacoin"
|
||||
},
|
||||
new CryptoDefinition()
|
||||
new CryptoDefinition()
|
||||
{
|
||||
Crypto = "dash",
|
||||
CryptoFragment = "dash"
|
||||
},
|
||||
new CryptoDefinition()
|
||||
{
|
||||
Crypto = "doge",
|
||||
CryptoFragment = "dogecoin"
|
||||
},
|
||||
new CryptoDefinition()
|
||||
{
|
||||
Crypto = "mona",
|
||||
CryptoFragment = "monacoin"
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -57,6 +57,7 @@ namespace DockerGenerator
|
||||
}
|
||||
var services = new List<KeyValuePair<YamlNode, YamlNode>>();
|
||||
var volumes = new List<KeyValuePair<YamlNode, YamlNode>>();
|
||||
var networks = new List<KeyValuePair<YamlNode, YamlNode>>();
|
||||
|
||||
foreach (var doc in Fragments.Select(f => ParseDocument(f)))
|
||||
{
|
||||
@@ -69,6 +70,10 @@ namespace DockerGenerator
|
||||
{
|
||||
volumes.AddRange(fragmentVolumesRoot.Children);
|
||||
}
|
||||
if (doc.Children.ContainsKey("networks") && doc.Children["networks"] is YamlMappingNode fragmentNetworksRoot)
|
||||
{
|
||||
networks.AddRange(fragmentNetworksRoot.Children);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -76,6 +81,7 @@ namespace DockerGenerator
|
||||
output.Add("version", new YamlScalarNode("3") { Style = YamlDotNet.Core.ScalarStyle.DoubleQuoted });
|
||||
output.Add("services", new YamlMappingNode(Merge(services)));
|
||||
output.Add("volumes", new YamlMappingNode(volumes));
|
||||
output.Add("networks", new YamlMappingNode(networks));
|
||||
var result = serializer.Serialize(output);
|
||||
var outputFile = GetFilePath();
|
||||
File.WriteAllText(outputFile, result.Replace("''", ""));
|
||||
|
||||
Reference in New Issue
Block a user