diff --git a/.github/workflows/build-docker-beta.yaml b/.github/workflows/build-docker-beta.yaml index e1f9fd35a..7c2b72904 100644 --- a/.github/workflows/build-docker-beta.yaml +++ b/.github/workflows/build-docker-beta.yaml @@ -6,6 +6,7 @@ on: push: tags: - 'v[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+' + - 'v[0-9]+.[0-9]+.[0-9]+-docker.[0-9]+' jobs: build: diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 000000000..a04355504 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,18 @@ +# this compose file is for testing purposes only +# use it for testing docker containsers built on local machine +version: "3" +services: + dbgate: + # build: docker + image: dbgate/dbgate:beta + restart: always + ports: + - 3100:3000 + volumes: + - /mnt/sqt:/home/jena/test/chinook + environment: + CONNECTIONS: sqlite + + LABEL_sqlite: sqt + FILE_sqlite: /mnt/sqt/Chinook.db + ENGINE_sqlite: sqlite@dbgate-plugin-sqlite diff --git a/package.json b/package.json index 3648f3fa5..48f578084 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,8 @@ "resetPackagedPlugins": "node resetPackagedPlugins", "prettier": "prettier --write packages/api/src && prettier --write packages/datalib/src && prettier --write packages/filterparser/src && prettier --write packages/sqltree/src && prettier --write packages/tools/src && prettier --write packages/types && prettier --write packages/web/src && prettier --write app/src", "copy:docker:build": "copyfiles packages/api/dist/* docker -f && copyfiles packages/web/public/* docker -u 2 && copyfiles \"packages/web/public/**/*\" docker -u 2 && copyfiles \"plugins/dist/**/*\" docker/plugins -u 2", - "prepare:docker": "yarn plugins:copydist && yarn build:web:docker && yarn build:api && yarn copy:docker:build", + "install:sqlite:docker": "cd docker && yarn init --yes && yarn add better-sqlite3 && cd ..", + "prepare:docker": "yarn plugins:copydist && yarn build:web:docker && yarn build:api && yarn copy:docker:build && yarn install:sqlite:docker", "start": "concurrently --kill-others-on-fail \"yarn start:api\" \"yarn start:web\"", "lib": "concurrently --kill-others-on-fail \"yarn start:sqltree\" \"yarn start:filterparser\" \"yarn start:datalib\" \"yarn start:tools\" \"yarn start:querysplitter\" \"yarn build:plugins:frontend:watch\"", "ts:api": "yarn workspace dbgate-api ts", diff --git a/packages/api/webpack.config.js b/packages/api/webpack.config.js index d448ccc11..29c9a4d06 100644 --- a/packages/api/webpack.config.js +++ b/packages/api/webpack.config.js @@ -10,16 +10,16 @@ var config = { target: 'node', node: { __dirname: false, - }, + }, output: { path: path.resolve(__dirname, 'dist'), filename: 'bundle.js', libraryTarget: 'commonjs2', }, -// optimization: { -// minimize: false, -// }, + // optimization: { + // minimize: false, + // }, module: { rules: [ @@ -45,6 +45,9 @@ var config = { }, }), ], + externals: { + 'better-sqlite3': 'commonjs better-sqlite3', + }, }; module.exports = config;