From 49193cbc29aab404d6da9c9a9d17727c580f3064 Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Tue, 9 Aug 2022 10:23:55 +0200 Subject: [PATCH] Update Monero repo --- README.md | 2 +- contrib/DockerFileBuildHelper/Program.cs | 8 ++++--- contrib/build-all-images.sh | 30 +++++++----------------- 3 files changed, 15 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index 9e3cd0c..f1e985e 100644 --- a/README.md +++ b/README.md @@ -378,7 +378,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | btcpayserver/elements | 0.21.0.2-1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.21.0.2-1/Elements/0.21.0.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.21.0.2-1/Elements/0.21.0.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Elements/0.21.0.2-1/Elements/0.21.0.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/elements) | | btcpayserver/litecoin | 0.21.2.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1/Litecoin/0.21.2.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1/Litecoin/0.21.2.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Litecoin/0.21.2.1/Litecoin/0.21.2.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/litecoin) | | wakiyamap/docker-monacoin | 0.20.2 | [✔️](https://raw.githubusercontent.com/wakiyamap/docker-bitcoin/master/monacoin/0.20.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/wakiyamap/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/wakiyamap/docker-monacoin) | -| btcpayserver/monero | 0.18.0.0-amd64 | [✔️](https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Kukks/monero-docker) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | +| btcpayserver/monero | 0.18.0.0-amd64 | [✔️](https://github.com/btcpayserver/dockerfile-deps/blob/master/Monero/0.18.0.0/linuxamd64.Dockerfile) | ️❌ | [✔️](https://github.com/btcpayserver/dockerfile-deps/blob/master/Monero/0.18.0.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | | redis | 6.2.2-buster | [✔️](https://raw.githubusercontent.com/docker-library/redis/f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c/5.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/redis) - [DockerHub](https://hub.docker.com/_/redis) | | bluewalletorganization/lndhub | v1.3.3 | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/BlueWallet/LndHub/v1.3.3/Dockerfile) | ️❌ | [Github](https://github.com/BlueWallet/LndHub) - [DockerHub](https://hub.docker.com/r/bluewalletorganization/lndhub) | | jvandrew/btcqbo | 0.3.36 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.3.36/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/btcqbo) - [DockerHub](https://hub.docker.com/r/jvandrew/btcqbo) | diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index eefb646..1c7add7 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -400,9 +400,11 @@ namespace DockerFileBuildHelper dockerInfo.SupportedByUs = false; break; case "monero": - dockerInfo.DockerFilePath = "Dockerfile"; - dockerInfo.GitLink = "https://github.com/Kukks/monero-docker"; - dockerInfo.GitRef = $"x86_64"; + dockerInfo.DockerFilePath = $"Monero/{NoRevision(image.Tag)}/linuxamd64.Dockerfile"; + dockerInfo.DockerFilePathARM64v8 = $"Monero/{NoRevision(image.Tag)}/linuxarm64v8.Dockerfile"; + dockerInfo.GitLink = "https://github.com/btcpayserver/dockerfile-deps"; + dockerInfo.GitRef = $"Monero/{image.Tag}"; + dockerInfo.SupportedByUs = true; break; case "bitcoin": { diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 79ca6fe..b433360 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -450,26 +450,16 @@ cd - && cd .. # Build monero -# https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile -DOCKERFILE="Dockerfile" -echo "Building btcpayserver/monero:0.18.0.0-amd64" -git clone https://github.com/Kukks/monero-docker monero +# https://github.com/btcpayserver/dockerfile-deps/blob/master/Monero/0.18.0.0/linuxamd64.Dockerfile +DOCKERFILE="Monero/0.18.0.0/linuxamd64.Dockerfile" +# https://github.com/btcpayserver/dockerfile-deps/blob/master/Monero/0.18.0.0/linuxarm64v8.Dockerfile +[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Monero/0.18.0.0/linuxarm64v8.Dockerfile" +echo "Building btcpayserver/monero:0.18.0.0" +git clone https://github.com/btcpayserver/dockerfile-deps monero cd monero -git checkout x86_64 +git checkout Monero/0.18.0.0 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/monero:0.18.0.0-amd64" . -cd - && cd .. - - -# Build monero -# https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile -DOCKERFILE="Dockerfile" -echo "Building btcpayserver/monero:0.18.0.0-amd64" -git clone https://github.com/Kukks/monero-docker monero -cd monero -git checkout x86_64 -cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/monero:0.18.0.0-amd64" . +docker build -f "$DOCKERFILE" -t "btcpayserver/monero:0.18.0.0" . cd - && cd .. @@ -733,7 +723,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 .. @@ -1151,5 +1141,3 @@ git checkout master cd "$(dirname $DOCKERFILE)" docker build -f "$DOCKERFILE" -t "romanornr/docker-viacoin:0.15.2" . cd - && cd .. - -