Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/msa-ez/platform
Browse files Browse the repository at this point in the history
  • Loading branch information
kyusooK committed Dec 4, 2023
2 parents c876131 + b793593 commit a9b9720
Show file tree
Hide file tree
Showing 28 changed files with 8,190 additions and 6,455 deletions.
51 changes: 51 additions & 0 deletions .github/workflows/acebase.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: 'acebase-build'

on:
push:
tags:
- v*

env:
REGISTRY: ghcr.io
IMAGE_NAME: msa-ez/acebase

jobs:
test:
name: install
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./acebase
steps:
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v2
with:
node-version: 14
- name: Cache node modules
uses: actions/cache@v2
id: cache
with:
path: node_modules
key: npm-packages-${{ hashFiles('**/package-lock.json') }}
- name: Install Dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: npm install
- name: Log in to the Container registry
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
with:
registry: ${{ env.REGISTRY }}
username: ${{ secrets.ID }}
password: ${{ secrets.TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
- name: Build and push Docker image
uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
with:
context: ./acebase
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
name: 'platform-build'

on: push
on:
push:
tags:
- v*

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

jobs:
test:
Expand All @@ -27,8 +34,8 @@ jobs:
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
username: ${{ secrets.ID }}
password: ${{ secrets.TOKEN }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
Expand Down
9 changes: 4 additions & 5 deletions acebase/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ const https = process.env.DB_HTTPS ? process.env.DB_HTTPS : false; // DB PORT
const provider = process.env.PROVIDER ? process.env.PROVIDER : "github"; // DB PORT
const gitlab = process.env.GITLAB ? process.env.GITLAB : null; // DB PORT
const server = new AceBaseServer(dbname, {
host: "localhost",
port: 5757,
host: host,
port: dbport,
storage: {
path: "/acebase"
},
Expand All @@ -40,14 +40,13 @@ server.configAuthProvider(provider, {
host: gitlab
})


server.on("ready", () => {
console.log("SERVER ready");
});

const db = new AceBaseClient({
host: "localhost",
port: 5757,
host: host,
port: dbport,
dbname: dbname,
https: JSON.parse(https),
});
Expand Down
Empty file added gcloud
Empty file.
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
},
"main": "background.js",
"dependencies": {
"@apidevtools/swagger-parser": "^10.1.0",
"@crinkles/digl": "^2.0.3",
"@firebase/auth": "^1.3.0",
"@hscmap/vue-window": "^2.4.2",
Expand Down Expand Up @@ -201,7 +202,8 @@
"electron-devtools-installer": "^3.1.0",
"fork-ts-checker-webpack-plugin": "^6.5.2",
"husky": "^7.0.2",
"jest": "^29.6.2",
"jest": "^29.7.0",
"jest-environment-jsdom-fifteen": "^1.0.2",
"node-sass": "^7.0.1",
"prettier": "2.6.2",
"prismjs": "^1.24.1",
Expand Down
Loading

0 comments on commit a9b9720

Please sign in to comment.