diff --git a/bin/disinto b/bin/disinto index 530cf1f..7a9482b 100755 --- a/bin/disinto +++ b/bin/disinto @@ -278,11 +278,9 @@ services: ports: - "80:80" - "443:443" - environment: - - DISINTO_VERSION=${DISINTO_VERSION:-main} - - FORGE_URL=http://forgejo:3000 volumes: - ./docker/Caddyfile:/etc/caddy/Caddyfile + - ./docker/edge/dispatcher.sh:/usr/local/bin/dispatcher.sh:ro - caddy_data:/data - /var/run/docker.sock:/var/run/docker.sock depends_on: diff --git a/docker/edge/Dockerfile b/docker/edge/Dockerfile index 7076f51..8914a51 100644 --- a/docker/edge/Dockerfile +++ b/docker/edge/Dockerfile @@ -1,4 +1,3 @@ FROM caddy:alpine RUN apk add --no-cache bash jq curl git docker-cli -COPY entrypoint-edge.sh /usr/local/bin/entrypoint-edge.sh -ENTRYPOINT ["bash", "/usr/local/bin/entrypoint-edge.sh"] +COPY dispatcher.sh /usr/local/bin/dispatcher.sh diff --git a/docker/edge/entrypoint-edge.sh b/docker/edge/entrypoint-edge.sh deleted file mode 100755 index b070b61..0000000 --- a/docker/edge/entrypoint-edge.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -DISINTO_VERSION="${DISINTO_VERSION:-main}" -DISINTO_REPO="${FORGE_URL:-http://forgejo:3000}/johba/disinto.git" - -# Shallow clone at the pinned version -if [ ! -d /opt/disinto/.git ]; then - git clone --depth 1 --branch "$DISINTO_VERSION" "$DISINTO_REPO" /opt/disinto -fi - -# Start dispatcher in background -bash /opt/disinto/docker/edge/dispatcher.sh & - -# Caddy as main process -exec caddy run --config /etc/caddy/Caddyfile --adapter caddyfile