From 2d164543708b93d15d8695329fbc989c774e112c Mon Sep 17 00:00:00 2001
From: Gao Sun <gao@silverhand.io>
Date: Tue, 5 Jul 2022 16:40:00 +0800
Subject: [PATCH 1/3] chore: add GitPod config

---
 .gitpod.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .gitpod.yml

diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 000000000..f3e700ed9
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,13 @@
+tasks:
+  - name: Start Logto
+    init: |
+      docker-compose pull
+    command: |
+      ENDPOINT=$(gp url 3001) docker compose -p logto up
+    env:
+      TAG: edge
+
+ports:
+  - name: Logto
+    description: The Logto core service
+    port: 3001

From 1e96221acf852fc10232783f8980dc7e452f66f5 Mon Sep 17 00:00:00 2001
From: Gao Sun <gao@silverhand.io>
Date: Tue, 5 Jul 2022 19:56:20 +0800
Subject: [PATCH 2/3] chore: update docker compose

---
 .gitpod.yml                             |  2 +-
 docker-compose.yml                      | 16 ++++++++++++----
 packages/core/src/env-set/index.ts      |  3 ++-
 packages/core/src/env-set/parameters.ts |  2 +-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index f3e700ed9..65f629afd 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -5,7 +5,7 @@ tasks:
     command: |
       ENDPOINT=$(gp url 3001) docker compose -p logto up
     env:
-      TAG: edge
+      TAG: prerelease
 
 ports:
   - name: Logto
diff --git a/docker-compose.yml b/docker-compose.yml
index 5044a2278..04ea93e27 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,16 +3,24 @@ version: "3.9"
 services:
   app:
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
     image: ghcr.io/logto-io/logto:${TAG-latest}
     ports:
       - 3001:3001
     environment:
-      ALL_YES: 1
-      NO_INQUIRY: 0
-      DB_URL_DEFAULT: postgres://postgres:p0stgr3s@postgres:5432
+      - ALL_YES=1
+      - NO_INQUIRY=0
+      - TRUST_PROXY_HEADER=1
+      - DB_URL_DEFAULT=postgres://postgres:p0stgr3s@postgres:5432
+      - ENDPOINT
   postgres:
     image: postgres:14-alpine
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: p0stgr3s
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
diff --git a/packages/core/src/env-set/index.ts b/packages/core/src/env-set/index.ts
index c7a609156..538fbea43 100644
--- a/packages/core/src/env-set/index.ts
+++ b/packages/core/src/env-set/index.ts
@@ -5,6 +5,7 @@ import { appendPath } from '@/utils/url';
 
 import createPoolByEnv from './create-pool-by-env';
 import loadOidcValues from './oidc';
+import { isTrue } from './parameters';
 
 export enum MountedApps {
   Api = 'api',
@@ -32,7 +33,7 @@ const loadEnvValues = async () => {
     localhostUrl,
     endpoint,
     developmentUserId: getEnv('DEVELOPMENT_USER_ID'),
-    trustProxyHeader: getEnv('TRUST_PROXY_HEADER') === 'true',
+    trustProxyHeader: isTrue(getEnv('TRUST_PROXY_HEADER')),
     oidc: await loadOidcValues(appendPath(endpoint, '/oidc').toString()),
     adminConsoleUrl: appendPath(endpoint, '/console'),
   });
diff --git a/packages/core/src/env-set/parameters.ts b/packages/core/src/env-set/parameters.ts
index 667847af8..6b4d8af8a 100644
--- a/packages/core/src/env-set/parameters.ts
+++ b/packages/core/src/env-set/parameters.ts
@@ -1,6 +1,6 @@
 import { getEnv } from '@silverhand/essentials';
 
-const isTrue = (value: string) => ['1', 'true', 'y', 'yes', 'yep', 'yeah'].includes(value);
+export const isTrue = (value: string) => ['1', 'true', 'y', 'yes', 'yep', 'yeah'].includes(value);
 
 const parameters = new Set(process.argv.slice(2));
 export const noInquiry = parameters.has('--no-inquiry') || isTrue(getEnv('NO_INQUIRY'));

From 9d3c2e76ffacf14cfd687801db549e570b6560f3 Mon Sep 17 00:00:00 2001
From: Gao Sun <gao@silverhand.io>
Date: Tue, 5 Jul 2022 19:59:21 +0800
Subject: [PATCH 3/3] chore: add gitpod badge

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 88fc20cff..397b8c62b 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,9 @@
   <a href="https://github.com/logto-io/logto/releases">
     <img src="https://img.shields.io/github/v/release/logto-io/logto?color=7958FF" alt="release" />
   </a>
+  <a href="https://gitpod.io/#https://github.com/logto-io/logto">
+    <img src="https://img.shields.io/badge/gitpod-available-blue" alt="gitpod">
+  </a>
   <a href="https://app.codecov.io/gh/logto-io/logto">
     <img src="https://img.shields.io/codecov/c/github/logto-io/logto?label=core%20coverage" alt="core coverage" />
   </a>