feat: refactor config (#6)

* feat: refactor config

Author: leo220yuyaodog

docker/Dockerfile

@@ -24,7 +24,5 @@ COPY . .
 RUN ["chmod", "+x", "/home/dbgate-docker/entrypoint.sh"]
 
 WORKDIR /home/dbgate-docker
-EXPOSE 3000
-VOLUME /home/dbgate-docker/.dbgate
 
 CMD ["/home/dbgate-docker/entrypoint.sh"]

docker/Dockerfile-alpine

@@ -11,7 +11,5 @@ COPY . .
 RUN ["chmod", "+x", "/home/dbgate-docker/entrypoint.sh"]
 
 WORKDIR /home/dbgate-docker
-EXPOSE 3000
-VOLUME /home/dbgate-docker/.dbgate
 
 CMD ["/home/dbgate-docker/entrypoint.sh"]

packages/api/.env

@@ -2,6 +2,7 @@ DEVMODE=1
 SHELL_SCRIPTING=1
 DEVWEB=1
 RUN_AS_PORTAL=1
+WEB_ROOT=/dbgate
 WORKSPACE_DIR=../../.dbgate
 
 # PERMISSIONS=~widgets/app,~widgets/plugins

packages/api/src/controllers/config.js

@@ -34,13 +34,13 @@ module.exports = {
     const permissions = login ? login.permissions : process.env.PERMISSIONS;
 
     return {
-      runAsPortal: !!connections.portalConnections || !!process.env.RUN_AS_PORTAL || platformInfo.isCasvisor,
+      runAsPortal: !!connections.portalConnections || !!process.env.RUN_AS_PORTAL,
       singleDbConnection: connections.singleDbConnection,
       singleConnection: connections.singleConnection,
       // hideAppEditor: !!process.env.HIDE_APP_EDITOR,
       allowShellConnection: platformInfo.allowShellConnection,
       allowShellScripting: platformInfo.allowShellScripting,
-      isDocker: platformInfo.isDocker || platformInfo.isCasvisor,
+      isDocker: platformInfo.isDocker,
       permissions,
       login,
       oauth: process.env.OAUTH_AUTH,

packages/api/src/main.js

@@ -57,9 +57,7 @@ function start() {
 
   app.use(cors());
 
-  if (platformInfo.isCasvisor) {
-    app.use(getExpressPath('/'), express.static('/home/casvisor/dbgate-docker/public'));
-  } else if(platformInfo.isDocker){
+  if(platformInfo.isDocker){
     // server static files inside docker container
     app.use(getExpressPath('/'), express.static('/home/dbgate-docker/public'));
   } else if (platformInfo.isNpmDist) {

packages/api/src/shell/requirePlugin.js

@@ -24,7 +24,7 @@ function requirePlugin(packageName, requiredPlugin = null) {
       // @ts-ignore
       module = __non_webpack_require__(modulePath);
     } catch (err) {
-      // console.log('Failed load webpacked module', err.message);
+      logger.error('Failed load webpacked module', err.message);
       module = require(modulePath);
     }
     requiredPlugin = module.__esModule ? module.default : module;

packages/api/src/utility/directories.js

@@ -32,9 +32,6 @@ function datadirCore() {
   if (processArgs.workspaceDir) {
     return processArgs.workspaceDir;
   }
-  if(platformInfo.isCasvisor){
-    return path.join('/home/casvisor/dbgate-docker', '.dbgate');
-  }
   return path.join(os.homedir(), '.dbgate');
 }
 
@@ -74,9 +71,6 @@ function packagedPluginsDir() {
   if (platformInfo.isDevMode) {
     return path.resolve(__dirname, '../../../../plugins');
   }
-  if(platformInfo.isCasvisor){
-    return path.join('/home/casvisor/dbgate-docker', 'plugins');
-  }
   if (platformInfo.isDocker) {
     return '/home/dbgate-docker/plugins';
   }

packages/api/src/utility/platformInfo.js

@@ -12,7 +12,6 @@ const isDocker = fs.existsSync('/home/dbgate-docker/public');
 const isDevMode = process.env.DEVMODE == '1';
 const isNpmDist = !!global['IS_NPM_DIST'];
 const isForkedApi = processArgs.isForkedApi;
-const isCasvisor = fs.existsSync('/home/casvisor/dbgate-docker');
 
 // function moduleAvailable(name) {
 //   try {
@@ -28,7 +27,6 @@ const platformInfo = {
   isMac,
   isLinux,
   isDocker,
-  isCasvisor,
   isElectronBundle: isElectron() && !isDevMode,
   isForkedApi,
   isElectron: isElectron(),

packages/api/webpack.config.js

@@ -30,6 +30,11 @@ var config = {
     ],
   },
   plugins: [
+    new webpack.DefinePlugin({
+      'process.env.NODE_ENV': JSON.stringify("production"),
+      'process.env.RUN_AS_PORTAL': JSON.stringify("true"),
+      'process.env.WEB_ROOT': JSON.stringify("/dbgate"),
+  }),
     new webpack.IgnorePlugin({
       checkResource(resource) {
         const lazyImports = ['uws'];

packages/web/package.json

@@ -3,8 +3,8 @@
   "version": "5.0.0-alpha.1",
   "license": "MIT",
   "scripts": {
-    "build": "cross-env NODE_ENV=production rollup -c",
-    "dev": "cross-env NODE_ENV=development rollup -c -w",
+    "build": "rollup -c",
+    "dev": "cross-env rollup -c -w",
     "start": "sirv public --port 5001",
     "validate": "svelte-check",
     "prepublishOnly": "yarn build"