From e50ed907c9d9a8beaccc298ed73b885912d93c6d Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Mon, 14 Nov 2022 21:08:11 +0900 Subject: [PATCH] bump nbx --- README.md | 4 +- contrib/DockerFileBuildHelper/Program.cs | 6 +-- contrib/build-all-images.sh | 44 ++++++++++--------- .../docker-fragments/nbxplorer.yml | 2 +- 4 files changed, 29 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index bba61ed..0453e8e 100644 --- a/README.md +++ b/README.md @@ -350,7 +350,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/bitcoin | 23.0-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Bitcoin/23.0-1/Bitcoin/23.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/bitcoin) | | btcpayserver/btcpayserver | 1.6.12$? | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver/v1.6.12/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver) | | btcpayserver/monero | 0.18.1.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.1.1/Monero/0.18.1.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | -| nicolasdorier/nbxplorer | 2.3.44 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.44/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.44/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.44/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | +| nicolasdorier/nbxplorer | 2.3.45 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.45/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.45/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.45/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | | 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) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | @@ -400,7 +400,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | djbooth007/tallycoin_connect | v1.7.5 | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.5/Dockerfile) | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.5/Dockerfile.arm32v7) | [✔️](https://raw.githubusercontent.com/djbooth007/tallycoin_connect/v1.7.5/Dockerfile.arm64v8) | [Github](https://github.com/djbooth007/tallycoin_connect) - [DockerHub](https://hub.docker.com/r/djbooth007/tallycoin_connect) | | talaia/python-teos | latest | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/talaia-labs/python-teos/master/docker/arm64v8.Dockerfile) | [Github](https://github.com/talaia-labs/python-teos) - [DockerHub](https://hub.docker.com/r/talaia/python-teos) | | apotdevin/thunderhub | base-v0.13.11 | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.11/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.11/Dockerfile) | [✔️](https://raw.githubusercontent.com/apotdevin/thunderhub/v0.13.11/Dockerfile) | [Github](https://github.com/apotdevin/thunderhub) - [DockerHub](https://hub.docker.com/r/apotdevin/thunderhub) | -| zammad/zammad-docker-compose | zammad-postgresql-3.4.0-4 | [✔️](https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad-postgresql/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/zammad/zammad-docker-compose) - [DockerHub](https://hub.docker.com/r/zammad/zammad-docker-compose) | +| zammad/zammad-docker-compose | zammad-postgresql-3.4.0-4 | [✔️](https://raw.githubusercontent.com/zammad/zammad-docker-compose/ff20084ce2829486076e9781fe27407ca6cc09bb/containers/zammad-postgresql/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/zammad/zammad-docker-compose) - [DockerHub](https://hub.docker.com/r/zammad/zammad-docker-compose) | | memcached | 1.5.22-alpine | [✔️](https://raw.githubusercontent.com/docker-library/memcached/master/alpine/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/memcached) - [DockerHub](https://hub.docker.com/_/memcached) | | traefik | v2.6 | [✔️](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) | | 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) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index e9fc371..5b1dae5 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -625,19 +625,19 @@ namespace DockerFileBuildHelper case "zammad/zammad-docker-compose" when image.Tag.StartsWith("zammad-postgresql-"): dockerInfo.DockerFilePath = $"containers/zammad-postgresql/Dockerfile"; dockerInfo.GitLink = "https://github.com/zammad/zammad-docker-compose"; - dockerInfo.GitRef = $"master"; + dockerInfo.GitRef = $"ff20084ce2829486076e9781fe27407ca6cc09bb"; dockerInfo.SupportedByUs = false; break; case "zammad/zammad-docker-compose" when image.Tag.StartsWith("zammad-elasticsearch-"): dockerInfo.DockerFilePath = $"containers/zammad-elasticsearch/Dockerfile"; dockerInfo.GitLink = "https://github.com/zammad/zammad-docker-compose"; - dockerInfo.GitRef = $"master"; + dockerInfo.GitRef = $"ff20084ce2829486076e9781fe27407ca6cc09bb"; dockerInfo.SupportedByUs = false; break; case "zammad/zammad-docker-compose" when image.Tag.StartsWith("zammad-"): dockerInfo.DockerFilePath = $"containers/zammad/Dockerfile"; dockerInfo.GitLink = "https://github.com/zammad/zammad-docker-compose"; - dockerInfo.GitRef = $"master"; + dockerInfo.GitRef = $"ff20084ce2829486076e9781fe27407ca6cc09bb"; dockerInfo.SupportedByUs = false; break; case "memcached" when image.Tag.EndsWith("alpine"): diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index a7a72e8..ddb9b79 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -448,18 +448,18 @@ cd - && cd .. # Build nbxplorer -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.44/Dockerfile.linuxamd64 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.45/Dockerfile.linuxamd64 DOCKERFILE="Dockerfile.linuxamd64" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.44/Dockerfile.linuxarm32v7 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.45/Dockerfile.linuxarm32v7 [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.linuxarm32v7" -# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.44/Dockerfile.linuxarm64v8 +# https://raw.githubusercontent.com/dgarage/nbxplorer/v2.3.45/Dockerfile.linuxarm64v8 [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.linuxarm64v8" -echo "Building nicolasdorier/nbxplorer:2.3.44" +echo "Building nicolasdorier/nbxplorer:2.3.45" git clone https://github.com/dgarage/nbxplorer nbxplorer cd nbxplorer -git checkout v2.3.44 +git checkout v2.3.45 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.3.44" . +docker build -f "$DOCKERFILE" -t "nicolasdorier/nbxplorer:2.3.45" . cd - && cd .. @@ -709,7 +709,7 @@ DOCKERFILE="Dockerfile" echo "Building fireflyiii/core:latest" git clone https://dev.azure.com/Firefly-III/_git/MainImage core cd core -git checkout +git checkout cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "fireflyiii/core:latest" . cd - && cd .. @@ -1032,36 +1032,36 @@ cd - && cd .. # Build zammad-docker-compose -# https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad-postgresql/Dockerfile +# https://raw.githubusercontent.com/zammad/zammad-docker-compose/ff20084ce2829486076e9781fe27407ca6cc09bb/containers/zammad-postgresql/Dockerfile DOCKERFILE="containers/zammad-postgresql/Dockerfile" echo "Building zammad/zammad-docker-compose:zammad-postgresql-3.4.0-4" git clone https://github.com/zammad/zammad-docker-compose zammad-docker-compose cd zammad-docker-compose -git checkout master +git checkout ff20084ce2829486076e9781fe27407ca6cc09bb cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "zammad/zammad-docker-compose:zammad-postgresql-3.4.0-4" . cd - && cd .. # Build zammad-docker-compose -# https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad-elasticsearch/Dockerfile +# https://raw.githubusercontent.com/zammad/zammad-docker-compose/ff20084ce2829486076e9781fe27407ca6cc09bb/containers/zammad-elasticsearch/Dockerfile DOCKERFILE="containers/zammad-elasticsearch/Dockerfile" echo "Building zammad/zammad-docker-compose:zammad-elasticsearch-3.4.0-4" git clone https://github.com/zammad/zammad-docker-compose zammad-docker-compose cd zammad-docker-compose -git checkout master +git checkout ff20084ce2829486076e9781fe27407ca6cc09bb cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "zammad/zammad-docker-compose:zammad-elasticsearch-3.4.0-4" . cd - && cd .. # Build zammad-docker-compose -# https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad/Dockerfile +# https://raw.githubusercontent.com/zammad/zammad-docker-compose/ff20084ce2829486076e9781fe27407ca6cc09bb/containers/zammad/Dockerfile DOCKERFILE="containers/zammad/Dockerfile" echo "Building zammad/zammad-docker-compose:zammad-3.4.0-4" git clone https://github.com/zammad/zammad-docker-compose zammad-docker-compose cd zammad-docker-compose -git checkout master +git checkout ff20084ce2829486076e9781fe27407ca6cc09bb cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "zammad/zammad-docker-compose:zammad-3.4.0-4" . cd - && cd .. @@ -1080,48 +1080,48 @@ cd - && cd .. # Build zammad-docker-compose -# https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad/Dockerfile +# https://raw.githubusercontent.com/zammad/zammad-docker-compose/ff20084ce2829486076e9781fe27407ca6cc09bb/containers/zammad/Dockerfile DOCKERFILE="containers/zammad/Dockerfile" echo "Building zammad/zammad-docker-compose:zammad-3.4.0-4" git clone https://github.com/zammad/zammad-docker-compose zammad-docker-compose cd zammad-docker-compose -git checkout master +git checkout ff20084ce2829486076e9781fe27407ca6cc09bb cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "zammad/zammad-docker-compose:zammad-3.4.0-4" . cd - && cd .. # Build zammad-docker-compose -# https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad/Dockerfile +# https://raw.githubusercontent.com/zammad/zammad-docker-compose/ff20084ce2829486076e9781fe27407ca6cc09bb/containers/zammad/Dockerfile DOCKERFILE="containers/zammad/Dockerfile" echo "Building zammad/zammad-docker-compose:zammad-3.4.0-4" git clone https://github.com/zammad/zammad-docker-compose zammad-docker-compose cd zammad-docker-compose -git checkout master +git checkout ff20084ce2829486076e9781fe27407ca6cc09bb cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "zammad/zammad-docker-compose:zammad-3.4.0-4" . cd - && cd .. # Build zammad-docker-compose -# https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad/Dockerfile +# https://raw.githubusercontent.com/zammad/zammad-docker-compose/ff20084ce2829486076e9781fe27407ca6cc09bb/containers/zammad/Dockerfile DOCKERFILE="containers/zammad/Dockerfile" echo "Building zammad/zammad-docker-compose:zammad-3.4.0-4" git clone https://github.com/zammad/zammad-docker-compose zammad-docker-compose cd zammad-docker-compose -git checkout master +git checkout ff20084ce2829486076e9781fe27407ca6cc09bb cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "zammad/zammad-docker-compose:zammad-3.4.0-4" . cd - && cd .. # Build zammad-docker-compose -# https://raw.githubusercontent.com/zammad/zammad-docker-compose/master/containers/zammad/Dockerfile +# https://raw.githubusercontent.com/zammad/zammad-docker-compose/ff20084ce2829486076e9781fe27407ca6cc09bb/containers/zammad/Dockerfile DOCKERFILE="containers/zammad/Dockerfile" echo "Building zammad/zammad-docker-compose:zammad-3.4.0-4" git clone https://github.com/zammad/zammad-docker-compose zammad-docker-compose cd zammad-docker-compose -git checkout master +git checkout ff20084ce2829486076e9781fe27407ca6cc09bb cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "zammad/zammad-docker-compose:zammad-3.4.0-4" . cd - && cd .. @@ -1177,3 +1177,5 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. + + diff --git a/docker-compose-generator/docker-fragments/nbxplorer.yml b/docker-compose-generator/docker-fragments/nbxplorer.yml index c856017..bdc31fb 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.3.44 + image: nicolasdorier/nbxplorer:2.3.45 expose: - "32838" environment: