Merge 'feat/use-certapi' into master

Author: mesudip

.github/workflows/docker-image.yml

@@ -4,35 +4,46 @@ on:
   push:
     tags:
       - '*'
+    branches:
+      - master
 
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v3
-      -
-        name: Set up QEMU
+
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-      -
-        name: Set up Docker Buildx
+
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      -
-        name: Login to DockerHub
+
+      - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
           username: mesudip
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      -
-        name: Build and push
+      - name: Build and push for tags
+        if: startsWith(github.ref, 'refs/tags/')
         uses: docker/build-push-action@v3
         with:
           file: Dockerfile
           context: .
-          platforms: linux/amd64, linux/arm64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
             mesudip/nginx-proxy:${{ github.ref_name }}
             mesudip/nginx-proxy:latest
+
+      - name: Build and push for main branch
+        if: github.ref == 'refs/heads/master'
+        uses: docker/build-push-action@v3
+        with:
+          file: Dockerfile
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: mesudip/nginx-proxy:${{ github.sha }}

.gitignore

@@ -1,7 +1,8 @@
 venv/
+.venv/
+
 __pycache__/
 /.idea/
 /.run_data/
-/run_data
-.env
-.venv
+run_data/
+.env

main.py

@@ -73,8 +73,8 @@ def eventLoop():
                 process_network_event(eventAction, event)
             elif eventType == "container":
                 if eventAction == "health_status":
-                    break
-                    #process_container_health_event(event)
+                    # process_container_health_event(event)
+                    continue
                 else:
                     process_container_event(eventAction, event)
 
@@ -119,7 +119,8 @@ def process_network_event(action, event):
 try:
     server = WebServer(client)
     eventLoop()
-except (KeyboardInterrupt, SystemExit):
+except (KeyboardInterrupt, SystemExit) as e:
+    # traceback.print_exception(e)
     print("-------------------------------\nPerforming Graceful ShutDown !!")
     if server is not None:
         server.cleanup()

run_local.sh

@@ -7,5 +7,7 @@
 #
 
 mkdir -p ./.run_data/conf.d
-#
-DUMMY_NGINX=y CHALLENGE_DIR=./.run_data/acme_challenges SSL_DIR=./.run_data NGINX_CONF_DIR=./.run_data python3 main.py
+
+LETSENCRYPT_API=https://acme-staging-v02.api.letsencrypt.org/directory \
+CHALLENGE_DIR=./.run_data/acme_challenges \
+DUMMY_NGINX=y SSL_DIR=./.run_data NGINX_CONF_DIR=./.run_data python3 main.py