From f271d747137caab7a401f46b62598424cb705d68 Mon Sep 17 00:00:00 2001 From: hackape Date: Fri, 4 Nov 2016 14:53:49 +0800 Subject: [PATCH 01/56] update README, close #28 --- README-zh.md | 5 +++-- README.md | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README-zh.md b/README-zh.md index 2d3549b..e53b33d 100644 --- a/README-zh.md +++ b/README-zh.md @@ -35,10 +35,11 @@ Coding WebIDE(https://ide.coding.net) 是 Coding 自主研发的在线集成开 ## 运行环境 -WebIDE Frontend 依赖 **npm** 做包管理，**webpack** 和 **babel** 做构建工具 +WebIDE Frontend 需要 **node v6.x** 作为编译运行环境（可以避免很多奇怪的错误），推荐使用 **yarn** 做包管理工具，做构建工具使用 **webpack** 和 **babel** + WebIDE-Frontend-Webjars & WebIDE-Backend 项目依赖 **maven3** 和 **java8** -在编译、运行项目前，请保证环境依赖已被正确配置。 +运行该项目需要至少 512MB 的内存空间。在编译、运行项目前，请保证环境依赖已被正确配置。 ## Server 版 diff --git a/README.md b/README.md index 1dfda7d..0cf5507 100644 --- a/README.md +++ b/README.md @@ -35,10 +35,11 @@ This is the entry point to setup and run the WebIDE Community Edition project. I ## Environment -WebIDE Frontend uses **npm** for package management, **webpack** and **babel** for building. +WebIDE Frontend require **node v6.x** as build environment (this will save you from alot of weird errors). We recommend **yarn** for package management, **webpack** and **babel** is used for building. + Frontend Webjars & WebIDE Backend use **maven3** and **java8**. -Please ensure you have corresponding tools installed in your environment before build and run the project. +The project requires at minimum 512MB memory to run. Please ensure you have corresponding tools installed in your environment before build and run the project. ## Native Server From d06f295f5e568373d983fb53671a3b1b850897ac Mon Sep 17 00:00:00 2001 From: hackape Date: Mon, 7 Nov 2016 16:18:48 +0800 Subject: [PATCH 02/56] update frontend ref --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index 9e007fd..b1c2f53 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 9e007fd1c64cfca9b1c2df181a3884b0d0f29390 +Subproject commit b1c2f531db4387b1f5b5528b43bc1711dc78304d From 08243d68e0f692c6b71d4189b63f102f1ea94fc6 Mon Sep 17 00:00:00 2001 From: tanhe123 Date: Mon, 14 Nov 2016 16:39:38 +0800 Subject: [PATCH 03/56] use two mvn command instead of one command, which may free some memery of jvm. --- ide.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ide.sh b/ide.sh index 88b7c8f..482055c 100755 --- a/ide.sh +++ b/ide.sh @@ -235,7 +235,7 @@ sub_docker() { do_run_backend() { cd $BACKEND - mvn clean spring-boot:run ${1} + mvn clean && mvn spring-boot:run ${1} cd $BASEDIR } From f34eedd0870ee1075f2c609df6412ee2d59533dd Mon Sep 17 00:00:00 2001 From: Yibai Zhang Date: Mon, 28 Nov 2016 12:22:26 +0800 Subject: [PATCH 04/56] Add config file to let users modify config easily. --- config | 18 ++++++++++++++++++ ide.sh | 32 +++++++++++++++++++++++++------- 2 files changed, 43 insertions(+), 7 deletions(-) create mode 100644 config diff --git a/config b/config new file mode 100644 index 0000000..26fa31d --- /dev/null +++ b/config @@ -0,0 +1,18 @@ +# Environment for running the application, either "prod" or "dev" +#RUN_ENV= + +# USER INFO +#USERNAME= +#EMAIL= +#AVATAR= + +# CORS (Seprate with comma) +#ALLOWED_ORIGINS= + +# Home Directory(Do not modify when using docker) +#CODING_IDE_HOME= +#SPACE_HOME= + +# Max file size to upload (in Mb) +#UPLOAD_FILE_SIZE_LIMIT= + diff --git a/ide.sh b/ide.sh index 482055c..96faf38 100755 --- a/ide.sh +++ b/ide.sh @@ -62,21 +62,37 @@ do_build_frontend() { cd $BASEDIR } +do_build_backend() { + cd $BACKEND + echo "mvn clean and packaging..." + mvn clean package -Dmaven.test.skip=true + valid_last_cmd + cd $BASEDIR +} + sub_build() { build_usage() { - echo "Usage: $PROG_NAME build frontend" + echo "Usage: $PROG_NAME build [frontend | backend | run]" } case $1 in "-h" | "--help") build_usage ;; - "" | "frontend") + "") + do_build_frontend + do_build_backend + ;; + "backend") + do_build_backend + ;; + "frontend") do_build_frontend ;; "run") # build and run do_build_frontend + do_build_backend do_run_backend ;; esac @@ -193,7 +209,7 @@ sub_docker() { create_dir_if_not_exist $HOME/.coding-ide-home echo "creating container $CONTAINER" - docker create -p 8080:8080 -v $HOME/.coding-ide-home:/home/coding/coding-ide-home --name webide -h webide webide/webide + docker create -p 8080:8080 --env-file config -v $HOME/.coding-ide-home:/home/coding/coding-ide-home --name webide -h webide webide/webide valid_last_cmd elif [ "$RUNNING" == "true" ]; then echo "CRITICAL - $CONTAINER is running." @@ -234,9 +250,11 @@ sub_docker() { } do_run_backend() { - cd $BACKEND - mvn clean && mvn spring-boot:run ${1} - cd $BASEDIR + if [ ! -f $BACKEND/target/ide-backend.jar ]; then + sub_build + fi + . $BASEDIR/config + java -jar $BACKEND/target/ide-backend.jar --PTY_LIB_FOLDER=$BACKEND/src/main/resources/lib ${1} } sub_run() { @@ -250,7 +268,7 @@ sub_run() { while getopts ":p:" opt; do case $opt in p) - EXTRA_VARS=-Drun.arguments="--server.port=${OPTARG}" + EXTRA_VARS="--server.port=${OPTARG}" ;; \?) run_usage From f95231657336ee06ad3ecedca4e2551f1e9c68f1 Mon Sep 17 00:00:00 2001 From: hackape Date: Mon, 28 Nov 2016 13:39:10 +0800 Subject: [PATCH 05/56] update submodule references, ready to release v0.5.0 --- backend | 2 +- frontend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend b/backend index 2e366a9..1dcafb8 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit 2e366a93a64ff4cbb9f951cc3e3372abd5f4808b +Subproject commit 1dcafb8a72d68655c709e12e87fe26b989e26cba diff --git a/frontend b/frontend index b1c2f53..cea4d39 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit b1c2f531db4387b1f5b5528b43bc1711dc78304d +Subproject commit cea4d39f2bb3d82d07cf6670216eb34b39a76190 From 44ed360c965164cd36a53c506460ecc8ea470cc8 Mon Sep 17 00:00:00 2001 From: hackape Date: Fri, 16 Dec 2016 17:13:10 +0800 Subject: [PATCH 06/56] update submodule --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index cea4d39..e664d06 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit cea4d39f2bb3d82d07cf6670216eb34b39a76190 +Subproject commit e664d068ee61e588976cf6d60709828813d7333f From 9df79470d47f26b32f3a914f7f61bcacfb51ec69 Mon Sep 17 00:00:00 2001 From: hackape Date: Mon, 26 Dec 2016 15:45:59 +0800 Subject: [PATCH 07/56] update submodule --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index e664d06..17c40d2 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit e664d068ee61e588976cf6d60709828813d7333f +Subproject commit 17c40d2a84d3a1b388d27f6ffb9659e4617a1073 From 09416bc1fa5bd1572945e69f30ecdd533307fb12 Mon Sep 17 00:00:00 2001 From: hackape Date: Sat, 1 Apr 2017 18:29:43 +0800 Subject: [PATCH 08/56] update submodules to release v0.8.0 --- README-zh.md | 10 +++++----- backend | 2 +- frontend | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README-zh.md b/README-zh.md index e53b33d..4da79b2 100644 --- a/README-zh.md +++ b/README-zh.md @@ -35,7 +35,7 @@ Coding WebIDE(https://ide.coding.net) 是 Coding 自主研发的在线集成开 ## 运行环境 -WebIDE Frontend 需要 **node v6.x** 作为编译运行环境（可以避免很多奇怪的错误），推荐使用 **yarn** 做包管理工具，做构建工具使用 **webpack** 和 **babel** +WebIDE Frontend 需要 **node v6.x** 作为编译运行环境（可以避免很多奇怪的错误），使用 **yarn** 做包管理工具，做构建工具使用 **webpack** 和 **babel** WebIDE-Frontend-Webjars & WebIDE-Backend 项目依赖 **maven3** 和 **java8** @@ -61,7 +61,7 @@ git submodule update 这样就会通过 git 的 submodule 机制 clone 另外 3 个 repo。 ``` -./ide.sh build # 编译并打包前端项目 +./ide.sh build # 编译并打包前端项目 ./ide.sh run # 启动项目 ``` @@ -69,10 +69,10 @@ git submodule update `backend/src/main/resources/application.properties` 包括用户、项目、数据库等配置，可以通过修改配置定制服务： -* **SPACE_HOME:** 存放 workspace 的目录，默认为 ${"user.home"}/.workspace -* **server.port:** 应用启动的端口 +* **SPACE_HOME:** 存放 workspace 的目录，默认为 ${"user.home"}/.workspace +* **server.port:** 应用启动的端口 * **USERNAME:** 用户名，git 提交时会使用该值作为 user.name，默认为 coding。 -* **EMAIL:** 用户邮箱，git 提交时会使用该值作为 user.email，默认为 coding@coding.net +* **EMAIL:** 用户邮箱，git 提交时会使用该值作为 user.email，默认为 coding@coding.net * **AVATAR:** 用户头像 * **CODING_IDE_HOME:** 应用数据存放目录 diff --git a/backend b/backend index 1dcafb8..e8a74c7 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit 1dcafb8a72d68655c709e12e87fe26b989e26cba +Subproject commit e8a74c7230ac43e2dd9f716bfab844587d75f37c diff --git a/frontend b/frontend index 17c40d2..7813027 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 17c40d2a84d3a1b388d27f6ffb9659e4617a1073 +Subproject commit 78130272746a3148116ab29c2e0edd01649d1549 From 8bfe884d9bc9278d9cf721092ff53d9875de2987 Mon Sep 17 00:00:00 2001 From: tanhe123 Date: Wed, 5 Apr 2017 14:29:54 +0800 Subject: [PATCH 09/56] update submodules to release v0.8.1 --- .gitignore | 2 ++ Dockerfile | 5 +++-- backend | 2 +- frontend | 2 +- ide.sh | 6 ++---- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index b25c15b..efd9db0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ *~ +node_modules/ + diff --git a/Dockerfile b/Dockerfile index 8da8760..9a87100 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,18 +9,19 @@ RUN apt-get update && apt-get install -y zsh && apt-get clean && rm -rf /var/lib RUN useradd --create-home --home-dir /home/coding --shell /usr/bin/zsh coding \ && echo "coding:coding" | chpasswd \ && adduser coding sudo \ - && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers USER coding ENV HOME /home/coding ENV SHELL /usr/bin/zsh ENV TERM xterm -ADD . /opt/coding/WebIDE # Install oh-my-zsh RUN git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh \ && cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc +ADD . /opt/coding/WebIDE + RUN sudo chown -R coding /opt/coding/WebIDE \ && mkdir $HOME/.m2 diff --git a/backend b/backend index e8a74c7..5cbaafc 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit e8a74c7230ac43e2dd9f716bfab844587d75f37c +Subproject commit 5cbaafc19ce3a33e9478f1483a561725bdb645ed diff --git a/frontend b/frontend index 7813027..af0d154 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 78130272746a3148116ab29c2e0edd01649d1549 +Subproject commit af0d154b9a173fe3e1cbbcdff5fceeb9222138f1 diff --git a/ide.sh b/ide.sh index 96faf38..f587657 100755 --- a/ide.sh +++ b/ide.sh @@ -48,11 +48,9 @@ sub_backend() { do_build_frontend() { cd $FRONTEND - echo "npm install..." - npm install --registry=https://registry.npm.taobao.org - echo "building frontend..." - npm run build + yarn install + yarn run build valid_last_cmd cd $FRONTEND_WEBJARS From a2512db960ebe8fcdea591ac844dac2168bcf42a Mon Sep 17 00:00:00 2001 From: tanhe123 Date: Wed, 5 Apr 2017 16:59:57 +0800 Subject: [PATCH 10/56] update submodules to release v0.8.2 --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index af0d154..cef7665 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit af0d154b9a173fe3e1cbbcdff5fceeb9222138f1 +Subproject commit cef76656309df788b93c8aa662eba49d4681058a From fd0be38508362edbe2044b879c2a1bf344999dc3 Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Fri, 7 Apr 2017 19:56:15 +0800 Subject: [PATCH 11/56] config travis --- .dockerignore | 10 +++++++--- .travis.yml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ Dockerfile | 40 +++++++++++----------------------------- 3 files changed, 64 insertions(+), 32 deletions(-) create mode 100644 .travis.yml diff --git a/.dockerignore b/.dockerignore index 04167b9..f8bef75 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,10 +1,14 @@ */.idea/ */*.iml *.orig -*/target/ +frontend/ +frontend-webjars/ +backend/ *.env **/*.db */*.ipr */*.iws -.DS_Store - +.DS_Store +*/.git/ +!backend/target/ide-backend.jar +!backend/src/main/resources/lib diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..480f884 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,46 @@ +language: java +jdk: + - oraclejdk8 + +node_js: "7" + +service: +- docker + +cache: + yarn: true + directories: + - "$HOME/.m2" + +env: + global: + - secure: cf1UZFSfaPjz9aQ+M8u+6yfZk81DWZoTzmIT9UxCZmwZH8kkb9zADjnLONaOB6jMk6Meyxau76ZACKL8szNd7BcOsL0M5nBpBoUIVc+Lbe+g02TFsm956yfk5FISbK7AUC/Qblhw9jQeyT7qFyeyh711/f3C+jwXFB9P9uxK2PjsUpz0BeQH6ld/wnappNQla3IDM+vLaHv1CmH2y9sLl3WDhs9jVHPUPhzeklgojibvHXRe2wcdytlII4Vh79+kDKCUUncNkPNFqrcY4ISluRGIchTsjy9AR2/MezbS3T3Ei6w4CqTlIT3hRr6B7mQrdXx4rTCKKucafFB2KcFp9cBcqeWZ++B/u/tXyb49nGcuNxQz2zoY0u3Ba5TLelwbQLH8X55meVeJLrDShOTX+PHiNK070o7luz8LDqE1O6WCD3Ne+GcOv1B2uaPT3TkNUNxt82rSaDHwHQWa9/2foELglo+W/ca6SmZb10McyJSaZn50XIquy0g/oMNhkvqTQVYklY5ztbKMqv4hXtiA+Rq1RMWJxDs9OkgQWafPmrTJOO8djf7rEhexfJuVVaOBOFzQZCjv0F+/DqP+E6YpZp2whvjga+/1mp/Nno7UIutJs8GLNONdA4un/EHky0U2BlD6NTH/DePKZWImwzYQSQdGK2xsnA2XH9QM6ZvMWBk= + - secure: FEjVU4qL2PBa0LKBGrIRxrWwqplBIf1HbOI+asD6C+woCfdvn2Hv58W339qTGCtHszJYUhLKfPx1Q9c8MriF1PZ4OWFqCI7LHz20IwfDGFXV+nN/WIjRrJWLWLbb2co2gY0mAd22+3ZWKJsqKueum0aKYv3Ba5jwiIfbvEFVG39cLDhVxfxIBmn7AtCEjsdOaDUhbuwde+SBLfC+Zc2IM7PlcAio9ZqGCveKE4Kz1pjcgsWG/kTckNow/zY4o8laOY8OUGFp+wTWQY4EGp9vc6dwQKankrUKhpU3hU261aoyOToZiGvqQCXuNiaAev3SgScLmkIkoSacr03W3xXuQ8ifocHZ8BaZD3fHCYyucORoDPr0s7ak/O8VEqCkasKK8yAD5WH4j9Klidl5dxjL23TCnqtrcHaDKz+5jF81ZONQkoBsFc/Q+4DT9TO01SnJ9uOQYs+FtNNg6GmoskdDFbTAGnC36Q9eb6ofJ+Z37PmfCPqCv36PPOIkaDwpVMdw817bOT/uJs9pgP64Ko8HsdfEHxZp0SZv5qRPUPE/XtoCzIv4cx3Htu1uoxVPDW+YY8gZfQIT8zVR44NqTyJ0DYgx+VZ1DO2bVxMu+2mn8m7aZ/eCHTD8WX7AnbL3GPTVrdvTzGkbAERAIOwFtCq9GPp9Xdc3rtzbg5eN4esWd1w= + - COMMIT=${TRAVIS_COMMIT::8} + +before_install: + - sudo apt-get update + - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine + +install: true + +script: + - cd frontend && yarn && yarn run build + - cd ../frontend-webjars && mvn install + - cd ../backend && mvn package + - cd .. + - docker login -u $DOCKER_USER -p $DOCKER_PASS + - export REPO=webide/webide + - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH + ; fi` + - docker build -f Dockerfile -t $REPO:$COMMIT . + - docker tag $REPO:$COMMIT $REPO:$TAG + - docker tag $REPO:$COMMIT $REPO:travis-$TRAVIS_BUILD_NUMBER + - docker push $REPO + +notifications: + slack: + on_failure: always + on_success: change + rooms: + secure: htxsb1e6mOjdWfyyL2D46tDSwrZsJZd22/VlVLykoSt4vktIBGBFIyfroc0BAD3Bxn/4LT23q1TXVXafFDwUa9NWUFOTciyn5wWoJfTzC/GZ3fk4c9dLX2zcFf+Nz+2UU4Kyg7v4rvm5DiqfyGPmvzoKHG+GjbdYLUTjWr0jKscP5zDIRWv/0RUiea8kgGR4dQLY+xq2tAmvCZBzNnb20NWNzdWHviTN8sdbQMipeLm3rW8LwMQavU/IWNRn4yMVTtUzz1eE+cG74c0H4RTU7iJh1NQFjaFKZvEGuE3ZnTA7e6WGeA5bHbaYY44fjZEEu5uhixj08huMuK3fEyTu1rNh5bkAowxqrI53RLPHsECq0xF+Y5aZpV5dEx+gvz/dNCWlV8d658H11oBhL3gPQPcouJTMoktW+12kEqeKVRnSm6fXJmhYZHLal+bF9iQZjh2Ask+1hoWvQJbFONlrCHp+XGKzMxSxyqXWV491QIDZIQsBw17qNSD1zQG0dSdHogxl/N5MB7lgCCmjMPrPaD29tqO1a3qJAN/2dw0dW0VBOznixNz+hpBVbUELJJjsu8wlrm1wBFsdwLIwCVjSKJ3CgQPoMcYTI1nCm5vzuUEExfGTArh00uvYG4H7usfF/KbMt4zQkwxEwjihLvnw5G//YwWpG+JIte5BMnSJuFU= diff --git a/Dockerfile b/Dockerfile index 9a87100..2f0d45f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,38 +1,20 @@ -FROM ksimple/java8-mvn-nodejs-npm-python3 -MAINTAINER tanhe123 from Coding IDE Team +FROM java:8-jre-alpine EXPOSE 8080 -RUN apt-get update && apt-get install -y zsh && apt-get clean && rm -rf /var/lib/apt/lists/* - -# Add user `coding` -RUN useradd --create-home --home-dir /home/coding --shell /usr/bin/zsh coding \ - && echo "coding:coding" | chpasswd \ - && adduser coding sudo \ - && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -USER coding -ENV HOME /home/coding -ENV SHELL /usr/bin/zsh -ENV TERM xterm +RUN set -ex && \ + if [ $(wget -qO- ipinfo.io/country) == CN ]; then echo "http://mirrors.aliyun.com/alpine/latest-stable/main/" > /etc/apk/repositories ;fi && \ + apk update && \ + apk add --no-cache zsh git # Install oh-my-zsh -RUN git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh \ +RUN git clone --depth=1 git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh \ && cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc -ADD . /opt/coding/WebIDE - -RUN sudo chown -R coding /opt/coding/WebIDE \ - && mkdir $HOME/.m2 +ENV SHELL /bin/zsh -RUN cd /opt/coding/WebIDE/frontend && npm install && npm run build \ - && cd /opt/coding/WebIDE/frontend-webjars && mvn clean install \ - && cd /opt/coding/WebIDE/backend && mvn clean package -Dmaven.test.skip=true \ - && cp /opt/coding/WebIDE/backend/target/ide-backend.jar /opt/coding/WebIDE \ - && cd /opt/coding/WebIDE/frontend && rm -r build node_modules \ - && cd /opt/coding/WebIDE/frontend-webjars && mvn clean \ - && cd /opt/coding/WebIDE/backend && mvn clean \ - && rm -fr $HOME/.m2 +ADD backend/target/ide-backend.jar /root +ADD backend/src/main/resources/lib /root/lib -ENV CODING_IDE_HOME /home/coding/coding-ide-home -CMD ["java", "-jar", "/opt/coding/WebIDE/ide-backend.jar", "--PTY_LIB_FOLDER=/opt/coding/WebIDE/backend/src/main/resources/lib"] +WORKDIR /root +CMD ["java", "-jar", "ide-backend.jar", "--PTY_LIB_FOLDER=/root/lib"] From a16ec8a8ae682d63247c13f77159dbf4b87819c3 Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Fri, 7 Apr 2017 20:05:56 +0800 Subject: [PATCH 12/56] Using Trusty --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 480f884..3d4db93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +dist: trusty language: java jdk: - oraclejdk8 From c57911dffe79174bf9cdda60cfcda93531e9cc1f Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Fri, 7 Apr 2017 20:18:21 +0800 Subject: [PATCH 13/56] fix travis --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3d4db93..ddeb77d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,6 @@ language: java jdk: - oraclejdk8 -node_js: "7" - service: - docker @@ -20,12 +18,13 @@ env: - COMMIT=${TRAVIS_COMMIT::8} before_install: - - sudo apt-get update - - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine + - curl -sL https://deb.nodesource.com/setup_7.x | sudo -E bash - + - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine nodejs install: true script: + - set -e - cd frontend && yarn && yarn run build - cd ../frontend-webjars && mvn install - cd ../backend && mvn package From 4230a8c274d62174c2db250f985c6ad061538176 Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Fri, 7 Apr 2017 20:24:09 +0800 Subject: [PATCH 14/56] fix travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index ddeb77d..b772454 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ dist: trusty language: java jdk: - oraclejdk8 +node_js: + - "7" service: - docker From 519d0923281f8976c0fbed5804b1e6fbc4dc8deb Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Fri, 7 Apr 2017 21:11:00 +0800 Subject: [PATCH 15/56] fix travis --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b772454..eb60616 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,6 @@ dist: trusty language: java jdk: - oraclejdk8 -node_js: - - "7" service: - docker @@ -20,8 +18,10 @@ env: - COMMIT=${TRAVIS_COMMIT::8} before_install: - - curl -sL https://deb.nodesource.com/setup_7.x | sudo -E bash - - - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine nodejs + - sudo apt-get update + - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine + - nvm install 7 + - nvm use 7 install: true From 487f5d1addde7a902390e0cde9b92eaf9e8c4cda Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Fri, 7 Apr 2017 21:20:08 +0800 Subject: [PATCH 16/56] update submodule --- backend | 2 +- frontend | 2 +- frontend-webjars | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend b/backend index 5cbaafc..b9e3fb0 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit 5cbaafc19ce3a33e9478f1483a561725bdb645ed +Subproject commit b9e3fb0c79943228770971865a7a7b26aee5698a diff --git a/frontend b/frontend index cef7665..24dc24c 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit cef76656309df788b93c8aa662eba49d4681058a +Subproject commit 24dc24c133acc6bf6b7cafeff1d1e90908f10e7b diff --git a/frontend-webjars b/frontend-webjars index 3872b1b..eabe1a7 160000 --- a/frontend-webjars +++ b/frontend-webjars @@ -1 +1 @@ -Subproject commit 3872b1bae6b1ece0e18aae192b9724b41bd76683 +Subproject commit eabe1a7ed38f66c45a2c585f58ca9d29ab5c9c5b From ebeb11028127bf4762e2a4659f7dc6290592d4dd Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Fri, 7 Apr 2017 21:58:13 +0800 Subject: [PATCH 17/56] fix travis --- .travis.yml | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb60616..6f48c6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ dist: trusty language: java jdk: - - oraclejdk8 +- oraclejdk8 service: - docker @@ -10,35 +10,34 @@ cache: yarn: true directories: - "$HOME/.m2" - env: global: - - secure: cf1UZFSfaPjz9aQ+M8u+6yfZk81DWZoTzmIT9UxCZmwZH8kkb9zADjnLONaOB6jMk6Meyxau76ZACKL8szNd7BcOsL0M5nBpBoUIVc+Lbe+g02TFsm956yfk5FISbK7AUC/Qblhw9jQeyT7qFyeyh711/f3C+jwXFB9P9uxK2PjsUpz0BeQH6ld/wnappNQla3IDM+vLaHv1CmH2y9sLl3WDhs9jVHPUPhzeklgojibvHXRe2wcdytlII4Vh79+kDKCUUncNkPNFqrcY4ISluRGIchTsjy9AR2/MezbS3T3Ei6w4CqTlIT3hRr6B7mQrdXx4rTCKKucafFB2KcFp9cBcqeWZ++B/u/tXyb49nGcuNxQz2zoY0u3Ba5TLelwbQLH8X55meVeJLrDShOTX+PHiNK070o7luz8LDqE1O6WCD3Ne+GcOv1B2uaPT3TkNUNxt82rSaDHwHQWa9/2foELglo+W/ca6SmZb10McyJSaZn50XIquy0g/oMNhkvqTQVYklY5ztbKMqv4hXtiA+Rq1RMWJxDs9OkgQWafPmrTJOO8djf7rEhexfJuVVaOBOFzQZCjv0F+/DqP+E6YpZp2whvjga+/1mp/Nno7UIutJs8GLNONdA4un/EHky0U2BlD6NTH/DePKZWImwzYQSQdGK2xsnA2XH9QM6ZvMWBk= - - secure: FEjVU4qL2PBa0LKBGrIRxrWwqplBIf1HbOI+asD6C+woCfdvn2Hv58W339qTGCtHszJYUhLKfPx1Q9c8MriF1PZ4OWFqCI7LHz20IwfDGFXV+nN/WIjRrJWLWLbb2co2gY0mAd22+3ZWKJsqKueum0aKYv3Ba5jwiIfbvEFVG39cLDhVxfxIBmn7AtCEjsdOaDUhbuwde+SBLfC+Zc2IM7PlcAio9ZqGCveKE4Kz1pjcgsWG/kTckNow/zY4o8laOY8OUGFp+wTWQY4EGp9vc6dwQKankrUKhpU3hU261aoyOToZiGvqQCXuNiaAev3SgScLmkIkoSacr03W3xXuQ8ifocHZ8BaZD3fHCYyucORoDPr0s7ak/O8VEqCkasKK8yAD5WH4j9Klidl5dxjL23TCnqtrcHaDKz+5jF81ZONQkoBsFc/Q+4DT9TO01SnJ9uOQYs+FtNNg6GmoskdDFbTAGnC36Q9eb6ofJ+Z37PmfCPqCv36PPOIkaDwpVMdw817bOT/uJs9pgP64Ko8HsdfEHxZp0SZv5qRPUPE/XtoCzIv4cx3Htu1uoxVPDW+YY8gZfQIT8zVR44NqTyJ0DYgx+VZ1DO2bVxMu+2mn8m7aZ/eCHTD8WX7AnbL3GPTVrdvTzGkbAERAIOwFtCq9GPp9Xdc3rtzbg5eN4esWd1w= + - secure: NtkK4A4aYmudQue+KzS/PRyO2+5YkKp9x0r0AFRpZB6F9v+4cX+aWynX1reVQ1By9NmB/F3W9t+hujS2Dm7pIwlzj4oDRzdSda/aakOF6fiJvy41xaa4fGNEDdrvrtzfFHoFCuG7lg8mO5hVAIlwXeLR+XjDQXj6XklgHcjxF5WCEzElN9ZcA8K3b7tU1pxyaGeKTN3Qu+L1xVNkFnfi7sCiLIkXG8LV/0O8al/qow5SAm3gBAIqplSN7o2AKur331IsZD6PfTqPTZJbQMYFkcRZisZ+8J/H+xCHTk/Bf56BpMuJYLr0ScZURznmX5Hhh+JSx4kZnQbgs6F26/c1k1vWy9G1ZMRdepBZm+UG3yobbAKH/Nu4tt47UjBdbkedvRJbLUQQCo/StUE0kqRFa9ykQYltGYPm879NRyZbryEK5LHkwW0CNSZFU1zlToo8q7IH47cZz+kJTDFkYoP/0wOVf9sSCV07tWTnegI7P6YR5s+q7n7XYhVUOcS+x0PERYajIybgU0bJ0r2hQc8kg05YlVOH88wR3BGegKnv0J2kw2IKpENIG6FNRmhIeXi27dTIAfcC4w+1XsqBBQZr6f/HKHgLvMi+Y6lrXV/hGJL1CkiEtkuuUyDF8zC68jfqhvunXAuIZD6FnRkHJBVnKqbcqMYD0BxLae4ic5sRXfI= + - secure: HZipPIhxoHUMxO+EsCImjcbaJNsbXTo4NpmBzGm5uv2RdQRTyauePpwNfcFnpZNrCz0e6BfSAxzEZ6HZ+hIViPZUCWBrB3us7XOSd9U9S40a6E4LnfMMfX53awC7BFAoiU5eIrcOAgSppIic0ZaOHdM0BbIFJeU3mUsApHQ9s4fj8pRp38e9PYfAQ7K0zreU5rnEV/cWJhF2G1Qx7jkeiA99tf4ndjNP9L8Olcs/jaN1nxggR7QuT8hTfNJNIVeYBirhudu/5K2TblydBh7CKcmv77N5H6um07SP32oXAOoUESpfEntKS/FgUAMcckYYX1SIsYzMuqZbN60kgmPocppsDp2NARsKn4/EEV1aZe0Dm8udOXipxVaXBCnKXS5mm+zlmmgRY//DCoH8Jk8ULOhqc6Yevj3IMUK4KIL46q4tfaB9ktVVa+a3b/Ljqs0dgsAKC11tx+rUWHjUCX30ixH035H40xOzRw+5DVVyy2KtppNnwKWx+3xBRrwx1zwWBb2p9UsXZ1hEo3c/cCpseuHvbbXYVOoOXRxA2ZtJf5MnjU9Y5K20gBM4qFJ/E2xYJ5LiE5HOLluNECyF6lzIWZeVMp1qic98C662+Hpyj9HnHnDGdwkHyuBBWlsQxyKTiQt9S6HfG0WDQFvS1PF3/9dW4yO8bkrXBTeuBWy9638= - COMMIT=${TRAVIS_COMMIT::8} before_install: - - sudo apt-get update - - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine - - nvm install 7 - - nvm use 7 +- sudo apt-get update +- sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine +- nvm install 7 +- nvm use 7 install: true script: - - set -e - - cd frontend && yarn && yarn run build - - cd ../frontend-webjars && mvn install - - cd ../backend && mvn package - - cd .. - - docker login -u $DOCKER_USER -p $DOCKER_PASS - - export REPO=webide/webide - - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH - ; fi` - - docker build -f Dockerfile -t $REPO:$COMMIT . - - docker tag $REPO:$COMMIT $REPO:$TAG - - docker tag $REPO:$COMMIT $REPO:travis-$TRAVIS_BUILD_NUMBER - - docker push $REPO +- set -e +- cd frontend && yarn && yarn run build +- cd ../frontend-webjars && mvn install +- cd ../backend && mvn package +- cd .. +- docker login -u $DOCKER_USER -p $DOCKER_PASS +- export REPO=webide/webide +- export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH + ; fi` +- docker build -f Dockerfile -t $REPO:$COMMIT . +- docker tag $REPO:$COMMIT $REPO:$TAG +- docker tag $REPO:$COMMIT $REPO:travis-$TRAVIS_BUILD_NUMBER +- docker push $REPO notifications: slack: From 4895b911ba11f2f1b1597ecc19a9b4cc7aee25ad Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Fri, 7 Apr 2017 22:46:08 +0800 Subject: [PATCH 18/56] cache docker image in travis --- .travis.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6f48c6d..e161311 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,17 +10,21 @@ cache: yarn: true directories: - "$HOME/.m2" + - "$HOME/docker" env: global: - secure: NtkK4A4aYmudQue+KzS/PRyO2+5YkKp9x0r0AFRpZB6F9v+4cX+aWynX1reVQ1By9NmB/F3W9t+hujS2Dm7pIwlzj4oDRzdSda/aakOF6fiJvy41xaa4fGNEDdrvrtzfFHoFCuG7lg8mO5hVAIlwXeLR+XjDQXj6XklgHcjxF5WCEzElN9ZcA8K3b7tU1pxyaGeKTN3Qu+L1xVNkFnfi7sCiLIkXG8LV/0O8al/qow5SAm3gBAIqplSN7o2AKur331IsZD6PfTqPTZJbQMYFkcRZisZ+8J/H+xCHTk/Bf56BpMuJYLr0ScZURznmX5Hhh+JSx4kZnQbgs6F26/c1k1vWy9G1ZMRdepBZm+UG3yobbAKH/Nu4tt47UjBdbkedvRJbLUQQCo/StUE0kqRFa9ykQYltGYPm879NRyZbryEK5LHkwW0CNSZFU1zlToo8q7IH47cZz+kJTDFkYoP/0wOVf9sSCV07tWTnegI7P6YR5s+q7n7XYhVUOcS+x0PERYajIybgU0bJ0r2hQc8kg05YlVOH88wR3BGegKnv0J2kw2IKpENIG6FNRmhIeXi27dTIAfcC4w+1XsqBBQZr6f/HKHgLvMi+Y6lrXV/hGJL1CkiEtkuuUyDF8zC68jfqhvunXAuIZD6FnRkHJBVnKqbcqMYD0BxLae4ic5sRXfI= - secure: HZipPIhxoHUMxO+EsCImjcbaJNsbXTo4NpmBzGm5uv2RdQRTyauePpwNfcFnpZNrCz0e6BfSAxzEZ6HZ+hIViPZUCWBrB3us7XOSd9U9S40a6E4LnfMMfX53awC7BFAoiU5eIrcOAgSppIic0ZaOHdM0BbIFJeU3mUsApHQ9s4fj8pRp38e9PYfAQ7K0zreU5rnEV/cWJhF2G1Qx7jkeiA99tf4ndjNP9L8Olcs/jaN1nxggR7QuT8hTfNJNIVeYBirhudu/5K2TblydBh7CKcmv77N5H6um07SP32oXAOoUESpfEntKS/FgUAMcckYYX1SIsYzMuqZbN60kgmPocppsDp2NARsKn4/EEV1aZe0Dm8udOXipxVaXBCnKXS5mm+zlmmgRY//DCoH8Jk8ULOhqc6Yevj3IMUK4KIL46q4tfaB9ktVVa+a3b/Ljqs0dgsAKC11tx+rUWHjUCX30ixH035H40xOzRw+5DVVyy2KtppNnwKWx+3xBRrwx1zwWBb2p9UsXZ1hEo3c/cCpseuHvbbXYVOoOXRxA2ZtJf5MnjU9Y5K20gBM4qFJ/E2xYJ5LiE5HOLluNECyF6lzIWZeVMp1qic98C662+Hpyj9HnHnDGdwkHyuBBWlsQxyKTiQt9S6HfG0WDQFvS1PF3/9dW4yO8bkrXBTeuBWy9638= - COMMIT=${TRAVIS_COMMIT::8} + - DOCKER_CACHE_FILE=${HOME}/docker/cache.tar.gz + - REPO=webide/webide before_install: - sudo apt-get update - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine - nvm install 7 - nvm use 7 +- if [ -f ${DOCKER_CACHE_FILE} ]; then gunzip -c ${DOCKER_CACHE_FILE} | docker load; fi install: true @@ -31,7 +35,6 @@ script: - cd ../backend && mvn package - cd .. - docker login -u $DOCKER_USER -p $DOCKER_PASS -- export REPO=webide/webide - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi` - docker build -f Dockerfile -t $REPO:$COMMIT . @@ -39,6 +42,11 @@ script: - docker tag $REPO:$COMMIT $REPO:travis-$TRAVIS_BUILD_NUMBER - docker push $REPO +before_cache: +- set -e +- mkdir -p $(dirname ${DOCKER_CACHE_FILE}) +- docker save $(docker history -q $REPO:$COMMIT | grep -v '') | gzip > ${DOCKER_CACHE_FILE}; fi + notifications: slack: on_failure: always From b5aa8bcb0e9d6303b6595c8dfe0aad9d96114a64 Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Fri, 7 Apr 2017 22:51:39 +0800 Subject: [PATCH 19/56] cache yarn in travis --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e161311..645c555 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,12 @@ service: - docker cache: - yarn: true directories: - - "$HOME/.m2" - - "$HOME/docker" + - $HOME/.m2 + - $HOME/docker + - $HOME/.yarn-cache + - frontend/node_modules + env: global: - secure: NtkK4A4aYmudQue+KzS/PRyO2+5YkKp9x0r0AFRpZB6F9v+4cX+aWynX1reVQ1By9NmB/F3W9t+hujS2Dm7pIwlzj4oDRzdSda/aakOF6fiJvy41xaa4fGNEDdrvrtzfFHoFCuG7lg8mO5hVAIlwXeLR+XjDQXj6XklgHcjxF5WCEzElN9ZcA8K3b7tU1pxyaGeKTN3Qu+L1xVNkFnfi7sCiLIkXG8LV/0O8al/qow5SAm3gBAIqplSN7o2AKur331IsZD6PfTqPTZJbQMYFkcRZisZ+8J/H+xCHTk/Bf56BpMuJYLr0ScZURznmX5Hhh+JSx4kZnQbgs6F26/c1k1vWy9G1ZMRdepBZm+UG3yobbAKH/Nu4tt47UjBdbkedvRJbLUQQCo/StUE0kqRFa9ykQYltGYPm879NRyZbryEK5LHkwW0CNSZFU1zlToo8q7IH47cZz+kJTDFkYoP/0wOVf9sSCV07tWTnegI7P6YR5s+q7n7XYhVUOcS+x0PERYajIybgU0bJ0r2hQc8kg05YlVOH88wR3BGegKnv0J2kw2IKpENIG6FNRmhIeXi27dTIAfcC4w+1XsqBBQZr6f/HKHgLvMi+Y6lrXV/hGJL1CkiEtkuuUyDF8zC68jfqhvunXAuIZD6FnRkHJBVnKqbcqMYD0BxLae4ic5sRXfI= From 6600ba41bdc64717d5fd8d69eb56836c46375b94 Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Fri, 7 Apr 2017 23:02:29 +0800 Subject: [PATCH 20/56] fix travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 645c555..d472c16 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ script: before_cache: - set -e - mkdir -p $(dirname ${DOCKER_CACHE_FILE}) -- docker save $(docker history -q $REPO:$COMMIT | grep -v '') | gzip > ${DOCKER_CACHE_FILE}; fi +- docker save $(docker history -q $REPO:$COMMIT | grep -v '') | gzip > ${DOCKER_CACHE_FILE} notifications: slack: From 1f7ee6d2068acb07d887ab82d336fe8875e72b60 Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Fri, 7 Apr 2017 23:36:12 +0800 Subject: [PATCH 21/56] speed up mvn build in travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d472c16..5dac012 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,8 +33,8 @@ install: true script: - set -e - cd frontend && yarn && yarn run build -- cd ../frontend-webjars && mvn install -- cd ../backend && mvn package +- cd ../frontend-webjars && mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V +- cd ../backend && mvn package -DskipTests=true -Dmaven.javadoc.skip=true -B -V - cd .. - docker login -u $DOCKER_USER -p $DOCKER_PASS - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH From ca5b3363122b1cda4407cb220e80b5fbe01ffea9 Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Sat, 8 Apr 2017 00:22:16 +0800 Subject: [PATCH 22/56] push image on tag --- .travis.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5dac012..d13dfec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,14 +35,8 @@ script: - cd frontend && yarn && yarn run build - cd ../frontend-webjars && mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V - cd ../backend && mvn package -DskipTests=true -Dmaven.javadoc.skip=true -B -V -- cd .. -- docker login -u $DOCKER_USER -p $DOCKER_PASS -- export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH - ; fi` -- docker build -f Dockerfile -t $REPO:$COMMIT . -- docker tag $REPO:$COMMIT $REPO:$TAG -- docker tag $REPO:$COMMIT $REPO:travis-$TRAVIS_BUILD_NUMBER -- docker push $REPO +- cd .. && docker build -f Dockerfile -t $REPO:$COMMIT . +- if [ -n $TRAVIS_TAG ]; then docker tag $REPO:$COMMIT $REPO:$TRAVIS_TAG ; docker tag $REPO:$COMMIT $REPO:latest ; docker login -u $DOCKER_USER -p $DOCKER_PASS ; docker push $REPO ; fi before_cache: - set -e From 5f9bf689f2dd4a78c2e479a8f984202fe644ce9f Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Sat, 8 Apr 2017 00:32:38 +0800 Subject: [PATCH 23/56] fix travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d13dfec..2d066d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ script: - cd ../frontend-webjars && mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V - cd ../backend && mvn package -DskipTests=true -Dmaven.javadoc.skip=true -B -V - cd .. && docker build -f Dockerfile -t $REPO:$COMMIT . -- if [ -n $TRAVIS_TAG ]; then docker tag $REPO:$COMMIT $REPO:$TRAVIS_TAG ; docker tag $REPO:$COMMIT $REPO:latest ; docker login -u $DOCKER_USER -p $DOCKER_PASS ; docker push $REPO ; fi +- if [ -n "$TRAVIS_TAG" ]; then docker tag $REPO:$COMMIT $REPO:$TRAVIS_TAG ; docker tag $REPO:$COMMIT $REPO:latest ; docker login -u $DOCKER_USER -p $DOCKER_PASS ; docker push $REPO ; fi before_cache: - set -e From 1af83e6a7bc8cf7cf3461603f4c36c157389ce17 Mon Sep 17 00:00:00 2001 From: tanhe123 Date: Mon, 10 Apr 2017 10:35:24 +0800 Subject: [PATCH 24/56] mod some url configs --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index 24dc24c..e3197d2 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 24dc24c133acc6bf6b7cafeff1d1e90908f10e7b +Subproject commit e3197d25b06befcfe0ba55305c2000ac0b01fced From f82fc738f86941bf8c3a58e4fb5e3882ee5e635b Mon Sep 17 00:00:00 2001 From: hackape Date: Mon, 10 Apr 2017 16:04:10 +0800 Subject: [PATCH 25/56] update submodule --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index e3197d2..afdb755 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit e3197d25b06befcfe0ba55305c2000ac0b01fced +Subproject commit afdb755f45200745f9cbe23e440be2fd7f8483c6 From 18578ea4848c3cf28252ac2c0da4a067b5a0156f Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Mon, 10 Apr 2017 17:56:18 +0800 Subject: [PATCH 26/56] Update README.md add shields --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0cf5507..5e93713 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ # Coding WebIDE +[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://github.com/Coding/WebIDE/blob/master/LICENSE) [![Build Status](https://travis-ci.org/Coding/WebIDE.svg?branch=master)](https://travis-ci.org/Coding/WebIDE) [![Docker Stars](https://img.shields.io/docker/stars/webide/webide.svg)](https://hub.docker.com/r/webide/webide 'DockerHub') [![Docker Pulls](https://img.shields.io/docker/pulls/webide/webide.svg)](https://hub.docker.com/r/webide/webide 'DockerHub') README: [English](https://github.com/Coding/WebIDE/blob/master/README.md) | [中文](https://github.com/Coding/WebIDE/blob/master/README-zh.md) From 4344009c4bdb13e8099ac91e6e404e4637a558d4 Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Thu, 13 Apr 2017 13:41:38 +0800 Subject: [PATCH 27/56] update readme --- README-zh.md | 1 + frontend | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README-zh.md b/README-zh.md index 4da79b2..b99d4c1 100644 --- a/README-zh.md +++ b/README-zh.md @@ -1,4 +1,5 @@ # Coding WebIDE +[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://github.com/Coding/WebIDE/blob/master/LICENSE) [![Build Status](https://travis-ci.org/Coding/WebIDE.svg?branch=master)](https://travis-ci.org/Coding/WebIDE) [![Docker Stars](https://img.shields.io/docker/stars/webide/webide.svg)](https://hub.docker.com/r/webide/webide 'DockerHub') [![Docker Pulls](https://img.shields.io/docker/pulls/webide/webide.svg)](https://hub.docker.com/r/webide/webide 'DockerHub') README: [English](https://github.com/Coding/WebIDE/blob/master/README.md) | [中文](https://github.com/Coding/WebIDE/blob/master/README-zh.md) diff --git a/frontend b/frontend index afdb755..24dc24c 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit afdb755f45200745f9cbe23e440be2fd7f8483c6 +Subproject commit 24dc24c133acc6bf6b7cafeff1d1e90908f10e7b From 4d5152ad56f61bbeae3ff9db65546089938744f1 Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Fri, 14 Apr 2017 09:29:18 +0800 Subject: [PATCH 28/56] update readme --- README-zh.md | 6 +++--- README.md | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README-zh.md b/README-zh.md index b99d4c1..9b41f27 100644 --- a/README-zh.md +++ b/README-zh.md @@ -70,19 +70,19 @@ git submodule update `backend/src/main/resources/application.properties` 包括用户、项目、数据库等配置，可以通过修改配置定制服务： -* **SPACE_HOME:** 存放 workspace 的目录，默认为 ${"user.home"}/.workspace +* **SPACE_HOME:** 存放 workspace 的目录，默认为 `~/.coding-ide/workspace` * **server.port:** 应用启动的端口 * **USERNAME:** 用户名，git 提交时会使用该值作为 user.name，默认为 coding。 * **EMAIL:** 用户邮箱，git 提交时会使用该值作为 user.email，默认为 coding@coding.net * **AVATAR:** 用户头像 -* **CODING_IDE_HOME:** 应用数据存放目录 +* **CODING_IDE_HOME:** 应用数据存放目录，默认为 `~/.coding-ide` 修改配置后，需要重启应用。另外如果修改了 `USERNAME`、`EMAIL` 的值，会在创建新的 Workspace 时生效。 ## docker 版 ``` -docker run -p 8080:8080 --name webide webide/webide +docker run -p 8080:8080 -v coding-ide-home:/root/.coding-ide webide/webide ``` 更多 docker 命令，参照 wiki [English](https://github.com/Coding/WebIDE/wiki/Docker-Server.en) [中文](https://github.com/Coding/WebIDE/wiki/Docker-Server.zh) diff --git a/README.md b/README.md index 5e93713..c07ffc6 100644 --- a/README.md +++ b/README.md @@ -75,12 +75,12 @@ Server runs on port 8080 by default, visit localhost:8080 to check it out. `backend/src/main/resources/application.properties` contains configurations of user, project, database, etc., you can change these parameters to meet your need: -* **SPACE_HOME:** path to your workspace directory, default to `${"user.home"}/.workspace` +* **SPACE_HOME:** path to your workspace directory, default to `~/.coding-ide/workspace` * **server.port:** backend server port * **USERNAME:** username, used by git as its `user.name` config when commit, defaults to "coding" * **EMAIL:** email, used by git as its `user.email` config when commit, defaults to "coding@coding.net" * **AVATAR:** user's avatar -* **CODING_IDE_HOME:** path to store WebIDE application's data +* **CODING_IDE_HOME:** path to store WebIDE application's data, default to `~/.coding-ide` If changed, restart the application to let your configurations take effect. Note that changes on `USERNAME`, `EMAIL` *WILL NOT* apply to workspaces that are already created. @@ -88,7 +88,7 @@ If changed, restart the application to let your configurations take effect. Note ## Docker Server ``` -docker run -p 8080:8080 -h webide --name webide webide/webide +docker run -p 8080:8080 -v coding-ide-home:/root/.coding-ide webide/webide ``` To learn more about docker commands，please refer to wiki [English](https://github.com/Coding/WebIDE/wiki/Docker-Server.en) [中文](https://github.com/Coding/WebIDE/wiki/Docker-Server.zh) From 0dc85a654c2f1dc49995b85a9a41e8131a374489 Mon Sep 17 00:00:00 2001 From: hackape Date: Fri, 14 Apr 2017 23:58:38 +0800 Subject: [PATCH 29/56] update submodules --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index afdb755..0dec996 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit afdb755f45200745f9cbe23e440be2fd7f8483c6 +Subproject commit 0dec996662addd9e70e238211309ad1d54957ed7 From 1a9f0bc12f848f3b8fa808ff5bec79f7c5a4c0a5 Mon Sep 17 00:00:00 2001 From: hackape Date: Mon, 17 Apr 2017 13:03:04 +0800 Subject: [PATCH 30/56] update submodule --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index 0dec996..a7b28de 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 0dec996662addd9e70e238211309ad1d54957ed7 +Subproject commit a7b28de681ba27fd9de178e09895d472b451d358 From dff9d42f200bbc42870dd726b1acf3d799d84a9c Mon Sep 17 00:00:00 2001 From: hackape Date: Mon, 1 May 2017 23:30:01 +0800 Subject: [PATCH 31/56] update submodules for v0.11.0 --- backend | 2 +- frontend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend b/backend index b9e3fb0..03b9652 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit b9e3fb0c79943228770971865a7a7b26aee5698a +Subproject commit 03b9652f8f292ed4136a2f329a4240b6649fefd6 diff --git a/frontend b/frontend index a7b28de..bc7bfc5 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit a7b28de681ba27fd9de178e09895d472b451d358 +Subproject commit bc7bfc5bb60479f8d701ac07624a9ac6935f8445 From 3aa513884818faef87c54dbc166a36999433ab6a Mon Sep 17 00:00:00 2001 From: hackape Date: Mon, 15 May 2017 15:23:36 +0800 Subject: [PATCH 32/56] update submodules for release v0.12.0 --- backend | 2 +- frontend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend b/backend index 03b9652..2440dbb 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit 03b9652f8f292ed4136a2f329a4240b6649fefd6 +Subproject commit 2440dbb96347ad10c90c9360e5eb42bb284336a2 diff --git a/frontend b/frontend index bc7bfc5..2d40b75 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit bc7bfc5bb60479f8d701ac07624a9ac6935f8445 +Subproject commit 2d40b7572ecdbde873053dc103708de8473f13fe From 19c519af127a82beb92f0c88153525785a895dcf Mon Sep 17 00:00:00 2001 From: hackape Date: Wed, 24 May 2017 18:57:12 +0800 Subject: [PATCH 33/56] update submodule for v0.13.0 --- backend | 2 +- frontend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend b/backend index 2440dbb..bcd988a 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit 2440dbb96347ad10c90c9360e5eb42bb284336a2 +Subproject commit bcd988aeeae4c8491d8f000f5be2861ee378b1e6 diff --git a/frontend b/frontend index 2d40b75..f414464 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 2d40b7572ecdbde873053dc103708de8473f13fe +Subproject commit f41446475dd823ec94fb3def21019547eab30d90 From c3c7bda5c8c441c8eff7e1c1296ff1fe3d834747 Mon Sep 17 00:00:00 2001 From: hackape Date: Thu, 15 Jun 2017 17:56:45 +0800 Subject: [PATCH 34/56] update submodule --- backend | 2 +- frontend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend b/backend index bcd988a..6d9c300 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit bcd988aeeae4c8491d8f000f5be2861ee378b1e6 +Subproject commit 6d9c30091757f6dd33aca00c9c8ef7e237c4fa39 diff --git a/frontend b/frontend index f414464..624df8a 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit f41446475dd823ec94fb3def21019547eab30d90 +Subproject commit 624df8ade3335695e588089d6809fea185c463fa From f57900a352a80f01d5303d5ad970a0452837ca67 Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Tue, 18 Jul 2017 14:37:13 +0800 Subject: [PATCH 35/56] add openssh for git clone and jdk for java user --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2f0d45f..e3b7f59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM java:8-jre-alpine +FROM java:8-jdk-alpine EXPOSE 8080 RUN set -ex && \ if [ $(wget -qO- ipinfo.io/country) == CN ]; then echo "http://mirrors.aliyun.com/alpine/latest-stable/main/" > /etc/apk/repositories ;fi && \ apk update && \ - apk add --no-cache zsh git + apk add --no-cache zsh git openssh # Install oh-my-zsh RUN git clone --depth=1 git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh \ From a92de3949bb9e44ad5739e2b8e014397a7deca68 Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Tue, 18 Jul 2017 14:43:08 +0800 Subject: [PATCH 36/56] fix ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2d066d4..c305601 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ env: before_install: - sudo apt-get update -- sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine +- sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce - nvm install 7 - nvm use 7 - if [ -f ${DOCKER_CACHE_FILE} ]; then gunzip -c ${DOCKER_CACHE_FILE} | docker load; fi From a3ff8cd418da1d00423d886486d6b121b662d6e4 Mon Sep 17 00:00:00 2001 From: hackape Date: Fri, 21 Jul 2017 19:27:10 +0800 Subject: [PATCH 37/56] update submodules --- backend | 2 +- frontend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend b/backend index 6d9c300..e3b0850 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit 6d9c30091757f6dd33aca00c9c8ef7e237c4fa39 +Subproject commit e3b08500be27e188cf2d6b5a712733c88961c8ff diff --git a/frontend b/frontend index 624df8a..e67477c 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 624df8ade3335695e588089d6809fea185c463fa +Subproject commit e67477c10fd932d618142ce91256c959b0c7a11f From 7eaa1ca083cf766893a75e34352935551027d90b Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Thu, 3 Aug 2017 16:20:48 +0800 Subject: [PATCH 38/56] update ide.sh and submodule --- backend | 2 +- frontend | 2 +- ide.sh | 10 +--------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/backend b/backend index e3b0850..bd74124 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit e3b08500be27e188cf2d6b5a712733c88961c8ff +Subproject commit bd74124927f2f074f0a9bfed675b0492b9fcfb88 diff --git a/frontend b/frontend index e67477c..561e18b 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit e67477c10fd932d618142ce91256c959b0c7a11f +Subproject commit 561e18b61629b73010920c3a12f7ba1eb3614f69 diff --git a/ide.sh b/ide.sh index f587657..212a4b1 100755 --- a/ide.sh +++ b/ide.sh @@ -8,7 +8,6 @@ BACKEND=$BASEDIR/backend FRONTEND=$BASEDIR/frontend FRONTEND_WEBJARS=$BASEDIR/frontend-webjars CONTAINER=webide -CODING_IDE_HOME=$HOME/.coding-ide-home valid_last_cmd() { if [ $? -ne 0 ]; then @@ -156,12 +155,6 @@ container_is_running() { fi } -create_dir_if_not_exist() { - if [ ! -d "$1" ]; then - echo "$1 is not exist, creating..." - mkdir $1 - fi -} sub_docker() { @@ -204,10 +197,9 @@ sub_docker() { RUNNING=$(docker inspect --format="{{ .State.Running }}" $CONTAINER 2> /dev/null) if ! container_exist ; then - create_dir_if_not_exist $HOME/.coding-ide-home echo "creating container $CONTAINER" - docker create -p 8080:8080 --env-file config -v $HOME/.coding-ide-home:/home/coding/coding-ide-home --name webide -h webide webide/webide + docker create -p 8080:8080 --env-file config -v coding-ide-home:/root/.coding-ide --name webide -h webide webide/webide valid_last_cmd elif [ "$RUNNING" == "true" ]; then echo "CRITICAL - $CONTAINER is running." From d9ab75b3653ab8289c558a1529273ef9b5cd6135 Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Thu, 3 Aug 2017 17:49:20 +0800 Subject: [PATCH 39/56] fix docker image build --- ide.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ide.sh b/ide.sh index 212a4b1..0ae30e2 100755 --- a/ide.sh +++ b/ide.sh @@ -191,7 +191,7 @@ sub_docker() { docker_usage ;; "build") - docker build $EXTRA_VARS . + docker build $EXTRA_VARS -t webide/webide . ;; "run") RUNNING=$(docker inspect --format="{{ .State.Running }}" $CONTAINER 2> /dev/null) From e8753998eefe81f2b14b8ee5e961c0a71cbadfc3 Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Thu, 3 Aug 2017 22:25:15 +0800 Subject: [PATCH 40/56] update backend submodule --- backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend b/backend index bd74124..3199dac 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit bd74124927f2f074f0a9bfed675b0492b9fcfb88 +Subproject commit 3199dacc5b42990dde52aa7e199042d2187132b1 From 13b9c2c6be8d18d0c3e2ab95ae01b0a7817b5d06 Mon Sep 17 00:00:00 2001 From: tanhe123 Date: Fri, 18 Aug 2017 17:27:30 +0800 Subject: [PATCH 41/56] add git local protocal support --- backend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend b/backend index 3199dac..99ac9cf 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit 3199dacc5b42990dde52aa7e199042d2187132b1 +Subproject commit 99ac9cf20fd767fd38d781cd6f3092194f9d81c3 From 962368f5aeadd303389df60d076926fe57a126a1 Mon Sep 17 00:00:00 2001 From: hackape Date: Mon, 21 Aug 2017 10:34:45 +0800 Subject: [PATCH 42/56] update submodule for v0.14.0 release --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index 561e18b..d74604f 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 561e18b61629b73010920c3a12f7ba1eb3614f69 +Subproject commit d74604ff8ed670b4fdfdbc38a81b39d4da0849e0 From 8961323776116e2ac4a85a3c85a3a209cd28a8f2 Mon Sep 17 00:00:00 2001 From: Yang Zhen Date: Mon, 16 Oct 2017 11:03:14 +0800 Subject: [PATCH 43/56] Update submodule --- backend | 2 +- frontend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend b/backend index 99ac9cf..a3012ca 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit 99ac9cf20fd767fd38d781cd6f3092194f9d81c3 +Subproject commit a3012ca315fc30e571cba7426271835d83e09d86 diff --git a/frontend b/frontend index d74604f..7b845ea 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit d74604ff8ed670b4fdfdbc38a81b39d4da0849e0 +Subproject commit 7b845ea41716734918aa6baa74bdadf0f8be545a From a762abfb20e12695579fced8f211494535607a19 Mon Sep 17 00:00:00 2001 From: Yang Zhen Date: Fri, 20 Oct 2017 12:08:59 +0800 Subject: [PATCH 44/56] Update frontend --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index 7b845ea..439c64e 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 7b845ea41716734918aa6baa74bdadf0f8be545a +Subproject commit 439c64e53f9be09afede2cae2cdd5293bbcc1902 From 4256590c27dddbd3264156a9aee5049f845a637a Mon Sep 17 00:00:00 2001 From: Yang Zhen Date: Mon, 30 Oct 2017 18:00:00 +0800 Subject: [PATCH 45/56] Update frontend --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index 439c64e..84bf575 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 439c64e53f9be09afede2cae2cdd5293bbcc1902 +Subproject commit 84bf5758b6d45850d5831cd1fe0f86275a6af91f From 6a66ac3abe95f19a5098fd8ce20ecf865f73f98e Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Wed, 29 Nov 2017 14:02:58 +0800 Subject: [PATCH 46/56] update submodule and prepare v0.16.0 --- backend | 2 +- frontend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend b/backend index a3012ca..c36a872 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit a3012ca315fc30e571cba7426271835d83e09d86 +Subproject commit c36a8726d4ec2add18489ad2a80372dfb1e9f53b diff --git a/frontend b/frontend index 84bf575..d8dd0c7 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 84bf5758b6d45850d5831cd1fe0f86275a6af91f +Subproject commit d8dd0c7173bdc5bd297a1e9b017c5e10e17ad4bb From 64dd4bdc1cf98ce07ae5c096b85253622413c38a Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Wed, 29 Nov 2017 14:21:38 +0800 Subject: [PATCH 47/56] fix frontend build. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c305601..c55add1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,7 @@ env: - COMMIT=${TRAVIS_COMMIT::8} - DOCKER_CACHE_FILE=${HOME}/docker/cache.tar.gz - REPO=webide/webide + - NODE_ENV=production before_install: - sudo apt-get update From 9ec35d88b6ebe045f5156179452565fad1cb469a Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Wed, 29 Nov 2017 15:07:35 +0800 Subject: [PATCH 48/56] fix frontend build --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index d8dd0c7..824af1a 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit d8dd0c7173bdc5bd297a1e9b017c5e10e17ad4bb +Subproject commit 824af1a0c898a1d659226c1b356d74075f2fabcb From ea4e642f2442a602df1480792f2d5d2d98d764ac Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Wed, 29 Nov 2017 15:52:29 +0800 Subject: [PATCH 49/56] debug frontend travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c55add1..a5707a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ install: true script: - set -e -- cd frontend && yarn && yarn run build +- cd frontend && yarn && pwd && ls node_modules/.bin && yarn run build - cd ../frontend-webjars && mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V - cd ../backend && mvn package -DskipTests=true -Dmaven.javadoc.skip=true -B -V - cd .. && docker build -f Dockerfile -t $REPO:$COMMIT . From 2abe6d79859614e9a6852c700f934bda59ed5b47 Mon Sep 17 00:00:00 2001 From: Vangie Du Date: Wed, 29 Nov 2017 16:56:31 +0800 Subject: [PATCH 50/56] fix frontend build. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a5707a0..cca1e4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ env: - COMMIT=${TRAVIS_COMMIT::8} - DOCKER_CACHE_FILE=${HOME}/docker/cache.tar.gz - REPO=webide/webide - - NODE_ENV=production + - NODE_ENV=prod before_install: - sudo apt-get update @@ -33,7 +33,7 @@ install: true script: - set -e -- cd frontend && yarn && pwd && ls node_modules/.bin && yarn run build +- cd frontend && yarn && yarn run build - cd ../frontend-webjars && mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V - cd ../backend && mvn package -DskipTests=true -Dmaven.javadoc.skip=true -B -V - cd .. && docker build -f Dockerfile -t $REPO:$COMMIT . From fe5a681a2dcc8dbc05c60e750198e47916c9f4db Mon Sep 17 00:00:00 2001 From: Yang Zhen Date: Sat, 2 Dec 2017 10:26:49 +0800 Subject: [PATCH 51/56] Update frontend and backend --- backend | 2 +- frontend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend b/backend index c36a872..ddb5008 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit c36a8726d4ec2add18489ad2a80372dfb1e9f53b +Subproject commit ddb5008e5f807d32217362697d09d4f78c61b75a diff --git a/frontend b/frontend index 824af1a..0d29b9d 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 824af1a0c898a1d659226c1b356d74075f2fabcb +Subproject commit 0d29b9d2f70bc62cbd980ac7655385a2d25e1cfb From f4920795725e0be61c2660188c78b26327105f11 Mon Sep 17 00:00:00 2001 From: Yang Zhen Date: Sat, 2 Dec 2017 11:37:03 +0800 Subject: [PATCH 52/56] Update frontend --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index 0d29b9d..564756e 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 0d29b9d2f70bc62cbd980ac7655385a2d25e1cfb +Subproject commit 564756eac00e2d60accbe7015be9d922d14379fa From 8c764e780c0bb1cd277596ae3ff821864f1b7fb7 Mon Sep 17 00:00:00 2001 From: tanhe123 Date: Fri, 22 Dec 2017 11:56:10 +0800 Subject: [PATCH 53/56] update submodule --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index 564756e..d8c953c 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit 564756eac00e2d60accbe7015be9d922d14379fa +Subproject commit d8c953cda8030f2f494d3edba7fdb24478282a8f From 8638414ca66bac22cbf9f713e6a2f0a78d699cde Mon Sep 17 00:00:00 2001 From: KevenYoung Date: Mon, 7 May 2018 15:58:49 +0800 Subject: [PATCH 54/56] Update readme --- README-zh.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README-zh.md b/README-zh.md index 9b41f27..8a9da81 100644 --- a/README-zh.md +++ b/README-zh.md @@ -3,6 +3,10 @@ README: [English](https://github.com/Coding/WebIDE/blob/master/README.md) | [中文](https://github.com/Coding/WebIDE/blob/master/README-zh.md) +---- +### 线上 WebIDE 现已全面升级为 Cloud Studio，欢迎访问 https://studio.coding.net/ +---- + ![](https://raw.githubusercontent.com/Coding/WebIDE/gh-pages/screenshots/import.png) ![](https://raw.githubusercontent.com/Coding/WebIDE/gh-pages/screenshots/workspace.png) From b7f24eeb3b4d398d4d8beca74b513843dcc93bb2 Mon Sep 17 00:00:00 2001 From: KevenYoung Date: Mon, 7 May 2018 16:02:32 +0800 Subject: [PATCH 55/56] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index c07ffc6..5c362db 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,10 @@ README: [English](https://github.com/Coding/WebIDE/blob/master/README.md) | [中文](https://github.com/Coding/WebIDE/blob/master/README-zh.md) +---- +### WebIDE is now upgraded to Cloud Studio，welcome to our new homepage https://studio.coding.net/ +---- + ![](https://raw.githubusercontent.com/Coding/WebIDE/gh-pages/screenshots/import.png) ![](https://raw.githubusercontent.com/Coding/WebIDE/gh-pages/screenshots/workspace.png) From 641bcc30d74183980d1ab47935f5b5c75fa2792c Mon Sep 17 00:00:00 2001 From: Yang Zhen Date: Thu, 23 Aug 2018 18:35:34 +0800 Subject: [PATCH 56/56] Update frontend version --- frontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend b/frontend index d8c953c..fab3d99 160000 --- a/frontend +++ b/frontend @@ -1 +1 @@ -Subproject commit d8c953cda8030f2f494d3edba7fdb24478282a8f +Subproject commit fab3d991cd90be0c04ec7c57332bca32c6e9cddf