From 9905f5c4b75b384266c88dbc696e1430510603fa Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" <nicolas.dorier@gmail.com> Date: Mon, 18 Mar 2019 23:38:18 +0900 Subject: [PATCH] Fix woocommerce without hidden services --- README.md | 4 ++-- contrib/build-all-images.sh | 16 ++++++++-------- .../docker-fragments/opt-add-woocommerce.yml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 4b7b159..013457f 100644 --- a/README.md +++ b/README.md @@ -333,13 +333,13 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H | 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.5 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.5/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.5/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) | -| opt-add-btcqbo.yml | jvandrew/btcqbo | 0.3.25 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.3.25/Dockerfile) | ️❌ | [Github](https://github.com/JeffVandrewJr/btcqbo) - [DockerHub](https://hub.docker.com/r/jvandrew/btcqbo) | +| opt-add-btcqbo.yml | jvandrew/btcqbo | 0.3.32 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.3.32/Dockerfile) | ️❌ | [Github](https://github.com/JeffVandrewJr/btcqbo) - [DockerHub](https://hub.docker.com/r/jvandrew/btcqbo) | | opt-add-btcqbo.yml | redis | 5.0.2-alpine | [✔️](https://raw.githubusercontent.com/docker-library/redis/f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c/5.0/Dockerfile) | ️❌ | [Github](https://github.com/docker-library/redis) - [DockerHub](https://hub.docker.com/_/redis) | | opt-add-librepatron.yml | jvandrew/librepatron | 0.7.31 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.31/Dockerfile) | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) | | opt-add-librepatron.yml | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) | | opt-add-tor.yml | btcpayserver/tor | 0.3.5.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.3.5.8/Tor/0.3.5.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.3.5.8/Tor/0.3.5.8/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) | | opt-add-tor.yml | btcpayserver/docker-gen | 0.7.5 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.5/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.5/linuxarm32v7.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | -| opt-add-woocommerce.yml | btcpayserver/docker-woocommerce | 3.0.6-2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.6-2/Dockerfile) | ️❌ | [Github](https://github.com/btcpayserver/docker-woocommerce) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-woocommerce) | +| 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) | [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) | [Github](https://github.com/containous/traefik-library-image) - [DockerHub](https://hub.docker.com/_/traefik) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 41d0a5f..fb26dd0 100755 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -377,14 +377,14 @@ cd - && cd .. # Build btcqbo -# https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.3.25/Dockerfile +# https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.3.32/Dockerfile DOCKERFILE="Dockerfile" -echo "Building jvandrew/btcqbo:0.3.25" +echo "Building jvandrew/btcqbo:0.3.32" git clone https://github.com/JeffVandrewJr/btcqbo btcqbo cd btcqbo -git checkout v0.3.25 +git checkout v0.3.32 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "jvandrew/btcqbo:0.3.25" . +docker build -f "$DOCKERFILE" -t "jvandrew/btcqbo:0.3.32" . cd - && cd .. @@ -455,14 +455,14 @@ cd - && cd .. # Build docker-woocommerce -# https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.6-2/Dockerfile +# https://raw.githubusercontent.com/btcpayserver/docker-woocommerce/v3.0.6-3/Dockerfile DOCKERFILE="Dockerfile" -echo "Building btcpayserver/docker-woocommerce:3.0.6-2" +echo "Building btcpayserver/docker-woocommerce:3.0.6-3" git clone https://github.com/btcpayserver/docker-woocommerce docker-woocommerce cd docker-woocommerce -git checkout v3.0.6-2 +git checkout v3.0.6-3 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "btcpayserver/docker-woocommerce:3.0.6-2" . +docker build -f "$DOCKERFILE" -t "btcpayserver/docker-woocommerce:3.0.6-3" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml b/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml index 0ab4a67..f9af887 100644 --- a/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml +++ b/docker-compose-generator/docker-fragments/opt-add-woocommerce.yml @@ -2,7 +2,7 @@ version: '3' services: woocommerce: - image: btcpayserver/docker-woocommerce:3.0.6-2 + image: btcpayserver/docker-woocommerce:3.0.6-3 environment: WOOCOMMERCE_HOST: ${WOOCOMMERCE_HOST} WORDPRESS_DB_HOST: mariadb