From e9d753fc093a9d86a9be88d432fde581863640a1 Mon Sep 17 00:00:00 2001 From: Jan Keromnes Date: Fri, 30 Aug 2019 11:42:13 +0200 Subject: [PATCH] fix(tools): fix and accelerate automated gitpod dev setup (#36720) * fix(tools): switch to official gitpod mongodb image * fix(tools): accelerate gitpod start-up by prebuilding the client * fix(tools): accelerate gitpod start-up by continuously prebuilding workspaces * fix(tools): add setup|automated badge with new fork-compatible gitpod url --- .gitpod.Dockerfile | 8 -------- .gitpod.yml | 33 +++++++++++++++++++++++++++++---- README.md | 1 + 3 files changed, 30 insertions(+), 12 deletions(-) delete mode 100644 .gitpod.Dockerfile diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile deleted file mode 100644 index f095f37d6d..0000000000 --- a/.gitpod.Dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM gitpod/workspace-full - -USER gitpod -WORKDIR $HOME - -RUN wget https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-3.6.13.tgz && \ - mkdir -p mongodb && \ - tar xaf mongodb-linux-x86_64-ubuntu1604-3.6.13.tgz -C mongodb --strip-components=1 diff --git a/.gitpod.yml b/.gitpod.yml index fd62f57bd2..1ea24dc649 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,5 +1,4 @@ -image: - file: .gitpod.Dockerfile +image: gitpod/workspace-mongodb ports: - port: 27017 # mongodb onOpen: ignore @@ -17,7 +16,7 @@ tasks: # starting mongo in background, so it doesn't block prebuilds before: > mkdir -p /workspace/data && - (~/mongodb/bin/mongod --dbpath /workspace/data &) + (mongod --dbpath /workspace/data &) - name: server before: export COOKIE_DOMAIN=gitpod.io && export HOME_LOCATION=$(gp url 8000) && export API_LOCATION=$(gp url 3000) @@ -26,9 +25,10 @@ tasks: init: > cp sample.env .env && npm ci && + gp sync-done npm-ci && gp await-port 27017 && npm run seed && - ~/mongodb/bin/mongo --eval "db.fsyncLock(); db.fsyncUnlock()" + mongo --eval "db.fsyncLock(); db.fsyncUnlock()" command: > npm run ensure-env && gp await-port 27017 && @@ -36,8 +36,33 @@ tasks: - name: client before: export HOME_LOCATION=$(gp url 8000) && export API_LOCATION=$(gp url 3000) + init: > + cd ./client && + gp sync-await npm-ci && + npm run prebuild && + npm run build:workers && + cd .. command: > gp await-port 3000 && cd ./client && npm run develop -- -H '0.0.0.0' openMode: split-right + +github: + prebuilds: + # enable for the master/default branch (defaults to true) + master: true + # enable for all branches in this repo (defaults to false) + branches: true + # enable for pull requests coming from this repo (defaults to true) + pullRequests: true + # enable for pull requests coming from forks (defaults to false) + pullRequestsFromForks: true + # add a check to pull requests (defaults to true) + addCheck: true + # add a "Review in Gitpod" button as a comment to pull requests (defaults to false) + addComment: true + # add a "Review in Gitpod" button to the pull request's description (defaults to false) + addBadge: false + # add a label once the prebuild is ready to pull requests (defaults to false) + addLabel: false diff --git a/README.md b/README.md index 1e90e4498b..f8baf3247e 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![Pull Requests Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat)](http://makeapullrequest.com) [![first-timers-only Friendly](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](http://www.firsttimersonly.com/) [![Open Source Helpers](https://www.codetriage.com/freecodecamp/freecodecamp/badges/users.svg)](https://www.codetriage.com/freecodecamp/freecodecamp) +[![Setup Automated](https://img.shields.io/badge/setup-automated-blue?logo=gitpod)](https://gitpod.io/from-referrer/) ## Welcome to freeCodeCamp.org's open source codebase and curriculum!