Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

Merge remote-tracking branch 'origin/next' into v5-parallel-inertia-react

Andras Bacsaidf854feee8e8
diff --cc docker-compose-maxio.dev.yml
index fe80a91e96,61037391bc..0cc986acb7
--- a/docker-compose-maxio.dev.yml
+++ b/docker-compose-maxio.dev.yml
@@@ -8,16 -8,14 +8,18 @@@ services
args:
- USER_ID=${USERID:-1000}
- GROUP_ID=${GROUPID:-1000}
+ - COOLIFY_FLUX_VERSION=${COOLIFY_FLUX_VERSION:-nightly}
+ - COOLIFY_CLI_VERSION=${COOLIFY_CLI_VERSION:-nightly}
ports:
- "${APP_PORT:-8000}:8080"
+ extra_hosts:
+ - "host.docker.internal:host-gateway"
environment:
AUTORUN_ENABLED: false
- PUSHER_HOST: "${PUSHER_HOST}"
- PUSHER_PORT: "${PUSHER_PORT}"
+ COOLIFY_FLUX_VERSION: "${COOLIFY_FLUX_VERSION:-nightly}"
+ COOLIFY_CLI_VERSION: "${COOLIFY_CLI_VERSION:-nightly}"
+ PUSHER_HOST: "${PUSHER_HOST:-}"
+ PUSHER_PORT: "${PUSHER_PORT:-}"
PUSHER_SCHEME: "${PUSHER_SCHEME:-http}"
PUSHER_APP_ID: "${PUSHER_APP_ID:-coolify}"
PUSHER_APP_KEY: "${PUSHER_APP_KEY:-coolify}"
diff --cc docker-compose.dev.yml
index 9bd8286861,8f84b5d600..555c8660c1
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@@ -8,23 -8,14 +8,25 @@@ services
args:
- USER_ID=${USERID:-1000}
- GROUP_ID=${GROUPID:-1000}
+ - COOLIFY_FLUX_VERSION=${COOLIFY_FLUX_VERSION:-nightly}
+ - COOLIFY_FLUX_CHECKSUM=${COOLIFY_FLUX_CHECKSUM:-unknown}
+ - COOLIFY_CLI_VERSION=${COOLIFY_CLI_VERSION:-nightly}
+ - COOLIFY_CLI_CHECKSUM=${COOLIFY_CLI_CHECKSUM:-unknown}
ports:
- "${APP_PORT:-8000}:8080"
+ - "${FORWARD_FLUX_PORT:-6443}:6443"
+ extra_hosts:
+ - "host.docker.internal:host-gateway"
environment:
AUTORUN_ENABLED: false
- PUSHER_HOST: "${PUSHER_HOST}"
- PUSHER_PORT: "${PUSHER_PORT}"
+ COOLIFY_CONTAINER_ROLE: "${COOLIFY_CONTAINER_ROLE:-all}"
+ COOLIFY_COOLD_VERSION: "${COOLIFY_COOLD_VERSION:-nightly}"
+ COOLIFY_FLUX_VERSION: "${COOLIFY_FLUX_VERSION:-nightly}"
+ COOLIFY_CLI_VERSION: "${COOLIFY_CLI_VERSION:-nightly}"
+ COOLIFY_CLI_SSH_USER: "${COOLIFY_CLI_SSH_USER:-}"
+ COOLIFY_CORROSION_VERSION: "${COOLIFY_CORROSION_VERSION:-v1.0.0}"
+ PUSHER_HOST: "${PUSHER_HOST:-}"
+ PUSHER_PORT: "${PUSHER_PORT:-}"
PUSHER_SCHEME: "${PUSHER_SCHEME:-http}"
PUSHER_APP_ID: "${PUSHER_APP_ID:-coolify}"
PUSHER_APP_KEY: "${PUSHER_APP_KEY:-coolify}"