Merge pull request 'add reverse-proxy details' (#7) from develop into main [CI SKIP]

Reviewed-on: #7

.drone.yml

@@ -1,12 +1,11 @@
 kind: pipeline
 type: docker
-name: build-main-images
+name: build-release-images
 trigger:
   event:
     exclude:
     - pull_request
   ref:
-    - refs/heads/main
     - refs/tags/**
 
 platform:
@@ -19,36 +18,16 @@ steps:
   image: docker:git
   commands:
     - git fetch --tags
-  when:
-    ref:
-      - refs/tags/**
   depends_on:
     - clone
 
-  # Set tags for main branch
 - name: make-tags
-  image: node
-  commands:
-    - echo -n "${DRONE_COMMIT_SHA:0:8}, latest" > .tags
-  when:
-    ref:
-      - refs/heads/main
-  depends_on:
-    - get-tags
-    - clone
-
-- name: make-tags-release
   image: node
   commands:
     - echo -n "${DRONE_TAG}, latest" > .tags
-  when:
-    ref:
-      - refs/tags/**
   depends_on:
     - get-tags
-    - clone
 
-  # Build containers from main branch
 - name: build-gitea
   image: thegeeklab/drone-docker-buildx
   privileged: true
@@ -65,7 +44,6 @@ steps:
       - linux/amd64
   depends_on:
     - make-tags
-    - make-tags-release
 
 - name: build-github
   image: thegeeklab/drone-docker-buildx
@@ -83,7 +61,6 @@ steps:
       - linux/amd64
   depends_on:
     - make-tags
-    - make-tags-release
 
 - name: release-gitea
   image: goreleaser/goreleaser
@@ -92,9 +69,6 @@ steps:
       from_secret: gitea_token
   commands:
     - goreleaser release -f .goreleaser-gitea.yaml
-  when:
-    ref:
-      - refs/tags/**
   depends_on:
     - build-gitea
 
@@ -105,9 +79,6 @@ steps:
       from_secret: github_token
   commands:
     - goreleaser release -f .goreleaser-github.yaml
-  when:
-    ref:
-      - refs/tags/**
   depends_on:
     - build-github
 
@@ -123,6 +94,78 @@ steps:
   depends_on:
     - release-gitea
     - release-github
+
+---
+kind: pipeline
+type: docker
+name: build-main-images
+trigger:
+  event:
+    exclude:
+    - pull_request
+  ref:
+    - refs/heads/main
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
+
+- name: make-tags
+  image: node
+  commands:
+    - echo -n "${DRONE_COMMIT_SHA:0:8}, latest" > .tags
+  when:
+    ref:
+      - refs/heads/main
+  depends_on:
+    - clone
+
+- name: build-gitea
+  image: thegeeklab/drone-docker-buildx
+  privileged: true
+  settings:
+    provenance: false
+    registry: git.mrmeeb.stream
+    username: 
+      from_secret: docker_username
+    password: 
+      from_secret: docker_password
+    repo: git.mrmeeb.stream/mrmeeb/cronicle
+    platforms:
+      - linux/arm64
+      - linux/amd64
+  depends_on:
+    - make-tags
+
+- name: build-github
+  image: thegeeklab/drone-docker-buildx
+  privileged: true
+  settings:
+    provenance: false
+    registry: ghcr.io
+    username: 
+      from_secret: docker_username
+    password: 
+      from_secret: github_token
+    repo: ghcr.io/mrmeeb/cronicle
+    platforms:
+      - linux/arm64
+      - linux/amd64
+  depends_on:
+    - make-tags
+
+- name: notify
+  image: plugins/slack
+  when:
+    status:
+    - success
+    - failure
+  settings:
+    webhook: 
+      from_secret: slack_webhook
+  depends_on:
     - build-github
     - build-gitea
 

Dockerfile

@@ -10,7 +10,7 @@ ENV S6_OVERLAY_ARCH=aarch64
 FROM base-${TARGETARCH}${TARGETVARIANT}
 
 ARG S6_OVERLAY_VERSION=3.1.5.0
-ARG CRONICLE_EDGE_VERSION=1.6.2
+ARG CRONICLE_EDGE_VERSION=.1.6.3
 
 ENV CRONICLE_foreground=1
 ENV CRONICLE_echo=1

README.md

@@ -92,6 +92,35 @@ services:
 
 This container automatically checks for scripts in `/config/init` and runs them at startup. This could be useful if you need to install additional applications into a worker container so it can execute jobs.
 
+## Reverse Proxying
+
+For a single manager behind a reverse proxy, you may need to specify a specific route for the web-socket connections.
+
+An example using nginx: 
+
+```  
+  location /socket.io/ {
+        client_max_body_size                    2048m;
+        proxy_read_timeout                      86400s;
+        proxy_send_timeout                      86400s;
+        proxy_set_header                        X-Forwarded-Host $host;
+        proxy_set_header                        X-Forwarded-Server $host;
+        proxy_set_header                        X-Real-IP $remote_addr;
+        proxy_set_header                        Host $host;
+        proxy_set_header                        X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_http_version                      1.1;
+        proxy_redirect                          off;
+        proxy_set_header                        Upgrade $http_upgrade;
+        proxy_set_header                        Connection "upgrade"; 
+
+    proxy_pass          http://localhost:3012/socket.io/;
+  }
+  ```
+
+Source: https://github.com/jhuckaby/Cronicle/issues/535
+
+Load-balancing between multiple managers, as described [here](https://github.com/jhuckaby/Cronicle/blob/master/docs/Setup.md#load-balancers), has not been tested, and could behave strangely due to docker DNS.
+
 ## Ports
 
 |Port |Description|