From a9ab300997e017e996a587625f1590bb99f9ffda Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Wed, 13 Dec 2023 13:59:54 +0900 Subject: [PATCH] bump docker-gen --- README.md | 2 +- contrib/DockerFileBuildHelper/Program.cs | 8 +-- contrib/build-all-images.sh | 54 +++++++++---------- .../docker-fragments/nginx.yml | 2 +- .../docker-fragments/opt-add-tor-relay.yml | 2 +- .../docker-fragments/opt-add-tor.yml | 2 +- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/README.md b/README.md index 400838a..dc6af59 100644 --- a/README.md +++ b/README.md @@ -352,7 +352,7 @@ Note that BTCPayServer developers will not spend excessive time testing your ima | nicolasdorier/nbxplorer | 2.4.3 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.4.3/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.4.3/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.4.3/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | btcpayserver/letsencrypt-nginx-proxy-companion | 2.2.9 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v2.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v2.2.9/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v2.2.9/Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | | nginx | 1.25.3-bookworm | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.23.2/stable/debian/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.23.2/stable/debian/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.23.2/stable/debian/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) | +| btcpayserver/docker-gen | 0.10.7 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/0.10.7/Dockerfile.alpine) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/0.10.7/Dockerfile.alpine) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/0.10.7/Dockerfile.alpine) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/btctransmuter | 0.0.59 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btctransmuter) - [DockerHub](https://hub.docker.com/r/btcpayserver/btctransmuter) | | btcpayserver/cloudflared | 2023.7.3 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2023.7.3/Cloudflared/2023.7.3/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2023.7.3/Cloudflared/2023.7.3/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2023.7.3/Cloudflared/2023.7.3/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/cloudflared) | | btcpayserver/btcpayserver-configurator | 0.0.21 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.21/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-configurator) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver-configurator) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 474d47c..57b08b2 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -544,11 +544,11 @@ namespace DockerFileBuildHelper dockerInfo.SupportedByUs = true; break; case "docker-gen": - dockerInfo.DockerFilePath = $"linuxamd64.Dockerfile"; - dockerInfo.DockerFilePathARM32v7 = $"linuxarm32v7.Dockerfile"; - dockerInfo.DockerFilePathARM64v8 = $"linuxarm64v8.Dockerfile"; + dockerInfo.DockerFilePath = $"Dockerfile.alpine"; + dockerInfo.DockerFilePathARM32v7 = $"Dockerfile.alpine"; + dockerInfo.DockerFilePathARM64v8 = $"Dockerfile.alpine"; dockerInfo.GitLink = "https://github.com/btcpayserver/docker-gen"; - dockerInfo.GitRef = $"v{image.Tag}"; + dockerInfo.GitRef = $"{image.Tag}"; dockerInfo.SupportedByUs = true; break; case "letsencrypt-nginx-proxy-companion": diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 2b98940..648d450 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -464,18 +464,18 @@ cd - && cd .. # Build docker-gen -# https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile -DOCKERFILE="linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile" -echo "Building btcpayserver/docker-gen:0.7.8" +# https://raw.githubusercontent.com/btcpayserver/docker-gen/0.10.7/Dockerfile.alpine +DOCKERFILE="Dockerfile.alpine" +# https://raw.githubusercontent.com/btcpayserver/docker-gen/0.10.7/Dockerfile.alpine +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.alpine" +# https://raw.githubusercontent.com/btcpayserver/docker-gen/0.10.7/Dockerfile.alpine +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.alpine" +echo "Building btcpayserver/docker-gen:0.10.7" git clone https://github.com/btcpayserver/docker-gen docker-gen cd docker-gen -git checkout v0.7.8 +git checkout 0.10.7 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/docker-gen:0.7.8" . +docker build -f "$DOCKERFILE" -t "btcpayserver/docker-gen:0.10.7" . cd - && cd .. @@ -910,18 +910,18 @@ cd - && cd .. # Build docker-gen -# https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile -DOCKERFILE="linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile" -echo "Building btcpayserver/docker-gen:0.7.8" +# https://raw.githubusercontent.com/btcpayserver/docker-gen/0.10.7/Dockerfile.alpine +DOCKERFILE="Dockerfile.alpine" +# https://raw.githubusercontent.com/btcpayserver/docker-gen/0.10.7/Dockerfile.alpine +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.alpine" +# https://raw.githubusercontent.com/btcpayserver/docker-gen/0.10.7/Dockerfile.alpine +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.alpine" +echo "Building btcpayserver/docker-gen:0.10.7" git clone https://github.com/btcpayserver/docker-gen docker-gen cd docker-gen -git checkout v0.7.8 +git checkout 0.10.7 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/docker-gen:0.7.8" . +docker build -f "$DOCKERFILE" -t "btcpayserver/docker-gen:0.10.7" . cd - && cd .. @@ -958,18 +958,18 @@ cd - && cd .. # Build docker-gen -# https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile -DOCKERFILE="linuxamd64.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile -[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="linuxarm32v7.Dockerfile" -# https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile -[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="linuxarm64v8.Dockerfile" -echo "Building btcpayserver/docker-gen:0.7.8" +# https://raw.githubusercontent.com/btcpayserver/docker-gen/0.10.7/Dockerfile.alpine +DOCKERFILE="Dockerfile.alpine" +# https://raw.githubusercontent.com/btcpayserver/docker-gen/0.10.7/Dockerfile.alpine +[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="Dockerfile.alpine" +# https://raw.githubusercontent.com/btcpayserver/docker-gen/0.10.7/Dockerfile.alpine +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile.alpine" +echo "Building btcpayserver/docker-gen:0.10.7" git clone https://github.com/btcpayserver/docker-gen docker-gen cd docker-gen -git checkout v0.7.8 +git checkout 0.10.7 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/docker-gen:0.7.8" . +docker build -f "$DOCKERFILE" -t "btcpayserver/docker-gen:0.10.7" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/nginx.yml b/docker-compose-generator/docker-fragments/nginx.yml index 746724b..5c3e0de 100644 --- a/docker-compose-generator/docker-fragments/nginx.yml +++ b/docker-compose-generator/docker-fragments/nginx.yml @@ -13,7 +13,7 @@ services: - "nginx_html:/usr/share/nginx/html" nginx-gen: restart: unless-stopped - image: btcpayserver/docker-gen:0.7.8 + image: btcpayserver/docker-gen:0.10.7 container_name: nginx-gen environment: DEFAULT_HOST: ${REVERSEPROXY_DEFAULT_HOST:-none} diff --git a/docker-compose-generator/docker-fragments/opt-add-tor-relay.yml b/docker-compose-generator/docker-fragments/opt-add-tor-relay.yml index feb684c..ae44d7d 100644 --- a/docker-compose-generator/docker-fragments/opt-add-tor-relay.yml +++ b/docker-compose-generator/docker-fragments/opt-add-tor-relay.yml @@ -2,7 +2,7 @@ version: "3" services: tor-relay-gen: restart: unless-stopped - image: btcpayserver/docker-gen:0.7.8 + image: btcpayserver/docker-gen:0.10.7 container_name: tor-relay-gen volumes: - "/var/run/docker.sock:/tmp/docker.sock:ro" diff --git a/docker-compose-generator/docker-fragments/opt-add-tor.yml b/docker-compose-generator/docker-fragments/opt-add-tor.yml index 96d1950..e3c44c6 100644 --- a/docker-compose-generator/docker-fragments/opt-add-tor.yml +++ b/docker-compose-generator/docker-fragments/opt-add-tor.yml @@ -109,7 +109,7 @@ services: tor-gen: restart: unless-stopped - image: btcpayserver/docker-gen:0.7.8 + image: btcpayserver/docker-gen:0.10.7 container_name: tor-gen volumes: - "/var/run/docker.sock:/tmp/docker.sock:ro"