lukechilds
/
btcpayserver-docker
mirror of https://github.com/lukechilds/btcpayserver-docker.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Note NGinx support for arm32v7

feature/auto_ssh
nicolas.dorier 6 years ago
parent
66c20cfa39
commit
45416f997c
3 changed files with 19 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      README.md
  2. 1
      contrib/DockerFileBuildHelper/Program.cs
  3. 32
      contrib/build-all-images.sh

2
README.md
View File

@ -328,7 +328,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
| litecoin-lnd.yml | btcpayserver/lnd | v0.5.1-beta-2 | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5.1-beta-2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5.1-beta-2/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/lnd) - [DockerHub](https://hub.docker.com/r/btcpayserver/lnd) | | litecoin-lnd.yml | btcpayserver/lnd | v0.5.1-beta-2 | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5.1-beta-2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.5.1-beta-2/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) | | 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) |
| nbxplorer.yml | nicolasdorier/nbxplorer | 2.0.0.11 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.11/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.11/Dockerfile.linuxarm32v7) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nbxplorer.yml | nicolasdorier/nbxplorer | 2.0.0.11 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.11/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.11/Dockerfile.linuxarm32v7) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) |
| nginx.yml | nginx | stable | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/master/stable/stretch/Dockerfile) | ️❌ | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | nginx.yml | nginx | stable | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/master/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/master/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) |
| nginx.yml | btcpayserver/docker-gen | 0.7.4 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.4/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.4/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | nginx.yml | btcpayserver/docker-gen | 0.7.4 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.4/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.4/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) |
| nginx.yml | btcpayserver/letsencrypt-nginx-proxy-companion | 1.10.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.10.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.10.0/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | | nginx.yml | btcpayserver/letsencrypt-nginx-proxy-companion | 1.10.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.10.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.10.0/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) |
| opt-add-btcqbo.yml | jvandrew/btcqbo | 0.2.12 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.2.12/Dockerfile) | ️❌ | [Github](https://github.com/JeffVandrewJr/btcqbo) - [DockerHub](https://hub.docker.com/r/jvandrew/btcqbo) | | opt-add-btcqbo.yml | jvandrew/btcqbo | 0.2.12 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.2.12/Dockerfile) | ️❌ | [Github](https://github.com/JeffVandrewJr/btcqbo) - [DockerHub](https://hub.docker.com/r/jvandrew/btcqbo) |

1
contrib/DockerFileBuildHelper/Program.cs
View File

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

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

@ -59,16 +59,16 @@ cd - && cd ..
# Build lightning # Build lightning
# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.6.3-3/Dockerfile # https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.6.3-4/Dockerfile
DOCKERFILE="Dockerfile" DOCKERFILE="Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.6.3-3/linuxarm32v7.Dockerfile # https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.6.3-4/linuxarm32v7.Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile"
echo "Building btcpayserver/lightning:v0.6.3-3" echo "Building btcpayserver/lightning:v0.6.3-4"
git clone https://github.com/btcpayserver/lightning lightning git clone https://github.com/btcpayserver/lightning lightning
cd lightning cd lightning
git checkout basedon-v0.6.3-3 git checkout basedon-v0.6.3-4
cd "$(dirname $DOCKERFILE)" cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.6.3-3" . docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.6.3-4" .
cd - && cd .. cd - && cd ..
@ -151,16 +151,16 @@ cd - && cd ..
# Build btcpayserver # Build btcpayserver
# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.47/Dockerfile.linuxamd64 # https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.48/Dockerfile.linuxamd64
DOCKERFILE="Dockerfile.linuxamd64" DOCKERFILE="Dockerfile.linuxamd64"
# https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.47/Dockerfile.linuxarm32v7 # https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.0.3.48/Dockerfile.linuxarm32v7
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7"
echo "Building btcpayserver/btcpayserver:1.0.3.47" echo "Building btcpayserver/btcpayserver:1.0.3.48"
git clone https://github.com/btcpayserver/btcpayserver btcpayserver git clone https://github.com/btcpayserver/btcpayserver btcpayserver
cd btcpayserver cd btcpayserver
git checkout v1.0.3.47 git checkout v1.0.3.48
cd "$(dirname $DOCKERFILE)" cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.0.3.47" . docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver:1.0.3.48" .
cd - && cd .. cd - && cd ..
@ -253,16 +253,16 @@ cd - && cd ..
# Build lightning # Build lightning
# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.6.3-3/Dockerfile # https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.6.3-4/Dockerfile
DOCKERFILE="Dockerfile" DOCKERFILE="Dockerfile"
# https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.6.3-3/linuxarm32v7.Dockerfile # https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.6.3-4/linuxarm32v7.Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile"
echo "Building btcpayserver/lightning:v0.6.3-3" echo "Building btcpayserver/lightning:v0.6.3-4"
git clone https://github.com/btcpayserver/lightning lightning git clone https://github.com/btcpayserver/lightning lightning
cd lightning cd lightning
git checkout basedon-v0.6.3-3 git checkout basedon-v0.6.3-4
cd "$(dirname $DOCKERFILE)" cd "$(dirname $DOCKERFILE)"
docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.6.3-3" . docker build -f "$DOCKERFILE" -t "btcpayserver/lightning:v0.6.3-4" .
cd - && cd .. cd - && cd ..
@ -321,6 +321,8 @@ cd - && cd ..
# Build nginx # Build nginx
# https://raw.githubusercontent.com/nginxinc/docker-nginx/master/stable/stretch/Dockerfile # https://raw.githubusercontent.com/nginxinc/docker-nginx/master/stable/stretch/Dockerfile
DOCKERFILE="stable/stretch/Dockerfile" DOCKERFILE="stable/stretch/Dockerfile"
# https://raw.githubusercontent.com/nginxinc/docker-nginx/master/stable/stretch/Dockerfile
[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="stable/stretch/Dockerfile"
echo "Building nginx:stable" echo "Building nginx:stable"
git clone https://github.com/nginxinc/docker-nginx nginx git clone https://github.com/nginxinc/docker-nginx nginx
cd nginx cd nginx

Write Preview
Loading…
Cancel
Save