Merge pull request #101 from ccheraa/docker-build-env

Docker build env able to build again

.circleci/config.yml

@@ -62,20 +62,20 @@ jobs:
             equal: [<<parameters.os>>, *nix]
           steps: 
             - store_artifacts: 
-                path: dist/fusion-studio-1.0.3.dmg
+                path: dist/fusion-studio-2.0.0-next.0.dmg
                 destination: macOS
       - when:
           condition: 
             equal: [<<parameters.os>>, *nix]
           steps:    
             - store_artifacts: 
-                path: dist/fusion-studio-1.0.3.deb
+                path: dist/fusion-studio-2.0.0-next.0.deb
                 destination: Linux
             - store_artifacts: 
-                path: dist/fusion-studio-1.0.3.AppImage
+                path: dist/fusion-studio-2.0.0-next.0.AppImage
                 destination: Linux
             - store_artifacts: 
-                path: dist/fusion-studio-1.0.3.rpm
+                path: dist/fusion-studio-2.0.0-next.0.rpm
                 destination: Linux        
   # (DP) build-win is a workaround for circleci-docs#5611
   build-win:
@@ -104,7 +104,7 @@ jobs:
       - run: yarn --version
       - run: yarn package
       - store_artifacts: 
-          path: dist/fusion-studio-1.0.3-installer.exe
+          path: dist/fusion-studio-2.0.0-next.0-installer.exe
           destination: Windows    
 
 

docker/centos7_x64/Dockerfile

@@ -3,9 +3,13 @@ FROM centos:7
 LABEL maintainer="Evolved Binary Ltd <[email protected]>"
 
 RUN yum -y update && \
+  yum -y install centos-release-scl && \
+  yum-config-manager --enable rhel-server-rhscl-7-rpms && \
+  yum -y install devtoolset-8-gcc devtoolset-8-gcc-c++ && \
+  source scl_source enable devtoolset-8 && \
   yum -y install epel-release && \
   yum -y install gcc-c++ make python-pip ruby-devel ruby-gems && \
-  yum -y install libxkbfile-devel libX11-devel && \
+  yum -y install libxkbfile-devel libX11-devel libsecret && \
   yum -y install openssl wget && \
   yum -y install https://harbottle.gitlab.io/wine32/7/i386/wine32-release.rpm && \
   yum -y install wine.i686 && \

docker/centos7_x64/build.sh

@@ -1,20 +1,20 @@
 # !/bin/sh
 source /root/.bashrc
-yarn config set drivelist_binary_host http://dv.evolvedbinary.com/fusion-studio/prebuild/drivelist
-yarn config set @theia/node-pty_binary_host http://dv.evolvedbinary.com/fusion-studio/prebuild/node-pty
-yarn config set find-git-repositories_binary_host http://dv.evolvedbinary.com/fusion-studio/prebuild/find-git-repositories
-yarn config set native-keymap_binary_host http://dv.evolvedbinary.com/fusion-studio/prebuild/native-keymap
-yarn config set nsfw_binary_host http://dv.evolvedbinary.com/fusion-studio/prebuild/nsfw
-yarn config set oniguruma_binary_host http://dv.evolvedbinary.com/fusion-studio/prebuild/oniguruma
+source scl_source enable devtoolset-8
+yarn config set drivelist_binary_host https://pear.evolvedbinary.com/fusion-studio/prebuild/drivelist
+yarn config set @theia/node-pty_binary_host https://pear.evolvedbinary.com/fusion-studio/prebuild/node-pty
+yarn config set find-git-repositories_binary_host https://pear.evolvedbinary.com/fusion-studio/prebuild/find-git-repositories
+yarn config set native-keymap_binary_host https://pear.evolvedbinary.com/fusion-studio/prebuild/native-keymap
+yarn config set nsfw_binary_host https://pear.evolvedbinary.com/fusion-studio/prebuild/nsfw
+yarn config set oniguruma_binary_host https://pear.evolvedbinary.com/fusion-studio/prebuild/oniguruma
 cp /root/force-download.js /project
 cd /project
 if [ -d /project/node_modules ]; then
    mv /project/node_modules /project/node_modules.bak
 fi
-yarn
+yarn --ignore-engines
 node /project/force-download @theia/node-pty nsfw find-git-repositories drivelist native-keymap oniguruma -p /project
 yarn package:all -c electron-builder.docker.yml
-node /project/force-download @theia/node-pty nsfw find-git-repositories drivelist native-keymap oniguruma -r -p /project
 rm /project/force-download.js
 rm -rf node_modules
 if [ -d /project/node_modules.bak ]; then

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fusion-studio-electron",
-  "version": "1.0.3",
+  "version": "2.0.0-next.0",
   "description": "Fusion Studio",
   "main": "src-gen/frontend/electron-main.js",
   "repository": {
@@ -29,21 +29,25 @@
   },
   "homepage": "https://github.com/evolvedbinary/fusion-studio#readme",
   "dependencies": {
-    "@theia/core": "^1.15.0",
-    "@theia/editor": "^1.15.0",
-    "@theia/electron": "^1.15.0",
-    "@theia/file-search": "^1.15.0",
-    "@theia/filesystem": "^1.15.0",
-    "@theia/git": "^1.15.0",
-    "@theia/markers": "^1.15.0",
-    "@theia/monaco": "^1.15.0",
-    "@theia/navigator": "^1.15.0",
-    "@theia/preferences": "^1.15.0",
-    "@theia/process": "^1.15.0",
-    "@theia/terminal": "^1.15.0",
-    "@theia/workspace": "^1.15.0",
+    "@theia/core": "1.15.0",
+    "@theia/editor": "1.15.0",
+    "@theia/electron": "1.15.0",
+    "@theia/file-search": "1.15.0",
+    "@theia/filesystem": "1.15.0",
+    "@theia/git": "1.15.0",
+    "@theia/markers": "1.15.0",
+    "@theia/monaco": "1.15.0",
+    "@theia/navigator": "1.15.0",
+    "@theia/preferences": "1.15.0",
+    "@theia/process": "1.15.0",
+    "@theia/terminal": "1.15.0",
+    "@theia/workspace": "1.15.0",
     "fs-extra": "10.0.0",
-    "fusion-studio-extension": "^1.2.0"
+    "fusion-studio-extension": "^2.0.0-next",
+    "xterm": "^4.13.0",
+    "xterm-addon-fit": "^0.5.0",
+    "xterm-addon-search": "^0.8.0",
+    "yargs": "^17.1.1"
   },
   "devDependencies": {
     "@theia/cli": "^1.15.0",