Code reorganization

.github/workflows/build.yml

@@ -88,7 +88,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: Dockerfile
+          file: build/Dockerfile
           build-args: |
             RELEASE_VERSION_ARG="${{ join(steps.tags.outputs.result, ',') }}"
           platforms: linux/amd64,linux/arm64

Makefile

@@ -2,7 +2,7 @@ VERSION := $(shell git rev-parse --short HEAD)
 
 .PHONY: build
 build:
-	docker build -t byjg/easy-haproxy --build-arg RELEASE_VERSION_ARG="$(VERSION)" -t byjg/easy-haproxy:local .
+	docker build -t byjg/easy-haproxy --build-arg RELEASE_VERSION_ARG="$(VERSION)" -t byjg/easy-haproxy:local -f build/Dockerfile .
 
 .PHONY: test
 test:

README.md

@@ -12,13 +12,15 @@ This Docker image will dynamically create the `haproxy.cfg` based on the labels
 a simple Yaml.
 
 EasyHAProxy can detect and configure automatically HAProxy on the folowing platforms:
+
 - Docker
 - Docker Swarm
 - Kubernetes
 
 ## Features
 
-EasyHAProxy will discover the services based on the Docker Tags of the running containers in a Docker host or Docker Swarm cluster and dynamically set up the `haproxy.cfg`. Below, EasyHAProxy main features::
+EasyHAProxy will discover the services based on the Docker Tags of the running containers in a Docker host or Docker Swarm cluster and dynamically set up the `haproxy.cfg`. Below, EasyHAProxy main features:
+
 - Use Letsencrypt with HAProxy.
 - Set your custom SSL certificates
 - Balance traffic between multiple replicas
@@ -113,6 +115,7 @@ Important: easyhaproxy needs to be in the same network of the containers or othe
 This will query all `ingress` in the kubernetes cluster and check the annotation `kubernetes.io/ingress.class: easyhaproxy-ingress`.
 
 e.g.:
+
 ```yaml
 kind: Ingress
 metadata:
@@ -150,7 +153,7 @@ Caveats:
 - Only the first path `spec.rules[].http.paths[0]` will be parsed.
 - There are specific annotations can be added as described bellow.
 
-### Kubernetes annotations:
+### Kubernetes annotations
 
 | annotation                  | Description                                                                             | Default      | Example      |
 |-----------------------------|-----------------------------------------------------------------------------------------|--------------|--------------|
@@ -180,7 +183,7 @@ spec:
 
 Make sure your cluster is accessible both through ports 80 and 443.
 
-### Kubernetes and SSL:
+### Kubernetes and SSL
 
 You need to create a secret with your certificate and key, and associate them in your ingress.
 
@@ -213,7 +216,7 @@ spec:
     ...
 ```
 
-### Container (Docker or Swarm) labels:
+### Container (Docker or Swarm) labels
 
 | Tag                                   | Description                                                                                           | Default               | Example      |
 |---------------------------------------|-------------------------------------------------------------------------------------------------------|----------------|--------------|
@@ -387,6 +390,7 @@ docker run \
 ```
 
 Run your container:
+
 ```bash
 docker run \
     -l easyhaproxy.express.port=80 \
@@ -424,7 +428,6 @@ docker run \
     -d byjg/easy-haproxy
 ```
 
-
 ## Mapping custom .cfg files
 
 You can concatenate valid HAProxy `.cfg` files to the dynamically generated `haproxy.cfg` by mapping the folder `/etc/haproxy/conf.d`.
@@ -439,6 +442,7 @@ docker run \
 ## Mapping SSL certificates volumes
 
 EasyHAProxy stores the certificates inside the folder `/certs/haproxy` and `/certs/letsencrypt`.
+
 - If you want to preserve the letsencrypt certificates between reloads, map the folder `/certs/letsencrypt` to your volume. 
 - If you want to provide your certificates as a file instead of a Base64 parameter, map the folder `/certs/haproxy` to your volume, and instead of use `easyhaproxy.[definition].sslcert`, use `easyhaproxy.[definition].ssl: true`
 
@@ -486,7 +490,6 @@ where ERROR_NUMBER is the HTTP error code (e.g., `503.http`)
 
 ## Build
 
-
 ```bash
 docker build -t byjg/easy-haproxy .
 ```
@@ -494,6 +497,7 @@ docker build -t byjg/easy-haproxy .
 ## Limitations
 
 EasyHAProxy has some limitations when there is more than one easy-haproxy container running:
+
 - Replicas can be out-of-sync for a few seconds because each replica will discover the pods separately. 
 - Each replica will request a Letsencrypt certificate and can fail because the letsencrypt challenge can be directed to the other replica. 
 

build-multiarch.sh

@@ -17,7 +17,7 @@ podman run --rm --events-backend=file --cgroup-manager=cgroupfs --privileged doc
 
 for VERSION in $VERSIONS
 do
-  DOCKERFILE=Dockerfile
+  DOCKERFILE=build/Dockerfile
 
   buildah manifest create byjg/easy-haproxy:$VERSION
 
@@ -29,4 +29,3 @@ do
 
   buildah manifest push --all --format v2s2 byjg/easy-haproxy:$VERSION docker://byjg/easy-haproxy:$VERSION
 done
-

build/Dockerfile

@@ -8,7 +8,7 @@ ENV TZ="Etc/UTC"
 WORKDIR /scripts
 
 COPY src/ /scripts/
-COPY assets /
+COPY build/assets /
 
 RUN apk add --no-cache haproxy bash python3 py3-pip py-yaml certbot openssl \
  && ln -s /usr/bin/python3 /usr/bin/python \

deploy/docker/docker-compose.yml

@@ -23,10 +23,15 @@ services:
       - "443:443/tcp"
       - "1936:1936/tcp"
 
+    networks:
+      - easyhaproxy
+
 volumes:
   certs_letsencrypt:
+    external: true
   certs_haproxy:
+    external: true
 
 networks:
   easyhaproxy:
-    driver: bridge
+    external: true

deploy/docker/install.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+ASSETS_DIR="$(dirname "${BASH_SOURCE[0]}")"/../../build/assets/certs/haproxy
+
+docker network create easyhaproxy
+docker volume create certs_letsencrypt
+docker volume create certs_haproxy
+
+docker run -d --rm --name easyhaproxy_install -v certs_haproxy:/certs alpine tail -f /dev/null
+docker cp $ASSETS_DIR/.place_holder_cert.pem easyhaproxy_install:/certs/.place_holder_cert.pem
+docker stop easyhaproxy_install
+
+echo
+echo
+echo make sure to add to all of your containers:
+echo
+echo docker-compose
+echo ==============
+echo "networks:"
+echo "   default:"
+echo "     name: easyhaproxy"
+echo "     external: true"
+
+echo
+echo
+echo docker run
+echo ==============
+echo docker run ... --network easyhaproxy ... your_image:tag
+echo

deploy/kubernetes/easyhaproxy.yml

@@ -4,7 +4,6 @@ kind: Namespace
 metadata:
   name: easyhaproxy
 
-
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -86,7 +85,6 @@ subjects:
   name: easyhaproxy-ingress
   namespace: easyhaproxy
 
-
 ---
 apiVersion: apps/v1
 kind: DaemonSet
@@ -135,4 +133,3 @@ spec:
           value: "true"
         - name: EASYHAPROXY_SSL_MODE
           value: loose
-