From 461a6f18164d40ae274b208367745145eb8aedd3 Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Thu, 29 Aug 2019 00:00:39 +0900 Subject: [PATCH] bump nbxplorer --- README.md | 4 ++-- contrib/DockerFileBuildHelper/Program.cs | 4 +--- contrib/build-all-images.sh | 20 ++++++++----------- .../docker-fragments/nbxplorer.yml | 2 +- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 88f9f5e..7bf2e49 100644 --- a/README.md +++ b/README.md @@ -345,7 +345,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | litecoin-clightning.yml | btcpayserver/lightning | v0.7.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.2/contrib/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lightning/basedon-v0.7.2/contrib/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/lightning) - [DockerHub](https://hub.docker.com/r/btcpayserver/lightning) | | litecoin-lnd.yml | btcpayserver/lnd | v0.7.1-beta | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.7.1-beta/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.7.1-beta/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/lnd/basedon-v0.7.1-beta/linuxarm64v8.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) | -| nbxplorer.yml | nicolasdorier/nbxplorer | 2.0.0.56 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.56/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.56/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.56/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | +| nbxplorer.yml | nicolasdorier/nbxplorer | 2.0.0.57 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.57/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.57/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.57/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | nginx.yml | nginx | 1.16.0 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.16.0/stable/stretch/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | nginx.yml | btcpayserver/docker-gen | 0.7.6 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.6/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.6/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.6/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | nginx-https.yml | btcpayserver/letsencrypt-nginx-proxy-companion | 1.10.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.10.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.10.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.10.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | @@ -359,7 +359,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | opt-add-woocommerce.yml | btcpayserver/docker-woocommerce | 3.0.6-3 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.6-3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | | opt-add-woocommerce.yml | mariadb | 10.3 | [✔️](https://raw.githubusercontent.com/docker-library/mariadb/master/10.3/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/mariadb) - [DockerHub](https://hub.docker.com/_/mariadb) | | postgres.yml | postgres | 9.6.5 | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [Github](https://github.com/docker-library/postgres) - [DockerHub](https://hub.docker.com/_/postgres) | -| traefik.yml | traefik | latest | [✔️](https://raw.githubusercontent.com/containous/traefik-library-image/master/scratch/amd64/Dockerfile) | [✔️](https://raw.githubusercontent.com/containous/traefik-library-image/master/scratch/arm/Dockerfile) | [✔️](https://raw.githubusercontent.com/containous/traefik-library-image/master/scratch/arm64/Dockerfile) | [Github](https://github.com/containous/traefik-library-image) - [DockerHub](https://hub.docker.com/_/traefik) | +| traefik.yml | traefik | latest | [✔️](https://raw.githubusercontent.com/containous/traefik-library-image/master/scratch/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/containous/traefik-library-image) - [DockerHub](https://hub.docker.com/_/traefik) | | trezarcoin.yml | chekaz/docker-trezarcoin | 0.13.0 | [✔️](https://raw.githubusercontent.com/ChekaZ/docker/master/trezarcoin/1.2.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/ChekaZ/docker) - [DockerHub](https://hub.docker.com/r/chekaz/docker-trezarcoin) | | viacoin.yml | romanornr/docker-viacoin | 0.15.2 | [✔️](https://raw.githubusercontent.com/viacoin/docker-viacoin/master/viacoin/0.15.2/docker-viacoin) | ️❌ | ️❌ | [Github](https://github.com/viacoin/docker-viacoin) - [DockerHub](https://hub.docker.com/r/romanornr/docker-viacoin) | | bgold.yml | kamigawabul/docker-bitcoingold | 0.15.2 | [✔️](https://raw.githubusercontent.com/Vutov/docker-bitcoin/master/bitcoingold/0.15.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Vutov/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/kamigawabul/docker-bitcoingold) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index c9b2127..e4e994a 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -453,9 +453,7 @@ namespace DockerFileBuildHelper dockerInfo.GitRef = $"b7cb3c6eacea93be2259381033be3cc435649369"; break; case "traefik": - dockerInfo.DockerFilePath = $"scratch/amd64/Dockerfile"; - dockerInfo.DockerFilePathARM32v7 = $"scratch/arm/Dockerfile"; - dockerInfo.DockerFilePathARM64v8 = $"scratch/arm64/Dockerfile"; + dockerInfo.DockerFilePath = $"scratch/Dockerfile"; dockerInfo.GitLink = "https://github.com/containous/traefik-library-image"; dockerInfo.GitRef = $"master"; break; diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 1eafc58..8a2d6e2 100755 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -332,18 +332,18 @@ cd - && cd .. # Build nbxplorer -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.56/Dockerfile.linuxamd64 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.57/Dockerfile.linuxamd64 DOCKERFILE="Dockerfile.linuxamd64" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.56/Dockerfile.linuxarm32v7 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.57/Dockerfile.linuxarm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.56/Dockerfile.linuxarm64v8 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.0.0.57/Dockerfile.linuxarm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8" -echo "Building nicolasdorier/nbxplorer:2.0.0.56" +echo "Building nicolasdorier/nbxplorer:2.0.0.57" git clone https://github.com/dgarage/nbxplorer nbxplorer cd nbxplorer -git checkout v2.0.0.56 +git checkout v2.0.0.57 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.0.0.56" . +docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.0.0.57" . cd - && cd .. @@ -530,12 +530,8 @@ cd - && cd .. # Build traefik -# https://raw.githubusercontent.com/containous/traefik-library-image/master/scratch/amd64/Dockerfile -DOCKERFILE="scratch/amd64/Dockerfile" -# https://raw.githubusercontent.com/containous/traefik-library-image/master/scratch/arm/Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="scratch/arm/Dockerfile" -# https://raw.githubusercontent.com/containous/traefik-library-image/master/scratch/arm64/Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="scratch/arm64/Dockerfile" +# https://raw.githubusercontent.com/containous/traefik-library-image/master/scratch/Dockerfile +DOCKERFILE="scratch/Dockerfile" echo "Building traefik:latest" git clone https://github.com/containous/traefik-library-image traefik cd traefik diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index f5e4f50..6aff135 100644 --- a/docker-compose-generator/docker-fragments/nbxplorer.yml +++ b/docker-compose-generator/docker-fragments/nbxplorer.yml @@ -4,7 +4,7 @@ services: nbxplorer: restart: unless-stopped - image: nicolasdorier/nbxplorer:2.0.0.56 + image: nicolasdorier/nbxplorer:2.0.0.57 expose: - "32838" environment: