Merge pull request #113 from ritual-net/docker-compose-sveltekit-env

Docker Compose setup: include default environment variables in `.env.docker`

.env.docker.example

@@ -7,3 +7,11 @@ EDGEDB_SERVER_PASSWORD=secret
 # A SendGrid API Key used to authenticate the SendGrid email relay service (https://www.twilio.com/docs/sendgrid/api-reference).
 # To use a different email relay service, modify the environment variables in docker-compose.yml found at services › smtp › environment.
 SENDGRID_KEY=SG.xx-xxxxxxxxxxxx-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+# ---
+
+# Variables shared by EdgeDB and SvelteKit – do not edit
+EDGEDB_HOST=edgedb
+EDGEDB_PORT=5656
+EDGEDB_BRANCH=main
+EDGEDB_SERVER_PROTOCOL=http

README.md

@@ -232,7 +232,7 @@ To access the Infernet Cloud UI from a different machine, you will need to set u
 Find more commands and their definitions in the `scripts` section of [`package.json`](package.json).
 
 
-## Docker Compose setup (recommended for production)
+## Docker Compose setup
 
 1. Install [Docker Compose](https://docs.docker.com/compose/install).
 

dbschema/bootstrap/auth.edgeql

@@ -11,7 +11,10 @@ ext::auth::AuthConfig::token_time_to_live := <duration>"24 hours";
 CONFIGURE CURRENT BRANCH SET
 ext::auth::AuthConfig::allowed_redirect_urls := {
 	# Local setup
-	'http://localhost:5173',
+	'http://localhost:4173',
+
+	# Local setup (dev)
+	# 'http://localhost:5173',
 
 	# Docker Compose setup
 	# 'http://localhost:3000',
@@ -25,7 +28,7 @@ INSERT ext::auth::EmailPasswordProviderConfig {
 
 # SMTP Configuration
 CONFIGURE CURRENT BRANCH SET
-ext::auth::SMTPConfig::sender := 'infernet-cloud@ritual.net';
+ext::auth::SMTPConfig::sender := 'your-sender-email@example.com';
 CONFIGURE CURRENT BRANCH SET
 ext::auth::SMTPConfig::host := 'smtp';
 CONFIGURE CURRENT BRANCH SET

package.json

@@ -28,7 +28,7 @@
 		"docker:clean": "docker system prune -f",
 		"docker:server:restart": "pnpm run docker:clean && pnpm run docker-compose up --build --no-deps --detach server",
 		"docker:edgedb:init": "pnpm run docker:edgedb:init:auth",
-		"docker:edgedb:init:auth": "pnpm run docker-compose up edgedb --wait && pnpm run docker:edgedb:cli query -f ./dbschema/bootstrap/auth.edgeql",
+		"docker:edgedb:init:auth": "pnpm run docker-compose up edgedb --wait && sh -c '. .env.docker && printf \"%s\\n\" \"$EDGEDB_SERVER_PASSWORD\" | pnpm run docker-compose exec -T edgedb edgedb --tls-security insecure --password-from-stdin query -f ./dbschema/bootstrap/auth.edgeql'",
 		"docker:edgedb:restart": "pnpm run docker:clean && pnpm run docker-compose up --build --no-deps --detach edgedb",
 		"docker:edgedb:backup": "cp -r edgedb-data \"edgedb-data.backup.$(date +%s)\"",
 		"docker:edgedb:destroy": "sh -c 'read -p \"Destroy EdgeDB Docker volume? (y/N): \" confirm && case $confirm in y|Y) pnpm run docker-compose down edgedb && rm -rf edgedb-data ;; *) echo \"Operation cancelled\" ;; esac'",

server.Dockerfile

@@ -21,6 +21,9 @@ FROM base AS build
 
 COPY .env.docker .env.docker
 
+# Also copy to .env to allow SvelteKit to read as $env/static/private
+COPY .env.docker .env
+
 # pnpm install
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile
 

src/routes/+layout.svelte

@@ -128,7 +128,7 @@
 				<ul class="row">
 					<li class="row">
 						<a
-							href="https://docs.ritual.net/infernet/about"
+							href="https://docs.ritual.net/infernet/general/introduction"
 							target="_blank"
 						>
 							Infernet Docs