Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker build env able to build again #101

Merged
merged 4 commits into from
Aug 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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


Expand Down
6 changes: 5 additions & 1 deletion docker/centos7_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@ FROM centos:7
LABEL maintainer="Evolved Binary Ltd <tech@evolvedbinary.com>"

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 && \
Expand Down
16 changes: 8 additions & 8 deletions docker/centos7_x64/build.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
34 changes: 19 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down Expand Up @@ -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",
Expand Down
Loading