bump litecoin

README.md

@@ -335,7 +335,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | groestlcoin-clightning.yml | groestlcoin/lightning | v0.7.0 | [✔️](https://raw.githubusercontent.com/Groestlcoin/lightning/v0.7.0/Dockerfile) | ️❌ | [Github](https://github.com/Groestlcoin/lightning) - [DockerHub](https://hub.docker.com/r/groestlcoin/lightning) |
 | groestlcoin-clightning.yml | groestlcoin/groestlcoin-lightning-charge | version-0.4.7 | [✔️](https://raw.githubusercontent.com/Groestlcoin/groestlcoin-lightning-charge/v0.4.7/Dockerfile) | ️❌ | [Github](https://github.com/Groestlcoin/groestlcoin-lightning-charge) - [DockerHub](https://hub.docker.com/r/groestlcoin/groestlcoin-lightning-charge) |
 | groestlcoin-clightning.yml | groestlcoin/groestlcoin-spark | version-0.2.4 | [✔️](https://raw.githubusercontent.com/Groestlcoin/groestlcoin-spark/v0.2.4/Dockerfile) | ️❌ | [Github](https://github.com/Groestlcoin/groestlcoin-spark) - [DockerHub](https://hub.docker.com/r/groestlcoin/groestlcoin-spark) |
-| litecoin.yml | btcpayserver/litecoin | 0.17.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1/Litecoin/0.17.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1/Litecoin/0.17.1/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/litecoin) |
+| litecoin.yml | btcpayserver/litecoin | 0.17.1-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/litecoin) |
 | litecoin-clightning.yml | btcpayserver/lightning | v0.7.0-3 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.0-3/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.0-3/contrib/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) |
 | litecoin-lnd.yml | btcpayserver/lnd | v0.6-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.6-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.6-beta/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) |
 | monacoin.yml | wakiyamap/docker-monacoin | 0.16.3 | [✔️](https://raw.githubusercontent.com/wakiyamap/docker-bitcoin/master/monacoin/0.16.3/Dockerfile) | ️❌ | [Github](https://github.com/wakiyamap/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/wakiyamap/docker-monacoin) |

contrib/DockerFileBuildHelper/Program.cs

@@ -389,8 +389,8 @@ namespace DockerFileBuildHelper
                     dockerInfo.GitRef = "master";
                     break;
                 case "litecoin":
-                    dockerInfo.DockerFilePath = $"Litecoin/{image.Tag}/linuxamd64.Dockerfile";
+                    dockerInfo.DockerFilePath = $"Litecoin/{NoRevision(image.Tag)}/linuxamd64.Dockerfile";
-                    dockerInfo.DockerFilePathARM32v7 = $"Litecoin/{image.Tag}/linuxarm32v7.Dockerfile";
+                    dockerInfo.DockerFilePathARM32v7 = $"Litecoin/{NoRevision(image.Tag)}/linuxarm32v7.Dockerfile";
                     dockerInfo.GitLink = "https://github.com/btcpayserver/dockerfile-deps";
                     dockerInfo.GitRef = $"Litecoin/{image.Tag}";
                     break;
@@ -459,7 +459,10 @@ namespace DockerFileBuildHelper
             dockerInfo.Image = image;
             return dockerInfo;
         }
-
+        string NoRevision(string str)
+        {
+            return str.Split('-').First();
+        }
         private YamlMappingNode ParseDocument(string fragment)
         {
             var input = new StringReader(File.ReadAllText(fragment));

contrib/build-all-images.sh

@@ -295,16 +295,16 @@ cd - && cd ..
 
 
 # Build litecoin
-# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1/Litecoin/0.17.1/linuxamd64.Dockerfile
+# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxamd64.Dockerfile
 DOCKERFILE="Litecoin/0.17.1/linuxamd64.Dockerfile"
-# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1/Litecoin/0.17.1/linuxarm32v7.Dockerfile
+# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.17.1-1/Litecoin/0.17.1/linuxarm32v7.Dockerfile
 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Litecoin/0.17.1/linuxarm32v7.Dockerfile"
-echo "Building btcpayserver/litecoin:0.17.1"
+echo "Building btcpayserver/litecoin:0.17.1-1"
 git clone https://github.com/btcpayserver/dockerfile-deps litecoin
 cd litecoin
-git checkout Litecoin/0.17.1
+git checkout Litecoin/0.17.1-1
 cd "$(dirname $DOCKERFILE)"
-docker build -f "$DOCKERFILE" -t "btcpayserver/litecoin:0.17.1" .
+docker build -f "$DOCKERFILE" -t "btcpayserver/litecoin:0.17.1-1" .
 cd - && cd ..
 
 

docker-compose-generator/docker-fragments/litecoin.yml

@@ -4,7 +4,7 @@ services:
   litecoind:
     restart: unless-stopped
     container_name: btcpayserver_litecoind
-    image: btcpayserver/litecoin:0.17.1
+    image: btcpayserver/litecoin:0.17.1-1
     environment:
       BITCOIN_NETWORK: ${NBITCOIN_NETWORK:-regtest}
       BITCOIN_EXTRA_ARGS: |

docker-compose-generator/src/DockerComposeDefinition.cs

@@ -10,13 +10,13 @@ namespace DockerGenerator
 {
 	public class DockerComposeDefinition
 	{
-		public List<string> Fragments
+		public HashSet<string> Fragments
 		{
 			get; set;
 		}
 		private string _Name;
 
-		public DockerComposeDefinition(string name, List<string> fragments)
+		public DockerComposeDefinition(string name, HashSet<string> fragments)
 		{
 			Fragments = fragments;
 			_Name = name;
@@ -55,6 +55,27 @@ namespace DockerGenerator
 					Console.WriteLine($"\t{fragment}");
 				}
 			}
+
+			var deps = new HashSet<string>();
+			foreach (var doc in Fragments.Select(f => ParseDocument(f)))
+			{
+				GetDeps(deps, doc);
+			}
+
+			foreach (var fragment in deps.Where(d => Fragments.Add(d)))
+			{
+				var fragmentPath = GetFragmentLocation(fragment);
+				if (!File.Exists(fragmentPath))
+				{
+					Console.WriteLine($"\t{fragment} not found in {fragmentPath}, ignoring...");
+					Fragments.Remove(fragment);
+				}
+				else
+				{
+					Console.WriteLine($"\t{fragment}");
+				}
+			}
+
 			var services = new List<KeyValuePair<YamlNode, YamlNode>>();
 			var volumes = new List<KeyValuePair<YamlNode, YamlNode>>();
 			var networks = new List<KeyValuePair<YamlNode, YamlNode>>();
@@ -89,6 +110,11 @@ namespace DockerGenerator
 			Console.WriteLine();
 		}
 
+		private void GetDeps(HashSet<string> deps, YamlMappingNode doc)
+		{
+			throw new NotImplementedException();
+		}
+
 		private KeyValuePair<YamlNode, YamlNode>[] Merge(List<KeyValuePair<YamlNode, YamlNode>> services)
 		{
 			return services

docker-compose-generator/src/Program.cs

@@ -73,7 +73,7 @@ namespace DockerGenerator
 				fragments.Add(fragment.Trim());
 			}
 			fragments = fragments.Where(s => !composition.ExcludeFragments.Contains(s)).ToHashSet();
-			var def = new DockerComposeDefinition(name, fragments.ToList());
+			var def = new DockerComposeDefinition(name, fragments);
 			def.FragmentLocation = fragmentLocation;
 			def.BuildOutputDirectory = output;
 			def.Build();