Merge pull request #84 from sineverba/docker-dev

Docker dev

Author: sineverba

.semaphore/deploy.yml

@@ -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

.semaphore/semaphore.yml

@@ -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 =~ '.*'"

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Next version
 + 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

Makefile

@@ -0,0 +1,20 @@
+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
+
+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
+
+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"
+
+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

README.md

@@ -1,6 +1,10 @@
 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).
@@ -131,3 +135,19 @@ Everyone is welcome to contribute! See `CONTRIBUTING.md`
 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 version
+
++ Pull from Docker Hub: `docker pull sineverba/cfhookbash`
++ Make a first run, it will create the correct directories and files:
+
+```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:
+
+```shell
+$ docker run -it --rm -v $(pwd)/data:/app/dehydrated --name cfhookbash sineverba/cfhookbash:latest
+```
+

docker/Dockerfile

@@ -0,0 +1,16 @@
+FROM alpine:3.13.1
+
+RUN apk add --no-cache bash curl jq openssl --upgrade grep
+
+RUN mkdir -p dehydrated /app/dehydrated
+
+COPY docker/dehydrated/ /dehydrated/
+RUN chmod +x /dehydrated/dehydrated
+
+COPY ./hook.sh /dehydrated
+COPY ./config.default.sh /dehydrated/config.sh
+
+COPY docker/docker-entrypoint.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/docker-entrypoint.sh
+
+ENTRYPOINT [ "docker-entrypoint.sh" ]

docker/dehydrated/config

@@ -0,0 +1 @@
+CA="https://acme-staging-v02.api.letsencrypt.org/directory"