Merge pull request #85 from sineverba/release-4.3.0

Release 4.3.0

Author: sineverba

.deploy/scripts/build.sh

@@ -0,0 +1,39 @@
+version: v1.0
+
+name: Build and deploy Pipeline
+agent:
+  machine:
+    type: e1-standard-2
+    os_image: ubuntu1804
+execution_time_limit:
+  hours: 3
+
+global_job_config:
+
+  prologue:
+    commands:
+      - echo $DOCKER_TOKEN | docker login --username "$DOCKER_USERNAME" --password-stdin
+
+  env_vars:
+    - name: DOCKER_USERNAME
+      value: sineverba
+    - name: DOCKER_IMAGE
+      value: cfhookbash
+
+blocks:
+  - name: 'Build and deploy'
+    task:
+      jobs:
+        - name: 'Build and deploy'
+          commands:
+            - 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
+            - 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 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
+      secrets:
+        - name: DOCKER_TOKEN

.deploy/scripts/deploy.sh

@@ -0,0 +1,41 @@
+version: v1.0
+
+name: Build and test Pipeline
+agent:
+  machine:
+    type: e1-standard-2
+    os_image: ubuntu1804
+
+global_job_config:
+
+  prologue:
+    commands:
+      - echo $DOCKER_TOKEN | docker login --username "$DOCKER_USERNAME" --password-stdin
+
+  env_vars:
+    - name: DOCKER_USERNAME
+      value: sineverba
+    - name: DOCKER_IMAGE
+      value: cfhookbash
+
+blocks:
+  - name: 'Build and test'
+    skip:
+      when: "tag =~ '.*'"
+    task:
+      jobs:
+        - name: 'Build and test'
+          commands:
+            - checkout
+            - docker build --tag $DOCKER_USERNAME/$DOCKER_IMAGE --file ./docker/Dockerfile .
+            - docker run -it --rm --name cfhookbash $DOCKER_USERNAME/$DOCKER_IMAGE | grep "Using main config file /app/dehydrated/config"
+            - docker run -it --rm --name cfhookbash $DOCKER_USERNAME/$DOCKER_IMAGE | grep "Registering account"
+
+      secrets:
+        - name: DOCKER_TOKEN
+
+promotions:
+  - name: Deploy
+    pipeline_file: deploy.yml
+    auto_promote:
+      when: "result = 'passed' and tag =~ '.*'"

.deploy/scripts/test.sh

@@ -1,36 +1,19 @@
 os: linux
-
 dist: bionic
-
 language: shell
 
 env:
   DOCKER_USERNAME: sineverba
   DOCKER_IMAGE: cfhookbash
 
 before_install:
-  - export VCS_REF=$(git rev-parse --short HEAD)
-  - |
-    if [[ $TRAVIS_BRANCH == "master" || $TRAVIS_BRANCH == "develop" || $TRAVIS_TAG != "" ]]; then
-      chmod +x ./.deploy/scripts/build.sh
-      chmod +x ./.deploy/scripts/test.sh
-      chmod +x ./.deploy/scripts/deploy.sh
-    fi
+  - echo "before install"
 
 install:
-  - |
-    if [[ $TRAVIS_BRANCH == "master" || $TRAVIS_BRANCH == "develop" || $TRAVIS_TAG != "" ]]; then
-    ./.deploy/scripts/build.sh
-    fi
+  - echo "install"
 
 script:
-  - |
-    if [[ $TRAVIS_BRANCH == "master" || $TRAVIS_BRANCH == "develop" || $TRAVIS_TAG != "" ]]; then
-      ./.deploy/scripts/test.sh
-    fi
+  - echo "script"
 
 after_success:
-  - |
-    if [[ $TRAVIS_TAG != "" ]]; then
-    ./.deploy/scripts/deploy.sh
-    fi
+  - echo "after success"

.semaphore/deploy.yml

@@ -1,4 +1,12 @@
-# 4.2.0
+# 4.3.0
++ Remove Docker implementation (not completed)
++ Remove config folder (for old Docker)
++ Add Dockerfile
++ Add instructions for Docker
++ Add semaphore
++ Fix semaphore
+
+## 4.2.0
 + Add hook-chaining support
 + Improve logging/error messages
 

.semaphore/semaphore.yml

@@ -26,6 +26,7 @@ We accept contributions via Pull Requests.
 
    - Create a branch `feature-myawesomefeature` or `hotfix-myhotfix` from `develop`
    - Push your branch against `develop` branch.
