From 55266888d485550550f21ca9eedd542e793231c1 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Sun, 28 Aug 2022 14:01:21 +0800
Subject: [PATCH] workspace: remove dev dockerfile

---
 .gitpod.Dockerfile                |  9 ---------
 .gitpod.yml                       | 13 ++++++++-----
 packages/hydrooj/src/interface.ts |  2 +-
 packages/hydrooj/src/settings.ts  |  3 ++-
 4 files changed, 11 insertions(+), 16 deletions(-)
 delete mode 100644 .gitpod.Dockerfile

diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
deleted file mode 100644
index a472f5a4..00000000
--- a/.gitpod.Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM gitpod/workspace-mongodb
-RUN npm i pm2 -g && \
-    sudo apt-get update && \
-    sudo apt-get install clang -y && \
-    cargo install sonic-server --version 1.3.0 && \
-    mkdir -p /home/gitpod/.hydro && \
-    echo '{"host":"127.0.0.1","port":"27017","name":"hydro","username":"","password":""}' >/home/gitpod/.hydro/config.json && \
-    mkdir /data/file -p
-    chmod 777 /data/file
\ No newline at end of file
diff --git a/.gitpod.yml b/.gitpod.yml
index a6dd1417..60fb5a58 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,14 +1,17 @@
-image:
-  file: .gitpod.Dockerfile
+image: gitpod/workspace-mongodb
 tasks:
+  - command: mongod --dbpath /home/gitpod/db
   - init: |
+      mkdir -p /home/gitpod/.hydro
+      echo '{"host":"127.0.0.1","port":"27017","name":"hydro","username":"","password":""}' >/home/gitpod/.hydro/config.json && \
       yarn
-      pm2 start mongod
-      yarn build:ui
+      yarn build:ui:production
       npx hydrooj cli system set server.port 2333
       npx hydrooj cli user create root@hydro.local root rootroot 2
       npx hydrooj cli user setSuperAdmin 2
-      yarn debug
+    command: yarn debug
+    env:
+      DEFAULT_STORE_PATH: /home/gitpod/file
 vscode:
   extensions:
     - dbaeumer.vscode-eslint
diff --git a/packages/hydrooj/src/interface.ts b/packages/hydrooj/src/interface.ts
index 11e6d5c8..c553305b 100644
--- a/packages/hydrooj/src/interface.ts
+++ b/packages/hydrooj/src/interface.ts
@@ -628,7 +628,7 @@ export interface Service {
     db: typeof import('./service/db'),
     monitor: typeof import('./service/monitor'),
     server: typeof import('./service/server'),
-    storage: typeof import('./service/storage'),
+    storage: typeof import('./service/storage').default,
 }
 
 export interface GeoIP {
diff --git a/packages/hydrooj/src/settings.ts b/packages/hydrooj/src/settings.ts
index 858edfc1..452dd6e0 100644
--- a/packages/hydrooj/src/settings.ts
+++ b/packages/hydrooj/src/settings.ts
@@ -5,7 +5,8 @@ import * as bus from 'hydrooj/src/service/bus';
 import { Logger } from './logger';
 import { NestKeys } from './typeutils';
 
-const defaultPath = process.env.CI ? '/tmp/file' : '/data/file/hydro';
+const defaultPath = process.env.CI ? '/tmp/file'
+    : process.env.DEFAULT_STORE_PATH || '/data/file/hydro';
 const FileSetting = Schema.intersect([
     Schema.object({
         type: Schema.union([