Merge pull request #109 from sineverba/release-4.6.0

Release 4.6.0

Author: sineverba

.circleci/config.yml

@@ -4,7 +4,7 @@ name: Build and deploy Pipeline
 agent:
   machine:
     type: e1-standard-2
-    os_image: ubuntu1804
+    os_image: ubuntu2004
 execution_time_limit:
   hours: 3
 
@@ -29,7 +29,7 @@ blocks:
             - checkout
             - docker -v
             - mkdir -vp ~/.docker/cli-plugins/
-            - curl --silent -L "https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
+            - curl --silent -L "https://github.com/docker/buildx/releases/download/v0.7.1/buildx-v0.7.1.linux-amd64" > ~/.docker/cli-plugins/docker-buildx
             - chmod a+x ~/.docker/cli-plugins/docker-buildx
             - docker buildx version
             - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes

.semaphore/deploy.yml

@@ -4,7 +4,7 @@ name: Build and test Pipeline
 agent:
   machine:
     type: e1-standard-2
-    os_image: ubuntu1804
+    os_image: ubuntu2004
 
 global_job_config:
 

.semaphore/semaphore.yml

@@ -1,10 +1,11 @@
-# Next version
+# 4.6.0
 + Fix Cron output
 + Remove Travis and add Circle CI
 + Enable CircleCI
 + Fix documentation
 + Fix CircleCI badge
 + Update license year (yes, this project is alive!)
++ Upgrade dependencies / images
 
 ## 4.5.0
 + Rearrange instructions (for Docker)

CHANGELOG.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 - 2021 sineverba
+Copyright (c) 2018 - 2022 sineverba
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -1,20 +1,29 @@
+APP_VERSION=4.5.0
+BUILDX_VERSION=0.7.1
+
+
 build:
-	docker build --tag sineverba/cfhookbash:latest --file ./docker/Dockerfile .
+	docker build --tag sineverba/cfhookbash-dev:$(APP_VERSION) --file ./docker/Dockerfile .
 
 multi:
-	docker buildx build --platform linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 --tag sineverba/cfhookbash:latest --file ./docker/Dockerfile . --push
+	mkdir -vp ~/.docker/cli-plugins/
+	curl --silent -L "https://github.com/docker/buildx/releases/download/v$(BUILDX_VERSION)/buildx-v$(BUILDX_VERSION).linux-amd64" > ~/.docker/cli-plugins/docker-buildx
+	chmod a+x ~/.docker/cli-plugins/docker-buildx
+	docker buildx version
+	docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+	docker buildx create --name alfa && docker buildx use alfa && docker buildx inspect --bootstrap
+	docker buildx build --tag sineverba/cfhookbash-dev:latest --tag sineverba/cfhookbash-dev:$(APP_VERSION) --platform linux/amd64,linux/armhf,linux/arm64 --file ./docker/Dockerfile .
+	docker buildx rm alfa
 
 run:
-	#docker run -it -v ${PWD}/certs:/certs -v ${PWD}/config:/config --name cfhookbash sineverba/cfhookbash:latest
-	docker run -it --rm --name cfhookbash sineverba/cfhookbash:latest
+	docker run -it --rm --name cfhookbash sineverba/cfhookbash-dev:$(APP_VERSION)
 
 test:
-	docker run -it --rm --name cfhookbash sineverba/cfhookbash:latest | grep "INFO: Using main config file /app/dehydrated/config"
-	docker run -it --rm --name cfhookbash sineverba/cfhookbash:latest | grep "Registering account"
+	docker run -it --rm --name cfhookbash sineverba/cfhookbash-dev:$(APP_VERSION) | grep "INFO: Using main config file /app/dehydrated/config"
+	docker run -it --rm --name cfhookbash sineverba/cfhookbash-dev:$(APP_VERSION) | grep "Registering account"
 
 inspect:
-	#docker run -it --entrypoint "/bin/bash" -v ${PWD}/certs:/certs -v ${PWD}/config:/config cfhookbash
 	docker run -it --entrypoint "/bin/bash" cfhookbash
 
 destroy:
-	docker image rm sineverba/cfhookbash:latest
+	docker image rm sineverba/cfhookbash-dev:$(APP_VERSION)

Makefile

@@ -4,15 +4,14 @@ Cloudflare dns-01 challenge hook bash for dehydrated
 | CD / CI   |           |
 | --------- | --------- |
 | Semaphore CI | [![Build Status](https://sineverba.semaphoreci.com/badges/cfhookbash/branches/master.svg)](https://sineverba.semaphoreci.com/projects/cfhookbash) |
-| Circle CI | [![CircleCI](https://circleci.com/gh/sineverba/cfhookbash.svg?style=svg)](https://circleci.com/gh/sineverba/cfhookbash) |
 
 **If you like this project, or use it, please, star it!**
 
 Cloudflare Bash hook for [dehydrated](https://github.com/dehydrated-io/dehydrated).
 
 ## Docker version
 
-For Docker version usage, see [wiki](https://github.com/sineverba/cfhookbash/wiki/Docker-usage)
+For [Docker](https://hub.docker.com/r/sineverba/cfhookbash) version usage, see [wiki](https://github.com/sineverba/cfhookbash/wiki/Docker-usage)
 
 
 ## Why Cloudflare? What is this script?

README.md

@@ -1,6 +1,6 @@
-FROM alpine:3.12.3
+FROM alpine:3.15.0
 
-RUN apk add --no-cache bash curl jq openssl --upgrade grep
+RUN apk update && apk upgrade && apk add --no-cache bash curl jq openssl --upgrade grep
 
 RUN mkdir -p dehydrated /app/dehydrated