AaronFiore/btcpayserver-docker
1
0
Fork 0
Code Activity

Show progress of armv64 support

Browse Source
This commit is contained in:
nicolas.dorier
2019-08-06 13:26:32 +09:00
parent a737559fde
commit ce8379e56b
3 changed files with 59 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/DockerFileBuildHelper/Program.cs
View File

@@ -142,8 +142,8 @@ namespace DockerFileBuildHelper
StringBuilder tb = new StringBuilder();
tb.Append(readme.Substring(0, start));
tb.AppendLine("| Source | Image | Version | x64 | arm32v7 | links |");
tb.AppendLine("|---|---|---|:-:|:-:|:-:|");
tb.AppendLine("| Source | Image | Version | x64 | arm32v7 | arm64v8 | links |");
tb.AppendLine("|---|---|---|:-:|:-:|:-:|:-:|");
dockerInfos = dockerInfos.OrderBy(i => i.Image.Source).ToList();
// Make sure bitcoin appears before shitcoin
@@ -176,6 +176,14 @@ namespace DockerFileBuildHelper
{
tb.Append($" ️❌ |");
}
if (!string.IsNullOrEmpty(image.DockerFilePathARM64v8))
{
tb.Append($" [✔️]({image.GetGithubLinkOf(image.DockerFilePathARM64v8)}) |");
}
else
{
tb.Append($" ️❌ |");
}
tb.AppendLine($" [Github]({image.GitLink}) - [DockerHub]({image.DockerHubLink}) |");
}
tb.Append(readme.Substring(end));
@@ -404,6 +412,7 @@ namespace DockerFileBuildHelper
case "nginx":
dockerInfo.DockerFilePath = $"stable/stretch/Dockerfile";
dockerInfo.DockerFilePathARM32v7 = $"stable/stretch/Dockerfile";
dockerInfo.DockerFilePathARM64v8 = $"stable/stretch/Dockerfile";
dockerInfo.GitLink = "https://github.com/nginxinc/docker-nginx";
dockerInfo.GitRef = image.Tag;
break;
@@ -433,6 +442,7 @@ namespace DockerFileBuildHelper
case "postgres":
dockerInfo.DockerFilePath = $"9.6/Dockerfile";
dockerInfo.DockerFilePathARM32v7 = $"9.6/Dockerfile";
dockerInfo.DockerFilePathARM64v8 = $"9.6/Dockerfile";
dockerInfo.GitLink = "https://github.com/docker-library/postgres";
dockerInfo.GitRef = $"b7cb3c6eacea93be2259381033be3cc435649369";
break;

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

@@ -354,6 +354,8 @@ cd - && cd ..
DOCKERFILE="stable/stretch/Dockerfile"
# https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="stable/stretch/Dockerfile"
# https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="stable/stretch/Dockerfile"
echo "Building nginx:1.16.0"
git clone https://github.com/nginxinc/docker-nginx nginx
cd nginx
@@ -500,6 +502,8 @@ cd - && cd ..
DOCKERFILE="9.6/Dockerfile"
# https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="9.6/Dockerfile"
# https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile
[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="9.6/Dockerfile"
echo "Building postgres:9.6.5"
git clone https://github.com/docker-library/postgres postgres
cd postgres