change bun command

Author: sebasptsch

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
           bun-version: latest
 
       - name: init gel
-        run: cd apps/server && bunx gel project init --non-interactive
+        run: cd apps/server && bun x gel project init --non-interactive
 
       - name: Docker Meta Release
         id: meta-release

.github/workflows/test.yml

@@ -17,7 +17,7 @@ jobs:
           bun-version: latest
 
       - name: init gel
-        run: cd apps/server && bunx gel project init --non-interactive
+        run: cd apps/server && bun x gel project init --non-interactive
 
       - name: generate gel schema types
         run: bun run --filter server generate

Dockerfile

@@ -5,7 +5,7 @@ RUN curl -fsSL https://bun.com/install | bash
 ENV PATH="/root/.bun/bin:${PATH}"
 WORKDIR /app
 
-
+# Dependancy layer, for caching
 FROM base AS install
 
 # Development dependencies
@@ -20,7 +20,8 @@ COPY apps/server/package.json /temp/prod/apps/server/
 COPY apps/client/package.json /temp/prod/apps/client/
 RUN cd /temp/prod && bun install --frozen-lockfile --production --filter "server"
 
-FROM base as prerelease
+# Build frontend and backend
+FROM base AS prerelease
 COPY --from=install /temp/dev/node_modules node_modules
 COPY --from=install /temp/dev/apps/server/node_modules apps/server/node_modules
 COPY --from=install /temp/dev/apps/client/node_modules apps/client/node_modules

apps/server/gel.toml

@@ -5,4 +5,4 @@ server-version = "6.4"
 schema-dir = "src/dbschema"
 
 [hooks]
-schema.update.after = "bunx @gel/generate interfaces && bunx @gel/generate edgeql-js --target esm"
+schema.update.after = "bun x @gel/generate interfaces && bun x @gel/generate edgeql-js --target esm"

apps/server/package.json

@@ -8,7 +8,7 @@
 		"build": "bun tsdown",
 		"start": "node ./dist/main.js",
 		"migrate": "gel migration create && gel migrate && bun generate",
-		"generate": "bunx @gel/generate interfaces && bunx @gel/generate edgeql-js --target esm"
+		"generate": "bun x @gel/generate interfaces && bun x @gel/generate edgeql-js --target esm"
 	},
 	"types": "./dist/main.d.ts",
 	"main": "./dist/main.js",

docker-compose.yml

@@ -1,21 +1,31 @@
-version: '3.1'
-
 services:
   voting:
     build: .
     restart: unless-stopped
     ports:
       - 8080:8080
+    links:
+      - gel
     environment:
       PORT: 8080
       GEL_DSN: gel://gel
       GEL_CLIENT_TLS_SECURITY: insecure
 
-    # volumes:
-
   gel:
     image: geldata/gel:6.4
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:5656/server/status/ready"]
+      start_interval: 10s
+      start_period: 30s
+      interval: 20s
+      timeout: 10s
+      retries: 5
+    volumes:
+      - gel_data:/var/lib/gel/data
     environment:
       GEL_SERVER_TLS_CERT_MODE: generate_self_signed
-      GEL_SERVER_SECURITY: insecure_dev_mode
+      GEL_SERVER_SECURITY: insecure_dev_mode
+
+volumes:
+  gel_data: