From db5edef4f0aef735125bc7fa1164865f5f25a367 Mon Sep 17 00:00:00 2001 From: timothymiller Date: Wed, 16 Dec 2020 18:55:06 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=96=A5=EF=B8=8F=20=20Complete=20Official?= =?UTF-8?q?=20Python=20Docker=20Image=20support=20=F0=9F=93=9A=20Updated?= =?UTF-8?q?=20README.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 32 ++++++++++++++++++++++++++++---- docker-build-all.sh | 2 ++ docker-build.sh | 2 +- 3 files changed, 31 insertions(+), 5 deletions(-) create mode 100755 docker-build-all.sh diff --git a/README.md b/README.md index 53ab5d1..162d933 100755 --- a/README.md +++ b/README.md @@ -106,16 +106,40 @@ docker-compose up -d Create a config.json file with your production credentials. -Give build-docker-image.sh permission to execute. +### 💖 Please Note + +The optional `docker-build-all.sh` script requires Docker experimental support to be enabled. + +Docker Hub has experimental support for multi-architecture builds. Their official blog post specifies easy instructions for building with [Mac and Windows versions of Docker Desktop](https://docs.docker.com/docker-for-mac/multi-arch/). + +1. Choose build platform + +- Multi-architecture (experimental) `docker-build-all.sh` + +- Linux/amd64 by default `docker-build.sh` + +Give your bash script permission to execute. ```bash -sudo chmod +x ./build-docker-image.sh +sudo chmod +x ./docker-build.sh ``` -At project root, run the build-docker-image.sh script. +```bash +sudo chmod +x ./docker-build-all.sh +``` + +At project root, run the `docker-build.sh` script. + +Recommended for local development ```bash -./build-docker-image.sh +./docker-build.sh +``` + +Recommended for production + +```bash +./docker-build-all.sh ``` ### Run the locally compiled version diff --git a/docker-build-all.sh b/docker-build-all.sh new file mode 100755 index 0000000..199937b --- /dev/null +++ b/docker-build-all.sh @@ -0,0 +1,2 @@ +docker buildx build --platform linux/ppc64le,linux/s390x,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/amd64 --tag timothyjmiller/cloudflare-ddns:latest . +# TODO: Support linux/riscv64 \ No newline at end of file diff --git a/docker-build.sh b/docker-build.sh index dd400f6..358e3bd 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -1 +1 @@ -docker buildx build --platform linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/amd64 --tag timothyjmiller/cloudflare-ddns:latest . \ No newline at end of file +docker build --platform linux/amd64 --tag timothyjmiller/cloudflare-ddns:latest . \ No newline at end of file