From ac5f7fa1c93721a6e3d09c43a61e457f84ba4590 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Mon, 24 May 2021 17:33:03 -0400 Subject: [PATCH] chore: add desktop build support with docker-compose --- docker-compose-embedding.yml | 13 +++++++++++-- package.json | 1 + ui/desktop/package.json | 3 ++- 3 files changed, 14 insertions(+), 3 deletions(-) mode change 100644 => 100755 docker-compose-embedding.yml mode change 100644 => 100755 package.json mode change 100644 => 100755 ui/desktop/package.json diff --git a/docker-compose-embedding.yml b/docker-compose-embedding.yml old mode 100644 new mode 100755 index cfa19d38b..ece698329 --- a/docker-compose-embedding.yml +++ b/docker-compose-embedding.yml @@ -6,24 +6,33 @@ version: '3.8' services: node: &node - image: docker.mirror.hashicorp.services/node:12 + image: docker.mirror.hashicorp.services/node:14 volumes: - './:/src' - 'icu_node_modules:/src/node_modules' - 'icu_addons_api_node_modules:/src/addons/api/node_modules' - 'icu_addons_auth_node_modules:/src/addons/auth/node_modules' + - 'icu_addons_core_node_modules:/src/addons/cor/node_modules' - 'icu_addons_rose_node_modules:/src/addons/rose/node_modules' - 'icu_ui_admin_node_modules:/src/ui/admin/node_modules' + - 'icu_ui_desktop_node_modules:/src/ui/desktop/node_modules' working_dir: /src - build: + build-admin: <<: *node entrypoint: bash command: '-c "yarn install && yarn build:ui:admin && chmod -R 777 ."' + build-desktop-production: + <<: *node + entrypoint: bash + command: '-c "yarn install && yarn build:ui:desktop:production && chmod -R 777 ."' + volumes: icu_node_modules: icu_addons_api_node_modules: icu_addons_auth_node_modules: + icu_addons_core_node_modules: icu_addons_rose_node_modules: icu_ui_admin_node_modules: + icu_ui_desktop_node_modules: diff --git a/package.json b/package.json old mode 100644 new mode 100755 index 267a13692..307ad025d --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "build": "yarn build:ui:admin", "build:ui:admin": "cd ui/admin && yarn build", "build:ui:desktop": "cd ui/desktop && yarn build", + "build:ui:desktop:production": "cd ui/desktop && yarn build:production", "lint": "npm-run-all lint:*", "lint:addons-api": "cd addons/api && yarn lint", "lint:addons-auth": "cd addons/auth && yarn lint", diff --git a/ui/desktop/package.json b/ui/desktop/package.json old mode 100644 new mode 100755 index ad95f6b81..dd4b5b794 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -11,7 +11,8 @@ }, "scripts": { "doc:toc": "doctoc README.md", - "build": "EMBER_CLI_ELECTRON=true ember build --environment=production && yarn build:desktop", + "build": "EMBER_CLI_ELECTRON=true yarn build:production && yarn build:desktop", + "build:production": "ember build --environment=production", "build:development": "ember build", "prebuild:desktop": "cp -r dist/ electron-app/ember-dist/", "build:desktop": "cd electron-app && yarn make",