Normalize Railway upstream URL for web proxy
CI / Test (linux/amd64) (push) Waiting to run
CI / Lint (push) Waiting to run
CI / Cross-build (darwin/amd64) (push) Waiting to run
CI / Cross-build (linux/amd64) (push) Waiting to run
CI / Cross-build (darwin/arm64) (push) Waiting to run
CI / Cross-build (linux/arm64) (push) Waiting to run
CI / Test (linux/amd64) (push) Waiting to run
CI / Lint (push) Waiting to run
CI / Cross-build (darwin/amd64) (push) Waiting to run
CI / Cross-build (linux/amd64) (push) Waiting to run
CI / Cross-build (darwin/arm64) (push) Waiting to run
CI / Cross-build (linux/arm64) (push) Waiting to run
This commit is contained in:
+2
-2
@@ -6,13 +6,13 @@
|
|||||||
root * /srv
|
root * /srv
|
||||||
|
|
||||||
handle /api/* {
|
handle /api/* {
|
||||||
reverse_proxy {$URAPT_SERVER_URL} {
|
reverse_proxy {$URAPT_UPSTREAM} {
|
||||||
header_up Host {upstream_hostport}
|
header_up Host {upstream_hostport}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
handle /apt/* {
|
handle /apt/* {
|
||||||
reverse_proxy {$URAPT_SERVER_URL} {
|
reverse_proxy {$URAPT_UPSTREAM} {
|
||||||
header_up Host {upstream_hostport}
|
header_up Host {upstream_hostport}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,3 +12,6 @@ RUN pnpm build
|
|||||||
FROM caddy:2-alpine
|
FROM caddy:2-alpine
|
||||||
COPY --from=build /app/dist /srv
|
COPY --from=build /app/dist /srv
|
||||||
COPY Caddyfile /etc/caddy/Caddyfile
|
COPY Caddyfile /etc/caddy/Caddyfile
|
||||||
|
COPY docker-entrypoint.sh /usr/local/bin/urapt-web-entrypoint
|
||||||
|
RUN chmod +x /usr/local/bin/urapt-web-entrypoint
|
||||||
|
ENTRYPOINT ["/usr/local/bin/urapt-web-entrypoint"]
|
||||||
|
|||||||
@@ -76,6 +76,8 @@ In Railway, create a new service from this repo with:
|
|||||||
- Root Directory: `urapt-web`
|
- Root Directory: `urapt-web`
|
||||||
- Environment variable: `URAPT_SERVER_URL=https://your-urapt-server.up.railway.app`
|
- Environment variable: `URAPT_SERVER_URL=https://your-urapt-server.up.railway.app`
|
||||||
|
|
||||||
|
A trailing slash is okay; the container normalizes it before starting Caddy.
|
||||||
|
|
||||||
Do not set `VITE_API_BASE_URL` for this deployment; the UI should keep using the
|
Do not set `VITE_API_BASE_URL` for this deployment; the UI should keep using the
|
||||||
default same-origin `/api/v1` path.
|
default same-origin `/api/v1` path.
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
if [ -z "${URAPT_SERVER_URL:-}" ]; then
|
||||||
|
echo "URAPT_SERVER_URL is required, e.g. https://urapt-production.up.railway.app" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Caddy reverse_proxy upstreams may only contain scheme, host, and port.
|
||||||
|
# Railway/public URLs are often copied with a trailing slash; normalize that.
|
||||||
|
URAPT_UPSTREAM="$URAPT_SERVER_URL"
|
||||||
|
while [ "${URAPT_UPSTREAM%/}" != "$URAPT_UPSTREAM" ]; do
|
||||||
|
URAPT_UPSTREAM="${URAPT_UPSTREAM%/}"
|
||||||
|
done
|
||||||
|
export URAPT_UPSTREAM
|
||||||
|
|
||||||
|
exec caddy run --config /etc/caddy/Caddyfile --adapter caddyfile
|
||||||
Reference in New Issue
Block a user