diff --git a/.env b/.env index ec7edca352..9bc036ec18 100644 --- a/.env +++ b/.env @@ -1,4 +1,3 @@ -SITE_URL=localhost DB_PASSWORD=changeme # GitHub OAuth- https://docs.github.com/en/developers/apps/building-oauth-apps/creating-an-oauth-app diff --git a/Caddyfile b/Caddyfile index 419b192ad4..324de536f0 100644 --- a/Caddyfile +++ b/Caddyfile @@ -1,4 +1,4 @@ -{$SITE_URL} { +:80 { bind {$ADDRESS} reverse_proxy /* windmill:8000 } diff --git a/README.md b/README.md index e8c069c273..7cee3d8c14 100644 --- a/README.md +++ b/README.md @@ -104,8 +104,7 @@ Windmill is fully open-sourced: ## How to self-host -`docker volume create caddy_data && docker-compose up` with the following -docker-compose is sufficient: +`docker compose up` with the following docker-compose is sufficient: The default super-admin user is: admin@windmill.dev / changeme diff --git a/docker-compose.yml b/docker-compose.yml index 4182417316..7ce8e051a9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,11 +23,11 @@ services: privileged: true restart: unless-stopped ports: - - 8000:8000 + - 80:8000 environment: - DATABASE_URL=postgres://postgres:${DB_PASSWORD}@db/windmill?sslmode=disable - APP_USER_PASSWORD=changeme - - BASE_URL=https://${SITE_URL} + - BASE_URL=http://localhost - BASE_INTERNAL_URL=http://localhost:8000 - RUST_LOG=info - NUM_WORKERS=3 @@ -38,20 +38,6 @@ services: depends_on: db: condition: service_healthy - - caddy: - image: caddy - restart: unless-stopped - environment: - - SITE_URL=${SITE_URL} - ports: - - 80:80 - - 443:443 - volumes: - - $PWD/Caddyfile:/etc/caddy/Caddyfile - - caddy_data:/data - volumes: - caddy_data: - external: true + db_data: null