AaronFiore/btcpayserver-docker
1
0
Fork 0
Code Activity

Revert "Merge pull request #72 from Kukks/feature/mysql"

Browse Source 
This reverts commit a187899945, reversing
changes made to d7241f0d0f.
This commit is contained in:
nicolas.dorier
2018-12-07 13:08:17 +09:00
parent ee6f9fba9a
commit 43c8443f3a
10 changed files with 8 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docker-compose-generator/src/DockerComposition.cs
View File

@@ -17,12 +17,6 @@ namespace DockerGenerator
get;
set;
}
public string SelectedDatabase
{
get;
set;
}
public string SelectedLN
{
get;
@@ -45,7 +39,6 @@ namespace DockerGenerator
continue;
composition.SelectedCryptos.Add(selectedCrypto.ToLowerInvariant());
}
composition.SelectedDatabase = (Environment.GetEnvironmentVariable("BTCPAYGEN_DATABASE") ?? "postgtres").ToLowerInvariant();
composition.SelectedProxy = (Environment.GetEnvironmentVariable("BTCPAYGEN_REVERSEPROXY") ?? "").ToLowerInvariant();
composition.SelectedLN = (Environment.GetEnvironmentVariable("BTCPAYGEN_LIGHTNING") ?? "").ToLowerInvariant();
composition.AdditionalFragments = (Environment.GetEnvironmentVariable("BTCPAYGEN_ADDITIONAL_FRAGMENTS") ?? "").ToLowerInvariant()

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

@@ -8,10 +8,10 @@ namespace DockerGenerator
{
class Program
{
static void Main(string[] args)
{
var root = Environment.GetEnvironmentVariable("INSIDE_CONTAINER") == "1"
? FindRoot("app")
var root = Environment.GetEnvironmentVariable("INSIDE_CONTAINER") == "1" ? FindRoot("app")
: Path.GetFullPath(Path.Combine(FindRoot("docker-compose-generator"), ".."));
var composition = DockerComposition.FromEnvironmentVariables();
@@ -27,9 +27,7 @@ namespace DockerGenerator
private void Run(DockerComposition composition, string name, string output)
{
var fragmentLocation = Environment.GetEnvironmentVariable("INSIDE_CONTAINER") == "1"
? "app"
: "docker-compose-generator";
var fragmentLocation = Environment.GetEnvironmentVariable("INSIDE_CONTAINER") == "1" ? "app" : "docker-compose-generator";
fragmentLocation = FindRoot(fragmentLocation);
fragmentLocation = Path.GetFullPath(Path.Combine(fragmentLocation, "docker-fragments"));
@@ -51,14 +49,9 @@ namespace DockerGenerator
fragments.Add("btcpayserver-noreverseproxy");
break;
}
fragments.Add("btcpayserver");
fragments.Add("nbxplorer");
if (composition.SelectedDatabase != "sqlite")
{
fragments.Add(composition.SelectedDatabase);
}
fragments.Add("postgres");
foreach (var crypto in CryptoDefinition.GetDefinitions())
{
if (!composition.SelectedCryptos.Contains(crypto.Crypto))
@@ -69,7 +62,6 @@ namespace DockerGenerator
{
fragments.Add(crypto.CLightningFragment);
}
if (composition.SelectedLN == "lnd" && crypto.LNDFragment != null)
{
fragments.Add(crypto.LNDFragment);
@@ -102,4 +94,4 @@ namespace DockerGenerator
}
}
}
}
}

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

@@ -9,8 +9,7 @@
"BTCPAYGEN_CRYPTO3": "btg",
"BTCPAYGEN_CRYPTO2": "ltc",
"BTCPAYGEN_CRYPTO1": "btc",
"BTCPAYGEN_REVERSEPROXY": "nginx",
"BTCPAYGEN_DATABASE": "postgres"
"BTCPAYGEN_REVERSEPROXY": "nginx"
}
}
}