Compare commits
No commits in common. "2a9239a32f60def315dd4376b7376a90eb027e97" and "4f5c8cee51528da9a006874b6e1d1ce4729f322f" have entirely different histories.
2a9239a32f
...
4f5c8cee51
3 changed files with 2 additions and 21 deletions
|
|
@ -278,11 +278,9 @@ services:
|
||||||
ports:
|
ports:
|
||||||
- "80:80"
|
- "80:80"
|
||||||
- "443:443"
|
- "443:443"
|
||||||
environment:
|
|
||||||
- DISINTO_VERSION=${DISINTO_VERSION:-main}
|
|
||||||
- FORGE_URL=http://forgejo:3000
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./docker/Caddyfile:/etc/caddy/Caddyfile
|
- ./docker/Caddyfile:/etc/caddy/Caddyfile
|
||||||
|
- ./docker/edge/dispatcher.sh:/usr/local/bin/dispatcher.sh:ro
|
||||||
- caddy_data:/data
|
- caddy_data:/data
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
FROM caddy:alpine
|
FROM caddy:alpine
|
||||||
RUN apk add --no-cache bash jq curl git docker-cli
|
RUN apk add --no-cache bash jq curl git docker-cli
|
||||||
COPY entrypoint-edge.sh /usr/local/bin/entrypoint-edge.sh
|
COPY dispatcher.sh /usr/local/bin/dispatcher.sh
|
||||||
ENTRYPOINT ["bash", "/usr/local/bin/entrypoint-edge.sh"]
|
|
||||||
|
|
|
||||||
|
|
@ -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
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue