From b4b3ea0b56533ffc133a92d9d326ed87ca887780 Mon Sep 17 00:00:00 2001 From: sineverba Date: Fri, 5 Feb 2021 14:01:41 +0100 Subject: [PATCH 1/2] Add ARM64 architecture --- .semaphore/deploy.yml | 2 +- CHANGELOG.md | 1 + Makefile | 2 +- README.md | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.semaphore/deploy.yml b/.semaphore/deploy.yml index e5aab7a..6155415 100644 --- a/.semaphore/deploy.yml +++ b/.semaphore/deploy.yml @@ -34,6 +34,6 @@ blocks: - docker buildx version - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - docker buildx create --name mybuilder && docker buildx use mybuilder && docker buildx inspect --bootstrap - - docker buildx build --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7 --tag $DOCKER_USERNAME/$DOCKER_IMAGE:$SEMAPHORE_GIT_TAG_NAME --tag $DOCKER_USERNAME/$DOCKER_IMAGE:latest --file ./docker/Dockerfile . --push + - docker buildx build --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 --tag $DOCKER_USERNAME/$DOCKER_IMAGE:$SEMAPHORE_GIT_TAG_NAME --tag $DOCKER_USERNAME/$DOCKER_IMAGE:latest --file ./docker/Dockerfile . --push secrets: - name: DOCKER_TOKEN \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 63abdaa..44eafe5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Next version + Rearrange instructions (for Docker) ++ Add `linux/arm64` architecture ## 4.4.0 + Remove force renew from Docker diff --git a/Makefile b/Makefile index fc62c6d..6a67f03 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ build: docker build --tag sineverba/cfhookbash:latest --file ./docker/Dockerfile . multi: - docker buildx build --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7 --tag sineverba/cfhookbash:latest --file ./docker/Dockerfile . --push + docker buildx build --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 --tag sineverba/cfhookbash:latest --file ./docker/Dockerfile . --push run: #docker run -it -v ${PWD}/certs:/certs -v ${PWD}/config:/config --name cfhookbash sineverba/cfhookbash:latest diff --git a/README.md b/README.md index 490aaaf..764a045 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,8 @@ Cloudflare dns-01 challenge hook bash for dehydrated Cloudflare Bash hook for [dehydrated](https://github.com/lukas2511/dehydrated). +## Docker version + For Docker version usage, see [wiki](https://github.com/sineverba/cfhookbash/wiki/Docker-usage) From 29701268c6c87d34d2a9f1f87e00ec7dc25c97e0 Mon Sep 17 00:00:00 2001 From: sineverba Date: Sun, 7 Feb 2021 11:44:57 +0100 Subject: [PATCH 2/2] Add date to output log --- CHANGELOG.md | 1 + README.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44eafe5..ef8ce69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Next version + Rearrange instructions (for Docker) + Add `linux/arm64` architecture ++ Add date to log ## 4.4.0 + Remove force renew from Docker diff --git a/README.md b/README.md index 764a045..94bc717 100644 --- a/README.md +++ b/README.md @@ -111,7 +111,7 @@ Following script will run every monday at 4AM and will create a log in home fold `$ sudo crontab -e` ``` shell -0 4 * * 1 cd /home/YOUR_USER/dehydrated && /home/YOUR_USER/dehydrated/dehydrated -c -t dns-01 -k '/home/YOUR_USER/cfhookbash/hook.sh' >> /home/YOUR_USER/cfhookbash.log +0 4 * * 1 cd /home/YOUR_USER/dehydrated && /home/YOUR_USER/dehydrated/dehydrated -c -t dns-01 -k '/home/YOUR_USER/cfhookbash/hook.sh' >> /home/YOUR_USER/"cfhookbash-$(date +'%Y-%m-%d-%H-%M-%S').log" ``` #### Update / upgrade