AaronFiore/btcpayserver-docker
1
0
Fork 0
Code Activity

bump btcpayserver, pin version of nginx

Browse Source
This commit is contained in:
nicolas.dorier
2019-07-12 13:23:11 +09:00
parent 0b0c6b5733
commit a3c149aa9e
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/DockerFileBuildHelper/Program.cs
View File

@@ -405,7 +405,7 @@ namespace DockerFileBuildHelper
dockerInfo.DockerFilePath = $"stable/stretch/Dockerfile";
dockerInfo.DockerFilePathARM32v7 = $"stable/stretch/Dockerfile";
dockerInfo.GitLink = "https://github.com/nginxinc/docker-nginx";
dockerInfo.GitRef = $"master";
dockerInfo.GitRef = image.Tag;
break;
case "docker-gen":
dockerInfo.DockerFilePath = $"linuxamd64.Dockerfile";

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

@@ -166,16 +166,16 @@ cd - && cd ..
# Build btcpayserver
# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.120/amd64.Dockerfile
# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.121/amd64.Dockerfile
DOCKERFILE="amd64.Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.120/arm32v7.Dockerfile
# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.121/arm32v7.Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="arm32v7.Dockerfile"
echo "Building btcpayserver/btcpayserver:1.0.3.120"
echo "Building btcpayserver/btcpayserver:1.0.3.121"
git clone https://github.com/btcpayserver/btcpayserver btcpayserver
cd btcpayserver
git checkout v1.0.3.120
git checkout v1.0.3.121
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.0.3.120" .
docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.0.3.121" .
cd - && cd ..
@@ -350,16 +350,16 @@ cd - && cd ..
# Build nginx
# https://raw.githubusercontent.com/nginxinc/docker-nginx/master/stable/stretch/Dockerfile
# https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile
DOCKERFILE="stable/stretch/Dockerfile"
# https://raw.githubusercontent.com/nginxinc/docker-nginx/master/stable/stretch/Dockerfile
# https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="stable/stretch/Dockerfile"
echo "Building nginx:latest"
echo "Building nginx:1.16.0"
git clone https://github.com/nginxinc/docker-nginx nginx
cd nginx
git checkout master
git checkout 1.16.0
cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "nginx:latest" .
docker build -f "$DOCKERFILE" -t "nginx:1.16.0" .
cd - && cd ..