+   - Update `CHANGELOG.md` under a `#Next version` section
 
 - **One pull request per feature** - If you want to do more than one thing, send multiple pull requests.
 

.travis.yml

@@ -1,23 +1,20 @@
 build:
-		@docker build --tag sineverba/cfhookbash:latest --build-arg VCS_REF=`git rev-parse --short HEAD` --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` --file ./docker/Dockerfile .
+	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
 
 run:
-		@docker run -it -v ${PWD}/certs:/certs -v ${PWD}/config:/config --name cfhookbash sineverba/cfhookbash:latest
+	#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
 
 test:
-		docker run -dit -v ${PWD}/certs:/certs -v ${PWD}/config:/config --name cfhookbash --entrypoint=/bin/sh sineverba/cfhookbash:latest
-		docker exec -it cfhookbash cat /dehydrated/dehydrated | grep 0.6.5
-		docker container stop cfhookbash
-		docker container rm cfhookbash
+	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"
 
 inspect:
-		docker run -it --entrypoint "/bin/bash" -v ${PWD}/certs:/certs -v ${PWD}/config:/config cfhookbash
-
-push:
-		docker push sineverba/cfhookbash:latest
+	#docker run -it --entrypoint "/bin/bash" -v ${PWD}/certs:/certs -v ${PWD}/config:/config cfhookbash
+	docker run -it --entrypoint "/bin/bash" cfhookbash
 
 destroy:
-		docker container stop cfhookbash
-		docker container rm cfhookbash
-		# sudo rm -r certs/
-		docker image rm sineverba/cfhookbash:latest
+	docker image rm sineverba/cfhookbash:latest

CHANGELOG.md

@@ -1,14 +1,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) |
+
 **If you like this project, or use it, please, star it!**
 
 Cloudflare Bash hook for [dehydrated](https://github.com/lukas2511/dehydrated).
 
-| CI / CD | Status |
-| ------- | ------ |
-| Travis  | [![Build Status](https://travis-ci.com/sineverba/cfhookbash.svg?branch=master)](https://travis-ci.com/sineverba/cfhookbash) |
-| Docker  | [![](https://images.microbadger.com/badges/image/sineverba/cfhookbash.svg)](https://microbadger.com/images/sineverba/cfhookbash "Get your own image badge on microbadger.com") |
 
 ## Why Cloudflare? What is this script?
 
@@ -136,28 +136,18 @@ Inspired by
 + [https://www.splitbrain.org/blog/2017-08/10-homeassistant_duckdns_letsencrypt](https://www.splitbrain.org/blog/2017-08/10-homeassistant_duckdns_letsencrypt)
 + [https://github.com/kappataumu/letsencrypt-Cloudflare-hook](https://github.com/kappataumu/letsencrypt-Cloudflare-hook)
 
-----------------------------------------------------
-
-### Docker mode - beware! Not stable and under development!
-+ Make a new dir (e.g. `mkdir -p /home/$USER/cfhookbashdocker`)
-+ Create a `certs` folder
-+ Create one or more folders with name of domain in `certs` (e.g. `certs/example.com` and `certs/test.example.com`)
-+ Create a `config` folder
-+ Create a `config.sh` file in `/config/` and fill it (see below how to get data)
-+ Create a `domains.txt` file in `/config/` and insert a domain for every line
-+ Make a first run in stage mode: create a `config` file under `/config` with this content `CA="https://acme-staging-v02.api.letsencrypt.org/directory"`
+## Docker version
 
-Run
++ Pull from Docker Hub: `docker pull sineverba/cfhookbash`
++ Make a first run, it will create the correct directories and files:
 
-``` shell
-docker run -it \
-  -v ${PWD}/certs:/certs \
-  -v ${PWD}/config:/config \
-  --name cfhookbash \
-  sineverba/cfhookbash:latest
+```shell
+$ docker run -it --rm -v $(pwd)/data:/app/dehydrated --name cfhookbash sineverba/cfhookbash:latest
 ```
++ Edit `data/config`, `data/config.sh` and `data/domains.txt`
++ Rerun:
 
-+ Certs will be available in `/certs`
-+ Docker run a cronjob every minute
+```shell
+$ docker run -it --rm -v $(pwd)/data:/app/dehydrated --name cfhookbash sineverba/cfhookbash:latest
+```
 
--------------------------------------------------------